[evolution] Update British English translation



commit 80bc8173a949ddcc052ccbe8e6f93f67d161637d
Author: Zander Brown <zbrown gnome org>
Date:   Sun Mar 14 10:47:38 2021 +0000

    Update British English translation

 po/en_GB.po | 6080 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 3162 insertions(+), 2918 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 29ffd9a5ed..769b9a03bc 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.
-# Bruce Cowan <bruce bcowan me uk>, 2009-2020.
-# Zander Brown <zbrown gnome org>, 2019-2020.
+# Zander Brown <zbrown gnome org>, 2019-2021.
+# Bruce Cowan <bruce bcowan me uk>, 2009-2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\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"
+"POT-Creation-Date: 2021-03-11 16:04+0000\n"
+"PO-Revision-Date: 2021-03-14 10:45+0000\n"
+"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
+"Language-Team: English - United Kingdom <en 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.36.0\n"
+"X-Generator: Gtranslator 3.38.0\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
@@ -1481,10 +1481,22 @@ msgid "If set to “true” quoted text in replies will be wrapped."
 msgstr "If set to “true” quoted text in replies will be wrapped."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+msgid "Paste plain text as preformatted"
+msgstr "Paste plain text as pre-formatted"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+msgid ""
+"When set, paste a plain text into the composer body as Preformatted "
+"paragraph. When not set, paste it as Normal paragraph."
+msgstr ""
+"When set, paste a plain text into the composer body as Pre-formatted "
+"paragraph. When not set, paste it as Normal paragraph."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Convert UTC time in reply credits to local time"
 msgstr "Convert UTC time in reply credits to local time"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid ""
 "Whether the time in reply credits should be converted to local time when "
 "it’s in UTC in the message."
@@ -1492,11 +1504,11 @@ msgstr ""
 "Whether the time in reply credits should be converted to local time when "
 "it’s in UTC in the message."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Mark replied to messages as read"
 msgstr "Mark replied to messages as read"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid ""
 "When replying to a message and marking it as being replied to, then whether "
 "also mark it as read."
@@ -1504,11 +1516,11 @@ msgstr ""
 "When replying to a message and marking it as being replied to, then whether "
 "also mark it as read."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Whether start Plain Text composer with Preformatted paragraph mode"
 msgstr "Whether start Plain Text composer with Preformatted paragraph mode"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid ""
 "When set to true, new Plain Text messages will have preselected Preformatted "
 "paragraph mode. The Normal paragraph mode will be used when set to false."
@@ -1516,11 +1528,11 @@ msgstr ""
 "When set to true, new Plain Text messages will have preselected Preformatted "
 "paragraph mode. The Normal paragraph mode will be used when set to false."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Whether to obey Content-Disposition:inline message header hint"
 msgstr "Whether to obey Content-Disposition:inline message header hint"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid ""
 "Set to “false” to block automatic display of attachments with Content-"
 "Disposition: inline."
@@ -1528,19 +1540,19 @@ msgstr ""
 "Set to “false” to block automatic display of attachments with Content-"
 "Disposition: inline."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Save file format for drag-and-drop operation"
 msgstr "Save file format for drag-and-drop operation"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Can be either “mbox” or “pdf”."
 msgstr "Can be either “mbox” or “pdf”."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show image animations"
 msgstr "Show image animations"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -1548,11 +1560,11 @@ msgstr ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Enable or disable type ahead search feature"
 msgstr "Enable or disable type ahead search feature"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -1560,11 +1572,11 @@ msgstr ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Enable or disable magic space bar"
 msgstr "Enable or disable magic space bar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -1572,55 +1584,55 @@ msgstr ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "Enable use of a similar message list view settings for all folders"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "Enable use of a similar message list view settings for all folders."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Mark citations in the message “Preview”"
 msgstr "Mark citations in the message “Preview”"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Mark citations in the message “Preview”."
 msgstr "Mark citations in the message “Preview”."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Citation highlight color"
 msgstr "Citation highlight colour"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Citation highlight color."
 msgstr "Citation highlight colour."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Enable/disable caret mode"
 msgstr "Enable/disable caret mode"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Enable caret mode, so that you can see a cursor when reading mail."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Default charset in which to display messages"
 msgstr "Default charset in which to display messages"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Default charset in which to display messages."
 msgstr "Default charset in which to display messages."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Automatically load images for HTML messages over HTTP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Show notification about missing remote content"
 msgstr "Show notification about missing remote content"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid ""
 "When the message preview shows a message which requires to download remote "
 "content, while the download is not allowed for the user or the site, then "
@@ -1630,27 +1642,27 @@ msgstr ""
 "content, while the download is not allowed for the user or the site, then "
 "show a notification about it on top of the preview panel."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Show Animations"
 msgstr "Show Animations"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Show animated images as animations."
 msgstr "Show animated images as animations."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Show all message headers"
 msgstr "Show all message headers"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Show all the headers when viewing a messages."
 msgstr "Show all the headers when viewing a messages."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "List of headers to show when viewing a message."
 msgstr "List of headers to show when viewing a message."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean "
 "indicating whether the header is enabled. Disabled headers are not shown "
@@ -1660,37 +1672,35 @@ msgstr ""
 "indicating whether the header is enabled. Disabled headers are not shown "
 "when viewing a message, but are still listed in Preferences."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Show photo of the sender"
 msgstr "Show photo of the sender"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 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"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 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."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Mark as Seen after specified timeout"
 msgstr "Mark as Seen after specified timeout"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Mark as Seen after specified timeout."
 msgstr "Mark as Seen after specified timeout."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Mark as Seen always after specified timeout"
 msgstr "Mark as Seen always after specified timeout"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout "
 "also after the folder change."
@@ -1698,19 +1708,19 @@ msgstr ""
 "If set to true, the selected message will be set as unread after the timeout "
 "also after the folder change."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Timeout for marking messages as seen"
 msgstr "Timeout for marking messages as seen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Timeout in milliseconds for marking messages as seen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Show Attachment Bar"
 msgstr "Show Attachment Bar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments."
@@ -1718,11 +1728,11 @@ msgstr ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Sender email-address column in the message list"
 msgstr "Sender e-mail address column in the message list"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -1730,27 +1740,27 @@ msgstr ""
 "Show the e-mail address of the sender in a separate column in the message "
 "list."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Show deleted messages in the message-list"
 msgstr "Show deleted messages in the message-list"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Show deleted messages (with a strike-through) in the message-list."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Show junk messages in the message-list"
 msgstr "Show junk messages in the message-list"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Show junk messages (with a red strike-through) in the message-list."
 msgstr "Show junk messages (with a red strike-through) in the message-list."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Enable Unmatched search folder"
 msgstr "Enable Unmatched search folder"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -1758,11 +1768,11 @@ msgstr ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Hides the per-folder preview and removes the selection"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid ""
 "This key is read only once and reset to “false” after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -1770,31 +1780,31 @@ msgstr ""
 "This key is read only once and reset to “false” after read. This unselects "
 "the mail in the list and removes the preview for that folder."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Height of the message-list pane"
 msgstr "Height of the message-list pane"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Height of the message-list pane."
 msgstr "Height of the message-list pane."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "Whether message headers are collapsed in the user interface"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Width of the message-list pane"
 msgstr "Width of the message-list pane"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Width of the message-list pane."
 msgstr "Width of the message-list pane."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Layout style"
 msgstr "Layout style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. “0” (Classic View) places the preview pane below the "
@@ -1806,35 +1816,35 @@ msgstr ""
 "message list. “1” (Vertical View) places the preview pane next to the "
 "message list."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Variable width font"
 msgstr "Variable width font"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "The variable width font for mail display."
 msgstr "The variable width font for mail display."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Terminal font"
 msgstr "Terminal font"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "The terminal font for mail display."
 msgstr "The terminal font for mail display."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Use custom fonts"
 msgstr "Use custom fonts"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Use custom fonts for displaying mail."
 msgstr "Use custom fonts for displaying mail."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Compress display of addresses in To/Cc/Bcc"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -1842,11 +1852,11 @@ msgstr ""
 "Compress display of addresses in To/Cc/Bcc to the number specified in "
 "address_count."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Number of addresses to display in To/Cc/Bcc"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a “...” is shown."
@@ -1854,13 +1864,13 @@ msgstr ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a “...” is shown."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid ""
 "Show mails in headers part of the message preview when name is available"
 msgstr ""
 "Show mails in headers part of the message preview when name is available"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid ""
 "When set to false, the mail addresses which contain both the name and the "
 "email parts in headers like To/Cc/Bcc will be shown only with the name part, "
@@ -1870,11 +1880,11 @@ msgstr ""
 "email parts in headers like To/Cc/Bcc will be shown only with the name part, "
 "without the actual email, with the name made clickable."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Thread the message-list based on Subject"
 msgstr "Thread the message-list based on Subject"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -1882,11 +1892,11 @@ msgstr ""
 "Whether to fall back on threading by subjects when the messages do not "
 "contain In-Reply-To or References headers."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Default value for thread expand state"
 msgstr "Default value for thread expand state"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -1894,11 +1904,11 @@ msgstr ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Whether sort threads based on latest message in that thread"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message’s date. Evolution requires a "
@@ -1908,11 +1918,11 @@ msgstr ""
 "message in each thread, rather than by message’s date. Evolution requires a "
 "restart."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "Whether sort thread children always ascending"
 msgstr "Whether sort thread children always ascending"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid ""
 "This setting specifies whether the thread children should be sorted always "
 "ascending, rather than using the same sort order as in the thread root level."
@@ -1920,11 +1930,23 @@ msgstr ""
 "This setting specifies whether the thread children should be sorted always "
 "ascending, rather than using the same sort order as in the thread root level."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+msgid "Whether to compress thread level"
+msgstr "Whether to compress thread level"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+msgid ""
+"Set to true to compress thread levels for flat conversations, to make the "
+"level not so deep."
+msgstr ""
+"Set to true to compress thread levels for flat conversations, to make the "
+"level not so deep."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Sort accounts alphabetically in a folder tree"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -1936,19 +1958,19 @@ msgstr ""
 "Computer and Search folders, otherwise accounts are sorted based on an order "
 "given by a user"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Log filter actions"
 msgstr "Log filter actions"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Log filter actions to the specified log file."
 msgstr "Log filter actions to the specified log file."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Logfile to log filter actions"
 msgstr "Logfile to log filter actions"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid ""
 "If not set, or being “stdout”, then the logging is done to stdout, instead "
 "to a file."
@@ -1956,11 +1978,11 @@ msgstr ""
 "If not set, or being “stdout”, then the logging is done to stdout, instead "
 "to a file."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Flush Outbox after filtering"
 msgstr "Flush Outbox after filtering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any “Forward to” filter action and approximately "
@@ -1970,15 +1992,15 @@ msgstr ""
 "only when there was used any “Forward to” filter action and approximately "
 "one minute after the last action invocation."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Default forward style"
 msgstr "Default forward style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Default reply style"
 msgstr "Default reply style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "Forward and reply attribution language tag, like en_US. Empty string means "
 "to use the same language as the user interface."
@@ -1986,11 +2008,11 @@ msgstr ""
 "Forward and reply attribution language tag, like en_GB. Empty string means "
 "to use the same language as the user interface."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr "Prompt on send when using key accelerator (Ctrl+Enter)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
@@ -1998,45 +2020,45 @@ msgstr ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Prompt on empty subject"
 msgstr "Prompt on empty subject"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Prompt the user when he or she tries to send a message without a Subject."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Prompt when emptying the trash"
 msgstr "Prompt when emptying the wastebasket"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Prompt the user when he or she tries to empty the wastebasket."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Prompt the user when he or she tries to expunge a folder."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Prompt when user calls Empty Junk"
 msgstr "Prompt when user calls Empty Junk"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Prompt the user when he or she tries to Empty a Junk folder."
 msgstr "Prompt the user when he or she tries to Empty a Junk folder."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "Prompt before sending to recipients not entered as mail addresses"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -2044,19 +2066,19 @@ msgstr ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Prompt when user tries to send a message with no To or Cc recipients."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Prompt when user tries to send unwanted HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -2064,11 +2086,11 @@ msgstr ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Prompt when user tries to open 10 or more messages at once"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -2076,19 +2098,19 @@ msgstr ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Prompt while marking multiple messages"
 msgstr "Prompt while marking multiple messages"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Enable or disable the prompt whilst marking multiple messages."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Prompt when deleting messages in search folder"
 msgstr "Prompt when deleting messages in search folder"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -2098,11 +2120,11 @@ msgstr ""
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid ""
 "Possible values are: “never” — do not allow copy with drag &amp; drop of "
 "folders in folder tree, “always” — allow copy with drag &amp; drop of "
@@ -2114,11 +2136,11 @@ msgstr ""
 "folders in folder tree without asking, or “ask” — (or any other value) will "
 "ask user."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr "Asks whether to move a folder by drag &amp; drop in the folder tree"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid ""
 "Possible values are: “never” — do not allow move with drag &amp; drop of "
 "folders in folder tree, “always” — allow move with drag &amp; drop of "
@@ -2130,11 +2152,11 @@ msgstr ""
 "folders in folder tree without asking, or “ask” — (or any other value) will "
 "ask user."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Prompt when replying privately to list messages"
 msgstr "Prompt when replying privately to list messages"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -2142,11 +2164,11 @@ msgstr ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Prompt when mailing list hijacks private replies"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -2156,11 +2178,11 @@ msgstr ""
 "a private reply to a message which arrived via a mailing list, but the list "
 "sets a Reply-To: header which redirects your reply back to the list."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "Prompt when replying to many recipients"
 msgstr "Prompt when replying to many recipients"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -2168,7 +2190,7 @@ msgstr ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid ""
 "Prompt when switching composer format and the content needs to lose its "
 "formatting"
@@ -2176,7 +2198,7 @@ msgstr ""
 "Prompt when switching composer format and the content needs to lose its "
 "formatting"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
 "composer format and the content needs to lose its formatting."
@@ -2184,11 +2206,11 @@ msgstr ""
 "It disables/enables the repeated prompts to warn that you are switching "
 "composer format and the content needs to lose its formatting."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "Prompt when sending to many To and CC recipients"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "“composer-many-to-cc-recips-num” defines the threshold."
@@ -2196,7 +2218,7 @@ msgstr ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "“composer-many-to-cc-recips-num” defines the threshold."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -2204,42 +2226,42 @@ msgstr ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "Empty Trash folders on exit"
 msgstr "Empty Wastebasket folders on exit"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Empty all Wastebasket folders when exiting Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum number of days between emptying the wastebasket on exit"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimum time between emptying the wastebasket on exit, in days."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "Last time Empty Trash was run"
 msgstr "Last time Empty Wastebasket was run"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "The last time Empty Wastebasket was run, in days since January 1st, 1970 "
 "(Epoch)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Amount of time in seconds the error should be shown on the status bar."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid "Level beyond which the message should be logged."
 msgstr "Level beyond which the message should be logged."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid ""
 "This can have three possible values. “0” for errors. “1” for warnings. “2” "
 "for debug messages."
@@ -2247,11 +2269,11 @@ msgstr ""
 "This can have three possible values. “0” for errors. “1” for warnings. “2” "
 "for debug messages."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid "Show original “Date” header value."
 msgstr "Show original “Date” header value."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid ""
 "Show the original “Date” header (with a local time only if the time zone "
 "differs). Otherwise always show “Date” header value in a user preferred "
@@ -2261,11 +2283,11 @@ msgstr ""
 "differs). Otherwise always show “Date” header value in a user preferred "
 "format and local time zone."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid "List of Labels and their associated colors"
 msgstr "List of Labels and their associated colours"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -2273,45 +2295,45 @@ msgstr ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid "Check incoming mail being junk"
 msgstr "Check incoming mail being junk"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "Run junk test on incoming mail."
 msgstr "Run junk test on incoming mail."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid "Empty Junk folders on exit"
 msgstr "Empty Junk folders on exit"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Empty all Junk folders when exiting Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Minimum days between emptying the junk on exit"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Minimum time between emptying the junk on exit, in days."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid "Last time Empty Junk was run"
 msgstr "Last time Empty Junk was run"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid "The default plugin for Junk hook"
 msgstr "The default plug-in for Junk hook"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won’t fall back "
@@ -2321,11 +2343,11 @@ msgstr ""
 "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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Determines whether to look up in address book for sender e-mail"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn’t be a spam. It looks up in the books marked for autocompletion. It "
@@ -2337,7 +2359,7 @@ msgstr ""
 "can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -2345,7 +2367,7 @@ msgstr ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -2355,11 +2377,11 @@ msgstr ""
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Determines whether to use custom headers to check for junk"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -2369,11 +2391,11 @@ msgstr ""
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 msgid "Custom headers to use while checking for junk."
 msgstr "Custom headers to use while checking for junk."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format “headername=value”."
@@ -2381,31 +2403,31 @@ msgstr ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format “headername=value”."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 msgid "UID string of the default account."
 msgstr "UID string of the default account."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
 msgid "Save directory"
 msgstr "Save directory"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
 msgid "Directory for saving mail component files."
 msgstr "Directory for saving mail component files."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
 msgid "Composer load/attach directory"
 msgstr "Composer load/attach directory"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directory for loading/attaching files to composer."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
 msgid "Check for new messages on start"
 msgstr "Check for new messages on start"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -2413,11 +2435,11 @@ msgstr ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
 msgid "Check for new messages in all active accounts"
 msgstr "Check for new messages in all active accounts"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account “Check for new messages every X minutes” option when Evolution is "
@@ -2427,11 +2449,11 @@ msgstr ""
 "account “Check for new messages every X minutes” option when Evolution is "
 "started. This option is used only together with “send_recv_on_start” option."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
 msgid "Server synchronization interval"
 msgstr "Server synchronisation interval"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -2439,11 +2461,11 @@ msgstr ""
 "Controls how frequently local changes are synchronised with the remote mail "
 "server. The interval must be at least 30 seconds."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
 msgid "Allow expunge in virtual folders"
 msgstr "Allow expunge in virtual folders"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
 msgid ""
 "Enables Expunge in virtual folders, which means that the Folder→Expunge will "
 "be callable in virtual folders, while the expunge itself will be done in all "
@@ -2455,12 +2477,12 @@ msgstr ""
 "folders for all deleted messages within the virtual folder, not only for "
 "deleted messages belonging to the virtual folder."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
 #: ../src/mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML format"
 msgstr "Inherit theme colours in HTML format"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
 msgid ""
 "When enabled the theme colors for background, text and links are sent in "
 "resulting HTML formatted message."
@@ -2468,11 +2490,11 @@ msgstr ""
 "When enabled the theme colours for background, text and links are sent in "
 "resulting HTML formatted message."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
 msgid "An Archive folder for On This Computer folders."
 msgstr "An Archive folder for On This Computer folders."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
@@ -2480,67 +2502,67 @@ msgstr ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
 msgid "Whether the To Do bar is visible in the main window"
 msgstr "Whether the To Do bar is visible in the main window"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
 msgid "Stores whether the To Do bar is visible in the main window."
 msgstr "Stores whether the To Do bar is visible in the main window."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
 msgid "Width of the To Do bar in the main window"
 msgstr "Width of the To Do bar in the main window"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
 msgid "Holds the width of the To Do bar for the main window."
 msgstr "Holds the width of the To Do bar for the main window."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
 msgid "Whether the To Do bar is visible in a sub-window"
 msgstr "Whether the To Do bar is visible in a sub-window"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
 msgid "Stores whether the To Do bar is visible in a sub-window."
 msgstr "Stores whether the To Do bar is visible in a sub-window."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
 msgid "Width of the To Do bar in a sub-window"
 msgstr "Width of the To Do bar in a sub-window"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
 msgid "Holds the width of the To Do bar for a sub-window."
 msgstr "Holds the width of the To Do bar for a sub-window."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
 msgid "Whether the To Do bar should show also completed tasks"
 msgstr "Whether the To Do bar should show also completed tasks"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
 msgid "Stores whether the To Do bar should show also completed tasks."
 msgstr "Stores whether the To Do bar should show also completed tasks."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
 msgid "Whether the To Do bar should show also tasks without Due date"
 msgstr "Whether the To Do bar should show also tasks without Due date"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
 msgid "Stores whether the To Do bar should show also tasks without Due date."
 msgstr "Stores whether the To Do bar should show also tasks without Due date."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
 msgid "Show start up wizard"
 msgstr "Show start up wizard"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
 msgid "Whether show start up wizard when there is no mail account configured."
 msgstr "Whether show start up wizard when there is no mail account configured."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:276
 msgid "Whether go to the previous message after message deletion"
 msgstr "Whether go to the previous message after message deletion"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
 msgid ""
 "If set to true, goes to the previous message when the selected is deleted; "
 "or to the next message, when it’s set to false."
@@ -2548,11 +2570,11 @@ msgstr ""
 "If set to true, goes to the previous message when the selected is deleted; "
 "or to the next message, when it’s set to false."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
 msgid "Show Subject above Sender in Messages column"
 msgstr "Show Subject above Sender in Messages column"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
 msgid ""
 "Whether to show Subject above Sender (From/To) in the Messages column, "
 "usually shown in the Vertical/Wide view of the message list"
@@ -2560,30 +2582,30 @@ msgstr ""
 "Whether to show Subject above Sender (From/To) in the Messages column, "
 "usually shown in the Vertical/Wide view of the message list"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:276
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
 msgid "Visually wrap long lines in composer"
 msgstr "Visually wrap long lines in composer"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:281
 #: ../src/composer/e-composer-actions.c:556
 msgid ""
 "Whether to visually wrap long lines of text to avoid horizontal scrolling"
 msgstr ""
 "Whether to visually wrap long lines of text to avoid horizontal scrolling"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
 msgid "Alternative reply style"
 msgstr "Alternative reply style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
 msgid "Format message in HTML"
 msgstr "Format message in HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
 msgid "Put the cursor at the bottom of alternative replies"
 msgstr "Put the cursor at the bottom of alternative replies"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:281
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
 msgid ""
 "This determines whether the cursor is placed at the top of the message or "
 "the bottom when using Alternative Reply."
@@ -2591,15 +2613,11 @@ msgstr ""
 "This determines whether the cursor is placed at the top of the message or "
 "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"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
 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."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
 msgid ""
 "This determines whether the signature is placed at the top of the message or "
 "the bottom when using Alternative Reply."
@@ -2607,19 +2625,19 @@ 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
 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:285
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
 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:286
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
 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:287
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
 msgid ""
 "Whether preserve original message subject when applying template for "
 "Alternative Reply"
@@ -2627,7 +2645,7 @@ msgstr ""
 "Whether preserve original message subject when applying template for "
 "Alternative Reply"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
 msgid ""
 "Whether set “body” in mailto: URI as Preformatted paragraph style. If set to "
 "“false”, then Normal paragraph style will be used."
@@ -2635,7 +2653,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:289
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
 msgid ""
 "Close the message browser window when the selected message is deleted or "
 "marked as Junk."
@@ -2643,7 +2661,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:290
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
 msgid ""
 "Collapse archive folders in Move/Copy message to Folder and Go to Folder "
 "selectors."
@@ -2651,7 +2669,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:291
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
 msgid ""
 "Where to lookup recipient S/MIME certificates or PGP keys when encrypting "
 "messages."
@@ -2659,7 +2677,7 @@ msgstr ""
 "Where to lookup recipient S/MIME certificates or PGP keys when encrypting "
 "messages."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
 msgid ""
 "The “off” value completely disables certificate lookup; the “autocompleted” "
 "value provides certificates only for auto-completed contacts; the “books” "
@@ -2671,11 +2689,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:293
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
 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:294
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
 msgid ""
 "If enabled, whenever Send/Receive is run it also runs synchronization of "
 "messages for offline use. The option is disabled by default."
@@ -2683,11 +2701,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:295
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
 msgid "Whether display delivery notification parts inline."
 msgstr "Whether display delivery notification parts inline."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
 msgid ""
 "If enabled, the message/delivery-status and message/disposition-notification "
 "parts are shown automatically inline."
@@ -2695,11 +2713,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:297
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
 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:298
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
 msgid ""
 "If enabled, unset colors in HTML messages, forcing use of desktop theme "
 "colors instead."
@@ -2707,11 +2725,27 @@ msgstr ""
 "If enabled, unset colours in HTML messages, forcing use of desktop theme "
 "colours instead."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
+msgid ""
+"Whether to preserve expand state of the folders when calling Copy/Move to "
+"Folder."
+msgstr ""
+"Whether to preserve expand state of the folders when calling Copy/Move to "
+"Folder."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:304
+msgid ""
+"If enabled, the Copy/Move to Folder dialog will preserve the expand state of "
+"the folders in the dialog, otherwise all the folders will be expanded."
+msgstr ""
+"If enabled, the Copy/Move to Folder dialogue will preserve the expand state "
+"of the folders in the dialogue, otherwise all the folders will be expanded."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:305
 msgid "(Deprecated) Default forward style"
 msgstr "(Deprecated) Default forward style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
+#: ../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 "
 "“forward-style-name” instead."
@@ -2719,11 +2753,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:301
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:307
 msgid "(Deprecated) Default reply style"
 msgstr "(Deprecated) Default reply style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
+#: ../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 "
 "“reply-style-name” instead."
@@ -2731,11 +2765,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:303
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:309
 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:304
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:310
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“show-headers” instead."
@@ -2743,11 +2777,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:305
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:311
 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:306
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:312
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“image-loading-policy” instead."
@@ -2755,7 +2789,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:307
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:313
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -2763,7 +2797,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:308
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:314
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“browser-close-on-reply-policy” instead."
@@ -3048,6 +3082,24 @@ msgstr ""
 "The key specifies the list of destinations to where publish calendars. Each "
 "values specifies an XML with setup for publishing to one destination."
 
+#: ../data/org.gnome.evolution.plugin.sender-validator.gschema.xml.in.h:1
+msgid "[]"
+msgstr "[]"
+
+#: ../data/org.gnome.evolution.plugin.sender-validator.gschema.xml.in.h:2
+msgid "List of assignments for recipient and the address to be used with it"
+msgstr "List of assignments for recipient and the address to be used with it"
+
+#: ../data/org.gnome.evolution.plugin.sender-validator.gschema.xml.in.h:3
+msgid ""
+"The list is of format 'recipient&lt;tab&gt;sender', where the recipient can "
+"be part of the address only and the sender is a full email address, which "
+"should match the From address precisely."
+msgstr ""
+"The list is of format 'recipient&lt;tab&gt;sender', where the recipient can "
+"be part of the address only and the sender is a full email address, which "
+"should match the From address precisely."
+
 #: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
@@ -3258,6 +3310,20 @@ msgstr ""
 "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.shell.gschema.xml.in.h:42
+msgid "Set of additional illegal characters in the filename"
+msgstr "Set of additional illegal characters in the filename"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:43
+msgid ""
+"When generating file names from custom strings some non-printable or "
+"reserved characters are replaced with an underscore. Here's a set of "
+"additional characters to be replaced."
+msgstr ""
+"When generating file names from custom strings some non-printable or "
+"reserved characters are replaced with an underscore. Here's a set of "
+"additional characters to be replaced."
+
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
 msgid "Use only local spam tests."
 msgstr "Use only local spam tests."
@@ -3314,7 +3380,7 @@ 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:1291
+#: ../src/mail/e-mail-browser.c:1293
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
 #: ../src/shell/e-shell-window-private.c:241
 msgid "Evolution"
@@ -3378,27 +3444,27 @@ 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:839
-#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:470
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
+#: ../src/e-util/e-collection-account-wizard.c:855
+#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:532
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:199
-#: ../src/modules/calendar/e-cal-shell-view.c:599
+#: ../src/modules/calendar/e-cal-shell-view.c:620
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
 msgid "Calendar"
 msgstr "Calendar"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:10
 #: ../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/kmail-importer.c:249
 #: ../src/mail/importers/pine-importer.c:423
-#: ../src/modules/mail/e-mail-shell-view.c:1624
-#: ../src/smime/gui/certificate-manager.c:1666
+#: ../src/modules/mail/e-mail-shell-view.c:1608
+#: ../src/smime/gui/certificate-manager.c:1664
 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:1773
+#: ../src/calendar/gui/e-memo-table.c:446 ../src/e-util/e-webdav-browser.c:522
+#: ../src/modules/calendar/e-cal-shell-content.c:1887
 #: ../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
@@ -3406,15 +3472,15 @@ msgid "Memos"
 msgstr "Memos"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:12
-#: ../src/calendar/gui/e-task-table.c:624 ../src/calendar/gui/print.c:2442
+#: ../src/calendar/gui/e-task-table.c:618 ../src/calendar/gui/print.c:2442
 #: ../src/calendar/importers/icalendar-importer.c:77
-#: ../src/calendar/importers/icalendar-importer.c:1141
-#: ../src/e-util/e-webdav-browser.c:461
+#: ../src/calendar/importers/icalendar-importer.c:1148
+#: ../src/e-util/e-webdav-browser.c:523
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:72
-#: ../src/modules/calendar/e-cal-shell-content.c:1733
+#: ../src/modules/calendar/e-cal-shell-content.c:1847
 #: ../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:515
+#: ../src/modules/calendar/e-task-shell-view.c:530
 msgid "Tasks"
 msgstr "Tasks"
 
@@ -3719,11 +3785,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:2429
+#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2594
 msgid "_Memos"
 msgstr "_Memos"
 
-#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2433
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2598
 #: ../src/plugins/pst-import/pst-importer.c:571
 msgid "_Tasks"
 msgstr "_Tasks"
@@ -3885,20 +3951,21 @@ msgstr ""
 #: ../src/addressbook/addressbook.error.xml.h:32
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:757
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1525
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1493
 #: ../src/e-util/e-accounts-window.c:1563
-#: ../src/e-util/e-mail-signature-manager.c:328
-#: ../src/e-util/e-name-selector-dialog.c:1029 ../src/e-util/filter.ui.h:25
+#: ../src/e-util/e-mail-signature-manager.c:324
+#: ../src/e-util/e-name-selector-dialog.c:1026 ../src/e-util/filter.ui.h:25
 #: ../src/mail/e-mail-account-manager.c:721
-#: ../src/mail/e-mail-label-manager.c:371
-#: ../src/mail/em-folder-properties.c:1330
-#: ../src/mail/em-vfolder-editor-rule.c:408
-#: ../src/mail/em-vfolder-editor-rule.c:637 ../src/mail/mail-config.ui.h:63
-#: ../src/modules/mail/em-composer-prefs.c:423
+#: ../src/mail/e-mail-label-manager.c:355
+#: ../src/mail/em-folder-properties.c:1359
+#: ../src/mail/em-vfolder-editor-rule.c:405
+#: ../src/mail/em-vfolder-editor-rule.c:634 ../src/mail/mail-config.ui.h:63
+#: ../src/modules/mail/em-composer-prefs.c:420
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:544
-#: ../src/plugins/email-custom-header/email-custom-header.c:839
+#: ../src/plugins/email-custom-header/email-custom-header.c:826
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../src/plugins/templates/templates.c:464
+#: ../src/plugins/sender-validation/sender-validation.c:498
+#: ../src/plugins/templates/templates.c:470
 msgid "_Add"
 msgstr "_Add"
 
@@ -3935,7 +4002,7 @@ msgstr ""
 "to add it anyway?"
 
 #: ../src/addressbook/addressbook.error.xml.h:39
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1242
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Failed to delete contact"
 msgstr "Failed to delete contact"
 
@@ -4046,12 +4113,13 @@ msgstr "Show Certificates"
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:724
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:746
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3111
 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:2379
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2416
+#: ../src/em-format/e-mail-formatter-attachment.c:277
 #: ../src/mail/mail-config.ui.h:40
 msgid "Options"
 msgstr "Options"
@@ -4059,103 +4127,103 @@ msgstr "Options"
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4346
-#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:220
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3274
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3504
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4336
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4342
+#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:212
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:453
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:14
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
 #: ../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:1322
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1327
 #: ../src/calendar/gui/e-cal-dialogs.c:690
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:304
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:305
 #: ../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-dialog.c:289
 #: ../src/e-util/e-attachment-store.c:658
 #: ../src/e-util/e-attachment-store.c:668
 #: ../src/e-util/e-attachment-store.c:848
 #: ../src/e-util/e-attachment-store.c:854 ../src/e-util/e-attachment-view.c:301
 #: ../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:1868
-#: ../src/e-util/e-collection-account-wizard.c:2109
+#: ../src/e-util/e-collection-account-wizard.c:240
+#: ../src/e-util/e-collection-account-wizard.c:1887
+#: ../src/e-util/e-collection-account-wizard.c:2134
 #: ../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
 #: ../src/e-util/e-html-editor-actions.c:386
 #: ../src/e-util/e-html-editor-actions.c:489
 #: ../src/e-util/e-image-chooser-dialog.c:179
-#: ../src/e-util/e-mail-signature-script-dialog.c:366
+#: ../src/e-util/e-mail-signature-script-dialog.c:358
 #: ../src/e-util/e-passwords.c:468 ../src/e-util/e-rule-context.c:816
-#: ../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-rule-editor.c:184 ../src/e-util/e-rule-editor.c:295
+#: ../src/e-util/e-rule-editor.c:930 ../src/e-util/e-send-options.ui.h:16
+#: ../src/e-util/e-source-config-dialog.c:356
 #: ../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-table-config.c:540 ../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: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:4050
+#: ../src/e-util/evolution-source-viewer.c:829 ../src/e-util/e-web-view.c:3994
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:265
+#: ../src/mail/e-mail-config-window.c:310 ../src/mail/e-mail-label-dialog.c:186
+#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4031
 #: ../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
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:277
-#: ../src/modules/backup-restore/evolution-backup-tool.c:936
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:409
+#: ../src/modules/backup-restore/evolution-backup-tool.c:989
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:406
 #: ../src/modules/calendar/e-cal-attachment-handler.c:281
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
 #: ../src/plugins/face/face.c:298
-#: ../src/plugins/publish-calendar/publish-calendar.c:789
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:419
-#: ../src/plugins/save-calendar/save-calendar.c:186
+#: ../src/plugins/publish-calendar/publish-calendar.c:788
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:417
+#: ../src/plugins/save-calendar/save-calendar.c:184
 #: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:748
 #: ../src/shell/e-shell-utils.c:69 ../src/shell/e-shell-utils.c:133
-#: ../src/smime/gui/certificate-manager.c:651
-#: ../src/smime/gui/certificate-manager.c:723
-#: ../src/smime/gui/certificate-manager.c:951
-#: ../src/smime/gui/certificate-manager.c:1332
+#: ../src/smime/gui/certificate-manager.c:653
+#: ../src/smime/gui/certificate-manager.c:721
+#: ../src/smime/gui/certificate-manager.c:949
+#: ../src/smime/gui/certificate-manager.c:1330
 #: ../src/smime/gui/e-cert-selector.c:235 ../src/smime/gui/smime-ui.ui.h:17
 msgid "_Cancel"
 msgstr "_Cancel"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3504
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 #: ../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/calendar/gui/e-comp-editor.c:2237
 #: ../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:2457 ../src/e-util/e-web-view.c:3932
-#: ../src/e-util/gal-view-instance-save-as-dialog.c:268
+#: ../src/e-util/e-mail-signature-script-dialog.c:362
+#: ../src/e-util/e-webdav-browser.c:2622 ../src/e-util/e-web-view.c:3994
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:266
 #: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:133
-#: ../src/smime/gui/certificate-manager.c:651
-#: ../src/smime/gui/certificate-manager.c:724
+#: ../src/smime/gui/certificate-manager.c:653
+#: ../src/smime/gui/certificate-manager.c:722
 msgid "_Save"
 msgstr "_Save"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../src/calendar/gui/e-comp-editor.c:2055
-#: ../src/calendar/gui/e-comp-editor.c:2127
-#: ../src/e-util/e-preferences-window.c:390
+#: ../src/calendar/gui/e-comp-editor.c:2134
+#: ../src/calendar/gui/e-comp-editor.c:2206
+#: ../src/e-util/e-preferences-window.c:387
 #: ../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:1066
+#: ../src/shell/e-shell-window-actions.c:1117
 msgid "_Help"
 msgstr "_Help"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
-#: ../src/e-util/e-misc-utils.c:3574
+#: ../src/e-util/e-misc-utils.c:3585
 msgid "Image"
 msgstr "Image"
 
@@ -4181,8 +4249,8 @@ msgid "Full _Name..."
 msgstr "Full _Name…"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:925
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1345
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:918
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1331
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "E-mail"
@@ -4213,8 +4281,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:877
-#: ../src/modules/itip-formatter/itip-view.c:1972
+#: ../src/calendar/gui/e-comp-editor-event.c:871
+#: ../src/modules/itip-formatter/itip-view.c:1979
 msgid "_Calendar:"
 msgstr "_Calendar:"
 
@@ -4231,7 +4299,7 @@ msgid "Home Page:"
 msgstr "Home Page:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:34
-#: ../src/modules/cal-config-google/e-cal-config-google.c:97
+#: ../src/modules/cal-config-google/e-cal-config-google.c:94
 msgid "Calendar:"
 msgstr "Calendar:"
 
@@ -4302,16 +4370,16 @@ msgid "_Anniversary:"
 msgstr "_Anniversary:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1055
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1048
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:2098
+#: ../src/calendar/gui/e-calendar-view.c:2214
 msgid "Anniversary"
 msgstr "Anniversary"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1054
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1047
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:2097
+#: ../src/calendar/gui/e-calendar-view.c:2213
 msgid "Birthday"
 msgstr "Birthday"
 
@@ -4360,7 +4428,7 @@ msgstr "Home"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:63
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1023
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1016
 #: ../src/addressbook/gui/widgets/e-contact-map.c:380
 msgid "Work"
 msgstr "Work"
@@ -4368,8 +4436,8 @@ msgstr "Work"
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:64
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:526
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1089
-#: ../src/calendar/gui/e-cal-model.c:3792
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1082
+#: ../src/calendar/gui/e-cal-model.c:3793
 msgid "Other"
 msgstr "Other"
 
@@ -4393,20 +4461,21 @@ msgstr "Add _X.509"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:69
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1541
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1509
 #: ../src/e-util/e-attachment-view.c:355 ../src/e-util/e-filter-rule.c:409
-#: ../src/e-util/e-mail-signature-manager.c:368
-#: ../src/e-util/e-name-selector-dialog.c:1033
+#: ../src/e-util/e-mail-signature-manager.c:364
+#: ../src/e-util/e-name-selector-dialog.c:1030
 #: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:27
 #: ../src/mail/e-mail-config-identity-page.c:872
-#: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:678
-#: ../src/mail/em-folder-properties.c:1336
-#: ../src/mail/em-vfolder-editor-rule.c:642 ../src/mail/mail-config.ui.h:64
+#: ../src/mail/e-mail-label-manager.c:373 ../src/mail/em-filter-rule.c:678
+#: ../src/mail/em-folder-properties.c:1365
+#: ../src/mail/em-vfolder-editor-rule.c:639 ../src/mail/mail-config.ui.h:64
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:554
-#: ../src/plugins/email-custom-header/email-custom-header.c:849
-#: ../src/plugins/publish-calendar/publish-calendar.c:790
+#: ../src/plugins/email-custom-header/email-custom-header.c:836
+#: ../src/plugins/publish-calendar/publish-calendar.c:789
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:35
-#: ../src/plugins/templates/templates.c:474
+#: ../src/plugins/sender-validation/sender-validation.c:508
+#: ../src/plugins/templates/templates.c:480
 msgid "_Remove"
 msgstr "_Remove"
 
@@ -4424,25 +4493,25 @@ msgid "Certificates"
 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:1107
+#: ../src/calendar/gui/e-comp-editor.c:2169
+#: ../src/e-util/e-html-editor-actions.c:1109
 msgid "_Undo"
 msgstr "_Undo"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:263
-#: ../src/calendar/gui/e-comp-editor.c:2092 ../src/e-util/e-focus-tracker.c:147
+#: ../src/calendar/gui/e-comp-editor.c:2171 ../src/e-util/e-focus-tracker.c:147
 #: ../src/e-util/e-focus-tracker.c:150
 msgid "Undo"
 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:1093
+#: ../src/calendar/gui/e-comp-editor.c:2176
+#: ../src/e-util/e-html-editor-actions.c:1095
 msgid "_Redo"
 msgstr "_Redo"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:270
-#: ../src/calendar/gui/e-comp-editor.c:2099 ../src/e-util/e-focus-tracker.c:163
+#: ../src/calendar/gui/e-comp-editor.c:2178 ../src/e-util/e-focus-tracker.c:163
 #: ../src/e-util/e-focus-tracker.c:166
 msgid "Redo"
 msgstr "Redo"
@@ -4461,90 +4530,90 @@ msgid "Error removing contact"
 msgstr "Error removing contact"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:740
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3109
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3105
 #, c-format
 msgid "Contact Editor — %s"
 msgstr "Contact Editor — %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3245
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3241
 msgid "X.509 certificates"
 msgstr "X.509 certificates"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3250
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3246
 msgid "PGP keys"
 msgstr "PGP keys"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3256
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3252
 #: ../src/e-util/e-html-editor-actions.c:395
 #: ../src/e-util/e-image-chooser-dialog.c:193
-#: ../src/smime/gui/certificate-manager.c:672
-#: ../src/smime/gui/certificate-manager.c:961
+#: ../src/smime/gui/certificate-manager.c:674
+#: ../src/smime/gui/certificate-manager.c:959
 msgid "All files"
 msgstr "All files"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
 msgid "Open PGP key"
 msgstr "Open PGP key"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
 msgid "Open X.509 certificate"
 msgstr "Open X.509 certificate"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4347
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3274
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4336
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4343
 #: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:177
 #: ../src/e-util/e-html-editor-actions.c:342
 #: ../src/e-util/e-html-editor-actions.c:386
 #: ../src/e-util/e-html-editor-actions.c:489
 #: ../src/e-util/e-image-chooser-dialog.c:182 ../src/plugins/face/face.c:298
-#: ../src/shell/e-shell-utils.c:69 ../src/smime/gui/certificate-manager.c:951
+#: ../src/shell/e-shell-utils.c:69 ../src/smime/gui/certificate-manager.c:949
 msgid "_Open"
 msgstr "_Open"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3293
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3521
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3289
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3517
 msgid "Chosen file is not a local file."
 msgstr "Chosen file is not a local file."
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3306
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3302
 #, c-format
 msgid "Failed to load certificate: %s"
 msgstr "Failed to load certificate: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
 msgctxt "cert-kind"
 msgid "X.509"
 msgstr "X.509"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
 msgctxt "cert-kind"
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
 msgid "Save PGP key"
 msgstr "Save PGP key"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
 msgid "Save X.509 certificate"
 msgstr "Save X.509 certificate"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3533
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3529
 #, c-format
 msgid "Failed to save certificate: %s"
 msgstr "Failed to save certificate: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4337
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4343
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4333
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4339
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4348
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4344
 msgid "_No image"
 msgstr "_No image"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4711
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4707
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -4552,57 +4621,57 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4717
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4713
 #, c-format
 msgid "“%s” has an invalid format"
 msgstr "“%s” has an invalid format"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4725
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4721
 #, c-format
 msgid "“%s” cannot be a future date"
 msgstr "“%s” cannot be a future date"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4733
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4729
 #, c-format
 msgid "%s“%s” has an invalid format"
 msgstr "%s“%s” has an invalid format"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4746
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4760
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4742
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4756
 #, c-format
 msgid "%s“%s” is empty"
 msgstr "%s“%s” is empty"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4775
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4771
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:221
+#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:213
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:454
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:317
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:305
-#: ../src/e-util/e-attachment-dialog.c:311
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:306
+#: ../src/e-util/e-attachment-dialog.c:291
 #: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:258
 #: ../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: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-rule-editor.c:185 ../src/e-util/e-rule-editor.c:296
+#: ../src/e-util/e-rule-editor.c:931 ../src/e-util/e-send-options.ui.h:17
+#: ../src/e-util/e-source-config-dialog.c:357
 #: ../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-table-config.c:541 ../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
+#: ../src/mail/e-mail-config-window.c:311 ../src/mail/e-mail-tag-editor.c:162
 #: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
 #: ../src/mail/mail-vfolder-ui.c:150 ../src/mail/mail-vfolder-ui.c:272
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:278
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:420
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:418
 #: ../src/shell/e-shell-content.c:643 ../src/shell/e-shell-content.c:749
-#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1333
+#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1331
 #: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
 msgid "_OK"
 msgstr "_OK"
@@ -4698,7 +4767,7 @@ msgid "_Suffix:"
 msgstr "_Suffix:"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:822
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:825
 msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
@@ -4740,12 +4809,12 @@ msgid "_Top"
 msgstr "_Top"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../src/e-util/e-source-selector.c:3492 ../src/e-util/filter.ui.h:29
+#: ../src/e-util/e-source-selector.c:3673 ../src/e-util/filter.ui.h:29
 msgid "_Up"
 msgstr "_Up"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../src/e-util/e-source-selector.c:3493 ../src/e-util/filter.ui.h:30
+#: ../src/e-util/e-source-selector.c:3674 ../src/e-util/filter.ui.h:30
 msgid "_Down"
 msgstr "_Down"
 
@@ -4754,23 +4823,23 @@ msgstr "_Down"
 msgid "_Bottom"
 msgstr "_Bottom"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:947
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:950
 msgid "Contact List Members"
 msgstr "Contact List Members"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1506
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1502
 msgid "_Members"
 msgstr "_Members"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1642
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1662
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1686
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1682
 msgid "Error removing list"
 msgstr "Error removing list"
 
@@ -4785,13 +4854,13 @@ msgid "Email begins with"
 msgstr "E-mail begins with"
 
 #: ../src/addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../src/calendar/gui/caltypes.xml.in.h:26
-#: ../src/calendar/gui/memotypes.xml.in.h:19
-#: ../src/calendar/gui/tasktypes.xml.in.h:30
+#: ../src/calendar/gui/caltypes.xml.in.h:27
+#: ../src/calendar/gui/memotypes.xml.in.h:20
+#: ../src/calendar/gui/tasktypes.xml.in.h:38
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1295
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1790
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:807
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1022
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1036
 msgid "Any field contains"
 msgstr "Any field contains"
 
@@ -4806,27 +4875,27 @@ 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:429
+#: ../src/e-util/e-web-view.c:428
 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:441
+#: ../src/e-util/e-web-view.c:440
 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:443
+#: ../src/e-util/e-web-view.c:442
 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-misc-utils.c:4546
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:317
+#: ../src/e-util/e-misc-utils.c:4550
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:335
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:331
 #, c-format
 msgid "Click to open map for %s"
 msgstr "Click to open map for %s"
@@ -4839,141 +4908,141 @@ msgstr "Open map"
 msgid "SIP"
 msgstr "SIP"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:690
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:683
 msgid "List Members:"
 msgstr "List Members:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:784
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:777
 msgid "Fax"
 msgstr "Fax"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:786
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:779
 msgid "Phone"
 msgstr "Phone"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:930
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:923
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Nickname"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:931
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:924
 msgid "AIM"
 msgstr "AIM"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:932
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:925
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:933
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:926
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:934
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:927
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:935
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:928
 msgid "MSN"
 msgstr "MSN"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:936
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:929
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:937
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:930
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:938
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:931
 msgid "Skype"
 msgstr "Skype"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:939
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:932
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:994
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Company"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:995
 msgid "Department"
 msgstr "Department"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1003
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:996
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "Office"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1004
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:997
 msgid "Profession"
 msgstr "Profession"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1005
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:998
 msgid "Position"
 msgstr "Position"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1006
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:999
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Manager"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1007
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1000
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Assistant"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1008
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1010
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1003
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Free/Busy"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1013
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1053
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1079
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1006
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1046
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1072
 msgid "Address"
 msgstr "Address"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1049
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1042
 msgid "Home Page"
 msgstr "Home Page"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1050
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1043
 msgid "Web Log"
 msgstr "Web Log"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1056
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1049
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Spouse"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1066
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1059
 msgid "Personal"
 msgstr "Personal"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1111
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1104
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Note"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1307
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1293
 msgid "List Members"
 msgstr "List Members"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1330
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1316
 msgid "Job Title"
 msgstr "Job Title"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1371
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1357
 msgid "Home page"
 msgstr "Home page"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1381
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1367
 msgid "Blog"
 msgstr "Blog"
 
@@ -5153,7 +5222,7 @@ msgstr[1] "%d contacts"
 msgid "Error getting book view"
 msgstr "Error getting book view"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-model.c:817
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:814
 msgid "Search Interrupted"
 msgstr "Search Interrupted"
 
@@ -5161,71 +5230,75 @@ msgstr "Search Interrupted"
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:679
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Cut selected contacts to the clipboard"
 msgstr "Cut selected contacts to the clipboard"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:685
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copy selected contacts to the clipboard"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:691
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:669
 msgid "Paste contacts from the clipboard"
 msgstr "Paste contacts from the clipboard"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:697
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:675
 #: ../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:703
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:681
 msgid "Select all visible contacts"
 msgstr "Select all visible contacts"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1290
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:922
+msgid "Searching for the Contacts…"
+msgstr "Searching for the Contacts…"
+
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1295
 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:1294
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1299
 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:1298
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1303
 #, 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:1304
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1309
 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:1308
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1313
 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:1312
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1317
 #, 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:1323
-#: ../src/calendar/gui/e-comp-editor.c:2048
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1328
+#: ../src/calendar/gui/e-comp-editor.c:2127
 #: ../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:2678
+#: ../src/e-util/evolution-source-viewer.c:800
+#: ../src/e-util/e-webdav-browser.c:2846
 #: ../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-cal-shell-view-actions.c:1597
 #: ../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:917
-#: ../src/smime/gui/certificate-manager.c:1656 ../src/smime/gui/smime-ui.ui.h:8
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1622
+#: ../src/shell/e-shell-window-actions.c:961
+#: ../src/smime/gui/certificate-manager.c:1654 ../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:1471
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1476
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -5240,11 +5313,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:1479
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1484
 msgid "_Don’t Display"
 msgstr "_Don’t Display"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1480
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1485
 msgid "Display _All Contacts"
 msgstr "Display _All Contacts"
 
@@ -5359,7 +5432,7 @@ msgid "Title"
 msgstr "Title"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../src/calendar/gui/e-meeting-list-view.c:663
+#: ../src/calendar/gui/e-meeting-list-view.c:660
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Role"
@@ -5422,7 +5495,7 @@ msgstr "Zoom _In"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2861
+#: ../src/mail/e-mail-reader.c:2878
 msgid "Zoom _Out"
 msgstr "Zoom _Out"
 
@@ -5430,7 +5503,7 @@ msgstr "Zoom _Out"
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
 #: ../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:994
+#: ../src/shell/e-shell-window-actions.c:1038
 msgid "_Find"
 msgstr "_Find"
 
@@ -5495,9 +5568,9 @@ msgstr ""
 #: ../src/addressbook/importers/evolution-csv-importer.c:796
 #: ../src/addressbook/importers/evolution-ldif-importer.c:547
 #: ../src/addressbook/importers/evolution-vcard-importer.c:247
-#: ../src/calendar/importers/icalendar-importer.c:499
-#: ../src/calendar/importers/icalendar-importer.c:1003
-#: ../src/calendar/importers/icalendar-importer.c:1043
+#: ../src/calendar/importers/icalendar-importer.c:506
+#: ../src/calendar/importers/icalendar-importer.c:1010
+#: ../src/calendar/importers/icalendar-importer.c:1050
 msgid "Importing…"
 msgstr "Importing…"
 
@@ -5675,14 +5748,10 @@ 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 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 cancellation notice, the other participants may not "
 "know the meeting is canceled."
@@ -5711,9 +5780,6 @@ 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 cancellation notice, the other participants may not "
 "know the task has been deleted."
@@ -5732,14 +5798,10 @@ 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 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 cancellation notice, the other participants may not "
 "know the memo has been deleted."
@@ -6387,7 +6449,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:1960
+#: ../src/e-util/e-collection-account-wizard.c:1985
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -6419,23 +6481,23 @@ msgid "is not"
 msgstr "is not"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:9
-#: ../src/calendar/gui/e-cal-list-view.c:263
-#: ../src/calendar/gui/e-cal-model.c:296 ../src/calendar/gui/e-cal-model.c:304
-#: ../src/calendar/gui/e-task-table.c:445
+#: ../src/calendar/gui/e-cal-list-view.c:293
+#: ../src/calendar/gui/e-cal-model.c:293 ../src/calendar/gui/e-cal-model.c:301
+#: ../src/calendar/gui/e-task-table.c:438
 #: ../src/calendar/gui/memotypes.xml.in.h:10
 msgid "Public"
 msgstr "Public"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:10
-#: ../src/calendar/gui/e-cal-list-view.c:264
-#: ../src/calendar/gui/e-cal-model.c:306 ../src/calendar/gui/e-task-table.c:446
+#: ../src/calendar/gui/e-cal-list-view.c:294
+#: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-task-table.c:439
 #: ../src/calendar/gui/memotypes.xml.in.h:11
 msgid "Private"
 msgstr "Private"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:11
-#: ../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/e-cal-list-view.c:295
+#: ../src/calendar/gui/e-cal-model.c:305 ../src/calendar/gui/e-task-table.c:440
 #: ../src/calendar/gui/memotypes.xml.in.h:12
 #: ../src/e-util/e-html-editor-page-dialog.c:116
 #: ../src/e-util/e-send-options.ui.h:7
@@ -6449,7 +6511,7 @@ msgid "Organizer"
 msgstr "Organiser"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:13
-#: ../src/calendar/gui/e-meeting-list-view.c:623
+#: ../src/calendar/gui/e-meeting-list-view.c:620
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:2
 #: ../src/calendar/gui/tasktypes.xml.in.h:6
 msgid "Attendee"
@@ -6459,7 +6521,7 @@ msgstr "Attendee"
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:5
 #: ../src/calendar/gui/e-task-table.etspec.h:13
 #: ../src/mail/message-list.etspec.h:14
-#: ../src/plugins/publish-calendar/publish-calendar.c:861
+#: ../src/plugins/publish-calendar/publish-calendar.c:860
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../src/plugins/save-calendar/csv-format.c:376
 msgid "Location"
@@ -6468,7 +6530,7 @@ msgstr "Location"
 #: ../src/calendar/gui/caltypes.xml.in.h:15
 #: ../src/calendar/gui/memotypes.xml.in.h:13
 #: ../src/calendar/gui/tasktypes.xml.in.h:23
-#: ../src/e-util/e-categories-selector.c:328
+#: ../src/e-util/e-categories-selector.c:324
 msgid "Category"
 msgstr "Category"
 
@@ -6499,7 +6561,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:2101
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2097
 msgid "Recurrence"
 msgstr "Recurrence"
 
@@ -6521,125 +6583,133 @@ msgstr "More Than"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:24
 #: ../src/calendar/gui/memotypes.xml.in.h:17
-#: ../src/calendar/gui/tasktypes.xml.in.h:28
-msgid "Summary Contains"
-msgstr "Summary Contains"
+#: ../src/calendar/gui/tasktypes.xml.in.h:35
+#: ../src/mail/filtertypes.xml.in.h:23 ../src/mail/searchtypes.xml.in.h:25
+#: ../src/mail/vfoldertypes.xml.in.h:25
+msgid "Expression"
+msgstr "Expression"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:25
 #: ../src/calendar/gui/memotypes.xml.in.h:18
-#: ../src/calendar/gui/tasktypes.xml.in.h:29
+#: ../src/calendar/gui/tasktypes.xml.in.h:36
+msgid "Summary Contains"
+msgstr "Summary Contains"
+
+#: ../src/calendar/gui/caltypes.xml.in.h:26
+#: ../src/calendar/gui/memotypes.xml.in.h:19
+#: ../src/calendar/gui/tasktypes.xml.in.h:37
 msgid "Description Contains"
 msgstr "Description Contains"
 
-#: ../src/calendar/gui/comp-util.c:1546
-#: ../src/modules/itip-formatter/itip-view.c:2294
+#: ../src/calendar/gui/comp-util.c:1547
+#: ../src/modules/itip-formatter/itip-view.c:2313
 #, 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:1605
+#: ../src/calendar/gui/comp-util.c:1606
 #, c-format
 msgid "Comments: %s"
 msgstr "Comments: %s"
 
-#: ../src/calendar/gui/comp-util.c:1619 ../src/calendar/gui/comp-util.c:1622
+#: ../src/calendar/gui/comp-util.c:1620 ../src/calendar/gui/comp-util.c:1623
 msgctxt "iCalendarStatus"
 msgid "None"
 msgstr "None"
 
-#: ../src/calendar/gui/comp-util.c:1620
+#: ../src/calendar/gui/comp-util.c:1621
 msgctxt "iCalendarStatus"
 msgid "Tentative"
 msgstr "Tentative"
 
-#: ../src/calendar/gui/comp-util.c:1621
+#: ../src/calendar/gui/comp-util.c:1622
 msgctxt "iCalendarStatus"
 msgid "Confirmed"
 msgstr "Confirmed"
 
-#: ../src/calendar/gui/comp-util.c:1623
+#: ../src/calendar/gui/comp-util.c:1624
 msgctxt "iCalendarStatus"
 msgid "Draft"
 msgstr "Draft"
 
-#: ../src/calendar/gui/comp-util.c:1624
+#: ../src/calendar/gui/comp-util.c:1625
 msgctxt "iCalendarStatus"
 msgid "Final"
 msgstr "Final"
 
-#: ../src/calendar/gui/comp-util.c:1625
+#: ../src/calendar/gui/comp-util.c:1626
 msgctxt "iCalendarStatus"
 msgid "Not Started"
 msgstr "Not Started"
 
-#: ../src/calendar/gui/comp-util.c:1626
+#: ../src/calendar/gui/comp-util.c:1627
 msgctxt "iCalendarStatus"
 msgid "Needs Action"
 msgstr "Needs Action"
 
-#: ../src/calendar/gui/comp-util.c:1627
+#: ../src/calendar/gui/comp-util.c:1628
 msgctxt "iCalendarStatus"
 msgid "In Progress"
 msgstr "In Progress"
 
-#: ../src/calendar/gui/comp-util.c:1628
+#: ../src/calendar/gui/comp-util.c:1629
 msgctxt "iCalendarStatus"
 msgid "Completed"
 msgstr "Completed"
 
-#: ../src/calendar/gui/comp-util.c:1629
+#: ../src/calendar/gui/comp-util.c:1630
 msgctxt "iCalendarStatus"
 msgid "Cancelled"
 msgstr "Cancelled"
 
-#: ../src/calendar/gui/ea-cal-view.c:281
+#: ../src/calendar/gui/ea-cal-view.c:277
 msgid "New Appointment"
 msgstr "New Appointment"
 
-#: ../src/calendar/gui/ea-cal-view.c:282
+#: ../src/calendar/gui/ea-cal-view.c:278
 msgid "New All Day Event"
 msgstr "New All Day Event"
 
-#: ../src/calendar/gui/ea-cal-view.c:283
+#: ../src/calendar/gui/ea-cal-view.c:279
 msgid "New Meeting"
 msgstr "New Meeting"
 
-#: ../src/calendar/gui/ea-cal-view.c:284
+#: ../src/calendar/gui/ea-cal-view.c:280
 msgid "Go to Today"
 msgstr "Go to Today"
 
-#: ../src/calendar/gui/ea-cal-view.c:285
+#: ../src/calendar/gui/ea-cal-view.c:281
 msgid "Go to Date"
 msgstr "Go to Date"
 
-#: ../src/calendar/gui/ea-cal-view-event.c:232
+#: ../src/calendar/gui/ea-cal-view-event.c:229
 msgid "It has reminders."
 msgstr "It has reminders."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:235
+#: ../src/calendar/gui/ea-cal-view-event.c:232
 msgid "It has recurrences."
 msgstr "It has recurrences."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:238
+#: ../src/calendar/gui/ea-cal-view-event.c:235
 msgid "It is a meeting."
 msgstr "It is a meeting."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:242
+#: ../src/calendar/gui/ea-cal-view-event.c:239
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Calendar Event: Summary is %s."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:246
+#: ../src/calendar/gui/ea-cal-view-event.c:243
 msgid "Calendar Event: It has no summary."
 msgstr "Calendar Event: It has no summary."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:269
+#: ../src/calendar/gui/ea-cal-view-event.c:266
 msgid "calendar view event"
 msgstr "calendar view event"
 
-#: ../src/calendar/gui/ea-cal-view-event.c:501
+#: ../src/calendar/gui/ea-cal-view-event.c:498
 msgid "Grab Focus"
 msgstr "Grab Focus"
 
@@ -6697,28 +6767,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:2214
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2251
 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:2212
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2249
 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:2218
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2255
 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:2216
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2253
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Run a program"
@@ -6811,7 +6881,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:1068 ../src/mail/e-mail-config-page.c:124
+#: ../src/e-util/e-filter-rule.c:1015 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "Untitled"
 
@@ -6820,9 +6890,9 @@ msgid "Categories:"
 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:1700
-#: ../src/modules/itip-formatter/itip-view.c:1811
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:280
+#: ../src/modules/itip-formatter/itip-view.c:1703
+#: ../src/modules/itip-formatter/itip-view.c:1815
 msgid "Location:"
 msgstr "Location:"
 
@@ -6838,75 +6908,75 @@ msgstr "End Date:"
 msgid "Due Date:"
 msgstr "Due Date:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:326
+#: ../src/calendar/gui/e-cal-component-preview.c:327
 msgid "Recurs:"
 msgstr "Recurs:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:338
-#: ../src/modules/itip-formatter/itip-view.c:1703
-#: ../src/modules/itip-formatter/itip-view.c:1820
+#: ../src/calendar/gui/e-cal-component-preview.c:339
+#: ../src/modules/itip-formatter/itip-view.c:1707
+#: ../src/modules/itip-formatter/itip-view.c:1827
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:347
-#: ../src/calendar/gui/e-task-table.c:471
+#: ../src/calendar/gui/e-cal-component-preview.c:348
+#: ../src/calendar/gui/e-task-table.c:464
 #: ../src/calendar/gui/tasktypes.xml.in.h:19
-#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:334
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:338
 msgid "High"
 msgstr "High"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:349
-#: ../src/calendar/gui/e-cal-model.c:1872
-#: ../src/calendar/gui/e-task-table.c:472
+#: ../src/calendar/gui/e-cal-component-preview.c:350
+#: ../src/calendar/gui/e-cal-model.c:1873
+#: ../src/calendar/gui/e-task-table.c:465
 #: ../src/calendar/gui/tasktypes.xml.in.h:20
-#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:333
+#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:337
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:351
-#: ../src/calendar/gui/e-task-table.c:473
+#: ../src/calendar/gui/e-cal-component-preview.c:352
+#: ../src/calendar/gui/e-task-table.c:466
 #: ../src/calendar/gui/tasktypes.xml.in.h:21
-#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:332
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:336
 msgid "Low"
 msgstr "Low"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:353
+#: ../src/calendar/gui/e-cal-component-preview.c:354
 msgid "Priority:"
 msgstr "Priority:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:365
+#: ../src/calendar/gui/e-cal-component-preview.c:366
 msgid "Organizer:"
 msgstr "Organiser:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:406
+#: ../src/calendar/gui/e-cal-component-preview.c:407
 msgid "Attendees:"
 msgstr "Attendees:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:453
-#: ../src/mail/e-mail-config-service-page.c:533
+#: ../src/calendar/gui/e-cal-component-preview.c:454
+#: ../src/mail/e-mail-config-service-page.c:522
 msgid "Description:"
 msgstr "Description:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:507
+#: ../src/calendar/gui/e-cal-component-preview.c:508
 msgid "Web Page:"
 msgstr "Web Page:"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1753
+#: ../src/calendar/gui/e-cal-data-model.c:1733
 #, c-format
 msgid "Creating view for calendar “%s”"
 msgstr "Creating view for calendar “%s”"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1757
+#: ../src/calendar/gui/e-cal-data-model.c:1737
 #, c-format
 msgid "Creating view for task list “%s”"
 msgstr "Creating view for task list “%s”"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1761
+#: ../src/calendar/gui/e-cal-data-model.c:1741
 #, c-format
 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:1991
+#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1994
 msgid "Destination is read only"
 msgstr "Destination is read only"
 
@@ -6938,7 +7008,7 @@ msgid "Select Date"
 msgstr "Select Date"
 
 #: ../src/calendar/gui/e-cal-dialogs.c:689
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1256
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1305
 msgid "Select _Today"
 msgstr "Select _Today"
 
@@ -7036,57 +7106,99 @@ msgstr "Send my reminders with this event"
 msgid "Notify new attendees _only"
 msgstr "Notify new attendees _only"
 
-#: ../src/calendar/gui/e-calendar-view.c:478
+#: ../src/calendar/gui/e-calendar-view.c:481
 msgid "Cut selected events to the clipboard"
 msgstr "Cut selected events to the clipboard"
 
-#: ../src/calendar/gui/e-calendar-view.c:484
+#: ../src/calendar/gui/e-calendar-view.c:487
 msgid "Copy selected events to the clipboard"
 msgstr "Copy selected events to the clipboard"
 
-#: ../src/calendar/gui/e-calendar-view.c:490
+#: ../src/calendar/gui/e-calendar-view.c:493
 msgid "Paste events from the clipboard"
 msgstr "Paste events from the clipboard"
 
-#: ../src/calendar/gui/e-calendar-view.c:496
+#: ../src/calendar/gui/e-calendar-view.c:499
 msgid "Delete selected events"
 msgstr "Delete selected events"
 
-#: ../src/calendar/gui/e-calendar-view.c:906
+#: ../src/calendar/gui/e-calendar-view.c:910
 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:1582
+#: ../src/calendar/gui/e-calendar-view.c:921
+#: ../src/calendar/gui/e-cal-ops.c:1585
 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:1585
+#: ../src/calendar/gui/e-calendar-view.c:926
+#: ../src/calendar/gui/e-cal-ops.c:1588
 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:1588
+#: ../src/calendar/gui/e-calendar-view.c:931
+#: ../src/calendar/gui/e-cal-ops.c:1591
 msgid "Default task list not found"
 msgstr "Default task list not found"
 
-#: ../src/calendar/gui/e-calendar-view.c:1019
+#: ../src/calendar/gui/e-calendar-view.c:1023
 msgid "No suitable component found"
 msgstr "No suitable component found"
 
-#: ../src/calendar/gui/e-calendar-view.c:1089
+#: ../src/calendar/gui/e-calendar-view.c:1093
 msgid "Pasting iCalendar data"
 msgstr "Pasting iCalendar data"
 
+#: ../src/calendar/gui/e-calendar-view.c:1154
+#: ../src/calendar/gui/e-calendar-view.c:1157
+#: ../src/calendar/gui/e-calendar-view.c:1160
+#: ../src/calendar/gui/e-calendar-view.c:1161
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../src/calendar/gui/e-calendar-view.c:1156
+#: ../src/calendar/gui/e-day-view.c:3073
+#: ../src/calendar/gui/e-day-view-top-item.c:854
+#: ../src/calendar/gui/e-week-view-main-item.c:230
+msgid "%d %b"
+msgstr "%d %b"
+
+#: ../src/calendar/gui/e-calendar-view.c:1167
+msgid "%A %d %b %Y"
+msgstr "%A %d %b %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../src/calendar/gui/e-calendar-view.c:1169
+#: ../src/calendar/gui/e-day-view.c:3057
+#: ../src/calendar/gui/e-day-view-top-item.c:850
+#: ../src/calendar/gui/e-week-view-main-item.c:216
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: ../src/calendar/gui/e-calendar-view.c:1170
+#: ../src/calendar/gui/e-calendar-view.c:1172
+#: ../src/calendar/gui/e-calendar-view.c:1173
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
+
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../src/calendar/gui/e-calendar-view.c:1889
-#: ../src/calendar/gui/e-memo-table.c:572
-#: ../src/calendar/gui/e-task-table.c:736
+#: ../src/calendar/gui/e-calendar-view.c:1965
+#: ../src/calendar/gui/e-memo-table.c:561
+#: ../src/calendar/gui/e-task-table.c:730
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organiser: %s <%s>"
@@ -7094,18 +7206,18 @@ msgstr "Organiser: %s <%s>"
 #. 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
-#: ../src/calendar/gui/e-memo-table.c:577
-#: ../src/calendar/gui/e-task-table.c:740
+#: ../src/calendar/gui/e-calendar-view.c:1968
+#: ../src/calendar/gui/e-memo-table.c:566
+#: ../src/calendar/gui/e-task-table.c:734
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organiser: %s"
 
 #. Translators: It will display "Location: PlaceOfTheMeeting"
 #. Translators: It will display "Location: LocationOfTheAppointment"
-#: ../src/calendar/gui/e-calendar-view.c:1911
+#: ../src/calendar/gui/e-calendar-view.c:1987
 #: ../src/calendar/gui/e-meeting-time-sel.c:2580
-#: ../src/calendar/gui/e-task-table.c:758
+#: ../src/calendar/gui/e-task-table.c:752
 #: ../src/calendar/gui/e-to-do-pane.c:377 ../src/calendar/gui/print.c:3627
 #, c-format
 msgid "Location: %s"
@@ -7113,63 +7225,43 @@ msgstr "Location: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
 #. Translators: It will display "Time: StartDateAndTime (Duration)"
-#: ../src/calendar/gui/e-calendar-view.c:1970
+#: ../src/calendar/gui/e-calendar-view.c:2046
 #: ../src/calendar/gui/e-to-do-pane.c:480
 #, c-format
 msgid "Time: %s %s"
 msgstr "Time: %s %s"
 
+#: ../src/calendar/gui/e-calendar-view.c:2115
+#: ../src/calendar/gui/e-memo-table.c:660
+#: ../src/calendar/gui/e-task-table.c:882
+#: ../src/calendar/gui/e-to-do-pane.c:590 ../src/e-util/e-misc-utils.c:4614
+#: ../src/e-util/e-text.c:566 ../src/e-util/e-web-view.c:4175
+msgid "…"
+msgstr "…"
+
 #. Translators: the '%s' stands for a component summary, the '%d' for the years.
 #. The string is used for Birthday & Anniversary events where the first year is
 #. know, constructing a summary which also shows how many years the birthday or
 #. anniversary is for. Example: "Birthday: John Doe (13)"
-#: ../src/calendar/gui/e-calendar-view.c:2117
+#: ../src/calendar/gui/e-calendar-view.c:2233
 #, c-format
 msgctxt "BirthdaySummary"
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: ../src/calendar/gui/e-calendar-view.c:2318
-#: ../src/calendar/gui/e-calendar-view.c:2321
-#: ../src/calendar/gui/e-calendar-view.c:2324
-#: ../src/calendar/gui/e-calendar-view.c:2325
-msgid "%d %b %Y"
-msgstr "%d %b %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. * month name. You can change the order but don't
-#. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2320
-#: ../src/calendar/gui/e-day-view.c:3079
-#: ../src/calendar/gui/e-day-view-top-item.c:858
-#: ../src/calendar/gui/e-week-view-main-item.c:228
-msgid "%d %b"
-msgstr "%d %b"
-
-#: ../src/calendar/gui/e-calendar-view.c:2331
-msgid "%A %d %b %Y"
-msgstr "%A %d %b %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %d = day of month, %b = abbreviated month name.
-#. * You can change the order but don't change the
-#. * specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2333
-#: ../src/calendar/gui/e-day-view.c:3063
-#: ../src/calendar/gui/e-day-view-top-item.c:854
-#: ../src/calendar/gui/e-week-view-main-item.c:214
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#: ../src/calendar/gui/e-cal-list-view.c:116
+#, c-format
+msgid "%d appointment"
+msgid_plural "%d appointments"
+msgstr[0] "%d appointment"
+msgstr[1] "%d appointments"
 
-#: ../src/calendar/gui/e-calendar-view.c:2334
-#: ../src/calendar/gui/e-calendar-view.c:2336
-#: ../src/calendar/gui/e-calendar-view.c:2337
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
+#: ../src/calendar/gui/e-cal-list-view.c:120
+#: ../src/modules/calendar/e-memo-shell-view-private.c:365
+#: ../src/modules/calendar/e-task-shell-view-private.c:574
+#, c-format
+msgid "%d selected"
+msgstr "%d selected"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:1
 #: ../src/calendar/gui/e-memo-table.etspec.h:5
@@ -7203,8 +7295,8 @@ msgstr "Source"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:10
-#: ../src/calendar/gui/e-cal-model.c:3846
-#: ../src/calendar/gui/e-meeting-list-view.c:692
+#: ../src/calendar/gui/e-cal-model.c:3847
+#: ../src/calendar/gui/e-meeting-list-view.c:689
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../src/calendar/gui/e-memo-table.etspec.h:9
 #: ../src/calendar/gui/e-task-table.etspec.h:11
@@ -7215,115 +7307,115 @@ msgid "Status"
 msgstr "Status"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:11
-#: ../src/calendar/gui/e-meeting-list-view.c:649
+#: ../src/calendar/gui/e-meeting-list-view.c:646
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../src/calendar/gui/e-memo-table.etspec.h:3
 #: ../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:2001
-#: ../src/e-util/e-webdav-browser.c:2371
+#: ../src/e-util/e-collection-account-wizard.c:2026
+#: ../src/e-util/e-webdav-browser.c:2519
 #: ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "Type"
 
-#: ../src/calendar/gui/e-cal-model.c:310
-#: ../src/calendar/gui/e-meeting-list-view.c:183
-#: ../src/calendar/gui/e-meeting-list-view.c:197
+#: ../src/calendar/gui/e-cal-model.c:307
+#: ../src/calendar/gui/e-meeting-list-view.c:180
+#: ../src/calendar/gui/e-meeting-list-view.c:194
 #: ../src/calendar/gui/e-meeting-store.c:135
 #: ../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:3460
-#: ../src/modules/itip-formatter/itip-view.c:6505
+#: ../src/modules/itip-formatter/itip-view.c:3444
+#: ../src/modules/itip-formatter/itip-view.c:6406
 #: ../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:626
-#: ../src/calendar/gui/e-cal-ops.c:1267
+#: ../src/calendar/gui/e-cal-model.c:1366 ../src/calendar/gui/e-cal-ops.c:629
+#: ../src/calendar/gui/e-cal-ops.c:1270
 #: ../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:1384
+#: ../src/calendar/gui/e-cal-model.c:1477 ../src/calendar/gui/e-cal-ops.c:194
+#: ../src/calendar/gui/e-cal-ops.c:1387
 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:1388
+#: ../src/calendar/gui/e-cal-model.c:1481 ../src/calendar/gui/e-cal-ops.c:198
+#: ../src/calendar/gui/e-cal-ops.c:1391
 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:1392
+#: ../src/calendar/gui/e-cal-model.c:1485 ../src/calendar/gui/e-cal-ops.c:202
+#: ../src/calendar/gui/e-cal-ops.c:1395
 msgid "Creating a task"
 msgstr "Creating a task"
 
-#: ../src/calendar/gui/e-cal-model.c:1874
+#: ../src/calendar/gui/e-cal-model.c:1875
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../src/calendar/gui/e-cal-model.c:1876
+#: ../src/calendar/gui/e-cal-model.c:1877
 msgid "Assigned"
 msgstr "Assigned"
 
-#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model.c:1880
 #: ../src/calendar/gui/e-cal-model-tasks.c:1097
 msgid "Yes"
 msgstr "Yes"
 
-#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model.c:1880
 #: ../src/calendar/gui/e-cal-model-tasks.c:1097
 msgid "No"
 msgstr "No"
 
-#: ../src/calendar/gui/e-cal-model.c:3787
-#: ../src/calendar/gui/e-meeting-list-view.c:208
+#: ../src/calendar/gui/e-cal-model.c:3788
+#: ../src/calendar/gui/e-meeting-list-view.c:205
 #: ../src/calendar/gui/e-meeting-store.c:179
 #: ../src/calendar/gui/e-meeting-store.c:202
-#: ../src/modules/itip-formatter/itip-view.c:6493
+#: ../src/modules/itip-formatter/itip-view.c:6394
 msgid "Accepted"
 msgstr "Accepted"
 
-#: ../src/calendar/gui/e-cal-model.c:3788
-#: ../src/calendar/gui/e-meeting-list-view.c:209
+#: ../src/calendar/gui/e-cal-model.c:3789
+#: ../src/calendar/gui/e-meeting-list-view.c:206
 #: ../src/calendar/gui/e-meeting-store.c:181
 #: ../src/calendar/gui/e-meeting-store.c:204
-#: ../src/modules/itip-formatter/itip-view.c:6499
+#: ../src/modules/itip-formatter/itip-view.c:6400
 msgid "Declined"
 msgstr "Declined"
 
-#: ../src/calendar/gui/e-cal-model.c:3789
-#: ../src/calendar/gui/e-meeting-list-view.c:210
+#: ../src/calendar/gui/e-cal-model.c:3790
+#: ../src/calendar/gui/e-meeting-list-view.c:207
 #: ../src/calendar/gui/e-meeting-store.c:183
 #: ../src/calendar/gui/e-meeting-store.c:206
 #: ../src/calendar/gui/e-meeting-time-sel.c:523
 msgid "Tentative"
 msgstr "Tentative"
 
-#: ../src/calendar/gui/e-cal-model.c:3790
-#: ../src/calendar/gui/e-meeting-list-view.c:211
+#: ../src/calendar/gui/e-cal-model.c:3791
+#: ../src/calendar/gui/e-meeting-list-view.c:208
 #: ../src/calendar/gui/e-meeting-store.c:185
 #: ../src/calendar/gui/e-meeting-store.c:208
-#: ../src/modules/itip-formatter/itip-view.c:6502
+#: ../src/modules/itip-formatter/itip-view.c:6403
 msgid "Delegated"
 msgstr "Delegated"
 
-#: ../src/calendar/gui/e-cal-model.c:3791
+#: ../src/calendar/gui/e-cal-model.c:3792
 msgid "Needs action"
 msgstr "Needs action"
 
 #: ../src/calendar/gui/e-cal-model-calendar.c:91
-#: ../src/calendar/gui/e-task-table.c:529
+#: ../src/calendar/gui/e-task-table.c:523
 msgid "Free"
 msgstr "Free"
 
 #: ../src/calendar/gui/e-cal-model-calendar.c:94
 #: ../src/calendar/gui/e-meeting-time-sel.c:524
-#: ../src/calendar/gui/e-task-table.c:530
+#: ../src/calendar/gui/e-task-table.c:524
 msgid "Busy"
 msgstr "Busy"
 
@@ -7341,166 +7433,166 @@ msgstr ""
 msgid "In Progress"
 msgstr "In Progress"
 
-#: ../src/calendar/gui/e-cal-ops.c:314
+#: ../src/calendar/gui/e-cal-ops.c:317
 msgid "Modifying an event"
 msgstr "Modifying an event"
 
-#: ../src/calendar/gui/e-cal-ops.c:318
+#: ../src/calendar/gui/e-cal-ops.c:321
 msgid "Modifying a memo"
 msgstr "Modifying a memo"
 
-#: ../src/calendar/gui/e-cal-ops.c:322
+#: ../src/calendar/gui/e-cal-ops.c:325
 msgid "Modifying a task"
 msgstr "Modifying a task"
 
-#: ../src/calendar/gui/e-cal-ops.c:423 ../src/calendar/gui/e-to-do-pane.c:2074
+#: ../src/calendar/gui/e-cal-ops.c:426 ../src/calendar/gui/e-to-do-pane.c:2074
 msgid "Removing an event"
 msgstr "Removing an event"
 
-#: ../src/calendar/gui/e-cal-ops.c:427 ../src/calendar/gui/e-to-do-pane.c:2078
+#: ../src/calendar/gui/e-cal-ops.c:430 ../src/calendar/gui/e-to-do-pane.c:2078
 msgid "Removing a memo"
 msgstr "Removing a memo"
 
-#: ../src/calendar/gui/e-cal-ops.c:431 ../src/calendar/gui/e-to-do-pane.c:2082
+#: ../src/calendar/gui/e-cal-ops.c:434 ../src/calendar/gui/e-to-do-pane.c:2082
 msgid "Removing a task"
 msgstr "Removing a task"
 
-#: ../src/calendar/gui/e-cal-ops.c:519
+#: ../src/calendar/gui/e-cal-ops.c:522
 #, 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:523
+#: ../src/calendar/gui/e-cal-ops.c:526
 #, 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:527
+#: ../src/calendar/gui/e-cal-ops.c:530
 #, 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:738
+#: ../src/calendar/gui/e-cal-ops.c:741
 #, 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:753
+#: ../src/calendar/gui/e-cal-ops.c:756
 #, 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:768
+#: ../src/calendar/gui/e-cal-ops.c:771
 #, 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:868
+#: ../src/calendar/gui/e-cal-ops.c:871
 msgid "Updating an event"
 msgstr "Updating an event"
 
-#: ../src/calendar/gui/e-cal-ops.c:872
+#: ../src/calendar/gui/e-cal-ops.c:875
 msgid "Updating a memo"
 msgstr "Updating a memo"
 
-#: ../src/calendar/gui/e-cal-ops.c:876
+#: ../src/calendar/gui/e-cal-ops.c:879
 msgid "Updating a task"
 msgstr "Updating a task"
 
-#: ../src/calendar/gui/e-cal-ops.c:989
+#: ../src/calendar/gui/e-cal-ops.c:992
 #, 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:993
+#: ../src/calendar/gui/e-cal-ops.c:996
 #, 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:997
+#: ../src/calendar/gui/e-cal-ops.c:1000
 #, 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:1023
+#: ../src/calendar/gui/e-cal-ops.c:1026
 #, c-format
 msgid "Purging events in the calendar “%s”"
 msgstr "Purging events in the calendar “%s”"
 
-#: ../src/calendar/gui/e-cal-ops.c:1027
+#: ../src/calendar/gui/e-cal-ops.c:1030
 #, 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:1031
+#: ../src/calendar/gui/e-cal-ops.c:1034
 #, 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:1126
+#: ../src/calendar/gui/e-cal-ops.c:1129
 msgid "Purging events"
 msgstr "Purging events"
 
-#: ../src/calendar/gui/e-cal-ops.c:1130
+#: ../src/calendar/gui/e-cal-ops.c:1133
 msgid "Purging memos"
 msgstr "Purging memos"
 
-#: ../src/calendar/gui/e-cal-ops.c:1134
+#: ../src/calendar/gui/e-cal-ops.c:1137
 msgid "Purging tasks"
 msgstr "Purging tasks"
 
-#: ../src/calendar/gui/e-cal-ops.c:1236
+#: ../src/calendar/gui/e-cal-ops.c:1239
 msgid "Expunging completed tasks"
 msgstr "Expunging completed tasks"
 
-#: ../src/calendar/gui/e-cal-ops.c:2084
+#: ../src/calendar/gui/e-cal-ops.c:2087
 #, 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:2085
+#: ../src/calendar/gui/e-cal-ops.c:2088
 #, 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:2091
+#: ../src/calendar/gui/e-cal-ops.c:2094
 #, 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:2092
+#: ../src/calendar/gui/e-cal-ops.c:2095
 #, 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:2098
+#: ../src/calendar/gui/e-cal-ops.c:2101
 #, 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:2099
+#: ../src/calendar/gui/e-cal-ops.c:2102
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -7530,218 +7622,225 @@ msgstr ""
 msgid "Event’s time is in the past"
 msgstr "Event’s time is in the past"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:210
+#: ../src/calendar/gui/e-comp-editor-event.c:204
 msgid ""
 "Event cannot be edited, because the selected calendar could not be opened"
 msgstr ""
 "Event cannot be edited, because the selected calendar could not be opened"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:212
+#: ../src/calendar/gui/e-comp-editor-event.c:206
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "Event cannot be edited, because the selected calendar is read only"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:214
-msgid "Event cannot be fully edited, because you are not the organizer"
-msgstr "Event cannot be fully edited, because you are not the organiser"
+#: ../src/calendar/gui/e-comp-editor-event.c:208
+msgid ""
+"Changes made to the event will not be sent to the attendees, because you are "
+"not the organizer"
+msgstr ""
+"Changes made to the event will not be sent to the attendees, because you are "
+"not the organiser"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:506
-#: ../src/calendar/gui/e-comp-editor-task.c:591
+#: ../src/calendar/gui/e-comp-editor-event.c:500
+#: ../src/calendar/gui/e-comp-editor-task.c:584
 msgid "Start date is not a valid date"
 msgstr "Start date is not a valid date"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:508
+#: ../src/calendar/gui/e-comp-editor-event.c:502
 msgid "Start time is not a valid time"
 msgstr "Start time is not a valid time"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:512
-#: ../src/calendar/gui/e-comp-editor-event.c:528
+#: ../src/calendar/gui/e-comp-editor-event.c:506
+#: ../src/calendar/gui/e-comp-editor-event.c:522
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
-#: ../src/calendar/gui/e-comp-editor.c:338
+#: ../src/calendar/gui/e-comp-editor.c:340
 #: ../src/composer/e-composer-actions.c:180
 #: ../src/em-format/e-mail-part-secure-button.c:97
-#: ../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/e-util/e-misc-utils.c:4003 ../src/e-util/e-misc-utils.c:4015
+#: ../src/e-util/e-misc-utils.c:4029 ../src/mail/e-mail-autoconfig.c:1041
+#: ../src/mail/e-mail-display.c:2449 ../src/mail/e-mail-notes.c:875
+#: ../src/mail/e-mail-reader-utils.c:805 ../src/mail/em-composer-utils.c:3820
+#: ../src/mail/em-composer-utils.c:3851 ../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
+#: ../src/shell/e-shell.c:1260 ../src/smime/gui/certificate-manager.c:360
 #, c-format
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:522
+#: ../src/calendar/gui/e-comp-editor-event.c:516
 msgid "End date is not a valid date"
 msgstr "End date is not a valid date"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:524
+#: ../src/calendar/gui/e-comp-editor-event.c:518
 msgid "End time is not a valid time"
 msgstr "End time is not a valid time"
 
-#: ../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
+#: ../src/calendar/gui/e-comp-editor-event.c:713
+#: ../src/calendar/gui/e-comp-editor-memo.c:249
+#: ../src/calendar/gui/e-comp-editor-task.c:697
 msgid "_Categories"
 msgstr "_Categories"
 
-#: ../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
+#: ../src/calendar/gui/e-comp-editor-event.c:715
+#: ../src/calendar/gui/e-comp-editor-memo.c:251
+#: ../src/calendar/gui/e-comp-editor-task.c:699
 msgid "Toggles whether to display categories"
 msgstr "Toggles whether to display categories"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:727
-#: ../src/calendar/gui/e-comp-editor-task.c:712
+#: ../src/calendar/gui/e-comp-editor-event.c:721
+#: ../src/calendar/gui/e-comp-editor-task.c:705
 msgid "Time _Zone"
 msgstr "Time _Zone"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:729
-#: ../src/calendar/gui/e-comp-editor-task.c:714
+#: ../src/calendar/gui/e-comp-editor-event.c:723
+#: ../src/calendar/gui/e-comp-editor-task.c:707
 msgid "Toggles whether the time zone is displayed"
 msgstr "Toggles whether the time zone is displayed"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:735
+#: ../src/calendar/gui/e-comp-editor-event.c:729
 msgid "All _Day Event"
 msgstr "All _Day Event"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:737
+#: ../src/calendar/gui/e-comp-editor-event.c:731
 msgid "Toggles whether to have All Day Event"
 msgstr "Toggles whether to have All Day Event"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:743
+#: ../src/calendar/gui/e-comp-editor-event.c:737
 msgid "Show Time as _Busy"
 msgstr "Show Time as _Busy"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:745
+#: ../src/calendar/gui/e-comp-editor-event.c:739
 msgid "Toggles whether to show time as busy"
 msgstr "Toggles whether to show time as busy"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:754
+#: ../src/calendar/gui/e-comp-editor-event.c:748
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:756
+#: ../src/calendar/gui/e-comp-editor-event.c:750
 msgid "Classify as public"
 msgstr "Classify as public"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:761
+#: ../src/calendar/gui/e-comp-editor-event.c:755
 msgid "_Private"
 msgstr "_Private"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:763
+#: ../src/calendar/gui/e-comp-editor-event.c:757
 msgid "Classify as private"
 msgstr "Classify as private"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:768
+#: ../src/calendar/gui/e-comp-editor-event.c:762
 msgid "_Confidential"
 msgstr "_Confidential"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:770
+#: ../src/calendar/gui/e-comp-editor-event.c:764
 msgid "Classify as confidential"
 msgstr "Classify as confidential"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:888
+#: ../src/calendar/gui/e-comp-editor-event.c:882
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Start time:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:893
+#: ../src/calendar/gui/e-comp-editor-event.c:887
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "_End time:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:903
+#: ../src/calendar/gui/e-comp-editor-event.c:897
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "All da_y event"
 
-#: ../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
+#: ../src/calendar/gui/e-comp-editor-event.c:965
+#: ../src/calendar/gui/e-comp-editor-memo.c:350
+#: ../src/calendar/gui/e-comp-editor-task.c:875
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "General"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:974
-#: ../src/calendar/gui/e-comp-editor-task.c:905
+#: ../src/calendar/gui/e-comp-editor-event.c:968
+#: ../src/calendar/gui/e-comp-editor-task.c:898
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Reminders"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:977
-#: ../src/calendar/gui/e-comp-editor-task.c:909
+#: ../src/calendar/gui/e-comp-editor-event.c:971
+#: ../src/calendar/gui/e-comp-editor-task.c:902
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Recurrence"
 
-#: ../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
+#: ../src/calendar/gui/e-comp-editor-event.c:974
+#: ../src/calendar/gui/e-comp-editor-memo.c:353
+#: ../src/calendar/gui/e-comp-editor-task.c:906
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Attachments"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:990
+#: ../src/calendar/gui/e-comp-editor-event.c:984
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "Schedule"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:1025
+#: ../src/calendar/gui/e-comp-editor-event.c:1019
 #, c-format
 msgid "Meeting — %s"
 msgstr "Meeting — %s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:1026
+#: ../src/calendar/gui/e-comp-editor-event.c:1020
 #, c-format
 msgid "Appointment — %s"
 msgstr "Appointment — %s"
 
 #: ../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
+#: ../src/calendar/gui/e-comp-editor-memo.c:211
 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:220
+#: ../src/calendar/gui/e-comp-editor-memo.c:213
 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: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:215
+msgid ""
+"Changes made to the memo will not be sent to the attendees, because you are "
+"not the organizer"
+msgstr ""
+"Changes made to the memo will not be sent to the attendees, because you are "
+"not the organiser"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:318
-#: ../src/calendar/gui/e-comp-editor-task.c:813
+#: ../src/calendar/gui/e-comp-editor-memo.c:311
+#: ../src/calendar/gui/e-comp-editor-task.c:806
 msgid "_List:"
 msgstr "_List:"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:325
-#: ../src/calendar/gui/e-comp-editor-task.c:823
+#: ../src/calendar/gui/e-comp-editor-memo.c:318
+#: ../src/calendar/gui/e-comp-editor-task.c:816
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "Sta_rt date:"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:392
+#: ../src/calendar/gui/e-comp-editor-memo.c:385
 #, c-format
 msgid "Assigned Memo — %s"
 msgstr "Assigned Memo — %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:393
+#: ../src/calendar/gui/e-comp-editor-memo.c:386
 #, c-format
 msgid "Memo — %s"
 msgstr "Memo — %s"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:123
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:128
-#: ../src/em-format/e-mail-formatter-attachment.c:334
+#: ../src/em-format/e-mail-formatter-attachment.c:336
 #: ../src/e-util/e-attachment-bar.c:101 ../src/e-util/e-attachment-bar.c:106
 #: ../src/e-util/e-attachment-paned.c:175
 #: ../src/e-util/e-attachment-paned.c:180 ../src/mail/message-list.etspec.h:4
@@ -7762,7 +7861,7 @@ msgstr "Could not load “%s”"
 msgid "Could not load the attachment"
 msgstr "Could not load the attachment"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:416
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:411
 msgid ""
 "Some attachments are still being downloaded. Please wait until the download "
 "is finished."
@@ -7770,127 +7869,127 @@ msgstr ""
 "Some attachments are still being downloaded. Please wait until the download "
 "is finished."
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:443
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:438
 #, c-format
 msgid "Attachment “%s” cannot be found, remove it from the list, please"
 msgstr "Attachment “%s” cannot be found, remove it from the list, please"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:460
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:455
 #, c-format
 msgid "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
 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/calendar/gui/e-comp-editor-page-attachments.c:628
 #: ../src/composer/e-composer-actions.c:326
 msgid "_Attachment…"
 msgstr "_Attachment…"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:635
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:630
 #: ../src/composer/e-composer-actions.c:328
 #: ../src/e-util/e-attachment-view.c:343
 msgid "Attach a file"
 msgstr "Attach a file"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:642
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:637
 msgid "_Attachments"
 msgstr "_Attachments"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:644
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:639
 msgid "Show attachments"
 msgstr "Show attachments"
 
-#: ../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
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:807
+#: ../src/e-util/e-attachment-bar.c:716 ../src/e-util/e-attachment-paned.c:690
 msgid "Icon View"
 msgstr "Icon View"
 
-#: ../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
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:809
+#: ../src/e-util/e-attachment-bar.c:718 ../src/e-util/e-attachment-paned.c:692
 msgid "List View"
 msgstr "List View"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:392
+#: ../src/calendar/gui/e-comp-editor-page-general.c:322
 #, c-format
 msgid "Cannot find attendee “%s” in the list of attendees"
 msgstr "Cannot find attendee “%s” in the list of attendees"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:399
+#: ../src/calendar/gui/e-comp-editor-page-general.c:329
 #, c-format
 msgid "Not enough rights to delete attendee “%s”"
 msgstr "Not enough rights to delete attendee “%s”"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:429
+#: ../src/calendar/gui/e-comp-editor-page-general.c:359
 msgid "Failed to delete selected attendee"
 msgid_plural "Failed to delete selected attendees"
 msgstr[0] "Failed to delete selected attendee"
 msgstr[1] "Failed to delete selected attendees"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:543
+#: ../src/calendar/gui/e-comp-editor-page-general.c:473
 msgid "Organizer address is not a valid user mail address"
 msgstr "Organiser address is not a valid user mail address"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:712
+#: ../src/calendar/gui/e-comp-editor-page-general.c:686
 msgid "A_ttendees"
 msgstr "A_ttendees"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:714
+#: ../src/calendar/gui/e-comp-editor-page-general.c:688
 msgid "Toggles whether the Attendees are displayed"
 msgstr "Toggles whether the Attendees are displayed"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:723
+#: ../src/calendar/gui/e-comp-editor-page-general.c:697
 msgid "R_ole Field"
 msgstr "R_ole Field"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:725
+#: ../src/calendar/gui/e-comp-editor-page-general.c:699
 msgid "Toggles whether the Role field is displayed"
 msgstr "Toggles whether the Role field is displayed"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:731
+#: ../src/calendar/gui/e-comp-editor-page-general.c:705
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:733
+#: ../src/calendar/gui/e-comp-editor-page-general.c:707
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Toggles whether the RSVP field is displayed"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:739
+#: ../src/calendar/gui/e-comp-editor-page-general.c:713
 msgid "_Status Field"
 msgstr "_Status Field"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:741
+#: ../src/calendar/gui/e-comp-editor-page-general.c:715
 msgid "Toggles whether the Status field is displayed"
 msgstr "Toggles whether the Status field is displayed"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:747
+#: ../src/calendar/gui/e-comp-editor-page-general.c:721
 msgid "_Type Field"
 msgstr "_Type Field"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:749
+#: ../src/calendar/gui/e-comp-editor-page-general.c:723
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Toggles whether the Attendee Type is displayed"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1064
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1032
 msgid "An organizer is required."
 msgstr "An organiser is required."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1074
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1216
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1042
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1184
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1340
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1308
 msgid "Or_ganizer:"
 msgstr "Or_ganiser:"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1435
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1403
 msgid ""
 "Override color of the event. If not set, then color of the calendar is used."
 msgstr ""
 "Override colour of the event. If not set, then colour of the calendar is "
 "used."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1437
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1405
 msgid ""
 "Override color of the memo. If not set, then color of the memo list is used."
 msgstr ""
@@ -7898,47 +7997,48 @@ msgstr ""
 "used."
 
 #. E_SOURCE_EXTENSION_TASK_LIST
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1439
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1407
 msgid ""
 "Override color of the task. If not set, then color of the task list is used."
 msgstr ""
 "Override colour of the task. If not set, then colour of the task list is "
 "used."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1450
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1418
 msgctxt "ECompEditor"
 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:2321
-#: ../src/calendar/gui/e-comp-editor.c:2113
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1501
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2317
+#: ../src/calendar/gui/e-comp-editor.c:2192
 #: ../src/e-util/e-accounts-window.c:1745
-#: ../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:2671 ../src/e-util/filter.ui.h:26
+#: ../src/e-util/e-html-editor-actions.c:1118
+#: ../src/e-util/e-mail-signature-manager.c:354
+#: ../src/e-util/e-webdav-browser.c:2839 ../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
+#: ../src/mail/e-mail-label-manager.c:364
+#: ../src/mail/em-folder-properties.c:1362 ../src/mail/mail-config.ui.h:68
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:549
-#: ../src/plugins/email-custom-header/email-custom-header.c:844
+#: ../src/plugins/email-custom-header/email-custom-header.c:831
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../src/plugins/templates/templates.c:469
-#: ../src/shell/e-shell-window-actions.c:1052 ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/plugins/sender-validation/sender-validation.c:503
+#: ../src/plugins/templates/templates.c:475
+#: ../src/shell/e-shell-window-actions.c:1103 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:328
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:329
 msgid "Add exception"
 msgstr "Add exception"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:369
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:370
 msgid "Modify exception"
 msgstr "Modify exception"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:502
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:503
 msgid "on"
 msgstr "on"
 
@@ -7946,7 +8046,7 @@ msgstr "on"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:583
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:584
 msgctxt "ECompEditorPageRecur"
 msgid "first"
 msgstr "first"
@@ -7956,7 +8056,7 @@ msgstr "first"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:589
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:590
 msgctxt "ECompEditorPageRecur"
 msgid "second"
 msgstr "second"
@@ -7965,7 +8065,7 @@ msgstr "second"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:594
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:595
 msgctxt "ECompEditorPageRecur"
 msgid "third"
 msgstr "third"
@@ -7974,7 +8074,7 @@ msgstr "third"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:599
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:600
 msgctxt "ECompEditorPageRecur"
 msgid "fourth"
 msgstr "fourth"
@@ -7983,7 +8083,7 @@ msgstr "fourth"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:604
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:605
 msgctxt "ECompEditorPageRecur"
 msgid "fifth"
 msgstr "fifth"
@@ -7992,14 +8092,14 @@ msgstr "fifth"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:609
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:610
 msgctxt "ECompEditorPageRecur"
 msgid "last"
 msgstr "last"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:636
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:637
 msgctxt "ECompEditorPageRecur"
 msgid "Other Date"
 msgstr "Other Date"
@@ -8008,7 +8108,7 @@ msgstr "Other Date"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:642
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:643
 msgctxt "ECompEditorPageRecur"
 msgid "1st to 10th"
 msgstr "1st to 10th"
@@ -8017,7 +8117,7 @@ msgstr "1st to 10th"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:648
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:649
 msgctxt "ECompEditorPageRecur"
 msgid "11th to 20th"
 msgstr "11th to 20th"
@@ -8026,7 +8126,7 @@ msgstr "11th to 20th"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:654
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:655
 msgctxt "ECompEditorPageRecur"
 msgid "21st to 31st"
 msgstr "21st to 31st"
@@ -8034,42 +8134,42 @@ msgstr "21st to 31st"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:680
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:681
 msgctxt "ECompEditorPageRecur"
 msgid "day"
 msgstr "day"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:681
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:682
 msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "Monday"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:682
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:683
 msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:683
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:684
 msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:684
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:685
 msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "Thursday"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:685
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:686
 msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "Friday"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:686
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:687
 msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "Saturday"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:687
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:688
 msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
 msgstr "Sunday"
@@ -8077,7 +8177,7 @@ msgstr "Sunday"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:816
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:817
 msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "on the"
@@ -8088,116 +8188,116 @@ 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:1556
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2113
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1552
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2109
 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:1561
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1557
 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:1566
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1562
 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:1571
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1567
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "This component rec_urs"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1942
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1938
 msgid "Recurrence exception date is invalid"
 msgstr "Recurrence exception date is invalid"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1998
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1994
 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:2041
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2037
 msgid "R_ecurrence"
 msgstr "R_ecurrence"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2043
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2039
 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:2145
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2141
 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:2180
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2176
 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:2182
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2178
 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:2184
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2180
 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:2186
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2182
 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:2215
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2211
 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:2217
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2213
 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:2219
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2215
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "forever"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2235
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
 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:2248
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2244
 msgid "Exceptions"
 msgstr "Exceptions"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2313
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2168
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2309
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2205
 #: ../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:2329
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2176
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2325
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2213
 #: ../src/mail/mail-config.ui.h:69
 msgid "Re_move"
 msgstr "Re_move"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2337
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2333
 msgid "Preview"
 msgstr "Preview"
 
@@ -8205,16 +8305,16 @@ msgstr "Preview"
 msgid "Send To"
 msgstr "Send To"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1592
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1629
 msgid "_Reminders"
 msgstr "_Reminders"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1594
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1631
 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:1706
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1743
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "None"
@@ -8222,162 +8322,162 @@ 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:1716
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1753
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s before"
 msgstr "%s before"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1721
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1758
 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:1729
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1766
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "Custom"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1875
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1912
 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:1888
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1925
 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:1904
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1941
 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:1920
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1957
 msgctxt "cal-reminders"
 msgid "_minutes"
 msgstr "_minutes"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1926
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1963
 msgid "_Add time"
 msgstr "_Add time"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2006
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2043
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Reminders"
 msgstr "Reminders"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2031
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2068
 msgid "_Reminder"
 msgstr "_Reminder"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2056
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2093
 msgid "Add custom predefined time"
 msgstr "Add custom predefined time"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2064
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2101
 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:2249
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2286
 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:2251
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2288
 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:2253
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2290
 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:2270
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2307
 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:2272
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2309
 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:2288
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2325
 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:2290
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2327
 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:2309
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2346
 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:2334
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2371
 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:2371
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2408
 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:2373
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2410
 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:2375
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2412
 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:2412
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2569
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2449
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2606
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "Custom _message"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2456
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2493
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "Custom reminder _sound"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2467
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2504
 msgid "Select a sound file"
 msgstr "Select a sound file"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2495
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2532
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2520
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2557
 msgid "_Arguments:"
 msgstr "_Arguments:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2552
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2589
 msgid "_Send To:"
 msgstr "_Send To:"
 
@@ -8394,112 +8494,115 @@ msgctxt "ECompEditor"
 msgid "_Summary:"
 msgstr "_Summary:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:341
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:387
 msgctxt "ECompEditor"
 msgid "_Location:"
 msgstr "_Location:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:474
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:521
 msgctxt "ECompEditor"
 msgid "_Categories…"
 msgstr "_Categories…"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:573
-#| msgid "Edit as Ne_w…"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:624
 msgid "Edit as text"
 msgstr "Edit as text"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:573
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:624
+msgid "View as text"
+msgstr "View as text"
+
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:624
 msgid "View as HTML"
 msgstr "View as HTML"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:656
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:711
 msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "_Description:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:892
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1046
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "_Web page:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1263
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1417
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "D_ue date:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1357
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1511
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "Date _completed:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1373
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1527
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "Public"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1374
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1528
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "Private"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1375
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1529
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "Confidential"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1391
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1545
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "C_lassification:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1454
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1608
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1484
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1638
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "Undefined"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1485
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1639
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "High"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1486
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1640
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1487
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1641
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "Low"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1496
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1650
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "Priorit_y:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1550
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1704
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "Percent complete:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1631
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1785
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "Time _zone:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1727
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1881
 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:2148
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:2302
 msgctxt "ECompEditor"
 msgid "None"
 msgstr "None"
@@ -8512,230 +8615,234 @@ msgstr "Task’s start date is in the past"
 msgid "Task’s due date is in the past"
 msgstr "Task’s due date is in the past"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:530
+#: ../src/calendar/gui/e-comp-editor-task.c:523
 msgid ""
 "Task cannot be edited, because the selected task list could not be opened"
 msgstr ""
 "Task cannot be edited, because the selected task list could not be opened"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:532
+#: ../src/calendar/gui/e-comp-editor-task.c:525
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "Task cannot be edited, because the selected task list is read only"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:534
-msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "Task cannot be fully edited, because you are not the organiser"
+#: ../src/calendar/gui/e-comp-editor-task.c:527
+msgid ""
+"Changes made to the task will not be sent to the attendees, because you are "
+"not the organizer"
+msgstr ""
+"Changes made to the task will not be sent to the attendees, because you are "
+"not the organiser"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:605
+#: ../src/calendar/gui/e-comp-editor-task.c:598
 msgid "Start date is required for recurring tasks"
 msgstr "Start date is required for recurring tasks"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:621
+#: ../src/calendar/gui/e-comp-editor-task.c:614
 msgid "Due date is not a valid date"
 msgstr "Due date is not a valid date"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:632
+#: ../src/calendar/gui/e-comp-editor-task.c:625
 msgid "Completed date is not a valid date"
 msgstr "Completed date is not a valid date"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:643
+#: ../src/calendar/gui/e-comp-editor-task.c:636
 msgid "Completed date cannot be in the future"
 msgstr "Completed date cannot be in the future"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:720
+#: ../src/calendar/gui/e-comp-editor-task.c:713
 msgid "All _Day Task"
 msgstr "All _Day Task"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:722
+#: ../src/calendar/gui/e-comp-editor-task.c:715
 msgid "Toggles whether to have All Day Task"
 msgstr "Toggles whether to have All Day Task"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:946
+#: ../src/calendar/gui/e-comp-editor-task.c:939
 #, c-format
 msgid "Assigned Task — %s"
 msgstr "Assigned Task — %s"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:947
+#: ../src/calendar/gui/e-comp-editor-task.c:940
 #, c-format
 msgid "Task — %s"
 msgstr "Task — %s"
 
-#: ../src/calendar/gui/e-comp-editor.c:253
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:141
+#: ../src/calendar/gui/e-comp-editor.c:255
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:133
 msgid "attachment"
 msgstr "attachment"
 
-#: ../src/calendar/gui/e-comp-editor.c:610
+#: ../src/calendar/gui/e-comp-editor.c:613
 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:1799
+#: ../src/calendar/gui/e-comp-editor.c:1025
+#: ../src/e-util/e-webdav-browser.c:1925
 msgid "Saving changes…"
 msgstr "Saving changes…"
 
-#: ../src/calendar/gui/e-comp-editor.c:1245
+#: ../src/calendar/gui/e-comp-editor.c:1296
 msgid "No Summary"
 msgstr "No Summary"
 
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:2027
+#: ../src/calendar/gui/e-comp-editor.c:2106
 #: ../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: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/e-util/e-preferences-window.c:396
+#: ../src/e-util/e-table-field-chooser-dialog.c:197
 #: ../src/mail/e-mail-browser.c:166
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:758
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:751
 #: ../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/mail/em-folder-properties.c:1487
+#: ../src/mail/em-subscription-editor.c:1734
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:307
 #: ../src/shell/e-shell-window-actions.c:354
-#: ../src/shell/e-shell-window-actions.c:882
-#: ../src/smime/gui/certificate-manager.c:2196
+#: ../src/shell/e-shell-window-actions.c:926
+#: ../src/smime/gui/certificate-manager.c:2176
 msgid "_Close"
 msgstr "_Close"
 
-#: ../src/calendar/gui/e-comp-editor.c:2029
+#: ../src/calendar/gui/e-comp-editor.c:2108
 msgid "Close the current window"
 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: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
+#: ../src/calendar/gui/e-comp-editor.c:2113 ../src/e-util/e-focus-tracker.c:806
+#: ../src/e-util/e-html-editor-actions.c:1074 ../src/e-util/e-text.c:2065
+#: ../src/e-util/e-web-view.c:467 ../src/mail/e-mail-browser.c:173
+#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:947
 msgid "_Copy"
 msgstr "_Copy"
 
-#: ../src/calendar/gui/e-comp-editor.c:2036 ../src/e-util/e-focus-tracker.c:203
+#: ../src/calendar/gui/e-comp-editor.c:2115 ../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:470
-#: ../src/e-util/e-web-view.c:1994 ../src/mail/e-mail-browser.c:175
-#: ../src/shell/e-shell-window-actions.c:905
+#: ../src/e-util/e-focus-tracker.c:807 ../src/e-util/e-web-view.c:469
+#: ../src/e-util/e-web-view.c:2055 ../src/mail/e-mail-browser.c:175
+#: ../src/shell/e-shell-window-actions.c:949
 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:1079 ../src/e-util/e-text.c:2066
-#: ../src/mail/e-mail-browser.c:180 ../src/shell/e-shell-window-actions.c:910
+#: ../src/calendar/gui/e-comp-editor.c:2120 ../src/e-util/e-focus-tracker.c:801
+#: ../src/e-util/e-html-editor-actions.c:1081 ../src/e-util/e-text.c:2051
+#: ../src/mail/e-mail-browser.c:180 ../src/shell/e-shell-window-actions.c:954
 msgid "Cu_t"
 msgstr "Cu_t"
 
-#: ../src/calendar/gui/e-comp-editor.c:2043 ../src/e-util/e-focus-tracker.c:196
+#: ../src/calendar/gui/e-comp-editor.c:2122 ../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:2003
-#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:912
+#: ../src/e-util/e-focus-tracker.c:802 ../src/e-util/e-web-view.c:2064
+#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:956
 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/calendar/gui/e-comp-editor.c:2129 ../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:919
+#: ../src/shell/e-shell-window-actions.c:963
 msgid "Delete the selection"
 msgstr "Delete the selection"
 
-#: ../src/calendar/gui/e-comp-editor.c:2057
+#: ../src/calendar/gui/e-comp-editor.c:2136
 msgid "View help"
 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:1086 ../src/e-util/e-text.c:2092
-#: ../src/mail/e-mail-browser.c:187 ../src/shell/e-shell-window-actions.c:938
+#: ../src/calendar/gui/e-comp-editor.c:2141 ../src/e-util/e-focus-tracker.c:811
+#: ../src/e-util/e-html-editor-actions.c:1088 ../src/e-util/e-text.c:2077
+#: ../src/mail/e-mail-browser.c:187 ../src/shell/e-shell-window-actions.c:982
 msgid "_Paste"
 msgstr "_Paste"
 
-#: ../src/calendar/gui/e-comp-editor.c:2064 ../src/e-util/e-focus-tracker.c:210
+#: ../src/calendar/gui/e-comp-editor.c:2143 ../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:2012
-#: ../src/mail/e-mail-browser.c:189 ../src/shell/e-shell-window-actions.c:940
+#: ../src/e-util/e-focus-tracker.c:812 ../src/e-util/e-web-view.c:2073
+#: ../src/mail/e-mail-browser.c:189 ../src/shell/e-shell-window-actions.c:984
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
-#: ../src/calendar/gui/e-comp-editor.c:2069
-#: ../src/composer/e-composer-actions.c:387 ../src/mail/e-mail-reader.c:2749
+#: ../src/calendar/gui/e-comp-editor.c:2148
+#: ../src/composer/e-composer-actions.c:387 ../src/mail/e-mail-reader.c:2759
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1319
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1333
 msgid "_Print…"
 msgstr "_Print…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2076 ../src/mail/e-mail-reader.c:2756
+#: ../src/calendar/gui/e-comp-editor.c:2155 ../src/mail/e-mail-reader.c:2766
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1821
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:838
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1053
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1067
 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:1100 ../src/e-util/e-web-view.c:485
-#: ../src/mail/e-mail-browser.c:194 ../src/shell/e-shell-window-actions.c:1015
+#: ../src/calendar/gui/e-comp-editor.c:2162 ../src/e-util/e-focus-tracker.c:821
+#: ../src/e-util/e-html-editor-actions.c:1102 ../src/e-util/e-web-view.c:484
+#: ../src/mail/e-mail-browser.c:194 ../src/shell/e-shell-window-actions.c:1059
 msgid "Select _All"
 msgstr "Select _All"
 
-#: ../src/calendar/gui/e-comp-editor.c:2085 ../src/e-util/e-focus-tracker.c:224
+#: ../src/calendar/gui/e-comp-editor.c:2164 ../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:1017
+#: ../src/mail/e-mail-browser.c:196 ../src/shell/e-shell-window-actions.c:1061
 msgid "Select all text"
 msgstr "Select all text"
 
-#: ../src/calendar/gui/e-comp-editor.c:2106
+#: ../src/calendar/gui/e-comp-editor.c:2185
 msgid "_Classification"
 msgstr "_Classification"
 
-#: ../src/calendar/gui/e-comp-editor.c:2120
-#: ../src/e-util/e-html-editor-actions.c:1123
+#: ../src/calendar/gui/e-comp-editor.c:2199
+#: ../src/e-util/e-html-editor-actions.c:1125
 #: ../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
+#: ../src/mail/e-mail-notes.c:1029 ../src/shell/e-shell-window-actions.c:1110
 msgid "_File"
 msgstr "_File"
 
-#: ../src/calendar/gui/e-comp-editor.c:2134
-#: ../src/e-util/e-html-editor-actions.c:1144
+#: ../src/calendar/gui/e-comp-editor.c:2213
+#: ../src/e-util/e-html-editor-actions.c:1146
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../src/calendar/gui/e-comp-editor.c:2141
+#: ../src/calendar/gui/e-comp-editor.c:2220
 #: ../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: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
+#: ../src/calendar/gui/e-comp-editor.c:2227
+#: ../src/e-util/e-html-editor-actions.c:1167 ../src/mail/e-mail-browser.c:224
+#: ../src/shell/e-shell-window-actions.c:1153
+#: ../src/smime/gui/certificate-manager.c:1644 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "_View"
 
-#: ../src/calendar/gui/e-comp-editor.c:2160
+#: ../src/calendar/gui/e-comp-editor.c:2239
 msgid "Save current changes"
 msgstr "Save current changes"
 
-#: ../src/calendar/gui/e-comp-editor.c:2165
+#: ../src/calendar/gui/e-comp-editor.c:2244
 #: ../src/e-util/e-mail-signature-editor.c:328 ../src/mail/e-mail-notes.c:1024
 msgid "Save and Close"
 msgstr "Save and Close"
 
-#: ../src/calendar/gui/e-comp-editor.c:2167
+#: ../src/calendar/gui/e-comp-editor.c:2246
 msgid "Save current changes and close editor"
 msgstr "Save current changes and close editor"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../src/calendar/gui/e-day-view.c:2152 ../src/calendar/gui/e-to-do-pane.c:245
-#: ../src/calendar/gui/e-week-view.c:1756 ../src/calendar/gui/print.c:1076
+#: ../src/calendar/gui/e-day-view.c:2146 ../src/calendar/gui/e-to-do-pane.c:245
+#: ../src/calendar/gui/e-week-view.c:1761 ../src/calendar/gui/print.c:1076
 #: ../src/calendar/gui/print.c:1095 ../src/calendar/gui/print.c:2663
 #: ../src/calendar/gui/print.c:2683
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2155 ../src/calendar/gui/e-to-do-pane.c:249
-#: ../src/calendar/gui/e-week-view.c:1759 ../src/calendar/gui/print.c:1081
+#: ../src/calendar/gui/e-day-view.c:2149 ../src/calendar/gui/e-to-do-pane.c:249
+#: ../src/calendar/gui/e-week-view.c:1764 ../src/calendar/gui/print.c:1081
 #: ../src/calendar/gui/print.c:1097 ../src/calendar/gui/print.c:2668
 #: ../src/calendar/gui/print.c:2685
 msgid "pm"
@@ -8747,15 +8854,15 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../src/calendar/gui/e-day-view.c:3046
-#: ../src/calendar/gui/e-day-view-top-item.c:850
-#: ../src/calendar/gui/e-week-view-main-item.c:205
+#: ../src/calendar/gui/e-day-view.c:3040
+#: ../src/calendar/gui/e-day-view-top-item.c:846
+#: ../src/calendar/gui/e-week-view-main-item.c:207
 #: ../src/calendar/gui/print.c:2117
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../src/calendar/gui/e-day-view.c:3787
+#: ../src/calendar/gui/e-day-view.c:3780
 #, c-format
 msgid "Week %d"
 msgstr "Week %d"
@@ -8766,17 +8873,17 @@ msgstr "Week %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../src/calendar/gui/e-day-view-time-item.c:811
+#: ../src/calendar/gui/e-day-view-time-item.c:817
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minute divisions"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:836
+#: ../src/calendar/gui/e-day-view-time-item.c:842
 msgid "Show the second time zone"
 msgstr "Show the second time zone"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../src/calendar/gui/e-day-view-time-item.c:853
+#: ../src/calendar/gui/e-day-view-time-item.c:859
 #: ../src/modules/calendar/e-calendar-preferences.c:310
 #: ../src/modules/calendar/e-calendar-preferences.c:362
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:11
@@ -8784,7 +8891,7 @@ msgctxt "cal-second-zone"
 msgid "None"
 msgstr "None"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:887
+#: ../src/calendar/gui/e-day-view-time-item.c:893
 #: ../src/calendar/gui/e-timezone-entry.c:346
 #: ../src/modules/calendar/e-calendar-preferences.c:393
 msgid "Select…"
@@ -8806,70 +8913,70 @@ msgstr "Optional Participants"
 msgid "Resources"
 msgstr "Resources"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:163
+#: ../src/calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "Attendees"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:179
+#: ../src/calendar/gui/e-meeting-list-view.c:176
 #: ../src/calendar/gui/e-meeting-store.c:110
 #: ../src/calendar/gui/e-meeting-store.c:127
-#: ../src/calendar/gui/e-meeting-store.c:1072 ../src/calendar/gui/print.c:1261
+#: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1261
 msgid "Individual"
 msgstr "Individual"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:180
+#: ../src/calendar/gui/e-meeting-list-view.c:177
 #: ../src/calendar/gui/e-meeting-store.c:112
 #: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1262
 #: ../src/e-util/e-table-config.ui.h:1
 msgid "Group"
 msgstr "Group"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:181
+#: ../src/calendar/gui/e-meeting-list-view.c:178
 #: ../src/calendar/gui/e-meeting-store.c:114
 #: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1263
 msgid "Resource"
 msgstr "Resource"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:182
+#: ../src/calendar/gui/e-meeting-list-view.c:179
 #: ../src/calendar/gui/e-meeting-store.c:116
 #: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1264
 msgid "Room"
 msgstr "Room"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:193
+#: ../src/calendar/gui/e-meeting-list-view.c:190
 #: ../src/calendar/gui/e-meeting-store.c:145
 #: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1278
 msgid "Chair"
 msgstr "Chair"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:194
+#: ../src/calendar/gui/e-meeting-list-view.c:191
 #: ../src/calendar/gui/e-meeting-store.c:147
 #: ../src/calendar/gui/e-meeting-store.c:164
-#: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1279
+#: ../src/calendar/gui/e-meeting-store.c:1074 ../src/calendar/gui/print.c:1279
 msgid "Required Participant"
 msgstr "Required Participant"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:195
+#: ../src/calendar/gui/e-meeting-list-view.c:192
 #: ../src/calendar/gui/e-meeting-store.c:149
 #: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1280
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:196
+#: ../src/calendar/gui/e-meeting-list-view.c:193
 #: ../src/calendar/gui/e-meeting-store.c:151
 #: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1281
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:207
+#: ../src/calendar/gui/e-meeting-list-view.c:204
 #: ../src/calendar/gui/e-meeting-store.c:177
 #: ../src/calendar/gui/e-meeting-store.c:200
-#: ../src/calendar/gui/e-meeting-store.c:1079
+#: ../src/calendar/gui/e-meeting-store.c:1080
 msgid "Needs Action"
 msgstr "Needs Action"
 
 #. To translators: RSVP means "please reply"
-#: ../src/calendar/gui/e-meeting-list-view.c:678
+#: ../src/calendar/gui/e-meeting-list-view.c:675
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
@@ -8886,18 +8993,18 @@ msgstr "Completed"
 msgid "In Process"
 msgstr "In Process"
 
-#: ../src/calendar/gui/e-meeting-store.c:2003
+#: ../src/calendar/gui/e-meeting-store.c:2015
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "Enter password to access free/busy information on server %s as user %s"
 
-#: ../src/calendar/gui/e-meeting-store.c:2013
+#: ../src/calendar/gui/e-meeting-store.c:2025
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Failure reason: %s"
 
-#: ../src/calendar/gui/e-meeting-store.c:2018
-#: ../src/e-util/e-collection-account-wizard.c:493
+#: ../src/calendar/gui/e-meeting-store.c:2030
+#: ../src/e-util/e-collection-account-wizard.c:501
 #: ../src/plugins/publish-calendar/publish-calendar.c:350
 #: ../src/smime/gui/component.c:61
 msgid "Enter password"
@@ -9006,41 +9113,41 @@ msgstr "Common Name"
 msgid "Language"
 msgstr "Language"
 
-#: ../src/calendar/gui/e-memo-table.c:535
-#: ../src/calendar/gui/e-task-table.c:700
+#: ../src/calendar/gui/e-memo-table.c:524
+#: ../src/calendar/gui/e-task-table.c:694
 msgid "* No Summary *"
 msgstr "* No Summary *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../src/calendar/gui/e-memo-table.c:622
-#: ../src/calendar/gui/e-task-table.c:801
+#: ../src/calendar/gui/e-memo-table.c:611
+#: ../src/calendar/gui/e-task-table.c:795
 msgid "Start: "
 msgstr "Start: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../src/calendar/gui/e-memo-table.c:642
-#: ../src/calendar/gui/e-task-table.c:834
+#: ../src/calendar/gui/e-memo-table.c:631
+#: ../src/calendar/gui/e-task-table.c:828
 msgid "Due: "
 msgstr "Due: "
 
-#: ../src/calendar/gui/e-memo-table.c:850
+#: ../src/calendar/gui/e-memo-table.c:839
 msgid "Cut selected memos to the clipboard"
 msgstr "Cut selected memos to the clipboard"
 
-#: ../src/calendar/gui/e-memo-table.c:856
+#: ../src/calendar/gui/e-memo-table.c:845
 msgid "Copy selected memos to the clipboard"
 msgstr "Copy selected memos to the clipboard"
 
-#: ../src/calendar/gui/e-memo-table.c:862
+#: ../src/calendar/gui/e-memo-table.c:851
 msgid "Paste memos from the clipboard"
 msgstr "Paste memos from the clipboard"
 
-#: ../src/calendar/gui/e-memo-table.c:868
+#: ../src/calendar/gui/e-memo-table.c:857
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "Delete selected memos"
 
-#: ../src/calendar/gui/e-memo-table.c:874
+#: ../src/calendar/gui/e-memo-table.c:863
 msgid "Select all visible memos"
 msgstr "Select all visible memos"
 
@@ -9048,7 +9155,7 @@ msgstr "Select all visible memos"
 msgid "Click to add a memo"
 msgstr "Click to add a memo"
 
-#: ../src/calendar/gui/e-task-table.c:474
+#: ../src/calendar/gui/e-task-table.c:467
 #: ../src/calendar/gui/tasktypes.xml.in.h:22
 #: ../src/e-util/e-send-options.ui.h:1
 msgid "Undefined"
@@ -9058,29 +9165,29 @@ msgstr "Undefined"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../src/calendar/gui/e-task-table.c:502
+#: ../src/calendar/gui/e-task-table.c:496
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/calendar/gui/e-task-table.c:1072
+#: ../src/calendar/gui/e-task-table.c:1066
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cut selected tasks to the clipboard"
 
-#: ../src/calendar/gui/e-task-table.c:1078
+#: ../src/calendar/gui/e-task-table.c:1072
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copy selected tasks to the clipboard"
 
-#: ../src/calendar/gui/e-task-table.c:1084
+#: ../src/calendar/gui/e-task-table.c:1078
 msgid "Paste tasks from the clipboard"
 msgstr "Paste tasks from the clipboard"
 
-#: ../src/calendar/gui/e-task-table.c:1090
+#: ../src/calendar/gui/e-task-table.c:1084
 #: ../src/modules/calendar/e-task-shell-view-actions.c:698
 msgid "Delete selected tasks"
 msgstr "Delete selected tasks"
 
-#: ../src/calendar/gui/e-task-table.c:1096
+#: ../src/calendar/gui/e-task-table.c:1090
 msgid "Select all visible tasks"
 msgstr "Select all visible tasks"
 
@@ -9146,17 +9253,17 @@ msgid "Completed: %s"
 msgstr "Completed: %s"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1576 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/calendar/gui/e-to-do-pane.c:1576 ../src/e-util/e-cell-date-edit.c:338
 #: ../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:259
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1919
+#: ../src/modules/itip-formatter/itip-view.c:260
 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:287
+#: ../src/modules/itip-formatter/itip-view.c:288
 msgid "Tomorrow"
 msgstr "Tomorrow"
 
@@ -9165,12 +9272,12 @@ msgid "Tasks without Due date"
 msgstr "Tasks without Due date"
 
 #: ../src/calendar/gui/e-to-do-pane.c:2165
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1424
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1522
 msgid "New _Appointment…"
 msgstr "New _Appointment…"
 
 #: ../src/calendar/gui/e-to-do-pane.c:2173
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1459
 msgid "New _Meeting…"
 msgstr "New _Meeting…"
 
@@ -9209,7 +9316,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:3703
+#: ../src/calendar/gui/e-week-view.c:3715
 #, c-format
 msgctxt "SummaryWithLocation"
 msgid "%s (%s)"
@@ -9218,37 +9325,37 @@ msgstr "%s (%s)"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-week-view-main-item.c:222
+#: ../src/calendar/gui/e-week-view-main-item.c:224
 #: ../src/calendar/gui/print.c:2096
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../src/calendar/gui/itip-utils.c:795 ../src/calendar/gui/itip-utils.c:861
-#: ../src/calendar/gui/itip-utils.c:1010
+#: ../src/calendar/gui/itip-utils.c:913 ../src/calendar/gui/itip-utils.c:979
+#: ../src/calendar/gui/itip-utils.c:1128
 msgid "An organizer must be set."
 msgstr "An organiser must be set."
 
-#: ../src/calendar/gui/itip-utils.c:851
+#: ../src/calendar/gui/itip-utils.c:969
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: ../src/calendar/gui/itip-utils.c:1108 ../src/calendar/gui/itip-utils.c:1274
+#: ../src/calendar/gui/itip-utils.c:1226 ../src/calendar/gui/itip-utils.c:1392
 msgid "Event information"
 msgstr "Event information"
 
-#: ../src/calendar/gui/itip-utils.c:1111 ../src/calendar/gui/itip-utils.c:1277
+#: ../src/calendar/gui/itip-utils.c:1229 ../src/calendar/gui/itip-utils.c:1395
 msgid "Task information"
 msgstr "Task information"
 
-#: ../src/calendar/gui/itip-utils.c:1114 ../src/calendar/gui/itip-utils.c:1280
+#: ../src/calendar/gui/itip-utils.c:1232 ../src/calendar/gui/itip-utils.c:1398
 msgid "Memo information"
 msgstr "Memo information"
 
-#: ../src/calendar/gui/itip-utils.c:1117 ../src/calendar/gui/itip-utils.c:1298
+#: ../src/calendar/gui/itip-utils.c:1235 ../src/calendar/gui/itip-utils.c:1416
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
-#: ../src/calendar/gui/itip-utils.c:1120
+#: ../src/calendar/gui/itip-utils.c:1238
 msgid "Calendar information"
 msgstr "Calendar information"
 
@@ -9256,7 +9363,7 @@ msgstr "Calendar information"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1160
+#: ../src/calendar/gui/itip-utils.c:1278
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Accepted"
@@ -9265,7 +9372,7 @@ msgstr "Accepted"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1167
+#: ../src/calendar/gui/itip-utils.c:1285
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
@@ -9277,7 +9384,7 @@ msgstr "Tentatively Accepted"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1174 ../src/calendar/gui/itip-utils.c:1222
+#: ../src/calendar/gui/itip-utils.c:1292 ../src/calendar/gui/itip-utils.c:1340
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Declined"
@@ -9286,7 +9393,7 @@ msgstr "Declined"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1181
+#: ../src/calendar/gui/itip-utils.c:1299
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegated"
@@ -9294,7 +9401,7 @@ msgstr "Delegated"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1194
+#: ../src/calendar/gui/itip-utils.c:1312
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Updated"
@@ -9302,7 +9409,7 @@ msgstr "Updated"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1201
+#: ../src/calendar/gui/itip-utils.c:1319
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancel"
@@ -9310,7 +9417,7 @@ msgstr "Cancel"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1208
+#: ../src/calendar/gui/itip-utils.c:1326
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Refresh"
@@ -9318,47 +9425,47 @@ msgstr "Refresh"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1215
+#: ../src/calendar/gui/itip-utils.c:1333
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
 
-#: ../src/calendar/gui/itip-utils.c:1295
+#: ../src/calendar/gui/itip-utils.c:1413
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy information (%s to %s)"
 
-#: ../src/calendar/gui/itip-utils.c:1303
+#: ../src/calendar/gui/itip-utils.c:1421
 msgid "iCalendar information"
 msgstr "iCalendar information"
 
-#: ../src/calendar/gui/itip-utils.c:1332
+#: ../src/calendar/gui/itip-utils.c:1450
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Unable to book a resource, the new event collides with some other."
 
-#: ../src/calendar/gui/itip-utils.c:1337
+#: ../src/calendar/gui/itip-utils.c:1455
 msgid "Unable to book a resource, error: "
 msgstr "Unable to book a resource, error: "
 
-#: ../src/calendar/gui/itip-utils.c:1530
+#: ../src/calendar/gui/itip-utils.c:1648
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
-#: ../src/calendar/gui/itip-utils.c:2312
+#: ../src/calendar/gui/itip-utils.c:2527
 msgid "Sending an event"
 msgstr "Sending an event"
 
-#: ../src/calendar/gui/itip-utils.c:2316
+#: ../src/calendar/gui/itip-utils.c:2531
 msgid "Sending a memo"
 msgstr "Sending a memo"
 
-#: ../src/calendar/gui/itip-utils.c:2320
+#: ../src/calendar/gui/itip-utils.c:2535
 msgid "Sending a task"
 msgstr "Sending a task"
 
 #. Translator: This is used as a placeholder when an event doesn't have set a location
-#: ../src/calendar/gui/itip-utils.c:2572
+#: ../src/calendar/gui/itip-utils.c:2780
 msgctxt "Location"
 msgid "Unspecified"
 msgstr "Unspecified"
@@ -9532,11 +9639,39 @@ msgstr "is greater than"
 msgid "is less than"
 msgstr "is less than"
 
+#: ../src/calendar/gui/tasktypes.xml.in.h:28
+msgid "Current State"
+msgstr "Current State"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:29
+msgid "is Overdue"
+msgstr "is Overdue"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:30
+msgid "is Scheduled"
+msgstr "is Scheduled"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:31
+msgid "is not Scheduled"
+msgstr "is not Scheduled"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:32
+msgid "Due In"
+msgstr "Due In"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:33
+msgid "Next Days"
+msgstr "Next Days"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:34
+msgid "Previous Days"
+msgstr "Previous Days"
+
 #: ../src/calendar/importers/icalendar-importer.c:76
 msgid "Appointments and Meetings"
 msgstr "Appointments and Meetings"
 
-#: ../src/calendar/importers/icalendar-importer.c:327
+#: ../src/calendar/importers/icalendar-importer.c:334
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:480
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:89
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:280
@@ -9544,200 +9679,200 @@ msgstr "Appointments and Meetings"
 msgid "New Calendar"
 msgstr "New Calendar"
 
-#: ../src/calendar/importers/icalendar-importer.c:330
+#: ../src/calendar/importers/icalendar-importer.c:337
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:488
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:288
 #: ../src/modules/calendar/e-task-shell-view-actions.c:204
 msgid "New Task List"
 msgstr "New Task List"
 
-#: ../src/calendar/importers/icalendar-importer.c:372
+#: ../src/calendar/importers/icalendar-importer.c:379
 msgid "Cre_ate new calendar"
 msgstr "Cre_ate new calendar"
 
-#: ../src/calendar/importers/icalendar-importer.c:376
+#: ../src/calendar/importers/icalendar-importer.c:383
 msgid "Cre_ate new task list"
 msgstr "Cre_ate new task list"
 
-#: ../src/calendar/importers/icalendar-importer.c:521
-#: ../src/calendar/importers/icalendar-importer.c:971
+#: ../src/calendar/importers/icalendar-importer.c:528
+#: ../src/calendar/importers/icalendar-importer.c:978
 msgid "Opening calendar"
 msgstr "Opening calendar"
 
-#: ../src/calendar/importers/icalendar-importer.c:668
+#: ../src/calendar/importers/icalendar-importer.c:675
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar files (.ics)"
 
-#: ../src/calendar/importers/icalendar-importer.c:669
+#: ../src/calendar/importers/icalendar-importer.c:676
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar importer"
 
-#: ../src/calendar/importers/icalendar-importer.c:764
+#: ../src/calendar/importers/icalendar-importer.c:771
 msgid "Reminder!"
 msgstr "Reminder!"
 
-#: ../src/calendar/importers/icalendar-importer.c:859
+#: ../src/calendar/importers/icalendar-importer.c:866
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar files (.vcs)"
 
-#: ../src/calendar/importers/icalendar-importer.c:860
+#: ../src/calendar/importers/icalendar-importer.c:867
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar importer"
 
-#: ../src/calendar/importers/icalendar-importer.c:1134
+#: ../src/calendar/importers/icalendar-importer.c:1141
 msgid "Calendar Events"
 msgstr "Calendar Events"
 
-#: ../src/calendar/importers/icalendar-importer.c:1177
+#: ../src/calendar/importers/icalendar-importer.c:1184
 msgid "GNOME Calendar"
 msgstr "GNOME Calendar"
 
-#: ../src/calendar/importers/icalendar-importer.c:1178
+#: ../src/calendar/importers/icalendar-importer.c:1185
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution Calendar intelligent importer"
 
-#: ../src/calendar/importers/icalendar-importer.c:1254
-#: ../src/calendar/importers/icalendar-importer.c:1582
+#: ../src/calendar/importers/icalendar-importer.c:1280
+#: ../src/calendar/importers/icalendar-importer.c:1606
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Meeting"
 
-#: ../src/calendar/importers/icalendar-importer.c:1254
-#: ../src/calendar/importers/icalendar-importer.c:1582
+#: ../src/calendar/importers/icalendar-importer.c:1280
+#: ../src/calendar/importers/icalendar-importer.c:1606
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Event"
 
-#: ../src/calendar/importers/icalendar-importer.c:1257
-#: ../src/calendar/importers/icalendar-importer.c:1583
+#: ../src/calendar/importers/icalendar-importer.c:1283
+#: ../src/calendar/importers/icalendar-importer.c:1607
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Task"
 
-#: ../src/calendar/importers/icalendar-importer.c:1260
-#: ../src/calendar/importers/icalendar-importer.c:1584
+#: ../src/calendar/importers/icalendar-importer.c:1286
+#: ../src/calendar/importers/icalendar-importer.c:1608
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Memo"
 
+#: ../src/calendar/importers/icalendar-importer.c:1295
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "is an instance"
+
 #. have ? NULL :
-#: ../src/calendar/importers/icalendar-importer.c:1269
+#: ../src/calendar/importers/icalendar-importer.c:1298
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "has recurrences"
 
-#: ../src/calendar/importers/icalendar-importer.c:1274
-msgctxt "iCalImp"
-msgid "is an instance"
-msgstr "is an instance"
-
-#: ../src/calendar/importers/icalendar-importer.c:1279
+#: ../src/calendar/importers/icalendar-importer.c:1303
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "has reminders"
 
-#: ../src/calendar/importers/icalendar-importer.c:1284
+#: ../src/calendar/importers/icalendar-importer.c:1308
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "has attachments"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1296
+#: ../src/calendar/importers/icalendar-importer.c:1320
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Public"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1299
+#: ../src/calendar/importers/icalendar-importer.c:1323
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Private"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1302
+#: ../src/calendar/importers/icalendar-importer.c:1326
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Confidential"
 
 #. Translators: Appointment's classification section name
-#: ../src/calendar/importers/icalendar-importer.c:1306
+#: ../src/calendar/importers/icalendar-importer.c:1330
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Classification"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../src/calendar/importers/icalendar-importer.c:1311
-#: ../src/calendar/importers/icalendar-importer.c:1627
+#: ../src/calendar/importers/icalendar-importer.c:1335
+#: ../src/calendar/importers/icalendar-importer.c:1651
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Summary"
 
 #. Translators: Appointment's location
-#: ../src/calendar/importers/icalendar-importer.c:1318
+#: ../src/calendar/importers/icalendar-importer.c:1342
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Location"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../src/calendar/importers/icalendar-importer.c:1326
-#: ../src/calendar/importers/icalendar-importer.c:1622
+#: ../src/calendar/importers/icalendar-importer.c:1350
+#: ../src/calendar/importers/icalendar-importer.c:1646
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Start"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../src/calendar/importers/icalendar-importer.c:1336
+#: ../src/calendar/importers/icalendar-importer.c:1360
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Due"
 
 #. Translators: Appointment's end time
-#: ../src/calendar/importers/icalendar-importer.c:1347
+#: ../src/calendar/importers/icalendar-importer.c:1371
 msgctxt "iCalImp"
 msgid "End"
 msgstr "End"
 
 #. Translators: Appointment's categories
-#: ../src/calendar/importers/icalendar-importer.c:1356
+#: ../src/calendar/importers/icalendar-importer.c:1380
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Categories"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../src/calendar/importers/icalendar-importer.c:1381
+#: ../src/calendar/importers/icalendar-importer.c:1405
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Completed"
 
 #. Translators: Appointment's URL
-#: ../src/calendar/importers/icalendar-importer.c:1388
+#: ../src/calendar/importers/icalendar-importer.c:1412
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../src/calendar/importers/icalendar-importer.c:1405
-#: ../src/calendar/importers/icalendar-importer.c:1408
+#: ../src/calendar/importers/icalendar-importer.c:1429
+#: ../src/calendar/importers/icalendar-importer.c:1432
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organiser"
 
 #. Translators: Appointment's attendees
-#: ../src/calendar/importers/icalendar-importer.c:1437
-#: ../src/calendar/importers/icalendar-importer.c:1440
+#: ../src/calendar/importers/icalendar-importer.c:1461
+#: ../src/calendar/importers/icalendar-importer.c:1464
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Attendees"
 
-#: ../src/calendar/importers/icalendar-importer.c:1456
+#: ../src/calendar/importers/icalendar-importer.c:1480
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Description"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../src/calendar/importers/icalendar-importer.c:1617
+#: ../src/calendar/importers/icalendar-importer.c:1641
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Type"
@@ -11306,12 +11441,12 @@ msgid "Open New Message window"
 msgstr "Open New Message window"
 
 #: ../src/composer/e-composer-actions.c:347
-#: ../src/shell/e-shell-window-actions.c:952
+#: ../src/shell/e-shell-window-actions.c:996
 msgid "_Preferences"
 msgstr "_Preferences"
 
 #: ../src/composer/e-composer-actions.c:349
-#: ../src/shell/e-shell-window-actions.c:954
+#: ../src/shell/e-shell-window-actions.c:998
 msgid "Configure Evolution"
 msgstr "Configure Evolution"
 
@@ -11456,12 +11591,12 @@ msgid "Save Draft"
 msgstr "Save Draft"
 
 #: ../src/composer/e-composer-from-header.c:108
-#: ../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:2398
+#: ../src/e-util/e-collection-account-wizard.c:2058
+#: ../src/e-util/e-mail-signature-script-dialog.c:408
+#: ../src/e-util/e-webdav-browser.c:2546
 #: ../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
+#: ../src/mail/e-mail-config-summary-page.c:327
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:297
 msgid "_Name:"
 msgstr "_Name:"
@@ -11482,44 +11617,44 @@ msgstr ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 
-#: ../src/composer/e-composer-header-table.c:840
+#: ../src/composer/e-composer-header-table.c:831
 msgid "Fr_om:"
 msgstr "Fr_om:"
 
-#: ../src/composer/e-composer-header-table.c:847
+#: ../src/composer/e-composer-header-table.c:838
 msgid "_Reply-To:"
 msgstr "_Reply-To:"
 
-#: ../src/composer/e-composer-header-table.c:852
+#: ../src/composer/e-composer-header-table.c:843
 msgid "_To:"
 msgstr "_To:"
 
-#: ../src/composer/e-composer-header-table.c:858
+#: ../src/composer/e-composer-header-table.c:849
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../src/composer/e-composer-header-table.c:864
+#: ../src/composer/e-composer-header-table.c:855
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../src/composer/e-composer-header-table.c:869
+#: ../src/composer/e-composer-header-table.c:860
 msgid "_Post To:"
 msgstr "_Post To:"
 
-#: ../src/composer/e-composer-header-table.c:873
+#: ../src/composer/e-composer-header-table.c:864
 msgid "S_ubject:"
 msgstr "S_ubject:"
 
-#: ../src/composer/e-composer-header-table.c:883
+#: ../src/composer/e-composer-header-table.c:874
 #: ../src/mail/e-mail-config-identity-page.c:744
 msgid "Si_gnature:"
 msgstr "Si_gnature:"
 
-#: ../src/composer/e-composer-name-header.c:237
+#: ../src/composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "Click here for the address book"
 
-#: ../src/composer/e-composer-post-header.c:180
+#: ../src/composer/e-composer-post-header.c:176
 msgid "Click here to select folders to post to"
 msgstr "Click here to select folders to post to"
 
@@ -11543,19 +11678,18 @@ msgstr ""
 msgid "Compose Message"
 msgstr "Compose Message"
 
-#: ../src/composer/e-msg-composer.c:4362
+#: ../src/composer/e-msg-composer.c:4381
 #: ../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
+#: ../src/composer/e-msg-composer.c:5191
 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:5177
+#: ../src/composer/e-msg-composer.c:5196
 #, c-format
 msgid ""
 "There had been added %d attachment. Make sure it does not contain any "
@@ -11570,7 +11704,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:5310
+#: ../src/composer/e-msg-composer.c:5329
 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."
 
@@ -11720,7 +11854,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:694
+#: ../src/e-util/e-collection-account-wizard.c:710
 msgid "_Try Again"
 msgstr "_Try Again"
 
@@ -11852,7 +11986,15 @@ msgstr ""
 msgid "An error occurred while creating message composer."
 msgstr "An error occurred while creating message composer."
 
-#: ../src/em-format/e-mail-formatter-attachment.c:335
+#: ../src/em-format/e-mail-formatter-attachment.c:272
+msgid "Toggle View Inline"
+msgstr "Toggle View Inline"
+
+#: ../src/em-format/e-mail-formatter-attachment.c:272
+msgid "Open in default application"
+msgstr "Open in default application"
+
+#: ../src/em-format/e-mail-formatter-attachment.c:337
 msgid "Display as attachment"
 msgstr "Display as attachment"
 
@@ -11906,7 +12048,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:2342
+#: ../src/e-util/e-webdav-browser.c:2490
 #: ../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
@@ -11919,18 +12061,18 @@ msgstr "Name"
 msgid "Size"
 msgstr "Size"
 
-#: ../src/em-format/e-mail-formatter-quote-headers.c:181
+#: ../src/em-format/e-mail-formatter-quote-headers.c:184
 #: ../src/em-format/e-mail-part-headers.c:51
 #: ../src/mail/e-mail-tag-editor.c:201 ../src/mail/filtertypes.xml.in.h:16
 #: ../src/mail/message-list.etspec.h:6 ../src/mail/searchtypes.xml.in.h:17
 #: ../src/mail/vfoldertypes.xml.in.h:17
 #: ../src/modules/mail/em-mailer-prefs.c:65
-#: ../src/smime/gui/certificate-manager.c:1627
+#: ../src/smime/gui/certificate-manager.c:1625
 msgid "Subject"
 msgstr "Subject"
 
 #. pseudo-header
-#: ../src/em-format/e-mail-formatter-quote-headers.c:200
+#: ../src/em-format/e-mail-formatter-quote-headers.c:205
 #: ../src/em-format/e-mail-formatter-utils.c:360
 #: ../src/modules/mail/em-mailer-prefs.c:686
 #: ../src/modules/mail/em-mailer-prefs.c:1620
@@ -11958,12 +12100,12 @@ msgstr "HTML"
 msgid "Format part as HTML"
 msgstr "Format part as HTML"
 
-#: ../src/em-format/e-mail-formatter-quote-text-plain.c:121
+#: ../src/em-format/e-mail-formatter-quote-text-plain.c:130
 #: ../src/em-format/e-mail-formatter-text-plain.c:196
 msgid "Plain Text"
 msgstr "Plain Text"
 
-#: ../src/em-format/e-mail-formatter-quote-text-plain.c:122
+#: ../src/em-format/e-mail-formatter-quote-text-plain.c:131
 #: ../src/em-format/e-mail-formatter-text-plain.c:197
 msgid "Format part as plain text"
 msgstr "Format part as plain text"
@@ -12180,7 +12322,7 @@ msgid "partially S/MIME encrypted"
 msgstr "partially S/MIME encrypted"
 
 #: ../src/em-format/e-mail-formatter-utils.c:693
-#: ../src/mail/e-mail-config-security-page.c:856
+#: ../src/mail/e-mail-config-security-page.c:852
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:273
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:216
 msgid "Security"
@@ -12259,8 +12401,8 @@ msgstr "Unsupported signature format"
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:559
-#: ../src/e-util/e-dateedit.c:582 ../src/mail/message-list.etspec.h:7
+#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:558
+#: ../src/e-util/e-dateedit.c:581 ../src/mail/message-list.etspec.h:7
 #: ../src/modules/mail/em-mailer-prefs.c:66
 msgid "Date"
 msgstr "Date"
@@ -12301,7 +12443,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:914
+#: ../src/modules/mail/e-mail-shell-backend.c:1109
 msgid "Mail Accounts"
 msgstr "Mail Accounts"
 
@@ -12329,16 +12471,16 @@ msgstr "Task Lists"
 
 #: ../src/e-util/e-accounts-window.c:1399 ../src/e-util/filter.ui.h:23
 #: ../src/mail/e-mail-account-tree-view.c:84
-#: ../src/modules/mail/em-composer-prefs.c:1306
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:407
-#: ../src/plugins/mail-notification/mail-notification.c:1124
-#: ../src/plugins/publish-calendar/publish-calendar.c:854
+#: ../src/modules/mail/em-composer-prefs.c:1303
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:408
+#: ../src/plugins/mail-notification/mail-notification.c:1175
+#: ../src/plugins/publish-calendar/publish-calendar.c:853
 msgid "Enabled"
 msgstr "Enabled"
 
 #: ../src/e-util/e-accounts-window.c:1415
 #: ../src/mail/e-mail-account-tree-view.c:108
-#: ../src/plugins/mail-notification/mail-notification.c:1140
+#: ../src/plugins/mail-notification/mail-notification.c:1191
 msgid "Account Name"
 msgstr "Account Name"
 
@@ -12373,10 +12515,10 @@ 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: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
+#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2857
+#: ../src/mail/em-subscription-editor.c:1945
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1594
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1672
 msgid "_Refresh"
 msgstr "_Refresh"
 
@@ -12385,31 +12527,31 @@ msgid "Initiates refresh of account sources"
 msgstr "Initiates refresh of account sources"
 
 #. Translators: This is a cancelled activity.
-#: ../src/e-util/e-activity.c:256
+#: ../src/e-util/e-activity.c:252
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (cancelled)"
 
 #. Translators: This is a completed activity.
-#: ../src/e-util/e-activity.c:259
+#: ../src/e-util/e-activity.c:255
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (completed)"
 
 #. Translators: This is an activity waiting to run.
-#: ../src/e-util/e-activity.c:262
+#: ../src/e-util/e-activity.c:258
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (waiting)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../src/e-util/e-activity.c:266
+#: ../src/e-util/e-activity.c:262
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (cancelling)"
 
-#: ../src/e-util/e-activity.c:268
+#: ../src/e-util/e-activity.c:264
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -12417,7 +12559,7 @@ msgstr "%s"
 #. Translators: This is a running activity whose
 #. *              percent complete is known.
 #. Translators: This is a running activity whose percent complete is known.
-#: ../src/e-util/e-activity.c:273
+#: ../src/e-util/e-activity.c:269
 #: ../src/modules/addressbook/e-book-shell-view-private.c:334
 #: ../src/modules/calendar/e-cal-base-shell-content.c:143
 #, c-format
@@ -12425,7 +12567,7 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
 #: ../src/e-util/e-activity-proxy.c:350
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1790
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1784
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -12450,21 +12592,21 @@ msgstr "Failed to create a thread: "
 msgid "Attached message"
 msgstr "Attached message"
 
-#: ../src/e-util/e-attachment.c:2085 ../src/e-util/e-attachment.c:3146
+#: ../src/e-util/e-attachment.c:2085 ../src/e-util/e-attachment.c:3130
 msgid "Operation was cancelled"
 msgstr "Operation was cancelled"
 
 #. Translators: Default attachment filename.
-#: ../src/e-util/e-attachment.c:2270 ../src/e-util/e-attachment.c:2990
-#: ../src/e-util/e-attachment.c:3442 ../src/e-util/e-attachment-store.c:914
+#: ../src/e-util/e-attachment.c:2270 ../src/e-util/e-attachment.c:2974
+#: ../src/e-util/e-attachment.c:3426 ../src/e-util/e-attachment-store.c:914
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../src/e-util/e-attachment.c:2352 ../src/e-util/e-attachment.c:3502
+#: ../src/e-util/e-attachment.c:2352 ../src/e-util/e-attachment.c:3486
 msgid "A load operation is already in progress"
 msgstr "A load operation is already in progress"
 
-#: ../src/e-util/e-attachment.c:2360 ../src/e-util/e-attachment.c:3510
+#: ../src/e-util/e-attachment.c:2360 ../src/e-util/e-attachment.c:3494
 msgid "A save operation is already in progress"
 msgstr "A save operation is already in progress"
 
@@ -12478,41 +12620,41 @@ msgstr "Could not open “%s”"
 msgid "Could not open the attachment"
 msgstr "Could not open the attachment"
 
-#: ../src/e-util/e-attachment.c:3519
+#: ../src/e-util/e-attachment.c:3503
 msgid "Attachment contents not loaded"
 msgstr "Attachment contents not loaded"
 
-#: ../src/e-util/e-attachment.c:3610
+#: ../src/e-util/e-attachment.c:3594
 #, c-format
 msgid "Could not save “%s”"
 msgstr "Could not save “%s”"
 
-#: ../src/e-util/e-attachment.c:3613
+#: ../src/e-util/e-attachment.c:3597
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Could not save the attachment"
 
-#: ../src/e-util/e-attachment-dialog.c:315
+#: ../src/e-util/e-attachment-dialog.c:295
 msgid "Attachment Properties"
 msgstr "Attachment Properties"
 
-#: ../src/e-util/e-attachment-dialog.c:337
-#: ../src/e-util/e-import-assistant.c:277
+#: ../src/e-util/e-attachment-dialog.c:317
+#: ../src/e-util/e-import-assistant.c:303
 msgid "F_ilename:"
 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-attachment-dialog.c:334
+#: ../src/e-util/e-html-editor-image-dialog.c:602
 #: ../src/e-util/e-html-editor-link-dialog.c:226
-#: ../src/e-util/e-webdav-browser.c:2437
+#: ../src/e-util/e-webdav-browser.c:2602
 msgid "_Description:"
 msgstr "_Description:"
 
-#: ../src/e-util/e-attachment-dialog.c:372
+#: ../src/e-util/e-attachment-dialog.c:352
 msgid "MIME Type:"
 msgstr "MIME Type:"
 
-#: ../src/e-util/e-attachment-dialog.c:380
+#: ../src/e-util/e-attachment-dialog.c:360
 #: ../src/e-util/e-attachment-store.c:700
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggest automatic display of attachment"
@@ -12540,7 +12682,7 @@ msgid "Hide Attachment _Bar"
 msgstr "Hide Attachment _Bar"
 
 #: ../src/e-util/e-attachment-paned.c:105
-#: ../src/e-util/e-attachment-paned.c:741
+#: ../src/e-util/e-attachment-paned.c:706
 msgid "Show Attachment _Bar"
 msgstr "Show Attachment _Bar"
 
@@ -12590,9 +12732,9 @@ msgid "Sa_ve As"
 msgstr "Sa_ve As"
 
 #: ../src/e-util/e-attachment-view.c:331
-#: ../src/plugins/save-calendar/save-calendar.c:348
-#: ../src/plugins/save-calendar/save-calendar.c:387
-#: ../src/plugins/save-calendar/save-calendar.c:426
+#: ../src/plugins/save-calendar/save-calendar.c:345
+#: ../src/plugins/save-calendar/save-calendar.c:384
+#: ../src/plugins/save-calendar/save-calendar.c:423
 msgid "Save _As"
 msgstr "Save _As"
 
@@ -12602,41 +12744,41 @@ msgstr "A_dd Attachment…"
 
 #: ../src/e-util/e-attachment-view.c:348
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1181
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1333
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:619
 #: ../src/modules/calendar/e-task-shell-view-actions.c:745
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1593
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1587
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1665
 msgid "_Properties"
 msgstr "_Properties"
 
-#: ../src/e-util/e-attachment-view.c:786
+#: ../src/e-util/e-attachment-view.c:784
 #, c-format
 msgid "Open With “%s”"
 msgstr "Open With “%s”"
 
-#: ../src/e-util/e-attachment-view.c:787
+#: ../src/e-util/e-attachment-view.c:785
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Open this attachment in %s"
 
-#: ../src/e-util/e-attachment-view.c:789
+#: ../src/e-util/e-attachment-view.c:787
 msgid "Open With Default Application"
 msgstr "Open With Default Application"
 
-#: ../src/e-util/e-attachment-view.c:790
+#: ../src/e-util/e-attachment-view.c:788
 msgid "Open this attachment in default application"
 msgstr "Open this attachment in default application"
 
-#: ../src/e-util/e-book-source-config.c:98
+#: ../src/e-util/e-book-source-config.c:90
 msgid "Mark as default address book"
 msgstr "Mark as default address book"
 
-#: ../src/e-util/e-book-source-config.c:103
+#: ../src/e-util/e-book-source-config.c:95
 msgid "Autocomplete with this address book"
 msgstr "Autocomplete with this address book"
 
-#: ../src/e-util/e-book-source-config.c:277
+#: ../src/e-util/e-book-source-config.c:269
 msgid "Copy book content locally for offline operation"
 msgstr "Copy book content locally for offline operation"
 
@@ -12661,48 +12803,48 @@ msgid "Month Calendar"
 msgstr "Month Calendar"
 
 #. This is a strftime() format. %B = Month name.
-#: ../src/e-util/e-calendar-item.c:1357 ../src/e-util/e-calendar-item.c:2240
+#: ../src/e-util/e-calendar-item.c:1368 ../src/e-util/e-calendar-item.c:2261
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1359
+#: ../src/e-util/e-calendar-item.c:1370
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1396
+#: ../src/e-util/e-calendar-item.c:1407
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/e-util/e-cal-source-config.c:169
+#: ../src/e-util/e-cal-source-config.c:161
 msgid "Mark as default calendar"
 msgstr "Mark as default calendar"
 
-#: ../src/e-util/e-cal-source-config.c:172
+#: ../src/e-util/e-cal-source-config.c:164
 msgid "Mark as default task list"
 msgstr "Mark as default task list"
 
-#: ../src/e-util/e-cal-source-config.c:175
+#: ../src/e-util/e-cal-source-config.c:167
 msgid "Mark as default memo list"
 msgstr "Mark as default memo list"
 
-#: ../src/e-util/e-cal-source-config.c:200
+#: ../src/e-util/e-cal-source-config.c:192
 msgid "Color:"
 msgstr "Colour:"
 
-#: ../src/e-util/e-cal-source-config.c:428
+#: ../src/e-util/e-cal-source-config.c:420
 msgid "Copy calendar contents locally for offline operation"
 msgstr "Copy calendar contents locally for offline operation"
 
-#: ../src/e-util/e-cal-source-config.c:432
+#: ../src/e-util/e-cal-source-config.c:424
 msgid "Copy task list contents locally for offline operation"
 msgstr "Copy task list contents locally for offline operation"
 
-#: ../src/e-util/e-cal-source-config.c:436
+#: ../src/e-util/e-cal-source-config.c:428
 msgid "Copy memo list contents locally for offline operation"
 msgstr "Copy memo list contents locally for offline operation"
 
@@ -12729,7 +12871,7 @@ msgctxt "category"
 msgid "_Delete"
 msgstr "_Delete"
 
-#: ../src/e-util/e-categories-selector.c:323
+#: ../src/e-util/e-categories-selector.c:319
 msgid "Icon"
 msgstr "Icon"
 
@@ -12771,31 +12913,31 @@ msgstr ""
 "There is already a category “%s” in the configuration. Please use another "
 "name"
 
-#: ../src/e-util/e-cell-combo.c:183
+#: ../src/e-util/e-cell-combo.c:186
 msgid "popup list"
 msgstr "popup list"
 
-#: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:137
-#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2146
+#: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:138
+#: ../src/e-util/e-cell-date.c:158 ../src/mail/message-list.c:2146
 msgid "?"
 msgstr "?"
 
-#: ../src/e-util/e-cell-date-edit.c:320
+#: ../src/e-util/e-cell-date-edit.c:330
 msgid "Now"
 msgstr "Now"
 
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../src/e-util/e-cell-date-edit.c:338
+#: ../src/e-util/e-cell-date-edit.c:348
 msgctxt "table-date"
 msgid "None"
 msgstr "None"
 
-#: ../src/e-util/e-cell-date-edit.c:346 ../src/mail/e-mail-label-dialog.c:198
+#: ../src/e-util/e-cell-date-edit.c:356 ../src/mail/e-mail-label-dialog.c:190
 msgid "OK"
 msgstr "OK"
 
-#: ../src/e-util/e-cell-date-edit.c:901
+#: ../src/e-util/e-cell-date-edit.c:908
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "The time must be in the format: %s"
@@ -12890,15 +13032,35 @@ msgstr "Character Encoding"
 msgid "Enter the character set to use"
 msgstr "Enter the character set to use"
 
-#: ../src/e-util/e-charset-combo-box.c:364
+#: ../src/e-util/e-charset-combo-box.c:356
 msgid "Other…"
 msgstr "Other…"
 
-#: ../src/e-util/e-client-cache.c:1149 ../src/e-util/e-client-cache.c:1280
+#: ../src/e-util/e-client-cache.c:1146 ../src/e-util/e-client-cache.c:1277
 #, c-format
 msgid "Cannot create a client object from extension name “%s”"
 msgstr "Cannot create a client object from extension name “%s”"
 
+#: ../src/e-util/e-client-selector.c:190 ../src/mail/em-folder-tree.c:1035
+msgctxt "Status"
+msgid "Offline"
+msgstr "Offline"
+
+#: ../src/e-util/e-client-selector.c:193 ../src/mail/em-folder-tree.c:1038
+msgctxt "Status"
+msgid "Online"
+msgstr "Online"
+
+#: ../src/e-util/e-client-selector.c:196 ../src/mail/em-folder-tree.c:1041
+msgctxt "Status"
+msgid "Unreachable"
+msgstr "Unreachable"
+
+#: ../src/e-util/e-client-selector.c:199 ../src/mail/em-folder-tree.c:1044
+msgctxt "Status"
+msgid "Failed to connect"
+msgstr "Failed to connect"
+
 #: ../src/e-util/e-collection-account-wizard.c:107
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:83
 msgid "_Finish"
@@ -12909,8 +13071,8 @@ msgid "_Look Up"
 msgstr "_Look Up"
 
 #: ../src/e-util/e-collection-account-wizard.c:112
-#: ../src/e-util/e-collection-account-wizard.c:273
-#: ../src/e-util/e-search-bar.c:680
+#: ../src/e-util/e-collection-account-wizard.c:275
+#: ../src/e-util/e-search-bar.c:653
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:85
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:244
 msgid "_Next"
@@ -12920,27 +13082,27 @@ msgstr "_Next"
 msgid "New Collection Account"
 msgstr "New Collection Account"
 
-#: ../src/e-util/e-collection-account-wizard.c:258
-#: ../src/e-util/e-search-bar.c:668
+#: ../src/e-util/e-collection-account-wizard.c:260
+#: ../src/e-util/e-search-bar.c:641
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:78
 msgid "_Previous"
 msgstr "_Previous"
 
-#: ../src/e-util/e-collection-account-wizard.c:439
+#: ../src/e-util/e-collection-account-wizard.c:447
 msgid "Looking up details, please wait…"
 msgstr "Looking up details, please wait…"
 
 #. Translators: The %s is replaced with a clickable text "Enter password", thus it'll be "Requires password 
to continue. Enter password." at the end.
-#: ../src/e-util/e-collection-account-wizard.c:496
+#: ../src/e-util/e-collection-account-wizard.c:511
 #, c-format
 msgid "Requires password to continue. %s."
 msgstr "Requires password to continue. %s."
 
-#: ../src/e-util/e-collection-account-wizard.c:509
+#: ../src/e-util/e-collection-account-wizard.c:525
 msgid "View certificate"
 msgstr "View certificate"
 
-#: ../src/e-util/e-collection-account-wizard.c:550
+#: ../src/e-util/e-collection-account-wizard.c:566
 msgid ""
 "Found no candidates. It can also mean that the server doesn’t provide any "
 "information about its configuration using the selected lookup methods. Enter "
@@ -12950,95 +13112,93 @@ msgstr ""
 "information about its configuration using the selected lookup methods. Enter "
 "the account manually instead or change above settings."
 
-#: ../src/e-util/e-collection-account-wizard.c:552
+#: ../src/e-util/e-collection-account-wizard.c:568
 #, c-format
 msgid "Found one candidate"
 msgid_plural "Found %d candidates"
 msgstr[0] "Found one candidate"
 msgstr[1] "Found %d candidates"
 
-#: ../src/e-util/e-collection-account-wizard.c:663
+#: ../src/e-util/e-collection-account-wizard.c:679
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "_Username:"
 
-#: ../src/e-util/e-collection-account-wizard.c:675
+#: ../src/e-util/e-collection-account-wizard.c:691
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../src/smime/gui/certificate-manager.c:766
+#: ../src/smime/gui/certificate-manager.c:764
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../src/e-util/e-collection-account-wizard.c:688
+#: ../src/e-util/e-collection-account-wizard.c:704
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "_Remember password"
 msgstr "_Remember password"
 
-#: ../src/e-util/e-collection-account-wizard.c:835
-#: ../src/e-util/e-webdav-browser.c:474
+#: ../src/e-util/e-collection-account-wizard.c:851
+#: ../src/e-util/e-webdav-browser.c:536
 msgid "Collection"
 msgstr "Collection"
 
-#: ../src/e-util/e-collection-account-wizard.c:836
+#: ../src/e-util/e-collection-account-wizard.c:852
 msgid "Mail Receive"
 msgstr "Mail Receive"
 
-#: ../src/e-util/e-collection-account-wizard.c:837
+#: ../src/e-util/e-collection-account-wizard.c:853
 msgid "Mail Send"
 msgstr "Mail Send"
 
-#: ../src/e-util/e-collection-account-wizard.c:838
+#: ../src/e-util/e-collection-account-wizard.c:854
 #: ../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:840
+#: ../src/e-util/e-collection-account-wizard.c:856
 msgid "Memo List"
 msgstr "Memo List"
 
-#: ../src/e-util/e-collection-account-wizard.c:841
+#: ../src/e-util/e-collection-account-wizard.c:857
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Task List"
 msgstr "Task List"
 
-#: ../src/e-util/e-collection-account-wizard.c:1177
+#: ../src/e-util/e-collection-account-wizard.c:1193
 msgid "Looking up LDAP server’s search base…"
 msgstr "Looking up LDAP server’s search base…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1310
-#| msgid "Failed to create a thread: "
+#: ../src/e-util/e-collection-account-wizard.c:1326
 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: "
+#: ../src/e-util/e-collection-account-wizard.c:1336
 msgid "Failed to create sources: "
 msgstr "Failed to create sources: "
 
-#: ../src/e-util/e-collection-account-wizard.c:1487
+#: ../src/e-util/e-collection-account-wizard.c:1503
 msgid "Saving account settings, please wait…"
 msgstr "Saving account settings, please wait…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1639
+#: ../src/e-util/e-collection-account-wizard.c:1655
 msgid "User details"
 msgstr "User details"
 
-#: ../src/e-util/e-collection-account-wizard.c:1652
+#: ../src/e-util/e-collection-account-wizard.c:1668
 msgid "_Email Address or User name:"
 msgstr "_E-mail Address or User name:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1683
+#: ../src/e-util/e-collection-account-wizard.c:1699
 msgid "_Advanced Options"
 msgstr "_Advanced Options"
 
-#: ../src/e-util/e-collection-account-wizard.c:1688
+#: ../src/e-util/e-collection-account-wizard.c:1704
 #: ../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:1707
+#: ../src/e-util/e-collection-account-wizard.c:1723
 msgid ""
 "Semicolon (“;”) separated list of servers to look up information for, in "
 "addition to the domain of the e-mail address."
@@ -13046,13 +13206,13 @@ 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:1900
+#: ../src/e-util/e-collection-account-wizard.c:1925
 msgid "Select which parts should be configured:"
 msgstr "Select which parts should be configured:"
 
-#: ../src/e-util/e-collection-account-wizard.c:2024
+#: ../src/e-util/e-collection-account-wizard.c:2049
 #: ../src/mail/e-mail-config-identity-page.c:542
-#: ../src/mail/e-mail-config-summary-page.c:325
+#: ../src/mail/e-mail-config-summary-page.c:318
 msgid "Account Information"
 msgstr "Account Information"
 
@@ -13060,171 +13220,171 @@ msgstr "Account Information"
 msgid "Choose custom color"
 msgstr "Choose custom colour"
 
-#: ../src/e-util/e-color-combo.c:488 ../src/e-util/e-html-editor.c:127
+#: ../src/e-util/e-color-combo.c:476 ../src/e-util/e-html-editor.c:128
 #: ../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
+#: ../src/mail/e-mail-config-security-page.c:540
+#: ../src/mail/e-mail-config-security-page.c:704
+#: ../src/mail/e-mail-reader.c:4891 ../src/mail/mail-config.ui.h:78
 msgid "Default"
 msgstr "Default"
 
-#: ../src/e-util/e-color-combo.c:576
+#: ../src/e-util/e-color-combo.c:564
 msgid "black"
 msgstr "black"
 
-#: ../src/e-util/e-color-combo.c:577
+#: ../src/e-util/e-color-combo.c:565
 msgid "light brown"
 msgstr "light brown"
 
-#: ../src/e-util/e-color-combo.c:578
+#: ../src/e-util/e-color-combo.c:566
 msgid "brown gold"
 msgstr "brown gold"
 
-#: ../src/e-util/e-color-combo.c:579
+#: ../src/e-util/e-color-combo.c:567
 msgid "dark green #2"
 msgstr "dark green #2"
 
-#: ../src/e-util/e-color-combo.c:580
+#: ../src/e-util/e-color-combo.c:568
 msgid "navy"
 msgstr "navy"
 
-#: ../src/e-util/e-color-combo.c:581
+#: ../src/e-util/e-color-combo.c:569
 msgid "dark blue"
 msgstr "dark blue"
 
-#: ../src/e-util/e-color-combo.c:582
+#: ../src/e-util/e-color-combo.c:570
 msgid "purple #2"
 msgstr "purple #2"
 
-#: ../src/e-util/e-color-combo.c:583
+#: ../src/e-util/e-color-combo.c:571
 msgid "very dark gray"
 msgstr "very dark grey"
 
-#: ../src/e-util/e-color-combo.c:585
+#: ../src/e-util/e-color-combo.c:573
 msgid "dark red"
 msgstr "dark red"
 
-#: ../src/e-util/e-color-combo.c:586
+#: ../src/e-util/e-color-combo.c:574
 msgid "red-orange"
 msgstr "red-orange"
 
-#: ../src/e-util/e-color-combo.c:587
+#: ../src/e-util/e-color-combo.c:575
 msgid "gold"
 msgstr "gold"
 
-#: ../src/e-util/e-color-combo.c:588
+#: ../src/e-util/e-color-combo.c:576
 msgid "dark green"
 msgstr "dark green"
 
-#: ../src/e-util/e-color-combo.c:589
+#: ../src/e-util/e-color-combo.c:577
 msgid "dull blue"
 msgstr "dull blue"
 
-#: ../src/e-util/e-color-combo.c:590
+#: ../src/e-util/e-color-combo.c:578
 msgid "blue"
 msgstr "blue"
 
-#: ../src/e-util/e-color-combo.c:591
+#: ../src/e-util/e-color-combo.c:579
 msgid "dull purple"
 msgstr "dull purple"
 
-#: ../src/e-util/e-color-combo.c:592
+#: ../src/e-util/e-color-combo.c:580
 msgid "dark grey"
 msgstr "dark grey"
 
-#: ../src/e-util/e-color-combo.c:594
+#: ../src/e-util/e-color-combo.c:582
 msgid "red"
 msgstr "red"
 
-#: ../src/e-util/e-color-combo.c:595
+#: ../src/e-util/e-color-combo.c:583
 msgid "orange"
 msgstr "orange"
 
-#: ../src/e-util/e-color-combo.c:596
+#: ../src/e-util/e-color-combo.c:584
 msgid "lime"
 msgstr "lime"
 
-#: ../src/e-util/e-color-combo.c:597
+#: ../src/e-util/e-color-combo.c:585
 msgid "dull green"
 msgstr "dull green"
 
-#: ../src/e-util/e-color-combo.c:598
+#: ../src/e-util/e-color-combo.c:586
 msgid "dull blue #2"
 msgstr "dull blue #2"
 
-#: ../src/e-util/e-color-combo.c:599
+#: ../src/e-util/e-color-combo.c:587
 msgid "sky blue #2"
 msgstr "sky blue #2"
 
-#: ../src/e-util/e-color-combo.c:600
+#: ../src/e-util/e-color-combo.c:588
 msgid "purple"
 msgstr "purple"
 
-#: ../src/e-util/e-color-combo.c:601
+#: ../src/e-util/e-color-combo.c:589
 msgid "gray"
 msgstr "grey"
 
-#: ../src/e-util/e-color-combo.c:603
+#: ../src/e-util/e-color-combo.c:591
 msgid "magenta"
 msgstr "magenta"
 
-#: ../src/e-util/e-color-combo.c:604
+#: ../src/e-util/e-color-combo.c:592
 msgid "bright orange"
 msgstr "bright orange"
 
-#: ../src/e-util/e-color-combo.c:605
+#: ../src/e-util/e-color-combo.c:593
 msgid "yellow"
 msgstr "yellow"
 
-#: ../src/e-util/e-color-combo.c:606
+#: ../src/e-util/e-color-combo.c:594
 msgid "green"
 msgstr "green"
 
-#: ../src/e-util/e-color-combo.c:607
+#: ../src/e-util/e-color-combo.c:595
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/e-util/e-color-combo.c:608
+#: ../src/e-util/e-color-combo.c:596
 msgid "bright blue"
 msgstr "bright blue"
 
-#: ../src/e-util/e-color-combo.c:609
+#: ../src/e-util/e-color-combo.c:597
 msgid "red purple"
 msgstr "red purple"
 
-#: ../src/e-util/e-color-combo.c:610
+#: ../src/e-util/e-color-combo.c:598
 msgid "light grey"
 msgstr "light grey"
 
-#: ../src/e-util/e-color-combo.c:612
+#: ../src/e-util/e-color-combo.c:600
 msgid "pink"
 msgstr "pink"
 
-#: ../src/e-util/e-color-combo.c:613
+#: ../src/e-util/e-color-combo.c:601
 msgid "light orange"
 msgstr "light orange"
 
-#: ../src/e-util/e-color-combo.c:614
+#: ../src/e-util/e-color-combo.c:602
 msgid "light yellow"
 msgstr "light yellow"
 
-#: ../src/e-util/e-color-combo.c:615
+#: ../src/e-util/e-color-combo.c:603
 msgid "light green"
 msgstr "light green"
 
-#: ../src/e-util/e-color-combo.c:616
+#: ../src/e-util/e-color-combo.c:604
 msgid "light cyan"
 msgstr "light cyan"
 
-#: ../src/e-util/e-color-combo.c:617
+#: ../src/e-util/e-color-combo.c:605
 msgid "light blue"
 msgstr "light blue"
 
-#: ../src/e-util/e-color-combo.c:618
+#: ../src/e-util/e-color-combo.c:606
 msgid "light purple"
 msgstr "light purple"
 
-#: ../src/e-util/e-color-combo.c:619
+#: ../src/e-util/e-color-combo.c:607
 msgid "white"
 msgstr "white"
 
@@ -13232,53 +13392,53 @@ msgstr "white"
 msgid "Running…"
 msgstr "Running…"
 
-#: ../src/e-util/e-dateedit.c:526
+#: ../src/e-util/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "Date and Time"
 
-#: ../src/e-util/e-dateedit.c:558
+#: ../src/e-util/e-dateedit.c:557
 msgid "Text entry to input date"
 msgstr "Text entry to input date"
 
-#: ../src/e-util/e-dateedit.c:581
+#: ../src/e-util/e-dateedit.c:580
 msgid "Click this button to show a calendar"
 msgstr "Click this button to show a calendar"
 
-#: ../src/e-util/e-dateedit.c:636
+#: ../src/e-util/e-dateedit.c:640
 msgid "Drop-down combination box to select time"
 msgstr "Drop-down combination box to select time"
 
-#: ../src/e-util/e-dateedit.c:637
+#: ../src/e-util/e-dateedit.c:641
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Time"
 
-#: ../src/e-util/e-dateedit.c:714
+#: ../src/e-util/e-dateedit.c:718
 msgid "No_w"
 msgstr "No_w"
 
-#: ../src/e-util/e-dateedit.c:721
+#: ../src/e-util/e-dateedit.c:725
 msgid "_Today"
 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/mail/em-folder-selector.c:334
+#: ../src/e-util/e-dateedit.c:734 ../src/mail/em-folder-selector.c:334
 msgid "_None"
 msgstr "_None"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../src/e-util/e-dateedit.c:1889 ../src/e-util/e-dateedit.c:2140
+#: ../src/e-util/e-dateedit.c:1893 ../src/e-util/e-dateedit.c:2146
 msgctxt "date"
 msgid "None"
 msgstr "None"
 
-#: ../src/e-util/e-dateedit.c:2025 ../src/e-util/e-dateedit.c:2494
+#: ../src/e-util/e-dateedit.c:2029 ../src/e-util/e-dateedit.c:2500
 msgid "Invalid Date Value"
 msgstr "Invalid Date Value"
 
-#: ../src/e-util/e-dateedit.c:2063 ../src/e-util/e-dateedit.c:2551
+#: ../src/e-util/e-dateedit.c:2069 ../src/e-util/e-dateedit.c:2557
 msgid "Invalid Time Value"
 msgstr "Invalid Time Value"
 
@@ -13342,8 +13502,8 @@ msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Next Sun"
 
-#: ../src/e-util/e-datetime-format.c:367 ../src/e-util/e-datetime-format.c:377
-#: ../src/e-util/e-datetime-format.c:386
+#: ../src/e-util/e-datetime-format.c:368 ../src/e-util/e-datetime-format.c:378
+#: ../src/e-util/e-datetime-format.c:387
 msgid "Use locale default"
 msgstr "Use locale default"
 
@@ -13632,23 +13792,23 @@ msgstr "Select a time to compare against"
 msgid "Choose a File"
 msgstr "Choose a File"
 
-#: ../src/e-util/e-filter-rule.c:1061
+#: ../src/e-util/e-filter-rule.c:1008
 msgid "R_ule name:"
 msgstr "R_ule name:"
 
-#: ../src/e-util/e-filter-rule.c:1117
+#: ../src/e-util/e-filter-rule.c:1064
 msgid "all the following conditions"
 msgstr "all the following conditions"
 
-#: ../src/e-util/e-filter-rule.c:1118
+#: ../src/e-util/e-filter-rule.c:1065
 msgid "any of the following conditions"
 msgstr "any of the following conditions"
 
-#: ../src/e-util/e-filter-rule.c:1124
+#: ../src/e-util/e-filter-rule.c:1071
 msgid "_Find items which match:"
 msgstr "_Find items which match:"
 
-#: ../src/e-util/e-filter-rule.c:1147
+#: ../src/e-util/e-filter-rule.c:1094
 msgid "Find items that meet the following conditions"
 msgstr "Find items that meet the following conditions"
 
@@ -13656,120 +13816,107 @@ msgstr "Find items that meet the following conditions"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../src/e-util/e-filter-rule.c:1162
+#: ../src/e-util/e-filter-rule.c:1109
 #: ../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
 #: ../src/mail/e-mail-autoconfig.c:778
 #: ../src/mail/e-mail-config-summary-page.c:143
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:681
 msgid "None"
 msgstr "None"
 
-#: ../src/e-util/e-filter-rule.c:1163
+#: ../src/e-util/e-filter-rule.c:1110
 msgid "All related"
 msgstr "All related"
 
-#: ../src/e-util/e-filter-rule.c:1164 ../src/e-util/e-send-options.ui.h:24
+#: ../src/e-util/e-filter-rule.c:1111 ../src/e-util/e-send-options.ui.h:24
 msgid "Replies"
 msgstr "Replies"
 
-#: ../src/e-util/e-filter-rule.c:1165
+#: ../src/e-util/e-filter-rule.c:1112
 msgid "Replies and parents"
 msgstr "Replies and parents"
 
-#: ../src/e-util/e-filter-rule.c:1166
+#: ../src/e-util/e-filter-rule.c:1113
 msgid "No reply or parent"
 msgstr "No reply or parent"
 
-#: ../src/e-util/e-filter-rule.c:1169
+#: ../src/e-util/e-filter-rule.c:1116
 msgid "I_nclude threads:"
 msgstr "I_nclude threads:"
 
-#: ../src/e-util/e-filter-rule.c:1247
+#: ../src/e-util/e-filter-rule.c:1194
 msgid "A_dd Condition"
 msgstr "A_dd Condition"
 
-#: ../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
+#: ../src/e-util/e-filter-rule.c:1514 ../src/e-util/filter.ui.h:1
+#: ../src/mail/em-filter-rule.c:981 ../src/mail/em-utils.c:166
 msgid "Incoming"
 msgstr "Incoming"
 
-#: ../src/e-util/e-filter-rule.c:1567 ../src/mail/em-filter-rule.c:1043
+#: ../src/e-util/e-filter-rule.c:1514 ../src/mail/em-filter-rule.c:982
 #: ../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"
-#| 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
-#| 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 "Try a different search"
@@ -13810,481 +13957,475 @@ msgstr "Insert text file"
 msgid "Text file"
 msgstr "Text file"
 
-#: ../src/e-util/e-html-editor-actions.c:1074
+#: ../src/e-util/e-html-editor-actions.c:1076
 msgid "Copy selected text to the clipboard"
 msgstr "Copy selected text to the clipboard"
 
-#: ../src/e-util/e-html-editor-actions.c:1081
+#: ../src/e-util/e-html-editor-actions.c:1083
 msgid "Cut selected text to the clipboard"
 msgstr "Cut selected text to the clipboard"
 
-#: ../src/e-util/e-html-editor-actions.c:1088
+#: ../src/e-util/e-html-editor-actions.c:1090
 msgid "Paste text from the clipboard"
 msgstr "Paste text from the clipboard"
 
-#: ../src/e-util/e-html-editor-actions.c:1095
+#: ../src/e-util/e-html-editor-actions.c:1097
 msgid "Redo the last undone action"
 msgstr "Redo the last undone action"
 
-#: ../src/e-util/e-html-editor-actions.c:1109
+#: ../src/e-util/e-html-editor-actions.c:1111
 msgid "Undo the last action"
 msgstr "Undo the last action"
 
-#: ../src/e-util/e-html-editor-actions.c:1130
+#: ../src/e-util/e-html-editor-actions.c:1132
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ../src/e-util/e-html-editor-actions.c:1137
+#: ../src/e-util/e-html-editor-actions.c:1139
 msgid "_Paragraph Style"
 msgstr "_Paragraph Style"
 
-#: ../src/e-util/e-html-editor-actions.c:1151
-#: ../src/e-util/e-html-editor-image-dialog.c:590
+#: ../src/e-util/e-html-editor-actions.c:1153
+#: ../src/e-util/e-html-editor-image-dialog.c:678
 msgid "_Alignment"
 msgstr "_Alignment"
 
-#: ../src/e-util/e-html-editor-actions.c:1158
+#: ../src/e-util/e-html-editor-actions.c:1160
 msgid "Current _Languages"
 msgstr "Current _Languages"
 
-#: ../src/e-util/e-html-editor-actions.c:1175
+#: ../src/e-util/e-html-editor-actions.c:1177
 msgid "_Increase Indent"
 msgstr "_Increase Indent"
 
-#: ../src/e-util/e-html-editor-actions.c:1177
+#: ../src/e-util/e-html-editor-actions.c:1179
 msgid "Increase Indent"
 msgstr "Increase Indent"
 
-#: ../src/e-util/e-html-editor-actions.c:1182
+#: ../src/e-util/e-html-editor-actions.c:1184
 #: ../src/e-util/e-html-editor-actions.c:2212
 msgid "E_moji"
 msgstr "E_moji"
 
-#: ../src/e-util/e-html-editor-actions.c:1184
-#: ../src/e-util/e-html-editor-actions.c:1191
+#: ../src/e-util/e-html-editor-actions.c:1186
+#: ../src/e-util/e-html-editor-actions.c:1193
 msgid "Insert Emoji"
 msgstr "Insert Emoji"
 
-#: ../src/e-util/e-html-editor-actions.c:1189
-#| msgid "Insert Emoji"
+#: ../src/e-util/e-html-editor-actions.c:1191
 msgid "Insert E_moji"
 msgstr "Insert E_moji"
 
-#: ../src/e-util/e-html-editor-actions.c:1196
+#: ../src/e-util/e-html-editor-actions.c:1198
 msgid "_HTML File…"
 msgstr "_HTML File…"
 
-#: ../src/e-util/e-html-editor-actions.c:1203
+#: ../src/e-util/e-html-editor-actions.c:1205
 msgid "Te_xt File…"
 msgstr "Te_xt File…"
 
-#: ../src/e-util/e-html-editor-actions.c:1210
+#: ../src/e-util/e-html-editor-actions.c:1212
 msgid "Paste _Quotation"
 msgstr "Paste _Quotation"
 
-#: ../src/e-util/e-html-editor-actions.c:1217
+#: ../src/e-util/e-html-editor-actions.c:1219
 msgid "_Find…"
 msgstr "_Find…"
 
-#: ../src/e-util/e-html-editor-actions.c:1219
+#: ../src/e-util/e-html-editor-actions.c:1221
 msgid "Search for text"
 msgstr "Search for text"
 
-#: ../src/e-util/e-html-editor-actions.c:1224
+#: ../src/e-util/e-html-editor-actions.c:1226
 msgid "Find A_gain"
 msgstr "Find A_gain"
 
-#: ../src/e-util/e-html-editor-actions.c:1231
+#: ../src/e-util/e-html-editor-actions.c:1233
 msgid "Re_place…"
 msgstr "Re_place…"
 
-#: ../src/e-util/e-html-editor-actions.c:1233
+#: ../src/e-util/e-html-editor-actions.c:1235
 msgid "Search for and replace text"
 msgstr "Search for and replace text"
 
-#: ../src/e-util/e-html-editor-actions.c:1238
+#: ../src/e-util/e-html-editor-actions.c:1240
 msgid "Check _Spelling…"
 msgstr "Check _Spelling…"
 
-#: ../src/e-util/e-html-editor-actions.c:1245
+#: ../src/e-util/e-html-editor-actions.c:1247
 msgid "_Decrease Indent"
 msgstr "_Decrease Indent"
 
-#: ../src/e-util/e-html-editor-actions.c:1247
+#: ../src/e-util/e-html-editor-actions.c:1249
 msgid "Decrease Indent"
 msgstr "Decrease Indent"
 
-#: ../src/e-util/e-html-editor-actions.c:1252
+#: ../src/e-util/e-html-editor-actions.c:1254
 msgid "_Wrap Lines"
 msgstr "_Wrap Lines"
 
 #. Center
-#: ../src/e-util/e-html-editor-actions.c:1262
+#: ../src/e-util/e-html-editor-actions.c:1264
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:109
 msgid "_Center"
 msgstr "_Centre"
 
-#: ../src/e-util/e-html-editor-actions.c:1264
+#: ../src/e-util/e-html-editor-actions.c:1266
 msgid "Center Alignment"
 msgstr "Centre Alignment"
 
 #. Justified
-#: ../src/e-util/e-html-editor-actions.c:1269
+#: ../src/e-util/e-html-editor-actions.c:1271
 #: ../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
+#: ../src/e-util/e-html-editor-actions.c:1273
 msgid "Align Justified"
 msgstr "Align Justified"
 
 #. Left
-#: ../src/e-util/e-html-editor-actions.c:1276
+#: ../src/e-util/e-html-editor-actions.c:1278
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:100
 msgid "_Left"
 msgstr "_Left"
 
-#: ../src/e-util/e-html-editor-actions.c:1278
+#: ../src/e-util/e-html-editor-actions.c:1280
 msgid "Left Alignment"
 msgstr "Left Alignment"
 
 #. Right
-#: ../src/e-util/e-html-editor-actions.c:1283
+#: ../src/e-util/e-html-editor-actions.c:1285
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:118
 msgid "_Right"
 msgstr "_Right"
 
-#: ../src/e-util/e-html-editor-actions.c:1285
+#: ../src/e-util/e-html-editor-actions.c:1287
 msgid "Right Alignment"
 msgstr "Right Alignment"
 
-#: ../src/e-util/e-html-editor-actions.c:1293
+#: ../src/e-util/e-html-editor-actions.c:1295
 #: ../src/modules/text-highlight/languages.c:70
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../src/e-util/e-html-editor-actions.c:1295
+#: ../src/e-util/e-html-editor-actions.c:1297
 msgid "HTML editing mode"
 msgstr "HTML editing mode"
 
-#: ../src/e-util/e-html-editor-actions.c:1300
+#: ../src/e-util/e-html-editor-actions.c:1302
 msgid "Plain _Text"
 msgstr "Plain _Text"
 
-#: ../src/e-util/e-html-editor-actions.c:1302
+#: ../src/e-util/e-html-editor-actions.c:1304
 msgid "Plain text editing mode"
 msgstr "Plain text editing mode"
 
-#: ../src/e-util/e-html-editor-actions.c:1310
+#: ../src/e-util/e-html-editor-actions.c:1312
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../src/e-util/e-html-editor-actions.c:1317
+#: ../src/e-util/e-html-editor-actions.c:1319
 msgid "Heading _1"
 msgstr "Heading _1"
 
-#: ../src/e-util/e-html-editor-actions.c:1324
+#: ../src/e-util/e-html-editor-actions.c:1326
 msgid "Heading _2"
 msgstr "Heading _2"
 
-#: ../src/e-util/e-html-editor-actions.c:1331
+#: ../src/e-util/e-html-editor-actions.c:1333
 msgid "Heading _3"
 msgstr "Heading _3"
 
-#: ../src/e-util/e-html-editor-actions.c:1338
+#: ../src/e-util/e-html-editor-actions.c:1340
 msgid "Heading _4"
 msgstr "Heading _4"
 
-#: ../src/e-util/e-html-editor-actions.c:1345
+#: ../src/e-util/e-html-editor-actions.c:1347
 msgid "Heading _5"
 msgstr "Heading _5"
 
-#: ../src/e-util/e-html-editor-actions.c:1352
+#: ../src/e-util/e-html-editor-actions.c:1354
 msgid "Heading _6"
 msgstr "Heading _6"
 
-#: ../src/e-util/e-html-editor-actions.c:1359
+#: ../src/e-util/e-html-editor-actions.c:1361
 msgid "_Preformatted"
 msgstr "_Preformatted"
 
-#: ../src/e-util/e-html-editor-actions.c:1366
+#: ../src/e-util/e-html-editor-actions.c:1368
 msgid "A_ddress"
 msgstr "A_ddress"
 
-#: ../src/e-util/e-html-editor-actions.c:1373
+#: ../src/e-util/e-html-editor-actions.c:1375
 msgid "_Bulleted List"
 msgstr "_Bulleted List"
 
-#: ../src/e-util/e-html-editor-actions.c:1380
+#: ../src/e-util/e-html-editor-actions.c:1382
 msgid "_Roman Numeral List"
 msgstr "_Roman Numeral List"
 
-#: ../src/e-util/e-html-editor-actions.c:1387
+#: ../src/e-util/e-html-editor-actions.c:1389
 msgid "Numbered _List"
 msgstr "Numbered _List"
 
-#: ../src/e-util/e-html-editor-actions.c:1394
+#: ../src/e-util/e-html-editor-actions.c:1396
 msgid "_Alphabetical List"
 msgstr "_Alphabetical List"
 
-#: ../src/e-util/e-html-editor-actions.c:1410
-#: ../src/e-util/e-html-editor-actions.c:1448
+#: ../src/e-util/e-html-editor-actions.c:1412
+#: ../src/e-util/e-html-editor-actions.c:1450
 msgid "_Image…"
 msgstr "_Image…"
 
 #. Translators: This is an action tooltip
-#: ../src/e-util/e-html-editor-actions.c:1413
+#: ../src/e-util/e-html-editor-actions.c:1415
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: ../src/e-util/e-html-editor-actions.c:1418
-#: ../src/e-util/e-html-editor-actions.c:1455
+#: ../src/e-util/e-html-editor-actions.c:1420
+#: ../src/e-util/e-html-editor-actions.c:1457
 msgid "_Link…"
 msgstr "_Link…"
 
-#: ../src/e-util/e-html-editor-actions.c:1420
+#: ../src/e-util/e-html-editor-actions.c:1422
 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:1426
-#: ../src/e-util/e-html-editor-actions.c:1470
+#: ../src/e-util/e-html-editor-actions.c:1428
+#: ../src/e-util/e-html-editor-actions.c:1472
 msgid "_Rule…"
 msgstr "_Rule…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1429
+#: ../src/e-util/e-html-editor-actions.c:1431
 msgid "Insert Rule"
 msgstr "Insert Rule"
 
-#: ../src/e-util/e-html-editor-actions.c:1434
-#: ../src/e-util/e-html-editor-actions.c:1477
+#: ../src/e-util/e-html-editor-actions.c:1436
+#: ../src/e-util/e-html-editor-actions.c:1479
 msgid "_Table…"
 msgstr "_Table…"
 
-#: ../src/e-util/e-html-editor-actions.c:1436
+#: ../src/e-util/e-html-editor-actions.c:1438
 msgid "Insert Table"
 msgstr "Insert Table"
 
-#: ../src/e-util/e-html-editor-actions.c:1441
+#: ../src/e-util/e-html-editor-actions.c:1443
 msgid "_Cell…"
 msgstr "_Cell…"
 
-#: ../src/e-util/e-html-editor-actions.c:1462
+#: ../src/e-util/e-html-editor-actions.c:1464
 msgid "Pa_ge…"
 msgstr "Pa_ge…"
 
-#: ../src/e-util/e-html-editor-actions.c:1486
+#: ../src/e-util/e-html-editor-actions.c:1488
 msgid "Font _Size"
 msgstr "Font _Size"
 
-#: ../src/e-util/e-html-editor-actions.c:1493
+#: ../src/e-util/e-html-editor-actions.c:1495
 msgid "_Font Style"
 msgstr "_Font Style"
 
-#: ../src/e-util/e-html-editor-actions.c:1500
+#: ../src/e-util/e-html-editor-actions.c:1502
 msgid "Paste As _Text"
 msgstr "Paste As _Text"
 
-#: ../src/e-util/e-html-editor-actions.c:1511
+#: ../src/e-util/e-html-editor-actions.c:1513
 #: ../src/e-util/e-html-editor-text-dialog.c:201
 msgid "_Bold"
 msgstr "_Bold"
 
-#: ../src/e-util/e-html-editor-actions.c:1513
+#: ../src/e-util/e-html-editor-actions.c:1515
 msgid "Bold"
 msgstr "Bold"
 
-#: ../src/e-util/e-html-editor-actions.c:1519
+#: ../src/e-util/e-html-editor-actions.c:1521
 #: ../src/e-util/e-html-editor-text-dialog.c:212
 msgid "_Italic"
 msgstr "_Italic"
 
-#: ../src/e-util/e-html-editor-actions.c:1521
+#: ../src/e-util/e-html-editor-actions.c:1523
 msgid "Italic"
 msgstr "Italic"
 
-#: ../src/e-util/e-html-editor-actions.c:1527
+#: ../src/e-util/e-html-editor-actions.c:1529
 #: ../src/e-util/e-html-editor-text-dialog.c:233
 msgid "_Strikethrough"
 msgstr "_Strikethrough"
 
-#: ../src/e-util/e-html-editor-actions.c:1529
+#: ../src/e-util/e-html-editor-actions.c:1531
 msgid "Strikethrough"
 msgstr "Strikethrough"
 
-#: ../src/e-util/e-html-editor-actions.c:1535
-#| msgid "S_cript:"
+#: ../src/e-util/e-html-editor-actions.c:1537
 msgid "Subs_cript"
 msgstr "Subs_cript"
 
-#: ../src/e-util/e-html-editor-actions.c:1537
-#| msgid "_Subscribe"
+#: ../src/e-util/e-html-editor-actions.c:1539
 msgid "Subscript"
 msgstr "Subscript"
 
-#: ../src/e-util/e-html-editor-actions.c:1543
-#| msgid "S_cript:"
+#: ../src/e-util/e-html-editor-actions.c:1545
 msgid "Su_perscript"
 msgstr "Su_perscript"
 
-#: ../src/e-util/e-html-editor-actions.c:1545
-#| msgid "Description"
+#: ../src/e-util/e-html-editor-actions.c:1547
 msgid "Superscript"
 msgstr "Superscript"
 
-#: ../src/e-util/e-html-editor-actions.c:1551
+#: ../src/e-util/e-html-editor-actions.c:1553
 #: ../src/e-util/e-html-editor-text-dialog.c:223
 msgid "_Underline"
 msgstr "_Underline"
 
-#: ../src/e-util/e-html-editor-actions.c:1553
+#: ../src/e-util/e-html-editor-actions.c:1555
 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:1563
+#: ../src/e-util/e-html-editor-actions.c:1565
 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:1571
+#: ../src/e-util/e-html-editor-actions.c:1573
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1579
+#: ../src/e-util/e-html-editor-actions.c:1581
 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:1587
+#: ../src/e-util/e-html-editor-actions.c:1589
 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:1595
+#: ../src/e-util/e-html-editor-actions.c:1597
 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:1603
+#: ../src/e-util/e-html-editor-actions.c:1605
 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:1611
+#: ../src/e-util/e-html-editor-actions.c:1613
 msgid "+4"
 msgstr "+4"
 
-#: ../src/e-util/e-html-editor-actions.c:1630
+#: ../src/e-util/e-html-editor-actions.c:1632
 msgid "Cell Contents"
 msgstr "Cell Contents"
 
-#: ../src/e-util/e-html-editor-actions.c:1637
+#: ../src/e-util/e-html-editor-actions.c:1639
 msgid "Column"
 msgstr "Column"
 
-#: ../src/e-util/e-html-editor-actions.c:1644
+#: ../src/e-util/e-html-editor-actions.c:1646
 msgid "Row"
 msgstr "Row"
 
-#: ../src/e-util/e-html-editor-actions.c:1651
+#: ../src/e-util/e-html-editor-actions.c:1653
 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:1661
+#: ../src/e-util/e-html-editor-actions.c:1663
 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:1669
+#: ../src/e-util/e-html-editor-actions.c:1671
 msgid "Table Insert"
 msgstr "Table Insert"
 
-#: ../src/e-util/e-html-editor-actions.c:1676
+#: ../src/e-util/e-html-editor-actions.c:1678
 msgid "Properties"
 msgstr "Properties"
 
-#: ../src/e-util/e-html-editor-actions.c:1694
+#: ../src/e-util/e-html-editor-actions.c:1696
 msgid "Column After"
 msgstr "Column After"
 
-#: ../src/e-util/e-html-editor-actions.c:1701
+#: ../src/e-util/e-html-editor-actions.c:1703
 msgid "Column Before"
 msgstr "Column Before"
 
-#: ../src/e-util/e-html-editor-actions.c:1708
+#: ../src/e-util/e-html-editor-actions.c:1710
 msgid "Insert _Link"
 msgstr "Insert _Link"
 
-#: ../src/e-util/e-html-editor-actions.c:1715
+#: ../src/e-util/e-html-editor-actions.c:1717
 msgid "Row Above"
 msgstr "Row Above"
 
-#: ../src/e-util/e-html-editor-actions.c:1722
+#: ../src/e-util/e-html-editor-actions.c:1724
 msgid "Row Below"
 msgstr "Row Below"
 
-#: ../src/e-util/e-html-editor-actions.c:1729
+#: ../src/e-util/e-html-editor-actions.c:1731
 msgid "Cell…"
 msgstr "Cell…"
 
-#: ../src/e-util/e-html-editor-actions.c:1736
+#: ../src/e-util/e-html-editor-actions.c:1738
 msgid "Image…"
 msgstr "Image…"
 
-#: ../src/e-util/e-html-editor-actions.c:1743
+#: ../src/e-util/e-html-editor-actions.c:1745
 msgid "Link…"
 msgstr "Link…"
 
-#: ../src/e-util/e-html-editor-actions.c:1750
+#: ../src/e-util/e-html-editor-actions.c:1752
 msgid "Page…"
 msgstr "Page…"
 
-#: ../src/e-util/e-html-editor-actions.c:1757
+#: ../src/e-util/e-html-editor-actions.c:1759
 msgid "Paragraph…"
 msgstr "Paragraph…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1765
+#: ../src/e-util/e-html-editor-actions.c:1767
 msgid "Rule…"
 msgstr "Rule…"
 
-#: ../src/e-util/e-html-editor-actions.c:1772
+#: ../src/e-util/e-html-editor-actions.c:1774
 msgid "Table…"
 msgstr "Table…"
 
-#: ../src/e-util/e-html-editor-actions.c:1779
+#: ../src/e-util/e-html-editor-actions.c:1781
 msgid "Text…"
 msgstr "Text…"
 
-#: ../src/e-util/e-html-editor-actions.c:1786
+#: ../src/e-util/e-html-editor-actions.c:1788
 msgid "Remove Link"
 msgstr "Remove Link"
 
-#: ../src/e-util/e-html-editor-actions.c:1803
+#: ../src/e-util/e-html-editor-actions.c:1805
 msgid "Add Word to Dictionary"
 msgstr "Add Word to Dictionary"
 
-#: ../src/e-util/e-html-editor-actions.c:1810
+#: ../src/e-util/e-html-editor-actions.c:1812
 msgid "Ignore Misspelled Word"
 msgstr "Ignore Misspelt Word"
 
-#: ../src/e-util/e-html-editor-actions.c:1817
+#: ../src/e-util/e-html-editor-actions.c:1819
 msgid "Add Word To"
 msgstr "Add Word To"
 
-#: ../src/e-util/e-html-editor-actions.c:1826
+#: ../src/e-util/e-html-editor-actions.c:1828
 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:2061
+#: ../src/e-util/e-html-editor-actions.c:2063
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s Dictionary"
@@ -14319,34 +14460,31 @@ msgstr "_Rule"
 msgid "_Table"
 msgstr "_Table"
 
-#: ../src/e-util/e-html-editor.c:863
+#: ../src/e-util/e-html-editor.c:897
 msgid "Paragraph Style"
 msgstr "Paragraph Style"
 
-#: ../src/e-util/e-html-editor.c:877
+#: ../src/e-util/e-html-editor.c:911
 msgid "Editing Mode"
 msgstr "Editing Mode"
 
-#: ../src/e-util/e-html-editor.c:889
+#: ../src/e-util/e-html-editor.c:923
 msgid "Font Color"
 msgstr "Font Colour"
 
-#: ../src/e-util/e-html-editor.c:900
-#| msgid "_Background:"
+#: ../src/e-util/e-html-editor.c:934
 msgid "Background Color"
 msgstr "Background Colour"
 
-#: ../src/e-util/e-html-editor.c:910
+#: ../src/e-util/e-html-editor.c:944
 msgid "Font Size"
 msgstr "Font Size"
 
-#: ../src/e-util/e-html-editor.c:919
-#| msgid "Account Name"
+#: ../src/e-util/e-html-editor.c:953
 msgid "Font Name"
 msgstr "Font Name"
 
-#: ../src/e-util/e-html-editor.c:1523
-#| msgid "Failed to insert text file."
+#: ../src/e-util/e-html-editor.c:1577
 msgid "Failed to obtain content of editor"
 msgstr "Failed to obtain content of editor"
 
@@ -14393,17 +14531,17 @@ msgid "_Horizontal:"
 msgstr "_Horizontal:"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:502
-#: ../src/e-util/e-html-editor-image-dialog.c:580
+#: ../src/e-util/e-html-editor-image-dialog.c:668
 msgid "Top"
 msgstr "Top"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:503
-#: ../src/e-util/e-html-editor-image-dialog.c:581
+#: ../src/e-util/e-html-editor-image-dialog.c:669
 msgid "Middle"
 msgstr "Middle"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:504
-#: ../src/e-util/e-html-editor-image-dialog.c:582
+#: ../src/e-util/e-html-editor-image-dialog.c:670
 msgid "Bottom"
 msgstr "Bottom"
 
@@ -14422,7 +14560,7 @@ msgid "_Header Style"
 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-image-dialog.c:609
 #: ../src/e-util/e-html-editor-table-dialog.c:551
 msgid "<b>Layout</b>"
 msgstr "<b>Layout</b>"
@@ -14455,15 +14593,15 @@ msgid "C_olor:"
 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-image-dialog.c:565
 #: ../src/e-util/e-html-editor-table-dialog.c:683
 msgid "Images"
 msgstr "Images"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:645
 #: ../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-image-dialog.c:570
+#: ../src/e-util/e-html-editor-image-dialog.c:573
 #: ../src/e-util/e-html-editor-table-dialog.c:688
 #: ../src/e-util/e-html-editor-table-dialog.c:693
 msgid "Choose Background Image"
@@ -14511,7 +14649,7 @@ msgstr "<b>Size</b>"
 
 #. Width
 #: ../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-image-dialog.c:627
 #: ../src/e-util/e-html-editor-table-dialog.c:562
 msgid "_Width:"
 msgstr "_Width:"
@@ -14538,47 +14676,51 @@ msgstr "S_haded"
 msgid "Rule properties"
 msgstr "Rule properties"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:465
+#: ../src/e-util/e-html-editor-image-dialog.c:554
 #: ../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>"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:499
+#: ../src/e-util/e-html-editor-image-dialog.c:588
 msgid "_Source:"
 msgstr "_Source:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:562
+#: ../src/e-util/e-html-editor-image-dialog.c:640
 msgid "_Height:"
 msgstr "_Height:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:603
+#: ../src/e-util/e-html-editor-image-dialog.c:659
+msgid "Preserve aspect ratio"
+msgstr "Preserve aspect ratio"
+
+#: ../src/e-util/e-html-editor-image-dialog.c:691
 msgid "_X-Padding:"
 msgstr "_X-Padding:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:619
+#: ../src/e-util/e-html-editor-image-dialog.c:707
 msgid "_Y-Padding:"
 msgstr "_Y-Padding:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:635
+#: ../src/e-util/e-html-editor-image-dialog.c:723
 #: ../src/e-util/e-html-editor-table-dialog.c:629
 msgid "_Border:"
 msgstr "_Border:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:645
+#: ../src/e-util/e-html-editor-image-dialog.c:733
 msgid "<b>Link</b>"
 msgstr "<b>Link</b>"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:663
+#: ../src/e-util/e-html-editor-image-dialog.c:751
 #: ../src/e-util/e-html-editor-link-dialog.c:210
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:668
+#: ../src/e-util/e-html-editor-image-dialog.c:756
 msgid "_Test URL…"
 msgstr "_Test URL…"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:685
+#: ../src/e-util/e-html-editor-image-dialog.c:773
 msgid "Image Properties"
 msgstr "Image Properties"
 
@@ -14622,7 +14764,6 @@ msgstr "Graph Paper"
 
 #. == Colors ==
 #: ../src/e-util/e-html-editor-page-dialog.c:402
-#| msgid "Color"
 msgid "Colors"
 msgstr "Colours"
 
@@ -14644,18 +14785,15 @@ msgstr "_Background:"
 
 #. == 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:"
 
 #. == Background Image ==
 #: ../src/e-util/e-html-editor-page-dialog.c:500
-#| msgid "Choose Background Image"
 msgid "Background Image"
 msgstr "Background Image"
 
@@ -14665,7 +14803,7 @@ msgid "_Template:"
 msgstr "_Template:"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:531
-#: ../src/e-util/e-import-assistant.c:287
+#: ../src/e-util/e-import-assistant.c:313
 msgid "Select a file"
 msgstr "Select a file"
 
@@ -14797,7 +14935,7 @@ msgstr "_Padding:"
 
 #: ../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:2408
+#: ../src/e-util/e-webdav-browser.c:2556
 msgid "_Color:"
 msgstr "_Colour:"
 
@@ -14817,7 +14955,7 @@ msgstr "Si_ze:"
 msgid "Text Properties"
 msgstr "Text Properties"
 
-#: ../src/e-util/e-import-assistant.c:259
+#: ../src/e-util/e-import-assistant.c:285
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -14825,34 +14963,38 @@ msgstr ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 
-#: ../src/e-util/e-import-assistant.c:301
-#: ../src/e-util/e-import-assistant.c:480
+#: ../src/e-util/e-import-assistant.c:327
+#: ../src/e-util/e-import-assistant.c:526
 msgid "File _type:"
 msgstr "File _type:"
 
-#: ../src/e-util/e-import-assistant.c:344
-#: ../src/e-util/e-import-assistant.c:962
+#: ../src/e-util/e-import-assistant.c:355
+msgid "Pre_view:"
+msgstr "Pre_view:"
+
+#: ../src/e-util/e-import-assistant.c:390
+#: ../src/e-util/e-import-assistant.c:1008
 msgid "Choose the destination for this import"
 msgstr "Choose the destination for this import"
 
-#: ../src/e-util/e-import-assistant.c:370
+#: ../src/e-util/e-import-assistant.c:416
 msgid "Choose the type of importer to run:"
 msgstr "Choose the type of importer to run:"
 
-#: ../src/e-util/e-import-assistant.c:379
+#: ../src/e-util/e-import-assistant.c:425
 msgid "Import data and settings from _older programs"
 msgstr "Import data and settings from _older programs"
 
-#: ../src/e-util/e-import-assistant.c:387
+#: ../src/e-util/e-import-assistant.c:433
 msgid "Import a _single file"
 msgstr "Import a _single file"
 
-#: ../src/e-util/e-import-assistant.c:409
+#: ../src/e-util/e-import-assistant.c:455
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:209
 msgid "Please select the information that you would like to import:"
 msgstr "Please select the information that you would like to import:"
 
-#: ../src/e-util/e-import-assistant.c:541
+#: ../src/e-util/e-import-assistant.c:587
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
@@ -14862,44 +15004,44 @@ msgstr ""
 "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
 "would like to try again, please click the “Back” button."
 
-#: ../src/e-util/e-import-assistant.c:568
+#: ../src/e-util/e-import-assistant.c:614
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:238
 #, c-format
 msgid "From %s:"
 msgstr "From %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../src/e-util/e-import-assistant.c:814
+#: ../src/e-util/e-import-assistant.c:860
 msgid "_Cancel Import"
 msgstr "_Cancel Import"
 
-#: ../src/e-util/e-import-assistant.c:961
+#: ../src/e-util/e-import-assistant.c:1007
 msgid "Preview data to be imported"
 msgstr "Preview data to be imported"
 
-#: ../src/e-util/e-import-assistant.c:967
-#: ../src/e-util/e-import-assistant.c:980
-#: ../src/e-util/e-import-assistant.c:1333
-#: ../src/e-util/e-import-assistant.c:1410
-#: ../src/e-util/e-import-assistant.c:1419
+#: ../src/e-util/e-import-assistant.c:1013
+#: ../src/e-util/e-import-assistant.c:1026
+#: ../src/e-util/e-import-assistant.c:1399
+#: ../src/e-util/e-import-assistant.c:1476
+#: ../src/e-util/e-import-assistant.c:1485
 msgid "Import Data"
 msgstr "Import Data"
 
-#: ../src/e-util/e-import-assistant.c:975
+#: ../src/e-util/e-import-assistant.c:1021
 msgid "Select what type of file you want to import from the list."
 msgstr "Select what type of file you want to import from the list."
 
-#: ../src/e-util/e-import-assistant.c:1323
-#: ../src/e-util/e-import-assistant.c:1359
+#: ../src/e-util/e-import-assistant.c:1389
+#: ../src/e-util/e-import-assistant.c:1425
 msgid "Evolution Import Assistant"
 msgstr "Evolution Import Assistant"
 
-#: ../src/e-util/e-import-assistant.c:1340
-#: ../src/e-util/e-import-assistant.c:1397
+#: ../src/e-util/e-import-assistant.c:1406
+#: ../src/e-util/e-import-assistant.c:1463
 msgid "Import Location"
 msgstr "Import Location"
 
-#: ../src/e-util/e-import-assistant.c:1352
+#: ../src/e-util/e-import-assistant.c:1418
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -14909,19 +15051,19 @@ msgstr ""
 "With this assistant you will be guided through the process of importing "
 "external files into Evolution."
 
-#: ../src/e-util/e-import-assistant.c:1369
+#: ../src/e-util/e-import-assistant.c:1435
 msgid "Importer Type"
 msgstr "Importer Type"
 
-#: ../src/e-util/e-import-assistant.c:1379
+#: ../src/e-util/e-import-assistant.c:1445
 msgid "Select Information to Import"
 msgstr "Select Information to Import"
 
-#: ../src/e-util/e-import-assistant.c:1388
+#: ../src/e-util/e-import-assistant.c:1454
 msgid "Select a File"
 msgstr "Select a File"
 
-#: ../src/e-util/e-import-assistant.c:1405
+#: ../src/e-util/e-import-assistant.c:1471
 msgid "Click “Apply” to begin importing the file into Evolution."
 msgstr "Click “Apply” to begin importing the file into Evolution."
 
@@ -14954,31 +15096,31 @@ msgstr "Close"
 msgid "_Save and Close"
 msgstr "_Save and Close"
 
-#: ../src/e-util/e-mail-signature-editor.c:568
+#: ../src/e-util/e-mail-signature-editor.c:549
 msgid "Edit Signature"
 msgstr "Edit Signature"
 
-#: ../src/e-util/e-mail-signature-editor.c:601
+#: ../src/e-util/e-mail-signature-editor.c:582
 msgid "_Signature Name:"
 msgstr "_Signature Name:"
 
-#: ../src/e-util/e-mail-signature-editor.c:637
+#: ../src/e-util/e-mail-signature-editor.c:618
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: ../src/e-util/e-mail-signature-manager.c:338
+#: ../src/e-util/e-mail-signature-manager.c:334
 msgid "Add _Script"
 msgstr "Add _Script"
 
-#: ../src/e-util/e-mail-signature-manager.c:444
+#: ../src/e-util/e-mail-signature-manager.c:440
 msgid "Add Signature Script"
 msgstr "Add Signature Script"
 
-#: ../src/e-util/e-mail-signature-manager.c:538
+#: ../src/e-util/e-mail-signature-manager.c:534
 msgid "Edit Signature Script"
 msgstr "Edit Signature Script"
 
-#: ../src/e-util/e-mail-signature-script-dialog.c:394
+#: ../src/e-util/e-mail-signature-script-dialog.c:386
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14988,19 +15130,19 @@ msgstr ""
 "signature. The name you specify will be used\n"
 "for display purposes only."
 
-#: ../src/e-util/e-mail-signature-script-dialog.c:445
+#: ../src/e-util/e-mail-signature-script-dialog.c:437
 msgid "S_cript:"
 msgstr "S_cript:"
 
-#: ../src/e-util/e-mail-signature-script-dialog.c:476
+#: ../src/e-util/e-mail-signature-script-dialog.c:468
 msgid "Script file must be executable."
 msgstr "Script file must be executable."
 
-#: ../src/e-util/e-map.c:886
+#: ../src/e-util/e-map.c:883
 msgid "World Map"
 msgstr "World Map"
 
-#: ../src/e-util/e-map.c:889
+#: ../src/e-util/e-map.c:886
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -15036,12 +15178,12 @@ msgstr "Opening task list “%s”"
 msgid "Opening address book “%s”"
 msgstr "Opening address book “%s”"
 
-#: ../src/e-util/e-misc-utils.c:3351
+#: ../src/e-util/e-misc-utils.c:3348
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "_Do not show this message again"
 msgstr "_Do not show this message again"
 
-#: ../src/e-util/e-misc-utils.c:3979
+#: ../src/e-util/e-misc-utils.c:3990
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -15049,18 +15191,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:3991
+#: ../src/e-util/e-misc-utils.c:4002
 #, 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:4003
+#: ../src/e-util/e-misc-utils.c:4014
 #, 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:4017
+#: ../src/e-util/e-misc-utils.c:4028
 #, c-format
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
@@ -15076,7 +15218,7 @@ msgstr ""
 "Detailed error (%d): %s"
 
 #  addressbook:ldap-search-base secondary
-#: ../src/e-util/e-misc-utils.c:4028
+#: ../src/e-util/e-misc-utils.c:4039
 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 "
@@ -15086,12 +15228,12 @@ msgstr ""
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 
-#: ../src/e-util/e-misc-utils.c:4061
+#: ../src/e-util/e-misc-utils.c:4072
 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:4384
+#: ../src/e-util/e-misc-utils.c:4395
 #, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
@@ -15099,31 +15241,31 @@ 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:4393
+#: ../src/e-util/e-misc-utils.c:4404
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/e-util/e-misc-utils.c:4551
+#: ../src/e-util/e-misc-utils.c:4555
 #, c-format
 msgid "Click to call %s"
 msgstr "Click to call %s"
 
-#: ../src/e-util/e-misc-utils.c:4553
+#: ../src/e-util/e-misc-utils.c:4557
 msgid "Click to hide/unhide addresses"
 msgstr "Click to hide/unhide addresses"
 
-#: ../src/e-util/e-misc-utils.c:4566
+#: ../src/e-util/e-misc-utils.c:4570
 #, 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
+#: ../src/e-util/e-misc-utils.c:4572
 msgid "Go to the beginning of the message"
 msgstr "Go to the beginning of the message"
 
-#: ../src/e-util/e-misc-utils.c:4574
+#: ../src/e-util/e-misc-utils.c:4578
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
@@ -15145,9 +15287,9 @@ msgid "_Search:"
 msgstr "_Search:"
 
 #: ../src/e-util/e-name-selector-dialog.c:363
-#: ../src/e-util/e-name-selector-dialog.c:1325
+#: ../src/e-util/e-name-selector-dialog.c:1322
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1271
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1654
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1752
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:783
 #: ../src/modules/calendar/e-task-shell-view-actions.c:956
 msgid "Any Category"
@@ -15167,25 +15309,25 @@ msgid "Select Contacts from Address Book"
 msgstr "Select Contacts from Address Book"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../src/e-util/e-name-selector-entry.c:3234
+#: ../src/e-util/e-name-selector-entry.c:3222
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "E_xpand %s Inline"
 
 #. Copy Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3250
+#: ../src/e-util/e-name-selector-entry.c:3238
 #, c-format
 msgid "Cop_y %s"
 msgstr "Cop_y %s"
 
 #. Cut Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3261
+#: ../src/e-util/e-name-selector-entry.c:3249
 #, c-format
 msgid "C_ut %s"
 msgstr "C_ut %s"
 
 #. Edit Contact item
-#: ../src/e-util/e-name-selector-entry.c:3279
+#: ../src/e-util/e-name-selector-entry.c:3267
 #, c-format
 msgid "_Edit %s"
 msgstr "_Edit %s"
@@ -15231,7 +15373,7 @@ msgstr "_Remember this password"
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Remember this password for the remainder of this session"
 
-#: ../src/e-util/e-preferences-window.c:329
+#: ../src/e-util/e-preferences-window.c:326
 msgid "Evolution Preferences"
 msgstr "Evolution Preferences"
 
@@ -15329,11 +15471,11 @@ msgstr "Create a new proxy profile"
 msgid "Delete the selected proxy profile"
 msgstr "Delete the selected proxy profile"
 
-#: ../src/e-util/e-rule-editor.c:191
+#: ../src/e-util/e-rule-editor.c:188
 msgid "Add Rule"
 msgstr "Add Rule"
 
-#: ../src/e-util/e-rule-editor.c:302
+#: ../src/e-util/e-rule-editor.c:299
 msgid "Edit Rule"
 msgstr "Edit Rule"
 
@@ -15342,35 +15484,35 @@ msgstr "Edit Rule"
 msgid "Matches: %u"
 msgstr "Matches: %u"
 
-#: ../src/e-util/e-search-bar.c:624
+#: ../src/e-util/e-search-bar.c:597
 msgid "Close the find bar"
 msgstr "Close the find bar"
 
-#: ../src/e-util/e-search-bar.c:632
+#: ../src/e-util/e-search-bar.c:605
 msgid "Fin_d:"
 msgstr "Fin_d:"
 
-#: ../src/e-util/e-search-bar.c:644
+#: ../src/e-util/e-search-bar.c:617
 msgid "Clear the search"
 msgstr "Clear the search"
 
-#: ../src/e-util/e-search-bar.c:671
+#: ../src/e-util/e-search-bar.c:644
 msgid "Find the previous occurrence of the phrase"
 msgstr "Find the previous occurrence of the phrase"
 
-#: ../src/e-util/e-search-bar.c:683
+#: ../src/e-util/e-search-bar.c:656
 msgid "Find the next occurrence of the phrase"
 msgstr "Find the next occurrence of the phrase"
 
-#: ../src/e-util/e-search-bar.c:692
+#: ../src/e-util/e-search-bar.c:665
 msgid "Mat_ch case"
 msgstr "Mat_ch case"
 
-#: ../src/e-util/e-search-bar.c:720
+#: ../src/e-util/e-search-bar.c:693
 msgid "Reached bottom of page, continued from top"
 msgstr "Reached bottom of page, continued from top"
 
-#: ../src/e-util/e-search-bar.c:742
+#: ../src/e-util/e-search-bar.c:715
 msgid "Reached top of page, continued from bottom"
 msgstr "Reached top of page, continued from bottom"
 
@@ -15523,58 +15665,58 @@ msgstr "Return Notification"
 msgid "Sta_tus Tracking"
 msgstr "Sta_tus Tracking"
 
-#: ../src/e-util/e-source-config.c:725 ../src/e-util/e-source-config.c:729
+#: ../src/e-util/e-source-config.c:689 ../src/e-util/e-source-config.c:693
 msgid "Type:"
 msgstr "Type:"
 
-#: ../src/e-util/e-source-config.c:739 ../src/e-util/e-source-config.c:743
+#: ../src/e-util/e-source-config.c:703 ../src/e-util/e-source-config.c:707
 msgid "Name:"
 msgstr "Name:"
 
-#: ../src/e-util/e-source-config.c:850 ../src/e-util/e-webdav-browser.c:1733
+#: ../src/e-util/e-source-config.c:814 ../src/e-util/e-webdav-browser.c:1858
 msgid "Name cannot be empty"
 msgstr "Name cannot be empty"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../src/e-util/e-source-config.c:1417
+#: ../src/e-util/e-source-config.c:1381
 msgid "Refresh every"
 msgstr "Refresh every"
 
-#: ../src/e-util/e-source-config.c:1447 ../src/e-util/e-source-config.c:1521
+#: ../src/e-util/e-source-config.c:1411 ../src/e-util/e-source-config.c:1485
 msgid "Use a secure connection"
 msgstr "Use a secure connection"
 
-#: ../src/e-util/e-source-config.c:1548
+#: ../src/e-util/e-source-config.c:1512
 msgid "Unset _trust for SSL/TLS certificate"
 msgstr "Unset _trust for SSL/TLS certificate"
 
-#: ../src/e-util/e-source-config.c:1584
+#: ../src/e-util/e-source-config.c:1548
 msgid "User:"
 msgstr "User:"
 
-#: ../src/e-util/e-source-selector.c:3236
+#: ../src/e-util/e-source-selector.c:3417
 msgid "Show"
 msgstr "Show"
 
-#: ../src/e-util/e-source-selector.c:3242
+#: ../src/e-util/e-source-selector.c:3423
 msgid "Group name"
 msgstr "Group name"
 
-#: ../src/e-util/e-source-selector.c:3397 ../src/mail/e-mail-display.c:717
+#: ../src/e-util/e-source-selector.c:3578 ../src/mail/e-mail-display.c:717
 msgid "_Hide"
 msgstr "_Hide"
 
-#: ../src/e-util/e-source-selector.c:3397
-#: ../src/e-util/e-source-selector.c:3495
+#: ../src/e-util/e-source-selector.c:3578
+#: ../src/e-util/e-source-selector.c:3676
 msgid "_Show"
 msgstr "_Show"
 
-#: ../src/e-util/e-source-selector.c:3449
+#: ../src/e-util/e-source-selector.c:3630
 msgid "Manage Groups"
 msgstr "Manage Groups"
 
-#: ../src/e-util/e-source-selector.c:3461
+#: ../src/e-util/e-source-selector.c:3642
 msgid "Available Groups:"
 msgstr "Available Groups:"
 
@@ -15722,7 +15864,7 @@ msgstr ""
 msgid "Failed to refresh list of account sources"
 msgstr "Failed to refresh list of account sources"
 
-#: ../src/e-util/e-table-click-to-add.c:688
+#: ../src/e-util/e-table-click-to-add.c:686
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:59
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:140
 msgid "click to add"
@@ -15748,27 +15890,27 @@ msgstr "Move selected column names to bottom"
 msgid "Select all column names"
 msgstr "Select all column names"
 
-#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:380 ../src/e-util/e-table-config.c:426
 msgid "(Ascending)"
 msgstr "(Ascending)"
 
-#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:380 ../src/e-util/e-table-config.c:426
 msgid "(Descending)"
 msgstr "(Descending)"
 
-#: ../src/e-util/e-table-config.c:395
+#: ../src/e-util/e-table-config.c:387
 msgid "Not sorted"
 msgstr "Not sorted"
 
-#: ../src/e-util/e-table-config.c:440
+#: ../src/e-util/e-table-config.c:432
 msgid "No grouping"
 msgstr "No grouping"
 
-#: ../src/e-util/e-table-config.c:545
+#: ../src/e-util/e-table-config.c:537
 msgid "Show Fields"
 msgstr "Show Fields"
 
-#: ../src/e-util/e-table-config.c:559
+#: ../src/e-util/e-table-config.c:551
 msgid "Choose the order of information to appear in the message list."
 msgstr "Choose the order of information to appear in the message list."
 
@@ -15780,11 +15922,11 @@ msgstr "Clear _All"
 msgid "_Show field in View"
 msgstr "_Show field in View"
 
-#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1792
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1778
 msgid "Ascending"
 msgstr "Ascending"
 
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1792
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1778
 msgid "Descending"
 msgstr "Descending"
 
@@ -15844,7 +15986,7 @@ msgstr ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
 
-#: ../src/e-util/e-table-field-chooser-dialog.c:224
+#: ../src/e-util/e-table-field-chooser-dialog.c:216
 msgid "Add a Column"
 msgstr "Add a Column"
 
@@ -15855,7 +15997,7 @@ msgstr "Add a Column"
 #. * Finally the %d is replaced with count of items in this group.
 #. * Example: "Family name: Smith (13 items)"
 #.
-#: ../src/e-util/e-table-group-container.c:366
+#: ../src/e-util/e-table-group-container.c:355
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -15868,83 +16010,83 @@ msgstr[1] "%s: %s (%d items)"
 #. * The %d is replaced with count of items in this group.
 #. * Example: "Smith (13 items)"
 #.
-#: ../src/e-util/e-table-group-container.c:380
+#: ../src/e-util/e-table-group-container.c:369
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d item)"
 msgstr[1] "%s (%d items)"
 
-#: ../src/e-util/e-table-header-item.c:1610
+#: ../src/e-util/e-table-header-item.c:1596
 msgid "Customize Current View"
 msgstr "Customise Current View"
 
-#: ../src/e-util/e-table-header-item.c:1642
+#: ../src/e-util/e-table-header-item.c:1628
 msgid "Sort _Ascending"
 msgstr "Sort _Ascending"
 
-#: ../src/e-util/e-table-header-item.c:1645
+#: ../src/e-util/e-table-header-item.c:1631
 msgid "Sort _Descending"
 msgstr "Sort _Descending"
 
-#: ../src/e-util/e-table-header-item.c:1648
+#: ../src/e-util/e-table-header-item.c:1634
 msgid "_Reset sort"
 msgstr "_Reset sort"
 
-#: ../src/e-util/e-table-header-item.c:1651
+#: ../src/e-util/e-table-header-item.c:1637
 msgid "Group By This _Field"
 msgstr "Group By This _Field"
 
-#: ../src/e-util/e-table-header-item.c:1654
+#: ../src/e-util/e-table-header-item.c:1640
 msgid "Group By _Box"
 msgstr "Group By _Box"
 
-#: ../src/e-util/e-table-header-item.c:1658
+#: ../src/e-util/e-table-header-item.c:1644
 msgid "Remove This _Column"
 msgstr "Remove This _Column"
 
-#: ../src/e-util/e-table-header-item.c:1661
+#: ../src/e-util/e-table-header-item.c:1647
 msgid "Add a C_olumn…"
 msgstr "Add a C_olumn…"
 
-#: ../src/e-util/e-table-header-item.c:1665
+#: ../src/e-util/e-table-header-item.c:1651
 msgid "A_lignment"
 msgstr "A_lignment"
 
-#: ../src/e-util/e-table-header-item.c:1668
+#: ../src/e-util/e-table-header-item.c:1654
 msgid "B_est Fit"
 msgstr "B_est Fit"
 
-#: ../src/e-util/e-table-header-item.c:1671
+#: ../src/e-util/e-table-header-item.c:1657
 msgid "Format Column_s…"
 msgstr "Format Column_s…"
 
-#: ../src/e-util/e-table-header-item.c:1675
-#: ../src/shell/e-shell-window-actions.c:1239
+#: ../src/e-util/e-table-header-item.c:1661
+#: ../src/shell/e-shell-window-actions.c:1290
 msgid "Custo_mize Current View…"
 msgstr "Custo_mise Current View…"
 
-#: ../src/e-util/e-table-header-item.c:1742
+#: ../src/e-util/e-table-header-item.c:1728
 msgid "_Sort By"
 msgstr "_Sort By"
 
 #. Custom
-#: ../src/e-util/e-table-header-item.c:1765
+#: ../src/e-util/e-table-header-item.c:1751
 msgid "_Custom"
 msgstr "_Custom"
 
-#: ../src/e-util/e-text.c:2105
+#: ../src/e-util/e-text.c:2090
 msgid "Select All"
 msgstr "Select All"
 
-#: ../src/e-util/e-text.c:2118
+#: ../src/e-util/e-text.c:2103
 msgid "Input Methods"
 msgstr "Input Methods"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../src/e-util/e-timezone-dialog.c:280 ../src/e-util/e-timezone-dialog.c:520
-#: ../src/e-util/e-timezone-dialog.c:524 ../src/e-util/e-timezone-dialog.c:528
-#: ../src/e-util/e-timezone-dialog.c:1015
+#: ../src/e-util/e-timezone-dialog.c:270 ../src/e-util/e-timezone-dialog.c:510
+#: ../src/e-util/e-timezone-dialog.c:514 ../src/e-util/e-timezone-dialog.c:518
+#: ../src/e-util/e-timezone-dialog.c:1005
 msgid "UTC"
 msgstr "UTC"
 
@@ -15974,226 +16116,236 @@ msgstr "_Selection"
 msgid "Timezone drop-down combination box"
 msgstr "Timezone drop-down combination box"
 
-#: ../src/e-util/e-url-entry.c:102
+#: ../src/e-util/e-url-entry.c:155
 msgid "Click here to open the URL"
 msgstr "Click here to open the URL"
 
-#: ../src/e-util/e-url-entry.c:104
+#: ../src/e-util/e-url-entry.c:192
 msgid "Enter a URL here"
 msgstr "Enter a URL here"
 
-#: ../src/e-util/evolution-source-viewer.c:638
+#: ../src/e-util/evolution-source-viewer.c:632
 msgid "Evolution Source Viewer"
 msgstr "Evolution Source Viewer"
 
 #. Translators: The name that is displayed in the user interface
-#: ../src/e-util/evolution-source-viewer.c:668
+#: ../src/e-util/evolution-source-viewer.c:662
 msgid "Display Name"
 msgstr "Display Name"
 
-#: ../src/e-util/evolution-source-viewer.c:677
+#: ../src/e-util/evolution-source-viewer.c:671
 msgid "Flags"
 msgstr "Flags"
 
-#: ../src/e-util/evolution-source-viewer.c:729
+#: ../src/e-util/evolution-source-viewer.c:723
 #: ../src/mail/e-mail-config-identity-page.c:1231
 msgid "Identity"
 msgstr "Identity"
 
-#: ../src/e-util/e-webdav-browser.c:448
+#: ../src/e-util/e-webdav-browser.c:510
 msgid "Address book"
 msgstr "Address book"
 
-#: ../src/e-util/e-webdav-browser.c:459
+#: ../src/e-util/e-webdav-browser.c:521
 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:1936
+#: ../src/e-util/e-webdav-browser.c:594 ../src/mail/em-folder-tree-model.c:1587
+#: ../src/mail/em-folder-tree-model.c:1975
 msgid "Loading…"
 msgstr "Loading…"
 
-#: ../src/e-util/e-webdav-browser.c:1368
+#: ../src/e-util/e-webdav-browser.c:1447
 msgid "Searching collection children…"
 msgstr "Searching collection children…"
 
-#: ../src/e-util/e-webdav-browser.c:1370
+#: ../src/e-util/e-webdav-browser.c:1449
 msgid "Failed to search for collection children"
 msgstr "Failed to search for collection children"
 
-#: ../src/e-util/e-webdav-browser.c:1404
+#: ../src/e-util/e-webdav-browser.c:1483
 msgid "Searching for user home, please wait…"
 msgstr "Searching for user home, please wait…"
 
-#: ../src/e-util/e-webdav-browser.c:1406
+#: ../src/e-util/e-webdav-browser.c:1485
 msgid "Failed to search for user home"
 msgstr "Failed to search for user home"
 
-#: ../src/e-util/e-webdav-browser.c:1749
+#: ../src/e-util/e-webdav-browser.c:1874
 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:1768
+#: ../src/e-util/e-webdav-browser.c:1893
 msgid "Failed to get selected collection HREF"
 msgstr "Failed to get selected collection HREF"
 
-#: ../src/e-util/e-webdav-browser.c:1800
+#: ../src/e-util/e-webdav-browser.c:1926
 msgid "Failed to save changes"
 msgstr "Failed to save changes"
 
-#: ../src/e-util/e-webdav-browser.c:1802
+#: ../src/e-util/e-webdav-browser.c:1928
 msgid "Creating new book…"
 msgstr "Creating new book…"
 
-#: ../src/e-util/e-webdav-browser.c:1803
+#: ../src/e-util/e-webdav-browser.c:1929
 msgid "Failed to create new book"
 msgstr "Failed to create new book"
 
-#: ../src/e-util/e-webdav-browser.c:1805
+#: ../src/e-util/e-webdav-browser.c:1931
 msgid "Creating new calendar…"
 msgstr "Creating new calendar…"
 
-#: ../src/e-util/e-webdav-browser.c:1806
+#: ../src/e-util/e-webdav-browser.c:1932
 msgid "Failed to create new calendar"
 msgstr "Failed to create new calendar"
 
-#: ../src/e-util/e-webdav-browser.c:1808
+#: ../src/e-util/e-webdav-browser.c:1934
 msgid "Creating new collection…"
 msgstr "Creating new collection…"
 
-#: ../src/e-util/e-webdav-browser.c:1809
+#: ../src/e-util/e-webdav-browser.c:1935
 msgid "Failed to create new collection"
 msgstr "Failed to create new collection"
 
-#: ../src/e-util/e-webdav-browser.c:1948
+#: ../src/e-util/e-webdav-browser.c:2076
 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:1950
+#: ../src/e-util/e-webdav-browser.c:2078
 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:2179
+#: ../src/e-util/e-webdav-browser.c:2325
 msgid "Deleting book…"
 msgstr "Deleting book…"
 
-#: ../src/e-util/e-webdav-browser.c:2180
+#: ../src/e-util/e-webdav-browser.c:2326
 msgid "Failed to delete book"
 msgstr "Failed to delete book"
 
-#: ../src/e-util/e-webdav-browser.c:2183
+#: ../src/e-util/e-webdav-browser.c:2329
 msgid "Deleting calendar…"
 msgstr "Deleting calendar…"
 
-#: ../src/e-util/e-webdav-browser.c:2184
+#: ../src/e-util/e-webdav-browser.c:2330
 msgid "Failed to delete calendar"
 msgstr "Failed to delete calendar"
 
-#: ../src/e-util/e-webdav-browser.c:2187
+#: ../src/e-util/e-webdav-browser.c:2333
 msgid "Deleting collection…"
 msgstr "Deleting collection…"
 
-#: ../src/e-util/e-webdav-browser.c:2188
+#: ../src/e-util/e-webdav-browser.c:2334
 msgid "Failed to delete collection"
 msgstr "Failed to delete collection"
 
-#: ../src/e-util/e-webdav-browser.c:2419
+#. Translators: It's 'order' as 'sorting order'
+#: ../src/e-util/e-webdav-browser.c:2568
+#| msgid "_Border:"
+msgid "_Order:"
+msgstr "_Order:"
+
+#: ../src/e-util/e-webdav-browser.c:2578
+msgid "Use -1 to not set the sort order"
+msgstr "Use -1 to not set the sort order"
+
+#: ../src/e-util/e-webdav-browser.c:2584
 msgid "For Components:"
 msgstr "For Components:"
 
-#: ../src/e-util/e-webdav-browser.c:2425
+#: ../src/e-util/e-webdav-browser.c:2590
 msgid "_Events"
 msgstr "_Events"
 
-#: ../src/e-util/e-webdav-browser.c:2615
+#: ../src/e-util/e-webdav-browser.c:2783
 msgid "WebDAV server:"
 msgstr "WebDAV server:"
 
-#: ../src/e-util/e-webdav-browser.c:2650
+#: ../src/e-util/e-webdav-browser.c:2818
 msgid "Create _Book"
 msgstr "Create _Book"
 
-#: ../src/e-util/e-webdav-browser.c:2657
+#: ../src/e-util/e-webdav-browser.c:2825
 msgid "Create _Calendar"
 msgstr "Create _Calendar"
 
-#: ../src/e-util/e-webdav-browser.c:2664
+#: ../src/e-util/e-webdav-browser.c:2832
 msgid "Create Collectio_n"
 msgstr "Create Collectio_n"
 
-#: ../src/e-util/e-web-view.c:407
+#: ../src/e-util/e-web-view.c:406
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: ../src/e-util/e-web-view.c:409
+#: ../src/e-util/e-web-view.c:408
 msgid "Copy the link to the clipboard"
 msgstr "Copy the link to the clipboard"
 
-#: ../src/e-util/e-web-view.c:417
+#: ../src/e-util/e-web-view.c:416
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: ../src/e-util/e-web-view.c:419
+#: ../src/e-util/e-web-view.c:418
 msgid "Open the link in a web browser"
 msgstr "Open the link in a web browser"
 
-#: ../src/e-util/e-web-view.c:427
+#: ../src/e-util/e-web-view.c:426
 msgid "_Copy Email Address"
 msgstr "_Copy E-mail Address"
 
-#: ../src/e-util/e-web-view.c:434
+#: ../src/e-util/e-web-view.c:433
 msgid "Copy _Raw Email Address"
 msgstr "Copy _Raw E-mail Address"
 
-#: ../src/e-util/e-web-view.c:436
+#: ../src/e-util/e-web-view.c:435
 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:451
+#: ../src/e-util/e-web-view.c:450
 msgid "_Copy Image"
 msgstr "_Copy Image"
 
-#: ../src/e-util/e-web-view.c:453
+#: ../src/e-util/e-web-view.c:452
 msgid "Copy the image to the clipboard"
 msgstr "Copy the image to the clipboard"
 
-#: ../src/e-util/e-web-view.c:458
+#: ../src/e-util/e-web-view.c:457
 msgid "Save _Image…"
 msgstr "Save _Image…"
 
-#: ../src/e-util/e-web-view.c:460
+#: ../src/e-util/e-web-view.c:459
 msgid "Save the image to a file"
 msgstr "Save the image to a file"
 
-#: ../src/e-util/e-web-view.c:475 ../src/mail/e-mail-browser.c:201
-#: ../src/mail/e-mail-reader.c:2819
+#: ../src/e-util/e-web-view.c:474 ../src/mail/e-mail-browser.c:201
+#: ../src/mail/e-mail-reader.c:2836
 msgid "Search _Web…"
 msgstr "Search _Web…"
 
-#: ../src/e-util/e-web-view.c:477 ../src/mail/e-mail-browser.c:203
-#: ../src/mail/e-mail-reader.c:2821
+#: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:203
+#: ../src/mail/e-mail-reader.c:2838
 msgid "Search the Web with the selected text"
 msgstr "Search the Web with the selected text"
 
-#: ../src/e-util/e-web-view.c:487 ../src/e-util/e-web-view.c:2016
+#: ../src/e-util/e-web-view.c:486 ../src/e-util/e-web-view.c:2077
 msgid "Select all text and images"
 msgstr "Select all text and images"
 
-#: ../src/e-util/e-web-view.c:3742
+#: ../src/e-util/e-web-view.c:3804
 msgid "Copying image to clipboard"
 msgstr "Copying image to clipboard"
 
-#: ../src/e-util/e-web-view.c:3930
+#: ../src/e-util/e-web-view.c:3992
 msgid "Save Image"
 msgstr "Save Image"
 
-#: ../src/e-util/e-web-view.c:3967
+#: ../src/e-util/e-web-view.c:4029
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "Saving image to “%s”"
 
-#: ../src/e-util/e-web-view.c:4114
+#: ../src/e-util/e-web-view.c:4179
 #, 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."
@@ -16360,7 +16512,7 @@ msgstr "_Filter Rules"
 msgid "Rule Name"
 msgstr "Rule Name"
 
-#: ../src/e-util/gal-a11y-e-cell.c:128
+#: ../src/e-util/gal-a11y-e-cell.c:125
 msgid "Table Cell"
 msgstr "Table Cell"
 
@@ -16393,11 +16545,11 @@ msgstr "collapses the row in the ETree containing this cell"
 msgid "click"
 msgstr "click"
 
-#: ../src/e-util/gal-a11y-e-table-column-header.c:161
+#: ../src/e-util/gal-a11y-e-table-column-header.c:158
 msgid "sort"
 msgstr "sort"
 
-#: ../src/e-util/gal-view-instance-save-as-dialog.c:293
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:291
 msgid "Save Current View"
 msgstr "Save Current View"
 
@@ -16426,8 +16578,8 @@ msgid "Blank Signature"
 msgstr "Blank Signature"
 
 #: ../src/e-util/widgets.error.xml.h:5
-msgid "Please provide an unique name to identify this signature."
-msgstr "Please provide an unique name to identify this signature."
+msgid "Please provide a unique name to identify this signature."
+msgstr "Please provide a unique name to identify this signature."
 
 #: ../src/e-util/widgets.error.xml.h:6
 msgid "Unable to copy image to clipboard."
@@ -16502,54 +16654,56 @@ msgstr "Invalid folder URI “%s”"
 
 #. Some local folders
 #: ../src/libemail-engine/e-mail-session.c:120
-#: ../src/mail/em-folder-properties.c:1444
-#: ../src/mail/em-folder-tree-model.c:1503
+#: ../src/mail/em-folder-properties.c:1473
+#: ../src/mail/em-folder-tree-model.c:1509
+#: ../src/mail/em-folder-tree-model.c:1533
 #: ../src/mail/importers/kmail-libs.c:138
-#: ../src/modules/mail/e-mail-shell-view-private.c:1011
-#: ../src/modules/mail/e-mail-shell-view-private.c:1022
+#: ../src/modules/mail/e-mail-shell-view-private.c:1024
+#: ../src/modules/mail/e-mail-shell-view-private.c:1035
 msgid "Inbox"
 msgstr "Inbox"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
 #: ../src/libemail-engine/e-mail-session.c:121
-#: ../src/mail/em-folder-tree-model.c:1497
+#: ../src/mail/em-folder-tree-model.c:1503
+#: ../src/mail/em-folder-tree-model.c:1537
 #: ../src/mail/importers/kmail-libs.c:144
-#: ../src/modules/mail/e-mail-shell-view-private.c:1009
+#: ../src/modules/mail/e-mail-shell-view-private.c:1022
 msgid "Drafts"
 msgstr "Drafts"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
 #: ../src/libemail-engine/e-mail-session.c:122
-#: ../src/mail/em-folder-tree-model.c:1507
+#: ../src/mail/em-folder-tree-model.c:1513
 #: ../src/mail/importers/kmail-libs.c:140
-#: ../src/modules/mail/e-mail-shell-view-private.c:1013
+#: ../src/modules/mail/e-mail-shell-view-private.c:1026
 msgid "Outbox"
 msgstr "Outbox"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
 #: ../src/libemail-engine/e-mail-session.c:123
-#: ../src/mail/em-folder-tree-model.c:1511
+#: ../src/mail/em-folder-tree-model.c:1516
+#: ../src/mail/em-folder-tree-model.c:1536
 #: ../src/mail/importers/kmail-libs.c:142
-#: ../src/modules/mail/e-mail-shell-view-private.c:1015
+#: ../src/modules/mail/e-mail-shell-view-private.c:1028
 msgid "Sent"
 msgstr "Sent"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
 #: ../src/libemail-engine/e-mail-session.c:124
-#: ../src/mail/e-mail-templates-store.c:2211
-#: ../src/mail/em-folder-tree-model.c:1499
+#: ../src/mail/em-folder-tree-model.c:1505
 #: ../src/mail/importers/kmail-libs.c:146
-#: ../src/modules/mail/e-mail-shell-view-private.c:1017
+#: ../src/modules/mail/e-mail-shell-view-private.c:1030
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Templates"
 
-#: ../src/libemail-engine/e-mail-session.c:1514
+#: ../src/libemail-engine/e-mail-session.c:1504
 #, c-format
 msgid "User cancelled operation"
 msgstr "User cancelled operation"
 
-#: ../src/libemail-engine/e-mail-session.c:1575
+#: ../src/libemail-engine/e-mail-session.c:1565
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
@@ -16558,55 +16712,55 @@ msgstr ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 
-#: ../src/libemail-engine/e-mail-session.c:1588
+#: ../src/libemail-engine/e-mail-session.c:1578
 #, 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:1789
+#: ../src/libemail-engine/e-mail-session.c:1779
 #, 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:1909
+#: ../src/libemail-engine/e-mail-session.c:1899
 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:1911
+#: ../src/libemail-engine/e-mail-session.c:1901
 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:2958
+#: ../src/libemail-engine/e-mail-session.c:2948
 #, c-format
 msgid "Waiting for “%s”"
 msgstr "Waiting for “%s”"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:526
+#: ../src/libemail-engine/e-mail-session-utils.c:527
 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:708
+#: ../src/libemail-engine/e-mail-session-utils.c:618
+#: ../src/libemail-engine/mail-ops.c:705
 #, 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:744
+#: ../src/libemail-engine/e-mail-session-utils.c:656
+#: ../src/libemail-engine/mail-ops.c:741
 #, 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:772 ../src/libemail-engine/mail-ops.c:807
+#: ../src/libemail-engine/e-mail-session-utils.c:689
+#: ../src/libemail-engine/e-mail-session-utils.c:724
+#: ../src/libemail-engine/mail-ops.c:769 ../src/libemail-engine/mail-ops.c:804
 #, 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:796
+#: ../src/libemail-engine/e-mail-session-utils.c:713
+#: ../src/libemail-engine/mail-ops.c:793
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16615,15 +16769,15 @@ msgstr ""
 "Failed to append to %s: %s\n"
 "Appending to local “Sent” folder instead."
 
-#: ../src/libemail-engine/e-mail-session-utils.c:737
-#: ../src/libemail-engine/mail-ops.c:824
+#: ../src/libemail-engine/e-mail-session-utils.c:743
+#: ../src/libemail-engine/mail-ops.c:821
 #, 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:930
-#: ../src/libemail-engine/mail-ops.c:1020
-#: ../src/libemail-engine/mail-ops.c:1135 ../src/mail/mail-send-recv.c:665
+#: ../src/libemail-engine/e-mail-session-utils.c:936
+#: ../src/libemail-engine/mail-ops.c:1017
+#: ../src/libemail-engine/mail-ops.c:1129 ../src/mail/mail-send-recv.c:665
 msgid "Sending message"
 msgstr "Sending message"
 
@@ -16633,7 +16787,7 @@ msgid "Disconnecting from “%s”"
 msgstr "Disconnecting from “%s”"
 
 #: ../src/libemail-engine/e-mail-store-utils.c:264
-#: ../src/mail/e-mail-backend.c:1048
+#: ../src/mail/e-mail-backend.c:1055
 #, c-format
 msgid "Reconnecting to “%s”"
 msgstr "Reconnecting to “%s”"
@@ -16666,7 +16820,7 @@ msgstr ""
 msgid "Fetching mail from “%s”"
 msgstr "Fetching mail from “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:738
+#: ../src/libemail-engine/mail-ops.c:735
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -16679,7 +16833,7 @@ msgstr ""
 "Filters.\n"
 "Original error was: %s"
 
-#: ../src/libemail-engine/mail-ops.c:1031
+#: ../src/libemail-engine/mail-ops.c:1028
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
@@ -16687,52 +16841,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:1089
+#: ../src/libemail-engine/mail-ops.c:1086
 #, 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:1095
+#: ../src/libemail-engine/mail-ops.c:1092
 msgid "Cancelled."
 msgstr "Cancelled."
 
-#: ../src/libemail-engine/mail-ops.c:1097
+#: ../src/libemail-engine/mail-ops.c:1094
 msgid "Complete."
 msgstr "Complete."
 
-#: ../src/libemail-engine/mail-ops.c:1221
+#: ../src/libemail-engine/mail-ops.c:1215
 #, c-format
 msgid "Moving messages to “%s”"
 msgstr "Moving messages to “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1222
+#: ../src/libemail-engine/mail-ops.c:1216
 #, c-format
 msgid "Copying messages to “%s”"
 msgstr "Copying messages to “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1341
+#: ../src/libemail-engine/mail-ops.c:1335
 #, c-format
 msgid "Storing folder “%s”"
 msgstr "Storing folder “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1469
+#: ../src/libemail-engine/mail-ops.c:1463
 #, c-format
 msgid "Expunging and storing account “%s”"
 msgstr "Expunging and storing account “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1470
+#: ../src/libemail-engine/mail-ops.c:1464
 #, c-format
 msgid "Storing account “%s”"
 msgstr "Storing account “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1545
+#: ../src/libemail-engine/mail-ops.c:1539
 #, c-format
 msgid "Emptying trash in “%s”"
 msgstr "Emptying wastebasket in “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1644
+#: ../src/libemail-engine/mail-ops.c:1638
 #, c-format
 msgid "Processing folder changes in “%s”"
 msgstr "Processing folder changes in “%s”"
@@ -16883,9 +17037,9 @@ msgstr "POP3 server"
 msgid "SMTP server"
 msgstr "SMTP server"
 
-#: ../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
+#: ../src/mail/e-mail-browser.c:168 ../src/shell/e-shell-window-actions.c:921
+#: ../src/shell/e-shell-window-actions.c:928
+#: ../src/shell/e-shell-window-actions.c:935
 msgid "Close this window"
 msgstr "Close this window"
 
@@ -16903,11 +17057,11 @@ msgstr "Go _Back"
 msgid "_Skip Lookup"
 msgstr "_Skip Lookup"
 
-#: ../src/mail/e-mail-config-assistant.c:725
+#: ../src/mail/e-mail-config-assistant.c:710
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistant"
 
-#: ../src/mail/e-mail-config-assistant.c:1032
+#: ../src/mail/e-mail-config-assistant.c:1021
 msgid "_Revise Details"
 msgstr "_Revise Details"
 
@@ -16980,12 +17134,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:4148 ../src/mail/mail-config.ui.h:22
+#: ../src/mail/em-composer-utils.c:4129 ../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/em-composer-utils.c:4151 ../src/mail/mail-config.ui.h:23
+#: ../src/mail/em-composer-utils.c:4132 ../src/mail/mail-config.ui.h:23
 msgid "_Keep signature above the original message"
 msgstr "_Keep signature above the original message"
 
@@ -17111,7 +17265,7 @@ msgstr ""
 "e-mail you send."
 
 #: ../src/mail/e-mail-config-identity-page.c:580
-#: ../src/mail/e-mail-config-summary-page.c:355
+#: ../src/mail/e-mail-config-summary-page.c:348
 msgid ""
 "The above name will be used to identify this account.\n"
 "Use for example, “Work” or “Personal”."
@@ -17179,7 +17333,7 @@ msgid "Reply To is not a valid email"
 msgstr "Reply To is not a valid e-mail"
 
 #: ../src/mail/e-mail-config-identity-page.c:970
-#: ../src/mail/e-mail-config-summary-page.c:637
+#: ../src/mail/e-mail-config-summary-page.c:630
 msgid "Account Name cannot be empty"
 msgstr "Account Name cannot be empty"
 
@@ -17195,7 +17349,7 @@ msgstr "Checking for New Mail"
 msgid "Check for _new messages every"
 msgstr "Check for _new messages every"
 
-#: ../src/mail/e-mail-config-provider-page.c:767
+#: ../src/mail/e-mail-config-provider-page.c:763
 msgid "Receiving Options"
 msgstr "Receiving Options"
 
@@ -17205,118 +17359,118 @@ msgstr "Receiving E-mail"
 
 #. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
 #. The first '%s' is a key ID, the second '%s' is a display name of the key.
-#: ../src/mail/e-mail-config-security-page.c:379
+#: ../src/mail/e-mail-config-security-page.c:375
 #, c-format
 msgctxt "PGPKeyDescription"
 msgid "%s — %s"
 msgstr "%s — %s"
 
-#: ../src/mail/e-mail-config-security-page.c:460
-#: ../src/mail/em-folder-properties.c:1367 ../src/mail/mail-config.ui.h:34
+#: ../src/mail/e-mail-config-security-page.c:456
+#: ../src/mail/em-folder-properties.c:1396 ../src/mail/mail-config.ui.h:34
 #: ../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:806
+#: ../src/modules/mail/e-mail-shell-backend.c:1001
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "General"
 
-#: ../src/mail/e-mail-config-security-page.c:469
+#: ../src/mail/e-mail-config-security-page.c:465
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Do not sign meeting requests (for Outlook compatibility)"
 
-#: ../src/mail/e-mail-config-security-page.c:491
+#: ../src/mail/e-mail-config-security-page.c:487
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP)"
 
-#: ../src/mail/e-mail-config-security-page.c:500
+#: ../src/mail/e-mail-config-security-page.c:496
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP _Key ID:"
 
-#: ../src/mail/e-mail-config-security-page.c:531
+#: ../src/mail/e-mail-config-security-page.c:527
 msgid "Si_gning algorithm:"
 msgstr "Si_gning algorithm:"
 
-#: ../src/mail/e-mail-config-security-page.c:547
-#: ../src/mail/e-mail-config-security-page.c:711
+#: ../src/mail/e-mail-config-security-page.c:543
+#: ../src/mail/e-mail-config-security-page.c:707
 #: ../src/mail/mail-config.ui.h:79
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../src/mail/e-mail-config-security-page.c:550
-#: ../src/mail/e-mail-config-security-page.c:714
+#: ../src/mail/e-mail-config-security-page.c:546
+#: ../src/mail/e-mail-config-security-page.c:710
 #: ../src/mail/mail-config.ui.h:80
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../src/mail/e-mail-config-security-page.c:553
-#: ../src/mail/e-mail-config-security-page.c:717
+#: ../src/mail/e-mail-config-security-page.c:549
+#: ../src/mail/e-mail-config-security-page.c:713
 #: ../src/mail/mail-config.ui.h:81
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../src/mail/e-mail-config-security-page.c:556
-#: ../src/mail/e-mail-config-security-page.c:720
+#: ../src/mail/e-mail-config-security-page.c:552
+#: ../src/mail/e-mail-config-security-page.c:716
 #: ../src/mail/mail-config.ui.h:82
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../src/mail/e-mail-config-security-page.c:572
+#: ../src/mail/e-mail-config-security-page.c:568
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Al_ways sign outgoing messages when using this account"
 
-#: ../src/mail/e-mail-config-security-page.c:584
+#: ../src/mail/e-mail-config-security-page.c:580
 msgid "Always enc_rypt outgoing messages when using this account"
 msgstr "Always enc_rypt outgoing messages when using this account"
 
-#: ../src/mail/e-mail-config-security-page.c:596
+#: ../src/mail/e-mail-config-security-page.c:592
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Always encrypt to _myself when sending encrypted messages"
 
-#: ../src/mail/e-mail-config-security-page.c:608
+#: ../src/mail/e-mail-config-security-page.c:604
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Always _trust keys in my keyring when encrypting"
 
-#: ../src/mail/e-mail-config-security-page.c:620
+#: ../src/mail/e-mail-config-security-page.c:616
 msgid "Prefer _inline sign/encrypt for plain text messages"
 msgstr "Prefer _inline sign/encrypt for plain text messages"
 
-#: ../src/mail/e-mail-config-security-page.c:644
+#: ../src/mail/e-mail-config-security-page.c:640
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: ../src/mail/e-mail-config-security-page.c:653
+#: ../src/mail/e-mail-config-security-page.c:649
 msgid "Sig_ning certificate:"
 msgstr "Sig_ning certificate:"
 
-#: ../src/mail/e-mail-config-security-page.c:677
-#: ../src/mail/e-mail-config-security-page.c:775
+#: ../src/mail/e-mail-config-security-page.c:673
+#: ../src/mail/e-mail-config-security-page.c:771
 msgid "Select"
 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:980
+#: ../src/mail/e-mail-config-security-page.c:682
+#: ../src/mail/e-mail-config-security-page.c:780
+#: ../src/shell/e-shell-window-actions.c:1024
 msgid "_Clear"
 msgstr "_Clear"
 
-#: ../src/mail/e-mail-config-security-page.c:695
+#: ../src/mail/e-mail-config-security-page.c:691
 msgid "Signing _algorithm:"
 msgstr "Signing _algorithm:"
 
-#: ../src/mail/e-mail-config-security-page.c:736
+#: ../src/mail/e-mail-config-security-page.c:732
 msgid "Always sign outgoing messages when using this account"
 msgstr "Always sign outgoing messages when using this account"
 
-#: ../src/mail/e-mail-config-security-page.c:751
+#: ../src/mail/e-mail-config-security-page.c:747
 msgid "Encryption certificate:"
 msgstr "Encryption certificate:"
 
-#: ../src/mail/e-mail-config-security-page.c:793
+#: ../src/mail/e-mail-config-security-page.c:789
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Always encrypt outgoing messages when using this account"
 
-#: ../src/mail/e-mail-config-security-page.c:805
+#: ../src/mail/e-mail-config-security-page.c:801
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Always encrypt to myself when sending encrypted messages"
 
@@ -17324,59 +17478,59 @@ msgstr "Always encrypt to myself when sending encrypted messages"
 msgid "Sending Email"
 msgstr "Sending E-mail"
 
-#: ../src/mail/e-mail-config-service-page.c:501
+#: ../src/mail/e-mail-config-service-page.c:490
 msgid "Server _Type:"
 msgstr "Server _Type:"
 
-#: ../src/mail/e-mail-config-summary-page.c:308
+#: ../src/mail/e-mail-config-summary-page.c:301
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "This is a summary of the settings which will be used to access your mail."
 
-#: ../src/mail/e-mail-config-summary-page.c:372
+#: ../src/mail/e-mail-config-summary-page.c:365
 msgid "Personal Details"
 msgstr "Personal Details"
 
-#: ../src/mail/e-mail-config-summary-page.c:381
+#: ../src/mail/e-mail-config-summary-page.c:374
 msgid "Full Name:"
 msgstr "Full Name:"
 
-#: ../src/mail/e-mail-config-summary-page.c:395
+#: ../src/mail/e-mail-config-summary-page.c:388
 msgid "Email Address:"
 msgstr "E-mail Address:"
 
-#: ../src/mail/e-mail-config-summary-page.c:409
+#: ../src/mail/e-mail-config-summary-page.c:402
 msgid "Receiving"
 msgstr "Receiving"
 
-#: ../src/mail/e-mail-config-summary-page.c:421
+#: ../src/mail/e-mail-config-summary-page.c:414
 msgid "Sending"
 msgstr "Sending"
 
-#: ../src/mail/e-mail-config-summary-page.c:433
+#: ../src/mail/e-mail-config-summary-page.c:426
 msgid "Server Type:"
 msgstr "Server Type:"
 
-#: ../src/mail/e-mail-config-summary-page.c:454
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
+#: ../src/mail/e-mail-config-summary-page.c:447
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:658
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/mail/e-mail-config-summary-page.c:475
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
+#: ../src/mail/e-mail-config-summary-page.c:468
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "Username:"
 msgstr "Username:"
 
-#: ../src/mail/e-mail-config-summary-page.c:496
+#: ../src/mail/e-mail-config-summary-page.c:489
 msgid "Security:"
 msgstr "Security:"
 
-#: ../src/mail/e-mail-config-summary-page.c:650
+#: ../src/mail/e-mail-config-summary-page.c:643
 msgid "Cannot have both receiving and sending parts set to None"
 msgstr "Cannot have both receiving and sending parts set to None"
 
-#: ../src/mail/e-mail-config-summary-page.c:806
+#: ../src/mail/e-mail-config-summary-page.c:799
 msgid "Account Summary"
 msgstr "Account Summary"
 
@@ -17391,11 +17545,11 @@ msgstr ""
 "Click “Next” to begin."
 
 #: ../src/mail/e-mail-config-welcome-page.c:172
-#: ../src/modules/startup-wizard/e-startup-assistant.c:182
+#: ../src/modules/startup-wizard/e-startup-assistant.c:170
 msgid "Welcome"
 msgstr "Welcome"
 
-#: ../src/mail/e-mail-config-window.c:329
+#: ../src/mail/e-mail-config-window.c:305
 msgid "Account Editor"
 msgstr "Account Editor"
 
@@ -17467,73 +17621,78 @@ msgstr "C_reate"
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:694
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:687
 msgid "Folder Sort Order"
 msgstr "Folder Sort Order"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:735
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:728
 msgid "Reset c_urrent level"
 msgstr "Reset c_urrent level"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:736
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:729
 msgid "Reset sort order in the current level to the defaults"
 msgstr "Reset sort order in the current level to the defaults"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:746
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:739
 msgid "Reset _all levels"
 msgstr "Reset _all levels"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:747
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:740
 msgid "Reset sort order in all levels to their defaults"
 msgstr "Reset sort order in all levels to their defaults"
 
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
-#: ../src/mail/e-mail-free-form-exp.c:231
+#: ../src/mail/e-mail-free-form-exp.c:233
 msgctxt "ffe"
 msgid "Answered"
 msgstr "Answered"
 
-#: ../src/mail/e-mail-free-form-exp.c:232
+#: ../src/mail/e-mail-free-form-exp.c:234
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "Deleted"
 
-#: ../src/mail/e-mail-free-form-exp.c:233
+#: ../src/mail/e-mail-free-form-exp.c:235
 msgctxt "ffe"
 msgid "Draft"
 msgstr "Draft"
 
-#: ../src/mail/e-mail-free-form-exp.c:234
+#: ../src/mail/e-mail-free-form-exp.c:236
 msgctxt "ffe"
 msgid "Flagged"
 msgstr "Flagged"
 
-#: ../src/mail/e-mail-free-form-exp.c:235
+#: ../src/mail/e-mail-free-form-exp.c:237
 msgctxt "ffe"
 msgid "Seen"
 msgstr "Seen"
 
-#: ../src/mail/e-mail-free-form-exp.c:236
+#: ../src/mail/e-mail-free-form-exp.c:238
 msgctxt "ffe"
 msgid "Attachment"
 msgstr "Attachment"
 
-#: ../src/mail/e-mail-free-form-exp.c:489
+#: ../src/mail/e-mail-free-form-exp.c:488
 msgctxt "ffe"
 msgid "no"
 msgstr "no"
 
+#: ../src/mail/e-mail-free-form-exp.c:489
+msgctxt "ffe"
+msgid "not"
+msgstr "not"
+
 #: ../src/mail/e-mail-free-form-exp.c:490
 msgctxt "ffe"
 msgid "false"
 msgstr "false"
 
-#: ../src/mail/e-mail-junk-options.c:296
+#: ../src/mail/e-mail-junk-options.c:289
 msgid "Junk filtering software:"
 msgstr "Junk filtering software:"
 
-#: ../src/mail/e-mail-label-dialog.c:222
+#: ../src/mail/e-mail-label-dialog.c:214
 msgid "_Label name:"
 msgstr "_Label name:"
 
@@ -17561,17 +17720,17 @@ msgstr "_To Do"
 msgid "_Later"
 msgstr "_Later"
 
-#: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:905
-#: ../src/mail/em-folder-properties.c:1141
+#: ../src/mail/e-mail-label-manager.c:153 ../src/mail/e-mail-reader.c:914
+#: ../src/mail/em-folder-properties.c:1170
 msgid "Add Label"
 msgstr "Add Label"
 
-#: ../src/mail/e-mail-label-manager.c:220
-#: ../src/mail/em-folder-properties.c:1168
+#: ../src/mail/e-mail-label-manager.c:204
+#: ../src/mail/em-folder-properties.c:1197
 msgid "Edit Label"
 msgstr "Edit Label"
 
-#: ../src/mail/e-mail-label-manager.c:352
+#: ../src/mail/e-mail-label-manager.c:336
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -17592,7 +17751,6 @@ msgid "Cannot find message in its folder summary"
 msgstr "Cannot find message in its folder summary"
 
 #: ../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"
 
@@ -17645,677 +17803,681 @@ msgstr "Headers"
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: ../src/mail/e-mail-reader.c:357 ../src/mail/filtertypes.xml.in.h:65
+#: ../src/mail/e-mail-reader.c:359 ../src/mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "Move to Folder"
 
-#: ../src/mail/e-mail-reader.c:357 ../src/mail/filtertypes.xml.in.h:66
+#: ../src/mail/e-mail-reader.c:359 ../src/mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "Copy to Folder"
 
-#: ../src/mail/e-mail-reader.c:361 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:363 ../src/mail/em-folder-utils.c:568
 #: ../src/mail/mail.error.xml.h:153
 msgid "_Move"
 msgstr "_Move"
 
-#: ../src/mail/e-mail-reader.c:361 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:363 ../src/mail/em-folder-utils.c:568
 msgid "C_opy"
 msgstr "C_opy"
 
-#: ../src/mail/e-mail-reader.c:609
+#: ../src/mail/e-mail-reader.c:618
 msgid "Deleting message note…"
 msgstr "Deleting message note…"
 
-#: ../src/mail/e-mail-reader.c:1609 ../src/mail/e-mail-reader.c:1900
-#: ../src/mail/e-mail-reader.c:1940
+#: ../src/mail/e-mail-reader.c:1618 ../src/mail/e-mail-reader.c:1910
+#: ../src/mail/e-mail-reader.c:1950
 msgid "_Do not ask me again."
 msgstr "_Do not ask me again."
 
-#: ../src/mail/e-mail-reader.c:1946
+#: ../src/mail/e-mail-reader.c:1956
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Always ignore Reply-To: for mailing lists."
 
-#: ../src/mail/e-mail-reader.c:2150
+#: ../src/mail/e-mail-reader.c:2160
 msgid "Failed to retrieve message:"
 msgstr "Failed to retrieve message:"
 
-#: ../src/mail/e-mail-reader.c:2196 ../src/mail/e-mail-reader.c:3686
+#: ../src/mail/e-mail-reader.c:2206 ../src/mail/e-mail-reader.c:3707
 #, c-format
 msgid "Retrieving message “%s”"
 msgstr "Retrieving message “%s”"
 
-#: ../src/mail/e-mail-reader.c:2397
+#: ../src/mail/e-mail-reader.c:2407
 msgid "A_dd Sender to Address Book"
 msgstr "A_dd Sender to Address Book"
 
-#: ../src/mail/e-mail-reader.c:2399
+#: ../src/mail/e-mail-reader.c:2409
 msgid "Add sender to address book"
 msgstr "Add sender to address book"
 
-#: ../src/mail/e-mail-reader.c:2404
+#: ../src/mail/e-mail-reader.c:2414
 msgid "_Archive…"
 msgstr "_Archive…"
 
-#: ../src/mail/e-mail-reader.c:2406
+#: ../src/mail/e-mail-reader.c:2416
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Move selected messages to the Archive folder for the account"
 
-#: ../src/mail/e-mail-reader.c:2411
+#: ../src/mail/e-mail-reader.c:2421
 msgid "Check for _Junk"
 msgstr "Check for _Junk"
 
-#: ../src/mail/e-mail-reader.c:2413
+#: ../src/mail/e-mail-reader.c:2423
 msgid "Filter the selected messages for junk status"
 msgstr "Filter the selected messages for junk status"
 
-#: ../src/mail/e-mail-reader.c:2418
+#: ../src/mail/e-mail-reader.c:2428
 msgid "Assign C_olor…"
 msgstr "Assign C_olour…"
 
-#: ../src/mail/e-mail-reader.c:2420
+#: ../src/mail/e-mail-reader.c:2430
 msgid "Assign color for the selected messages"
 msgstr "Assign colour for the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2425
+#: ../src/mail/e-mail-reader.c:2435
 msgid "Unse_t Color"
 msgstr "Unse_t Colour"
 
-#: ../src/mail/e-mail-reader.c:2427
+#: ../src/mail/e-mail-reader.c:2437
 msgid "Unset color for the selected messages"
 msgstr "Unset colour for the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2432
+#: ../src/mail/e-mail-reader.c:2442
 msgid "_Copy to Folder…"
 msgstr "_Copy to Folder…"
 
-#: ../src/mail/e-mail-reader.c:2434
+#: ../src/mail/e-mail-reader.c:2444
 msgid "Copy selected messages to another folder"
 msgstr "Copy selected messages to another folder"
 
-#: ../src/mail/e-mail-reader.c:2439
+#: ../src/mail/e-mail-reader.c:2449
 msgid "_Delete Message"
 msgstr "_Delete Message"
 
-#: ../src/mail/e-mail-reader.c:2441
+#: ../src/mail/e-mail-reader.c:2451
 msgid "Mark the selected messages for deletion"
 msgstr "Mark the selected messages for deletion"
 
-#: ../src/mail/e-mail-reader.c:2446
+#: ../src/mail/e-mail-reader.c:2456
 msgid "_Add note…"
 msgstr "_Add note…"
 
-#: ../src/mail/e-mail-reader.c:2448
+#: ../src/mail/e-mail-reader.c:2458
 msgid "Add a note for the selected message"
 msgstr "Add a note for the selected message"
 
-#: ../src/mail/e-mail-reader.c:2453
+#: ../src/mail/e-mail-reader.c:2463
 msgid "Delete no_te"
 msgstr "Delete no_te"
 
-#: ../src/mail/e-mail-reader.c:2455
+#: ../src/mail/e-mail-reader.c:2465
 msgid "Delete the note for the selected message"
 msgstr "Delete the note for the selected message"
 
-#: ../src/mail/e-mail-reader.c:2460
+#: ../src/mail/e-mail-reader.c:2470
 msgid "_Edit note…"
 msgstr "_Edit note…"
 
-#: ../src/mail/e-mail-reader.c:2462
+#: ../src/mail/e-mail-reader.c:2472
 msgid "Edit a note for the selected message"
 msgstr "Edit a note for the selected message"
 
-#: ../src/mail/e-mail-reader.c:2467
+#: ../src/mail/e-mail-reader.c:2477
 msgid "Create a Filter Rule for Mailing _List…"
 msgstr "Create a Filter Rule for Mailing _List…"
 
-#: ../src/mail/e-mail-reader.c:2469
+#: ../src/mail/e-mail-reader.c:2479
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Create a rule to filter messages to this mailing list"
 
-#: ../src/mail/e-mail-reader.c:2474
+#: ../src/mail/e-mail-reader.c:2484
 msgid "Create a Filter Rule for _Recipients…"
 msgstr "Create a Filter Rule for _Recipients…"
 
-#: ../src/mail/e-mail-reader.c:2476
+#: ../src/mail/e-mail-reader.c:2486
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Create a rule to filter messages to these recipients"
 
-#: ../src/mail/e-mail-reader.c:2481
+#: ../src/mail/e-mail-reader.c:2491
 msgid "Create a Filter Rule for Se_nder…"
 msgstr "Create a Filter Rule for Se_nder…"
 
-#: ../src/mail/e-mail-reader.c:2483
+#: ../src/mail/e-mail-reader.c:2493
 msgid "Create a rule to filter messages from this sender"
 msgstr "Create a rule to filter messages from this sender"
 
-#: ../src/mail/e-mail-reader.c:2488
+#: ../src/mail/e-mail-reader.c:2498
 msgid "Create a Filter Rule for _Subject…"
 msgstr "Create a Filter Rule for _Subject…"
 
-#: ../src/mail/e-mail-reader.c:2490
+#: ../src/mail/e-mail-reader.c:2500
 msgid "Create a rule to filter messages with this subject"
 msgstr "Create a rule to filter messages with this subject"
 
-#: ../src/mail/e-mail-reader.c:2495
+#: ../src/mail/e-mail-reader.c:2505
 msgid "A_pply Filters"
 msgstr "A_pply Filters"
 
-#: ../src/mail/e-mail-reader.c:2497
+#: ../src/mail/e-mail-reader.c:2507
 msgid "Apply filter rules to the selected messages"
 msgstr "Apply filter rules to the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2502
+#: ../src/mail/e-mail-reader.c:2512
 msgid "_Find in Message…"
 msgstr "_Find in Message…"
 
-#: ../src/mail/e-mail-reader.c:2504
+#: ../src/mail/e-mail-reader.c:2514
 msgid "Search for text in the body of the displayed message"
 msgstr "Search for text in the body of the displayed message"
 
-#: ../src/mail/e-mail-reader.c:2509
+#: ../src/mail/e-mail-reader.c:2519
 msgid "_Clear Flag"
 msgstr "_Clear Flag"
 
-#: ../src/mail/e-mail-reader.c:2511
+#: ../src/mail/e-mail-reader.c:2521
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Remove the follow-up flag from the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2516
+#: ../src/mail/e-mail-reader.c:2526
 msgid "_Flag Completed"
 msgstr "_Flag Completed"
 
-#: ../src/mail/e-mail-reader.c:2518
+#: ../src/mail/e-mail-reader.c:2528
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Set the follow-up flag to completed on the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2523
+#: ../src/mail/e-mail-reader.c:2533
 msgid "Follow _Up…"
 msgstr "Follow _Up…"
 
-#: ../src/mail/e-mail-reader.c:2525
+#: ../src/mail/e-mail-reader.c:2535
 msgid "Flag the selected messages for follow-up"
 msgstr "Flag the selected messages for follow-up"
 
-#: ../src/mail/e-mail-reader.c:2530
+#: ../src/mail/e-mail-reader.c:2540
 #: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "_Attached"
 
-#: ../src/mail/e-mail-reader.c:2532 ../src/mail/e-mail-reader.c:2539
+#: ../src/mail/e-mail-reader.c:2542 ../src/mail/e-mail-reader.c:2549
 #: ../src/modules/mail/e-mail-attachment-handler.c:433
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Forward the selected message to someone as an attachment"
 
-#: ../src/mail/e-mail-reader.c:2537
+#: ../src/mail/e-mail-reader.c:2547
 msgid "Forward As _Attached"
 msgstr "Forward As _Attached"
 
-#: ../src/mail/e-mail-reader.c:2544
+#: ../src/mail/e-mail-reader.c:2554
 #: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ../src/mail/e-mail-reader.c:2546 ../src/mail/e-mail-reader.c:2553
+#: ../src/mail/e-mail-reader.c:2556 ../src/mail/e-mail-reader.c:2563
 #: ../src/modules/mail/e-mail-attachment-handler.c:440
 msgid "Forward the selected message in the body of a new message"
 msgstr "Forward the selected message in the body of a new message"
 
-#: ../src/mail/e-mail-reader.c:2551
+#: ../src/mail/e-mail-reader.c:2561
 msgid "Forward As _Inline"
 msgstr "Forward As _Inline"
 
-#: ../src/mail/e-mail-reader.c:2558
+#: ../src/mail/e-mail-reader.c:2568
 #: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ../src/mail/e-mail-reader.c:2560 ../src/mail/e-mail-reader.c:2567
+#: ../src/mail/e-mail-reader.c:2570 ../src/mail/e-mail-reader.c:2577
 #: ../src/modules/mail/e-mail-attachment-handler.c:447
 msgid "Forward the selected message quoted like a reply"
 msgstr "Forward the selected message quoted like a reply"
 
-#: ../src/mail/e-mail-reader.c:2565
+#: ../src/mail/e-mail-reader.c:2575
 msgid "Forward As _Quoted"
 msgstr "Forward As _Quoted"
 
-#: ../src/mail/e-mail-reader.c:2572
+#: ../src/mail/e-mail-reader.c:2582
 msgid "_New Label"
 msgstr "_New Label"
 
 #. Translators: "None" is used in the message label context menu.
 #. *              It removes all labels from the selected messages.
-#: ../src/mail/e-mail-reader.c:2581
+#: ../src/mail/e-mail-reader.c:2591
 msgid "N_one"
 msgstr "N_one"
 
-#: ../src/mail/e-mail-reader.c:2588
+#: ../src/mail/e-mail-reader.c:2598
 msgid "_Load Images"
 msgstr "_Load Images"
 
-#: ../src/mail/e-mail-reader.c:2590
+#: ../src/mail/e-mail-reader.c:2600
 msgid "Force images in HTML mail to be loaded"
 msgstr "Force images in HTML mail to be loaded"
 
-#: ../src/mail/e-mail-reader.c:2595 ../src/mail/e-mail-reader.c:3014
+#: ../src/mail/e-mail-reader.c:2605 ../src/mail/e-mail-reader.c:3031
 msgid "_Ignore Subthread"
 msgstr "_Ignore Subthread"
 
-#: ../src/mail/e-mail-reader.c:2597
+#: ../src/mail/e-mail-reader.c:2607
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "Mark new mails in a subthread as read automatically"
 
-#: ../src/mail/e-mail-reader.c:2602 ../src/mail/e-mail-reader.c:3018
+#: ../src/mail/e-mail-reader.c:2612 ../src/mail/e-mail-reader.c:3035
 msgid "_Ignore Thread"
 msgstr "_Ignore Thread"
 
-#: ../src/mail/e-mail-reader.c:2604
+#: ../src/mail/e-mail-reader.c:2614
 msgid "Mark new mails in this thread as read automatically"
 msgstr "Mark new mails in this thread as read automatically"
 
-#: ../src/mail/e-mail-reader.c:2609
+#: ../src/mail/e-mail-reader.c:2619
 msgid "_Important"
 msgstr "_Important"
 
-#: ../src/mail/e-mail-reader.c:2611
+#: ../src/mail/e-mail-reader.c:2621
 msgid "Mark the selected messages as important"
 msgstr "Mark the selected messages as important"
 
-#: ../src/mail/e-mail-reader.c:2616
+#: ../src/mail/e-mail-reader.c:2626
 msgid "_Junk"
 msgstr "_Junk"
 
-#: ../src/mail/e-mail-reader.c:2618
+#: ../src/mail/e-mail-reader.c:2628
 msgid "Mark the selected messages as junk"
 msgstr "Mark the selected messages as junk"
 
-#: ../src/mail/e-mail-reader.c:2623
+#: ../src/mail/e-mail-reader.c:2633
 msgid "_Not Junk"
 msgstr "_Not Junk"
 
-#: ../src/mail/e-mail-reader.c:2625
+#: ../src/mail/e-mail-reader.c:2635
 msgid "Mark the selected messages as not being junk"
 msgstr "Mark the selected messages as not being junk"
 
-#: ../src/mail/e-mail-reader.c:2630
+#: ../src/mail/e-mail-reader.c:2640
 msgid "_Read"
 msgstr "_Read"
 
-#: ../src/mail/e-mail-reader.c:2632
+#: ../src/mail/e-mail-reader.c:2642
 msgid "Mark the selected messages as having been read"
 msgstr "Mark the selected messages as having been read"
 
-#: ../src/mail/e-mail-reader.c:2637 ../src/mail/e-mail-reader.c:3038
+#: ../src/mail/e-mail-reader.c:2647 ../src/mail/e-mail-reader.c:3055
 msgid "Do not _Ignore Subthread"
 msgstr "Do not _Ignore Subthread"
 
-#: ../src/mail/e-mail-reader.c:2639
+#: ../src/mail/e-mail-reader.c:2649
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "Do not mark new mails in a subthread as read automatically"
 
-#: ../src/mail/e-mail-reader.c:2644 ../src/mail/e-mail-reader.c:3042
+#: ../src/mail/e-mail-reader.c:2654 ../src/mail/e-mail-reader.c:3059
 msgid "Do not _Ignore Thread"
 msgstr "Do not _Ignore Thread"
 
-#: ../src/mail/e-mail-reader.c:2646
+#: ../src/mail/e-mail-reader.c:2656
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "Do not mark new mails in this thread as read automatically"
 
-#: ../src/mail/e-mail-reader.c:2651
+#: ../src/mail/e-mail-reader.c:2661
 msgid "Uni_mportant"
 msgstr "Uni_mportant"
 
-#: ../src/mail/e-mail-reader.c:2653
+#: ../src/mail/e-mail-reader.c:2663
 msgid "Mark the selected messages as unimportant"
 msgstr "Mark the selected messages as unimportant"
 
-#: ../src/mail/e-mail-reader.c:2658
+#: ../src/mail/e-mail-reader.c:2668
 msgid "_Unread"
 msgstr "_Unread"
 
-#: ../src/mail/e-mail-reader.c:2660
+#: ../src/mail/e-mail-reader.c:2670
 msgid "Mark the selected messages as not having been read"
 msgstr "Mark the selected messages as not having been read"
 
-#: ../src/mail/e-mail-reader.c:2665
+#: ../src/mail/e-mail-reader.c:2675
 #: ../src/modules/mail/e-mail-attachment-handler.c:417
 msgid "_Edit as New Message…"
 msgstr "_Edit as New Message…"
 
-#: ../src/mail/e-mail-reader.c:2667
+#: ../src/mail/e-mail-reader.c:2677
 #: ../src/modules/mail/e-mail-attachment-handler.c:419
 msgid "Open the selected messages in the composer for editing"
 msgstr "Open the selected messages in the composer for editing"
 
-#: ../src/mail/e-mail-reader.c:2672
+#: ../src/mail/e-mail-reader.c:2682
 msgid "Compose _New Message"
 msgstr "Compose _New Message"
 
-#: ../src/mail/e-mail-reader.c:2674
+#: ../src/mail/e-mail-reader.c:2684
 msgid "Open a window for composing a mail message"
 msgstr "Open a window for composing a mail message"
 
-#: ../src/mail/e-mail-reader.c:2679
+#: ../src/mail/e-mail-reader.c:2689
 msgid "_Open in New Window"
 msgstr "_Open in New Window"
 
-#: ../src/mail/e-mail-reader.c:2681
+#: ../src/mail/e-mail-reader.c:2691
 msgid "Open the selected messages in a new window"
 msgstr "Open the selected messages in a new window"
 
-#: ../src/mail/e-mail-reader.c:2686
+#: ../src/mail/e-mail-reader.c:2696
 msgid "_Move to Folder…"
 msgstr "_Move to Folder…"
 
-#: ../src/mail/e-mail-reader.c:2688
+#: ../src/mail/e-mail-reader.c:2698
 msgid "Move selected messages to another folder"
 msgstr "Move selected messages to another folder"
 
-#: ../src/mail/e-mail-reader.c:2693
+#: ../src/mail/e-mail-reader.c:2703
 msgid "_Next Message"
 msgstr "_Next Message"
 
-#: ../src/mail/e-mail-reader.c:2695
+#: ../src/mail/e-mail-reader.c:2705
 msgid "Display the next message"
 msgstr "Display the next message"
 
-#: ../src/mail/e-mail-reader.c:2700
+#: ../src/mail/e-mail-reader.c:2710
 msgid "Next _Important Message"
 msgstr "Next _Important Message"
 
-#: ../src/mail/e-mail-reader.c:2702
+#: ../src/mail/e-mail-reader.c:2712
 msgid "Display the next important message"
 msgstr "Display the next important message"
 
-#: ../src/mail/e-mail-reader.c:2707
+#: ../src/mail/e-mail-reader.c:2717
 msgid "Next _Thread"
 msgstr "Next _Thread"
 
-#: ../src/mail/e-mail-reader.c:2709
+#: ../src/mail/e-mail-reader.c:2719
 msgid "Display the next thread"
 msgstr "Display the next thread"
 
-#: ../src/mail/e-mail-reader.c:2714
+#: ../src/mail/e-mail-reader.c:2724
 msgid "Next _Unread Message"
 msgstr "Next _Unread Message"
 
-#: ../src/mail/e-mail-reader.c:2716
+#: ../src/mail/e-mail-reader.c:2726
 msgid "Display the next unread message"
 msgstr "Display the next unread message"
 
-#: ../src/mail/e-mail-reader.c:2721
+#: ../src/mail/e-mail-reader.c:2731
 msgid "_Previous Message"
 msgstr "_Previous Message"
 
-#: ../src/mail/e-mail-reader.c:2723
+#: ../src/mail/e-mail-reader.c:2733
 msgid "Display the previous message"
 msgstr "Display the previous message"
 
-#: ../src/mail/e-mail-reader.c:2728
+#: ../src/mail/e-mail-reader.c:2738
 msgid "Pr_evious Important Message"
 msgstr "Pr_evious Important Message"
 
-#: ../src/mail/e-mail-reader.c:2730
+#: ../src/mail/e-mail-reader.c:2740
 msgid "Display the previous important message"
 msgstr "Display the previous important message"
 
-#: ../src/mail/e-mail-reader.c:2735
+#: ../src/mail/e-mail-reader.c:2745
 msgid "Previous T_hread"
 msgstr "Previous T_hread"
 
-#: ../src/mail/e-mail-reader.c:2737
+#: ../src/mail/e-mail-reader.c:2747
 msgid "Display the previous thread"
 msgstr "Display the previous thread"
 
-#: ../src/mail/e-mail-reader.c:2742
+#: ../src/mail/e-mail-reader.c:2752
 msgid "P_revious Unread Message"
 msgstr "P_revious Unread Message"
 
-#: ../src/mail/e-mail-reader.c:2744
+#: ../src/mail/e-mail-reader.c:2754
 msgid "Display the previous unread message"
 msgstr "Display the previous unread message"
 
-#: ../src/mail/e-mail-reader.c:2751
+#: ../src/mail/e-mail-reader.c:2761
 msgid "Print this message"
 msgstr "Print this message"
 
-#: ../src/mail/e-mail-reader.c:2758
+#: ../src/mail/e-mail-reader.c:2768
 msgid "Preview the message to be printed"
 msgstr "Preview the message to be printed"
 
-#: ../src/mail/e-mail-reader.c:2763
+#: ../src/mail/e-mail-reader.c:2773
 #: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "Re_direct"
 
-#: ../src/mail/e-mail-reader.c:2765
+#: ../src/mail/e-mail-reader.c:2775
 #: ../src/modules/mail/e-mail-attachment-handler.c:454
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirect (bounce) the selected message to someone"
 
-#: ../src/mail/e-mail-reader.c:2770
+#: ../src/mail/e-mail-reader.c:2780
 msgid "Remo_ve Attachments"
 msgstr "Remo_ve Attachments"
 
-#: ../src/mail/e-mail-reader.c:2772
+#: ../src/mail/e-mail-reader.c:2782
 msgid "Remove attachments"
 msgstr "Remove attachments"
 
-#: ../src/mail/e-mail-reader.c:2777
+#: ../src/mail/e-mail-reader.c:2787
 msgid "Remove Du_plicate Messages"
 msgstr "Remove Du_plicate Messages"
 
-#: ../src/mail/e-mail-reader.c:2779
+#: ../src/mail/e-mail-reader.c:2789
 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:4102
+#: ../src/mail/e-mail-reader.c:2794 ../src/mail/em-composer-utils.c:4083
 #: ../src/mail/mail.error.xml.h:28
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1550
 #: ../src/modules/mail/e-mail-attachment-handler.c:396
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: ../src/mail/e-mail-reader.c:2786
+#: ../src/mail/e-mail-reader.c:2796
 #: ../src/modules/mail/e-mail-attachment-handler.c:398
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Compose a reply to all the recipients of the selected message"
 
-#: ../src/mail/e-mail-reader.c:2791
+#: ../src/mail/e-mail-reader.c:2801
 msgid "Al_ternative Reply…"
 msgstr "Al_ternative Reply…"
 
-#: ../src/mail/e-mail-reader.c:2793
+#: ../src/mail/e-mail-reader.c:2803
 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:4097
+#: ../src/mail/e-mail-reader.c:2808 ../src/mail/em-composer-utils.c:4078
 #: ../src/mail/mail.error.xml.h:26
 #: ../src/modules/mail/e-mail-attachment-handler.c:403
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: ../src/mail/e-mail-reader.c:2800
+#: ../src/mail/e-mail-reader.c:2810
 #: ../src/modules/mail/e-mail-attachment-handler.c:405
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Compose a reply to the mailing list of the selected message"
 
-#: ../src/mail/e-mail-reader.c:2805
+#: ../src/mail/e-mail-reader.c:2815
 #: ../src/modules/mail/e-mail-attachment-handler.c:410
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: ../src/mail/e-mail-reader.c:2807
+#: ../src/mail/e-mail-reader.c:2817
 #: ../src/modules/mail/e-mail-attachment-handler.c:412
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Compose a reply to the sender of the selected message"
 
-#: ../src/mail/e-mail-reader.c:2812
+#: ../src/mail/e-mail-reader.c:2822
+msgid "Repl_y with Template"
+msgstr "Repl_y with Template"
+
+#: ../src/mail/e-mail-reader.c:2829
 msgid "_Save as mbox…"
 msgstr "_Save as mbox…"
 
-#: ../src/mail/e-mail-reader.c:2814
+#: ../src/mail/e-mail-reader.c:2831
 msgid "Save selected messages as an mbox file"
 msgstr "Save selected messages as an mbox file"
 
-#: ../src/mail/e-mail-reader.c:2826
+#: ../src/mail/e-mail-reader.c:2843
 msgid "_Message Source"
 msgstr "_Message Source"
 
-#: ../src/mail/e-mail-reader.c:2828
+#: ../src/mail/e-mail-reader.c:2845
 msgid "Show the raw email source of the message"
 msgstr "Show the raw e-mail source of the message"
 
-#: ../src/mail/e-mail-reader.c:2840
+#: ../src/mail/e-mail-reader.c:2857
 msgid "_Undelete Message"
 msgstr "_Undelete Message"
 
-#: ../src/mail/e-mail-reader.c:2842
+#: ../src/mail/e-mail-reader.c:2859
 msgid "Undelete the selected messages"
 msgstr "Undelete the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2847
+#: ../src/mail/e-mail-reader.c:2864
 msgid "_Normal Size"
 msgstr "_Normal Size"
 
-#: ../src/mail/e-mail-reader.c:2849
+#: ../src/mail/e-mail-reader.c:2866
 msgid "Reset the text to its original size"
 msgstr "Reset the text to its original size"
 
-#: ../src/mail/e-mail-reader.c:2854
+#: ../src/mail/e-mail-reader.c:2871
 msgid "_Zoom In"
 msgstr "_Zoom In"
 
-#: ../src/mail/e-mail-reader.c:2856
+#: ../src/mail/e-mail-reader.c:2873
 msgid "Increase the text size"
 msgstr "Increase the text size"
 
-#: ../src/mail/e-mail-reader.c:2863
+#: ../src/mail/e-mail-reader.c:2880
 msgid "Decrease the text size"
 msgstr "Decrease the text size"
 
-#: ../src/mail/e-mail-reader.c:2870
+#: ../src/mail/e-mail-reader.c:2887
 msgid "Cre_ate"
 msgstr "Cre_ate"
 
-#: ../src/mail/e-mail-reader.c:2877
+#: ../src/mail/e-mail-reader.c:2894
 msgid "Ch_aracter Encoding"
 msgstr "Ch_aracter Encoding"
 
-#: ../src/mail/e-mail-reader.c:2884
+#: ../src/mail/e-mail-reader.c:2901
 #: ../src/modules/mail/e-mail-attachment-handler.c:424
 msgid "F_orward As"
 msgstr "F_orward As"
 
-#: ../src/mail/e-mail-reader.c:2891
+#: ../src/mail/e-mail-reader.c:2908
 msgid "_Label"
 msgstr "_Label"
 
-#: ../src/mail/e-mail-reader.c:2898
+#: ../src/mail/e-mail-reader.c:2915
 msgid "_Group Reply"
 msgstr "_Group Reply"
 
-#: ../src/mail/e-mail-reader.c:2905
+#: ../src/mail/e-mail-reader.c:2922
 msgid "_Go To"
 msgstr "_Go To"
 
-#: ../src/mail/e-mail-reader.c:2912
+#: ../src/mail/e-mail-reader.c:2929
 msgid "Mar_k As"
 msgstr "Mar_k As"
 
-#: ../src/mail/e-mail-reader.c:2919
+#: ../src/mail/e-mail-reader.c:2936
 msgid "_Message"
 msgstr "_Message"
 
-#: ../src/mail/e-mail-reader.c:2926
+#: ../src/mail/e-mail-reader.c:2943
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../src/mail/e-mail-reader.c:2936
+#: ../src/mail/e-mail-reader.c:2953
 msgid "Create a Search Folder from Mailing _List…"
 msgstr "Create a Search Folder from Mailing _List…"
 
-#: ../src/mail/e-mail-reader.c:2938
+#: ../src/mail/e-mail-reader.c:2955
 msgid "Create a search folder for this mailing list"
 msgstr "Create a search folder for this mailing list"
 
-#: ../src/mail/e-mail-reader.c:2943
+#: ../src/mail/e-mail-reader.c:2960
 msgid "Create a Search Folder from Recipien_ts…"
 msgstr "Create a Search Folder from Recipien_ts…"
 
-#: ../src/mail/e-mail-reader.c:2945
+#: ../src/mail/e-mail-reader.c:2962
 msgid "Create a search folder for these recipients"
 msgstr "Create a search folder for these recipients"
 
-#: ../src/mail/e-mail-reader.c:2950
+#: ../src/mail/e-mail-reader.c:2967
 msgid "Create a Search Folder from Sen_der…"
 msgstr "Create a Search Folder from Sen_der…"
 
-#: ../src/mail/e-mail-reader.c:2952
+#: ../src/mail/e-mail-reader.c:2969
 msgid "Create a search folder for this sender"
 msgstr "Create a search folder for this sender"
 
-#: ../src/mail/e-mail-reader.c:2957
+#: ../src/mail/e-mail-reader.c:2974
 msgid "Create a Search Folder from S_ubject…"
 msgstr "Create a Search Folder from S_ubject…"
 
-#: ../src/mail/e-mail-reader.c:2959
+#: ../src/mail/e-mail-reader.c:2976
 msgid "Create a search folder for this subject"
 msgstr "Create a search folder for this subject"
 
-#: ../src/mail/e-mail-reader.c:3006
+#: ../src/mail/e-mail-reader.c:3023
 msgid "Mark for Follo_w Up…"
 msgstr "Mark for Follo_w Up…"
 
-#: ../src/mail/e-mail-reader.c:3022
+#: ../src/mail/e-mail-reader.c:3039
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: ../src/mail/e-mail-reader.c:3026
+#: ../src/mail/e-mail-reader.c:3043
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: ../src/mail/e-mail-reader.c:3030
+#: ../src/mail/e-mail-reader.c:3047
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: ../src/mail/e-mail-reader.c:3034
+#: ../src/mail/e-mail-reader.c:3051
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: ../src/mail/e-mail-reader.c:3046
+#: ../src/mail/e-mail-reader.c:3063
 msgid "Mark as Uni_mportant"
 msgstr "Mark as Uni_mportant"
 
-#: ../src/mail/e-mail-reader.c:3050
+#: ../src/mail/e-mail-reader.c:3067
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: ../src/mail/e-mail-reader.c:3098
+#: ../src/mail/e-mail-reader.c:3119
 msgid "_Caret Mode"
 msgstr "_Caret Mode"
 
-#: ../src/mail/e-mail-reader.c:3100
+#: ../src/mail/e-mail-reader.c:3121
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Show a blinking cursor in the body of displayed messages"
 
-#: ../src/mail/e-mail-reader.c:3106
+#: ../src/mail/e-mail-reader.c:3127
 msgid "All Message _Headers"
 msgstr "All Message _Headers"
 
-#: ../src/mail/e-mail-reader.c:3108
+#: ../src/mail/e-mail-reader.c:3129
 msgid "Show messages with all email headers"
 msgstr "Show messages with all e-mail headers"
 
-#: ../src/mail/e-mail-reader.c:3692
+#: ../src/mail/e-mail-reader.c:3713
 msgid "Retrieving message"
 msgstr "Retrieving message"
 
-#: ../src/mail/e-mail-reader.c:5062
+#: ../src/mail/e-mail-reader.c:5083
 #: ../src/modules/mail/e-mail-attachment-handler.c:389
 msgid "_Forward"
 msgstr "_Forward"
 
-#: ../src/mail/e-mail-reader.c:5063
+#: ../src/mail/e-mail-reader.c:5084
 #: ../src/modules/mail/e-mail-attachment-handler.c:391
 msgid "Forward the selected message to someone"
 msgstr "Forward the selected message to someone"
@@ -18324,29 +18486,29 @@ msgstr "Forward the selected message to someone"
 #. * (if possible and if that configuration option is enabled), or else
 #. * it will reply to all. The word "Group" was chosen because it covers
 #. * either of those, without too strongly implying one or the other.
-#: ../src/mail/e-mail-reader.c:5082
+#: ../src/mail/e-mail-reader.c:5103
 msgid "Group Reply"
 msgstr "Group Reply"
 
-#: ../src/mail/e-mail-reader.c:5083
+#: ../src/mail/e-mail-reader.c:5104
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Reply to the mailing list, or to all recipients"
 
-#: ../src/mail/e-mail-reader.c:5149 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:5170 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Delete"
 
-#: ../src/mail/e-mail-reader.c:5161
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1249
+#: ../src/mail/e-mail-reader.c:5182
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1298
 msgid "Next"
 msgstr "Next"
 
-#: ../src/mail/e-mail-reader.c:5165
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1242
+#: ../src/mail/e-mail-reader.c:5186
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "Previous"
 msgstr "Previous"
 
-#: ../src/mail/e-mail-reader.c:5174 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:5195 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Reply"
 
@@ -18401,7 +18563,7 @@ msgstr[1] ""
 "Folder “%s” contains %u duplicate messages. Are you sure you want to delete "
 "them?"
 
-#: ../src/mail/e-mail-reader-utils.c:3023
+#: ../src/mail/e-mail-reader-utils.c:2989
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Save Message"
@@ -18412,13 +18574,13 @@ msgstr[1] "Save Messages"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../src/mail/e-mail-reader-utils.c:3044
+#: ../src/mail/e-mail-reader-utils.c:3010
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Message"
 msgstr[1] "Messages"
 
-#: ../src/mail/e-mail-reader-utils.c:3458
+#: ../src/mail/e-mail-reader-utils.c:3424
 msgid "Parsing message"
 msgstr "Parsing message"
 
@@ -18453,7 +18615,7 @@ msgstr ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
 
-#: ../src/mail/e-mail-request.c:288
+#: ../src/mail/e-mail-request.c:289
 msgid "The message has no text content."
 msgstr "The message has no text content."
 
@@ -18469,16 +18631,16 @@ msgstr "Cl_ear"
 msgid "No Title"
 msgstr "No Title"
 
-#: ../src/mail/e-mail-ui-session.c:820
-#, c-format
-msgid "%s authentication failed"
-msgstr "%s authentication failed"
-
-#: ../src/mail/e-mail-ui-session.c:870
+#: ../src/mail/e-mail-ui-session.c:857 ../src/mail/e-mail-ui-session.c:929
 #, c-format
 msgid "No data source found for UID “%s”"
 msgstr "No data source found for UID “%s”"
 
+#: ../src/mail/e-mail-ui-session.c:879
+#, c-format
+msgid "%s authentication failed"
+msgstr "%s authentication failed"
+
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
 #: ../src/mail/em-composer-utils.c:395
 #, c-format
@@ -18520,7 +18682,7 @@ msgstr[1] ""
 
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
-#: ../src/mail/em-composer-utils.c:829
+#: ../src/mail/em-composer-utils.c:830
 msgid "Waiting for attachments to load…"
 msgstr "Waiting for attachments to load…"
 
@@ -18528,7 +18690,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:2032
+#: ../src/mail/em-composer-utils.c:2005
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -18536,79 +18698,79 @@ msgstr ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
-#: ../src/mail/em-composer-utils.c:2038
+#: ../src/mail/em-composer-utils.c:2011
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: ../src/mail/em-composer-utils.c:2043
+#: ../src/mail/em-composer-utils.c:2016
 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:2804
+#: ../src/mail/em-composer-utils.c:2777
 #, c-format
 msgctxt "reply-attribution"
 msgid "Re: %s"
 msgstr "Re: %s"
 
-#: ../src/mail/em-composer-utils.c:3422
+#: ../src/mail/em-composer-utils.c:3395
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
-#: ../src/mail/em-composer-utils.c:4048
+#: ../src/mail/em-composer-utils.c:4029
 msgid "Alternative Reply"
 msgstr "Alternative Reply"
 
-#: ../src/mail/em-composer-utils.c:4051
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1445
+#: ../src/mail/em-composer-utils.c:4032
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1543
 msgid "_Reply"
 msgstr "_Reply"
 
-#: ../src/mail/em-composer-utils.c:4064
+#: ../src/mail/em-composer-utils.c:4045
 msgid "Recipients:"
 msgstr "Recipients:"
 
-#: ../src/mail/em-composer-utils.c:4092
+#: ../src/mail/em-composer-utils.c:4073
 msgid "Reply to _Sender"
 msgstr "Reply to _Sender"
 
-#: ../src/mail/em-composer-utils.c:4114
+#: ../src/mail/em-composer-utils.c:4095
 msgid "Reply style:"
 msgstr "Reply style:"
 
-#: ../src/mail/em-composer-utils.c:4122
+#: ../src/mail/em-composer-utils.c:4103
 msgid "_Default"
 msgstr "_Default"
 
-#: ../src/mail/em-composer-utils.c:4126
+#: ../src/mail/em-composer-utils.c:4107
 msgid "Attach_ment"
 msgstr "Attach_ment"
 
-#: ../src/mail/em-composer-utils.c:4130
+#: ../src/mail/em-composer-utils.c:4111
 msgid "Inline (_Outlook style)"
 msgstr "Inline (_Outlook style)"
 
-#: ../src/mail/em-composer-utils.c:4134
+#: ../src/mail/em-composer-utils.c:4115
 msgid "_Quote"
 msgstr "_Quote"
 
-#: ../src/mail/em-composer-utils.c:4138
+#: ../src/mail/em-composer-utils.c:4119
 msgid "Do _Not Quote"
 msgstr "Do _Not Quote"
 
-#: ../src/mail/em-composer-utils.c:4145
+#: ../src/mail/em-composer-utils.c:4126
 msgid "_Format message in HTML"
 msgstr "_Format message in HTML"
 
-#: ../src/mail/em-composer-utils.c:4158
+#: ../src/mail/em-composer-utils.c:4139
 msgid "Apply t_emplate"
 msgstr "Apply t_emplate"
 
-#: ../src/mail/em-composer-utils.c:4170
+#: ../src/mail/em-composer-utils.c:4151
 msgid "Preserve original message S_ubject"
 msgstr "Preserve original message S_ubject"
 
-#: ../src/mail/em-composer-utils.c:4236
+#: ../src/mail/em-composer-utils.c:4217
 #, c-format
 msgid "one recipient"
 msgid_plural "%d recipients"
@@ -18616,11 +18778,11 @@ msgstr[0] "one recipient"
 msgstr[1] "%d recipients"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:4669
+#: ../src/mail/em-composer-utils.c:4658
 msgid "Posting destination"
 msgstr "Posting destination"
 
-#: ../src/mail/em-composer-utils.c:4674
+#: ../src/mail/em-composer-utils.c:4663
 msgid "Choose folders to post the message to."
 msgstr "Choose folders to post the message to."
 
@@ -18660,7 +18822,7 @@ msgid "If any of the following conditions are met"
 msgstr "If any of the following conditions are met"
 
 #. and now for the action area
-#: ../src/mail/em-filter-editor.c:203 ../src/mail/em-filter-rule.c:1067
+#: ../src/mail/em-filter-editor.c:203 ../src/mail/em-filter-rule.c:1006
 msgid "Then"
 msgstr "Then"
 
@@ -18668,25 +18830,25 @@ msgstr "Then"
 msgid "De_scribe Filters…"
 msgstr "De_scribe Filters…"
 
-#: ../src/mail/em-filter-editor-folder-element.c:154
+#: ../src/mail/em-filter-editor-folder-element.c:151
 msgid "Select Folder"
 msgstr "Select Folder"
 
 #. Translators: This is in a Mail filter rule editor, part of "For account: [ Any   ]" section
-#: ../src/mail/em-filter-rule.c:940
+#: ../src/mail/em-filter-rule.c:879
 msgctxt "mail-filter-rule"
 msgid "Any"
 msgstr "Any"
 
-#: ../src/mail/em-filter-rule.c:1037
+#: ../src/mail/em-filter-rule.c:976
 msgid "Rul_e type:"
 msgstr "Rul_e type:"
 
-#: ../src/mail/em-filter-rule.c:1055
+#: ../src/mail/em-filter-rule.c:994
 msgid "_For Account:"
 msgstr "_For Account:"
 
-#: ../src/mail/em-filter-rule.c:1140
+#: ../src/mail/em-filter-rule.c:1079
 msgid "Add Ac_tion"
 msgstr "Add Ac_tion"
 
@@ -18702,110 +18864,114 @@ msgstr "_Use custom icon"
 msgid "Use te_xt color"
 msgstr "Use te_xt colour"
 
-#: ../src/mail/em-folder-properties.c:494
+#: ../src/mail/em-folder-properties.c:517
+msgid "Path:"
+msgstr "Path:"
+
+#: ../src/mail/em-folder-properties.c:526
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Unread messages:"
 msgstr[1] "Unread messages:"
 
-#: ../src/mail/em-folder-properties.c:505
+#: ../src/mail/em-folder-properties.c:537
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total messages:"
 msgstr[1] "Total messages:"
 
-#: ../src/mail/em-folder-properties.c:526
+#: ../src/mail/em-folder-properties.c:558
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Quota usage (%s):"
 
-#: ../src/mail/em-folder-properties.c:528
+#: ../src/mail/em-folder-properties.c:560
 #, c-format
 msgid "Quota usage"
 msgstr "Quota usage"
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../src/mail/em-folder-properties.c:672
+#: ../src/mail/em-folder-properties.c:701
 msgid "_Send Account Override:"
 msgstr "_Send Account Override:"
 
-#: ../src/mail/em-folder-properties.c:912
+#: ../src/mail/em-folder-properties.c:941
 msgid "Archive this folder using these settings:"
 msgstr "Archive this folder using these settings:"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:924
+#: ../src/mail/em-folder-properties.c:953
 msgctxt "autoarchive"
 msgid "Auto-_cleanup messages older than"
 msgstr "Auto-_cleanup messages older than"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:937
+#: ../src/mail/em-folder-properties.c:966
 msgctxt "autoarchive"
 msgid "days"
 msgstr "days"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:939
+#: ../src/mail/em-folder-properties.c:968
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "weeks"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:941
+#: ../src/mail/em-folder-properties.c:970
 msgctxt "autoarchive"
 msgid "months"
 msgstr "months"
 
-#: ../src/mail/em-folder-properties.c:947
+#: ../src/mail/em-folder-properties.c:976
 msgid "Move messages to the default archive _folder"
 msgstr "Move messages to the default archive _folder"
 
-#: ../src/mail/em-folder-properties.c:954
+#: ../src/mail/em-folder-properties.c:983
 msgid "_Move messages to:"
 msgstr "_Move messages to:"
 
-#: ../src/mail/em-folder-properties.c:958
+#: ../src/mail/em-folder-properties.c:987
 msgid "Archive folder"
 msgstr "Archive folder"
 
-#: ../src/mail/em-folder-properties.c:958
+#: ../src/mail/em-folder-properties.c:987
 msgid "Select folder to use for Archive"
 msgstr "Select folder to use for Archive"
 
-#: ../src/mail/em-folder-properties.c:962
+#: ../src/mail/em-folder-properties.c:991
 msgid "_Delete messages"
 msgstr "_Delete messages"
 
-#: ../src/mail/em-folder-properties.c:1317
+#: ../src/mail/em-folder-properties.c:1346
 msgid "Server Tag"
 msgstr "Server Tag"
 
-#: ../src/mail/em-folder-properties.c:1321 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/em-folder-properties.c:1350 ../src/mail/filtertypes.xml.in.h:29
 #: ../src/mail/searchtypes.xml.in.h:31 ../src/mail/vfoldertypes.xml.in.h:31
 msgid "Label"
 msgstr "Label"
 
-#: ../src/mail/em-folder-properties.c:1370
+#: ../src/mail/em-folder-properties.c:1399
 msgid "Appearance"
 msgstr "Appearance"
 
 #. Translators: "Archive" is a noun (This is a tab heading in the mail folder properties)
-#: ../src/mail/em-folder-properties.c:1374
+#: ../src/mail/em-folder-properties.c:1403
 msgid "Archive"
 msgstr "Archive"
 
-#: ../src/mail/em-folder-properties.c:1377 ../src/mail/mail-config.ui.h:126
+#: ../src/mail/em-folder-properties.c:1406 ../src/mail/mail-config.ui.h:126
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Labels"
 
-#: ../src/mail/em-folder-properties.c:1455
+#: ../src/mail/em-folder-properties.c:1484
 msgid "Folder Properties"
 msgstr "Folder Properties"
 
-#: ../src/mail/em-folder-properties.c:1694
+#: ../src/mail/em-folder-properties.c:1723
 msgid "Gathering folder properties"
 msgstr "Gathering folder properties"
 
@@ -18817,7 +18983,7 @@ msgstr "<click here to select a folder>"
 msgid "Create a new folder"
 msgstr "Create a new folder"
 
-#: ../src/mail/em-folder-tree.c:684
+#: ../src/mail/em-folder-tree.c:685
 msgid "Folder names cannot contain “/”"
 msgstr "Folder names cannot contain “/”"
 
@@ -18839,37 +19005,37 @@ msgstr "Folder names cannot contain “/”"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../src/mail/em-folder-tree.c:878
+#: ../src/mail/em-folder-tree.c:887
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../src/mail/em-folder-tree.c:1740
+#: ../src/mail/em-folder-tree.c:1822
 msgid "Mail Folder Tree"
 msgstr "Mail Folder Tree"
 
-#: ../src/mail/em-folder-tree.c:2289
+#: ../src/mail/em-folder-tree.c:2371
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: ../src/mail/em-folder-tree.c:2292
+#: ../src/mail/em-folder-tree.c:2374
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: ../src/mail/em-folder-tree.c:2299 ../src/mail/message-list.c:2632
+#: ../src/mail/em-folder-tree.c:2381 ../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:2303 ../src/mail/message-list.c:2634
+#: ../src/mail/em-folder-tree.c:2385 ../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:2322
+#: ../src/mail/em-folder-tree.c:2404
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
@@ -18880,6 +19046,17 @@ msgstr "Cannot drop message(s) into toplevel store"
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
+#: ../src/mail/em-folder-tree-model.c:1534
+#: ../src/mail/importers/kmail-libs.c:149
+#: ../src/modules/mail/e-mail-shell-view-private.c:1032
+msgid "Trash"
+msgstr "Wastebasket"
+
+#: ../src/mail/em-folder-tree-model.c:1535 ../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"
+
 #: ../src/mail/em-folder-utils.c:111
 #, c-format
 msgid "Moving folder “%s”"
@@ -18921,8 +19098,8 @@ msgid "Subscribe To _All"
 msgstr "Subscribe To _All"
 
 #: ../src/mail/em-subscription-editor.c:936
-#: ../src/mail/em-subscription-editor.c:1890 ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1706
+#: ../src/mail/em-subscription-editor.c:1883 ../src/mail/mail.error.xml.h:73
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1700
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
@@ -18935,9 +19112,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:912
-#: ../src/modules/mail/e-mail-shell-view-private.c:944
-#: ../src/modules/mail/e-mail-shell-view-private.c:988
+#: ../src/modules/mail/e-mail-shell-view-private.c:925
+#: ../src/modules/mail/e-mail-shell-view-private.c:957
+#: ../src/modules/mail/e-mail-shell-view-private.c:1001
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -18945,67 +19122,67 @@ msgstr[0] "%d unread, "
 msgstr[1] "%d unread, "
 
 #: ../src/mail/em-subscription-editor.c:1319
-#: ../src/modules/mail/e-mail-shell-view-private.c:998
+#: ../src/modules/mail/e-mail-shell-view-private.c:1011
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: ../src/mail/em-subscription-editor.c:1731
+#: ../src/mail/em-subscription-editor.c:1724
 msgid "Folder Subscriptions"
 msgstr "Folder Subscriptions"
 
-#: ../src/mail/em-subscription-editor.c:1766
+#: ../src/mail/em-subscription-editor.c:1759
 msgid "_Account:"
 msgstr "_Account:"
 
-#: ../src/mail/em-subscription-editor.c:1779
+#: ../src/mail/em-subscription-editor.c:1772
 msgid "Clear Search"
 msgstr "Clear Search"
 
-#: ../src/mail/em-subscription-editor.c:1796
+#: ../src/mail/em-subscription-editor.c:1789
 msgid "Sho_w items that contain:"
 msgstr "Sho_w items that contain:"
 
-#: ../src/mail/em-subscription-editor.c:1843
+#: ../src/mail/em-subscription-editor.c:1836
 msgid "Subscribe to the selected folder"
 msgstr "Subscribe to the selected folder"
 
-#: ../src/mail/em-subscription-editor.c:1844
+#: ../src/mail/em-subscription-editor.c:1837
 msgid "Su_bscribe"
 msgstr "Su_bscribe"
 
-#: ../src/mail/em-subscription-editor.c:1889
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1708
+#: ../src/mail/em-subscription-editor.c:1882
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1702
 msgid "Unsubscribe from the selected folder"
 msgstr "Unsubscribe from the selected folder"
 
-#: ../src/mail/em-subscription-editor.c:1929
+#: ../src/mail/em-subscription-editor.c:1922
 msgid "Collapse all folders"
 msgstr "Collapse all folders"
 
-#: ../src/mail/em-subscription-editor.c:1930
+#: ../src/mail/em-subscription-editor.c:1923
 msgid "C_ollapse All"
 msgstr "C_ollapse All"
 
-#: ../src/mail/em-subscription-editor.c:1940
+#: ../src/mail/em-subscription-editor.c:1933
 msgid "Expand all folders"
 msgstr "Expand all folders"
 
-#: ../src/mail/em-subscription-editor.c:1941
+#: ../src/mail/em-subscription-editor.c:1934
 msgid "E_xpand All"
 msgstr "E_xpand All"
 
-#: ../src/mail/em-subscription-editor.c:1951
+#: ../src/mail/em-subscription-editor.c:1944
 msgid "Refresh the folder list"
 msgstr "Refresh the folder list"
 
-#: ../src/mail/em-subscription-editor.c:1963
+#: ../src/mail/em-subscription-editor.c:1956
 msgid "Stop the current operation"
 msgstr "Stop the current operation"
 
-#: ../src/mail/em-subscription-editor.c:1964
+#: ../src/mail/em-subscription-editor.c:1957
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "_Stop"
 msgstr "_Stop"
@@ -19025,24 +19202,24 @@ msgstr[1] "Are you sure you want to open %d messages at once?"
 msgid "Message Filters"
 msgstr "Message Filters"
 
-#: ../src/mail/em-utils.c:1014
+#: ../src/mail/em-utils.c:1022
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
 
 #. Translators: This is a reply attribution in the message reply subject. Both 'Re'-s in the 
'reply-attribution' translation context should translate into the same string.
-#: ../src/mail/em-utils.c:1575
+#: ../src/mail/em-utils.c:1583
 msgctxt "reply-attribution"
 msgid "Re"
 msgstr "Re"
 
 #. Translators: This is a reply attribution separator in the message reply subject. This should match the 
':' in 'Re: %s' in the 'reply-attribution' translation context.
-#: ../src/mail/em-utils.c:1578
+#: ../src/mail/em-utils.c:1586
 msgctxt "reply-attribution"
 msgid ":"
 msgstr ":"
 
-#: ../src/mail/em-utils.c:1878
+#: ../src/mail/em-utils.c:1886
 msgid "Deleting old messages"
 msgstr "Deleting old messages"
 
@@ -19050,35 +19227,35 @@ msgstr "Deleting old messages"
 msgid "Search _Folders"
 msgstr "Search _Folders"
 
-#: ../src/mail/em-vfolder-editor-rule.c:404
+#: ../src/mail/em-vfolder-editor-rule.c:401
 msgid "Add Folder"
 msgstr "Add Folder"
 
-#: ../src/mail/em-vfolder-editor-rule.c:533
+#: ../src/mail/em-vfolder-editor-rule.c:530
 msgid "Search Folder Sources"
 msgstr "Search Folder Sources"
 
-#: ../src/mail/em-vfolder-editor-rule.c:565
+#: ../src/mail/em-vfolder-editor-rule.c:562
 msgid "Automatically update on any _source folder change"
 msgstr "Automatically update on any _source folder change"
 
-#: ../src/mail/em-vfolder-editor-rule.c:577
+#: ../src/mail/em-vfolder-editor-rule.c:574
 msgid "All local folders"
 msgstr "All local folders"
 
-#: ../src/mail/em-vfolder-editor-rule.c:578
+#: ../src/mail/em-vfolder-editor-rule.c:575
 msgid "All active remote folders"
 msgstr "All active remote folders"
 
-#: ../src/mail/em-vfolder-editor-rule.c:579
+#: ../src/mail/em-vfolder-editor-rule.c:576
 msgid "All local and active remote folders"
 msgstr "All local and active remote folders"
 
-#: ../src/mail/em-vfolder-editor-rule.c:580
+#: ../src/mail/em-vfolder-editor-rule.c:577
 msgid "Specific folders"
 msgstr "Specific folders"
 
-#: ../src/mail/em-vfolder-editor-rule.c:618
+#: ../src/mail/em-vfolder-editor-rule.c:615
 msgid "include subfolders"
 msgstr "include subfolders"
 
@@ -19167,11 +19344,6 @@ msgstr "does not exist"
 msgid "Message Body"
 msgstr "Message Body"
 
-#: ../src/mail/filtertypes.xml.in.h:23 ../src/mail/searchtypes.xml.in.h:25
-#: ../src/mail/vfoldertypes.xml.in.h:25
-msgid "Expression"
-msgstr "Expression"
-
 #: ../src/mail/filtertypes.xml.in.h:24 ../src/mail/searchtypes.xml.in.h:26
 #: ../src/mail/vfoldertypes.xml.in.h:26
 msgid "Free Form Expression"
@@ -19233,11 +19405,6 @@ msgstr "Important"
 msgid "Read"
 msgstr "Read"
 
-#: ../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"
-
 #: ../src/mail/filtertypes.xml.in.h:42 ../src/mail/searchtypes.xml.in.h:44
 #: ../src/mail/vfoldertypes.xml.in.h:45
 msgid "Follow Up"
@@ -19389,20 +19556,20 @@ msgid "Import mail from Elm."
 msgstr "Import mail from Elm."
 
 #: ../src/mail/importers/evolution-mbox-importer.c:135
-#: ../src/mail/importers/kmail-importer.c:208
+#: ../src/mail/importers/kmail-importer.c:206
 #: ../src/plugins/dbx-import/dbx-importer.c:242
 msgid "_Destination folder:"
 msgstr "_Destination folder:"
 
 #: ../src/mail/importers/evolution-mbox-importer.c:141
-#: ../src/mail/importers/kmail-importer.c:214
+#: ../src/mail/importers/kmail-importer.c:212
 #: ../src/plugins/dbx-import/dbx-importer.c:248
 #: ../src/plugins/pst-import/pst-importer.c:537
 msgid "Select folder"
 msgstr "Select folder"
 
 #: ../src/mail/importers/evolution-mbox-importer.c:142
-#: ../src/mail/importers/kmail-importer.c:215
+#: ../src/mail/importers/kmail-importer.c:213
 #: ../src/plugins/dbx-import/dbx-importer.c:249
 #: ../src/plugins/pst-import/pst-importer.c:538
 msgid "Select folder to import into"
@@ -19429,26 +19596,21 @@ msgstr "Berkeley Mailbox (mbox)"
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer Berkeley Mailbox format folders"
 
-#: ../src/mail/importers/kmail-importer.c:261
+#: ../src/mail/importers/kmail-importer.c:259
 #, c-format
 msgid "%d Address"
 msgid_plural "%d Addresses"
 msgstr[0] "%d Address"
 msgstr[1] "%d Addresses"
 
-#: ../src/mail/importers/kmail-importer.c:352
+#: ../src/mail/importers/kmail-importer.c:350
 msgid "Evolution KMail importer"
 msgstr "Evolution KMail importer"
 
-#: ../src/mail/importers/kmail-importer.c:353
+#: ../src/mail/importers/kmail-importer.c:351
 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:1019
-msgid "Trash"
-msgstr "Wastebasket"
-
 #: ../src/mail/importers/mail-importer.c:55
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
@@ -19726,7 +19888,7 @@ msgid "Use for Recipients"
 msgstr "Use for Recipients"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../src/mail/mail-config.ui.h:73 ../src/modules/mail/em-composer-prefs.c:876
+#: ../src/mail/mail-config.ui.h:73 ../src/modules/mail/em-composer-prefs.c:873
 msgid "Account"
 msgstr "Account"
 
@@ -19799,7 +19961,6 @@ 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:"
 
@@ -19927,7 +20088,6 @@ 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: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"
 
@@ -20265,7 +20425,7 @@ msgstr ""
 "folders?"
 
 #: ../src/mail/mail.error.xml.h:42
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1579
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1573
 msgid "_Empty Trash"
 msgstr "_Empty Wastebasket"
 
@@ -21048,54 +21208,54 @@ msgstr "Edit Search Folder"
 msgid "New Search Folder"
 msgstr "New Search Folder"
 
-#: ../src/mail/message-list.c:312
+#: ../src/mail/message-list.c:316
 msgid "Unseen"
 msgstr "Unseen"
 
-#: ../src/mail/message-list.c:313
+#: ../src/mail/message-list.c:317
 msgid "Seen"
 msgstr "Seen"
 
-#: ../src/mail/message-list.c:314
+#: ../src/mail/message-list.c:318
 msgid "Answered"
 msgstr "Answered"
 
-#: ../src/mail/message-list.c:315
+#: ../src/mail/message-list.c:319
 msgid "Forwarded"
 msgstr "Forwarded"
 
-#: ../src/mail/message-list.c:316
+#: ../src/mail/message-list.c:320
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: ../src/mail/message-list.c:317
+#: ../src/mail/message-list.c:321
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: ../src/mail/message-list.c:330
+#: ../src/mail/message-list.c:334
 msgid "Lowest"
 msgstr "Lowest"
 
-#: ../src/mail/message-list.c:331
+#: ../src/mail/message-list.c:335
 msgid "Lower"
 msgstr "Lower"
 
-#: ../src/mail/message-list.c:335
+#: ../src/mail/message-list.c:339
 msgid "Higher"
 msgstr "Higher"
 
-#: ../src/mail/message-list.c:336
+#: ../src/mail/message-list.c:340
 msgid "Highest"
 msgstr "Highest"
 
-#: ../src/mail/message-list.c:485
+#: ../src/mail/message-list.c:489
 msgid "Generating message list"
 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:273
+#: ../src/modules/itip-formatter/itip-view.c:274
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
@@ -21115,20 +21275,24 @@ msgstr "%d %b %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../src/mail/message-list.c:3361
+#: ../src/mail/message-list.c:3364
 msgid "Select all visible messages"
 msgstr "Select all visible messages"
 
-#: ../src/mail/message-list.c:4135 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4168 ../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:5704
+#: ../src/mail/message-list.c:5749
 msgid "Follow-up"
 msgstr "Follow-up"
 
-#: ../src/mail/message-list.c:6791
+#: ../src/mail/message-list.c:6498 ../src/mail/message-list.c:6935
+msgid "Generating message list…"
+msgstr "Generating message list…"
+
+#: ../src/mail/message-list.c:6501
 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 "
@@ -21140,14 +21304,10 @@ 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:6799
+#: ../src/mail/message-list.c:6508
 msgid "There are no messages in this folder."
 msgstr "There are no messages in this folder."
 
-#: ../src/mail/message-list.c:6875
-msgid "Generating message list…"
-msgstr "Generating message list…"
-
 #: ../src/mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Flagged"
@@ -21198,32 +21358,32 @@ msgid "Subject or Addresses contains"
 msgstr "Subject or Addresses contains"
 
 #: ../src/mail/searchtypes.xml.in.h:58
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2111
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2105
 msgid "Recipients contain"
 msgstr "Recipients contain"
 
 #: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2104
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2098
 msgid "Message contains"
 msgstr "Message contains"
 
 #: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2125
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2119
 msgid "Subject contains"
 msgstr "Subject contains"
 
 #: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2118
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2112
 msgid "Sender contains"
 msgstr "Sender contains"
 
 #: ../src/mail/searchtypes.xml.in.h:62
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2090
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2084
 msgid "Body contains"
 msgstr "Body contains"
 
 #: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2097
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2091
 msgid "Free form expression"
 msgstr "Free form expression"
 
@@ -21278,15 +21438,15 @@ msgstr "Task List Properties"
 
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:80
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:229
-#: ../src/modules/accounts-window/e-webdav-browser-page.c:174
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:192
 msgid "_Back"
 msgstr "_Back"
 
-#: ../src/modules/accounts-window/e-webdav-browser-page.c:195
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:213
 msgid "_Browse"
 msgstr "_Browse"
 
-#: ../src/modules/accounts-window/e-webdav-browser-page.c:197
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:215
 msgid ""
 "Browse a WebDAV (CalDAV or CardDAV) server and create, edit or delete "
 "address books, calendars, memo lists or task lists there"
@@ -21432,7 +21592,7 @@ msgid "Show properties of the selected address book"
 msgstr "Show properties of the selected address book"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1057
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1347
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:626
 #: ../src/modules/calendar/e-task-shell-view-actions.c:752
 msgid "Re_fresh"
@@ -21455,10 +21615,10 @@ msgid "Show map with all contacts from selected address book"
 msgstr "Show map with all contacts from selected address book"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1078
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1361
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:640
 #: ../src/modules/calendar/e-task-shell-view-actions.c:766
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1679
 msgid "_Rename…"
 msgstr "_Rename…"
 
@@ -21531,7 +21691,7 @@ msgid "Send a message to the selected contacts"
 msgstr "Send a message to the selected contacts"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1157
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1580
 #: ../src/modules/calendar/e-task-shell-view-actions.c:831
 msgid "_Actions"
 msgstr "_Actions"
@@ -21539,12 +21699,12 @@ msgstr "_Actions"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1164
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:684
 #: ../src/modules/calendar/e-task-shell-view-actions.c:838
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1834
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1828
 msgid "_Preview"
 msgstr "_Preview"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1177
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:701
 #: ../src/modules/calendar/e-task-shell-view-actions.c:855
 msgid "_Manage groups…"
@@ -21573,7 +21733,7 @@ msgstr "Show maps in contact preview window"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1254
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:766
 #: ../src/modules/calendar/e-task-shell-view-actions.c:932
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1986
 msgid "_Classic View"
 msgstr "_Classic View"
 
@@ -21584,7 +21744,7 @@ msgstr "Show contact preview below the contact list"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1261
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:773
 #: ../src/modules/calendar/e-task-shell-view-actions.c:939
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1999
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1993
 msgid "_Vertical View"
 msgstr "_Vertical View"
 
@@ -21593,17 +21753,17 @@ msgid "Show contact preview alongside the contact list"
 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-cal-shell-view-actions.c:1773
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:790
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1005
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1012
 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-cal-shell-view-actions.c:1783
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:800
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1015
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2083
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2077
 #: ../src/shell/e-shell-content.c:639
 msgid "Advanced Search"
 msgstr "Advanced Search"
@@ -21658,7 +21818,7 @@ msgstr "_Send Message to List"
 msgid "_Send Message to Contact"
 msgstr "_Send Message to Contact"
 
-#: ../src/modules/alarm-notify/alarm-notify.c:171
+#: ../src/modules/alarm-notify/alarm-notify.c:163
 #, c-format
 msgid "Failed to launch command “%s”:"
 msgstr "Failed to launch command “%s”:"
@@ -21725,104 +21885,104 @@ msgstr "R_estore Evolution Data…"
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Restore Evolution data and settings from an archive file"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:73
+#: ../src/modules/backup-restore/evolution-backup-tool.c:72
 msgid "Back up Evolution directory"
 msgstr "Back up Evolution directory"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:75
+#: ../src/modules/backup-restore/evolution-backup-tool.c:74
 msgid "Restore Evolution directory"
 msgstr "Restore Evolution directory"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:77
+#: ../src/modules/backup-restore/evolution-backup-tool.c:76
 msgid "Check Evolution Back up"
 msgstr "Check Evolution Backup"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:79
+#: ../src/modules/backup-restore/evolution-backup-tool.c:78
 msgid "Restart Evolution"
 msgstr "Restart Evolution"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:81
+#: ../src/modules/backup-restore/evolution-backup-tool.c:80
 msgid "With Graphical User Interface"
 msgstr "With Graphical User Interface"
 
 #. FIXME Will the versioned setting always work?
-#: ../src/modules/backup-restore/evolution-backup-tool.c:294
-#: ../src/modules/backup-restore/evolution-backup-tool.c:498
+#: ../src/modules/backup-restore/evolution-backup-tool.c:293
+#: ../src/modules/backup-restore/evolution-backup-tool.c:551
 msgid "Shutting down Evolution"
 msgstr "Shutting down Evolution"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:303
+#: ../src/modules/backup-restore/evolution-backup-tool.c:302
 msgid "Backing Evolution accounts and settings"
 msgstr "Backing up Evolution accounts and settings"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:320
+#: ../src/modules/backup-restore/evolution-backup-tool.c:319
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Backing up Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:336
+#: ../src/modules/backup-restore/evolution-backup-tool.c:335
 msgid "Back up complete"
 msgstr "Backup complete"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:343
-#: ../src/modules/backup-restore/evolution-backup-tool.c:705
+#: ../src/modules/backup-restore/evolution-backup-tool.c:342
+#: ../src/modules/backup-restore/evolution-backup-tool.c:758
 msgid "Restarting Evolution"
 msgstr "Restarting Evolution"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:504
+#: ../src/modules/backup-restore/evolution-backup-tool.c:557
 msgid "Back up current Evolution data"
 msgstr "Back up current Evolution data"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:511
+#: ../src/modules/backup-restore/evolution-backup-tool.c:564
 msgid "Extracting files from back up"
 msgstr "Extracting files from backup"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:606
+#: ../src/modules/backup-restore/evolution-backup-tool.c:659
 msgid "Loading Evolution settings"
 msgstr "Loading Evolution settings"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:676
+#: ../src/modules/backup-restore/evolution-backup-tool.c:729
 msgid "Removing temporary back up files"
 msgstr "Removing temporary backup files"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:690
+#: ../src/modules/backup-restore/evolution-backup-tool.c:743
 msgid "Reloading registry service"
 msgstr "Reloading registry service"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:903
+#: ../src/modules/backup-restore/evolution-backup-tool.c:956
 msgid "Evolution Back Up"
 msgstr "Evolution Back Up"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:904
+#: ../src/modules/backup-restore/evolution-backup-tool.c:957
 #, c-format
 msgid "Backing up to the file %s"
 msgstr "Backing up to the file %s"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:908
+#: ../src/modules/backup-restore/evolution-backup-tool.c:961
 msgid "Evolution Restore"
 msgstr "Evolution Restore"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:909
+#: ../src/modules/backup-restore/evolution-backup-tool.c:962
 #, c-format
 msgid "Restoring from the file %s"
 msgstr "Restoring from the file %s"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:978
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1031
 msgid "Backing up Evolution Data"
 msgstr "Backing up Evolution Data"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:979
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1032
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Please wait while Evolution backs up your data."
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:981
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1034
 msgid "Restoring Evolution Data"
 msgstr "Restoring Evolution Data"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:982
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1035
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Please wait while Evolution restores your data."
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:1004
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1057
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "This may take a while depending on the amount of data in your account."
 
@@ -21914,159 +22074,161 @@ msgstr "Junk filter using Bogofilter"
 msgid "Choose an Address Book"
 msgstr "Choose an Address Book"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:264
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:277
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:313
-#: ../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
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:268
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:281
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:312
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:333
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:144
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:165
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:301
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:322
+#: ../src/modules/itip-formatter/itip-view.c:1704
+#: ../src/modules/itip-formatter/itip-view.c:1818
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:288
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:292
 msgid "Find Address Books"
 msgstr "Find Address Books"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:299
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:303
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 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
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:356
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:452
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:230
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:400
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr "URL is not a valid http:// nor https:// URL"
 
 #: ../src/modules/book-config-google/evolution-book-config-google.c:93
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1069
-#: ../src/modules/cal-config-google/e-cal-config-google.c:190
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1066
+#: ../src/modules/cal-config-google/e-cal-config-google.c:187
 #: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:444
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:479
 msgid "User name cannot be empty"
 msgstr "User name cannot be empty"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:418
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:415
 msgid "Looking up server search bases, please wait…"
 msgstr "Looking up server search bases, please wait…"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:494
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:491
 msgid "Standard LDAP Port"
 msgstr "Standard LDAP Port"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:500
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:497
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "LDAP over SSL/TLS (deprecated)"
 msgstr "LDAP over SSL/TLS (deprecated)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:506
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:503
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft Global Catalogue"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:512
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:509
 msgid "Microsoft Global Catalog over SSL/TLS"
 msgstr "Microsoft Global Catalog over SSL/TLS"
 
 #. Page 1
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:623
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:620
 msgid "Connecting to LDAP"
 msgstr "Connecting to LDAP"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:640
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:637
 msgid "Server Information"
 msgstr "Server Information"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:667
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:664
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:675
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:672
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:247
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:202
 msgid "Port number is not valid"
 msgstr "Port number is not valid"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (recommended)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:692
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:689
 msgid "Encryption:"
 msgstr "Encryption:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:713
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:324
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:267
 msgid "Authentication"
 msgstr "Authentication"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:748
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:745
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:749
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:746
 msgid "Username can be left empty"
 msgstr "Username can be left empty"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:752
 msgid "Using email address"
 msgstr "Using e-mail address"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:756
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:753
 msgid "requires anonymous access to your LDAP server"
 msgstr "requires anonymous access to your LDAP server"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:762
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:759
 msgid "Using distinguished name (DN)"
 msgstr "Using distinguished name (DN)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:763
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:760
 msgid "for example: uid=user,dc=example,dc=com"
 msgstr "for example: uid=user,dc=example,dc=com"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:771
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:768
 msgid "Method:"
 msgstr "Method:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:775
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:772
 msgid "This is the method Evolution will use to authenticate you."
 msgstr "This is the method Evolution will use to authenticate you."
 
 #. Page 2
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:787
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:784
 msgid "Using LDAP"
 msgstr "Using LDAP"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:804
-#: ../src/modules/mail/e-mail-shell-view.c:118
-#: ../src/modules/mail/e-mail-shell-view.c:200
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:801
+#: ../src/modules/mail/e-mail-shell-view.c:119
+#: ../src/modules/mail/e-mail-shell-view.c:208
 msgid "Searching"
 msgstr "Searching"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:826
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:823
 msgid "Search Base:"
 msgstr "Search Base:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:830
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:827
 msgid "Find Possible Search Bases"
 msgstr "Find Possible Search Bases"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:852
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:849
 msgid "One Level"
 msgstr "One Level"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:854
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:851
 msgid "Subtree"
 msgstr "Subtree"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:856
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:853
 msgid "Search Scope:"
 msgstr "Search Scope:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:861
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:858
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree.  A search scope of “Subtree” will include all entries "
@@ -22078,27 +22240,27 @@ msgstr ""
 "below your search base.  A search scope of “One Level” will only include the "
 "entries one level beneath your search base."
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:870
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:867
 msgid "Search Filter:"
 msgstr "Search Filter:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:882
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:879
 msgid "Downloading"
 msgstr "Downloading"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:903
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:900
 msgid "Limit:"
 msgstr "Limit:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:914
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:911
 msgid "contacts"
 msgstr "contacts"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:919
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:916
 msgid "Browse until limit is reached"
 msgstr "Browse until limit is reached"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1054
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1051
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:425
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:461
 msgid "Server address cannot be empty"
@@ -22119,23 +22281,24 @@ msgstr "Choose a Memo List"
 msgid "Choose a Task List"
 msgstr "Choose a Task List"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:349
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:348
 msgid "Find Calendars"
 msgstr "Find Calendars"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:352
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:351
 msgid "Find Memo Lists"
 msgstr "Find Memo Lists"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:355
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:354
 msgid "Find Task Lists"
 msgstr "Find Task Lists"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:374
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:373
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:260
 msgid "Email:"
 msgstr "E-mail:"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:380
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:379
 msgid "Server handles meeting invitations"
 msgstr "Server handles meeting invitations"
 
@@ -22143,11 +22306,11 @@ msgstr "Server handles meeting invitations"
 msgid "Choose which address books to use."
 msgstr "Choose which address books to use."
 
-#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:204
+#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:201
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Use in Birthdays & Anniversaries calendar"
 
-#: ../src/modules/cal-config-google/e-cal-config-google.c:101
+#: ../src/modules/cal-config-google/e-cal-config-google.c:98
 msgid "Enable Calendars to synchronize"
 msgstr "Enable Calendars to synchronise"
 
@@ -22155,23 +22318,23 @@ msgstr "Enable Calendars to synchronise"
 msgid "Default User Calendar"
 msgstr "Default User Calendar"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:159
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:177
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Use an existing iCalendar (ics) file"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:184
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:202
 msgid "iCalendar File"
 msgstr "iCalendar File"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:196
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:214
 msgid "Choose an iCalendar file"
 msgstr "Choose an iCalendar file"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:199
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:217
 msgid "File:"
 msgstr "File:"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:214
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:232
 msgid "Allow Evolution to update the file"
 msgstr "Allow Evolution to update the file"
 
@@ -22181,43 +22344,41 @@ msgstr "Allow Evolution to update the file"
 #. *
 #. * This string is just a fallback mechanism for systems on
 #. * which _NL_MEASUREMENT_MEASUREMENT is not available.
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:187
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:221
 msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "default:mm"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:259
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:290
 msgid "Fahrenheit (°F)"
 msgstr "Fahrenheit (°F)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:264
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:295
 msgid "Centigrade (°C)"
 msgstr "Centigrade (°C)"
 
 #. Translators: This is the temperature in kelvin.
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:268
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:299
 msgid "Kelvin (K)"
 msgstr "Kelvin (K)"
 
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:270
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:301
 msgid "Units:"
 msgstr "Units:"
 
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:322
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:357
 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"
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:336
 msgid "Find Notes"
 msgstr "Find Notes"
 
@@ -22262,45 +22423,45 @@ msgstr "I_mport to Memo List"
 msgid "I_mport to Task List"
 msgstr "I_mport to Task List"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:566
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:579
 #, c-format
 msgid "Copying an event into the calendar “%s”"
 msgstr "Copying an event into the calendar “%s”"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:567
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:580
 #, c-format
 msgid "Moving an event into the calendar “%s”"
 msgstr "Moving an event into the calendar “%s”"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:572
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:585
 #, c-format
 msgid "Copying a memo into the memo list “%s”"
 msgstr "Copying a memo into the memo list “%s”"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:573
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:586
 #, c-format
 msgid "Moving a memo into the memo list “%s”"
 msgstr "Moving a memo into the memo list “%s”"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:578
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:591
 #, c-format
 msgid "Copying a task into the task list “%s”"
 msgstr "Copying a task into the task list “%s”"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:579
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:592
 #, c-format
 msgid "Moving a task into the task list “%s”"
 msgstr "Moving a task into the task list “%s”"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:694
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:707
 msgid "Calendar Selector"
 msgstr "Calendar Selector"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:700
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:713
 msgid "Memo List Selector"
 msgstr "Memo List Selector"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:705
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:718
 msgid "Task List Selector"
 msgstr "Task List Selector"
 
@@ -22403,7 +22564,7 @@ msgid "_24 hour"
 msgstr "_24 hour"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:18
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1637
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1735
 msgid "Work Week"
 msgstr "Work Week"
 
@@ -22642,7 +22803,7 @@ msgid "_Appointment"
 msgstr "_Appointment"
 
 #: ../src/modules/calendar/e-cal-shell-backend.c:120
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1524
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
@@ -22670,7 +22831,7 @@ msgid "Cale_ndar"
 msgstr "Cale_ndar"
 
 #: ../src/modules/calendar/e-cal-shell-backend.c:144
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1279
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
@@ -22698,17 +22859,17 @@ msgstr ""
 msgid "Purge events older than"
 msgstr "Purge events older than"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:919
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:968
 msgid "Making an occurrence movable"
 msgstr "Making an occurrence movable"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1112
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1161
 msgid "event"
 msgstr "event"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1114
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1163
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:204
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:278
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:510
@@ -22716,154 +22877,154 @@ msgstr "event"
 msgid "Save as iCalendar"
 msgstr "Save as iCalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1228
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1277
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:591
 #: ../src/modules/calendar/e-task-shell-view-actions.c:717
 msgid "_Copy…"
 msgstr "_Copy…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1235
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1284
 msgid "D_elete Calendar"
 msgstr "D_elete Calendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1286
 msgid "Delete the selected calendar"
 msgstr "Delete the selected calendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Go Back"
 msgstr "Go Back"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Go Forward"
 msgstr "Go Forward"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Select today"
 msgstr "Select today"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1263
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Select _Date"
 msgstr "Select _Date"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Select a specific date"
 msgstr "Select a specific date"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1270
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "_Manage Calendar groups…"
 msgstr "_Manage Calendar groups…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Manage Calendar groups order and visibility"
 msgstr "Manage Calendar groups order and visibility"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1277
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "_New Calendar"
 msgstr "_New Calendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1340
 #: ../src/modules/calendar/e-task-shell-view-actions.c:822
 msgid "Purg_e"
 msgstr "Purg_e"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Purge old appointments and meetings"
 msgstr "Purge old appointments and meetings"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "Refresh the selected calendar"
 msgstr "Refresh the selected calendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1305
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1354
 msgid "Re_fresh list of account calendars"
 msgstr "Re_fresh list of account calendars"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1363
 msgid "Rename the selected calendar"
 msgstr "Rename the selected calendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Find _Next"
 msgstr "Find _Next"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Find next occurrence of the current search string"
 msgstr "Find next occurrence of the current search string"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "Find _Previous"
 msgstr "Find _Previous"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "Find previous occurrence of the current search string"
 msgstr "Find previous occurrence of the current search string"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1333
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "Stop _Running Search"
 msgstr "Stop _Running Search"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Stop currently running search"
 msgstr "Stop currently running search"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Sho_w All Calendars"
 msgstr "Sho_w All Calendars"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Show _Only This Calendar"
 msgstr "Show _Only This Calendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Cop_y to Calendar…"
 msgstr "Cop_y to Calendar…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1410
 msgid "_Delegate Meeting…"
 msgstr "_Delegate Meeting…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1368
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "_Delete Appointment"
 msgstr "_Delete Appointment"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Delete selected appointments"
 msgstr "Delete selected appointments"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Delete This _Occurrence"
 msgstr "Delete This _Occurrence"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "Delete this occurrence"
 msgstr "Delete this occurrence"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "Delete All Occ_urrences"
 msgstr "Delete All Occ_urrences"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Delete all occurrences"
 msgstr "Delete all occurrences"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Edit as Ne_w…"
 msgstr "Edit as Ne_w…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1440
 msgid "Edit the current appointment as new"
 msgstr "Edit the current appointment as new"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "New All Day _Event…"
 msgstr "New All Day _Event…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "Create a new all day event"
 msgstr "Create a new all-day event"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1452
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:238
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:318
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:584
@@ -22871,134 +23032,191 @@ msgstr "Create a new all-day event"
 msgid "_Forward as iCalendar…"
 msgstr "_Forward as iCalendar…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1461
 msgid "Create a new meeting"
 msgstr "Create a new meeting"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1466
+msgid "Send _RSVP"
+msgstr "Send _RSVP"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1468
+msgid "Send a meeting response"
+msgstr "Send a meeting response"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1473
+msgid "_Accept"
+msgstr "_Accept"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1475
+msgid "Accept meeting request"
+msgstr "Accept meeting request"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1480
+msgid "A_ccept this instance"
+msgstr "A_ccept this instance"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1482
+msgid "Accept meeting request for selected instance only"
+msgstr "Accept meeting request for selected instance only"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1487
+#: ../src/modules/itip-formatter/itip-view.c:1255
+msgid "_Decline"
+msgstr "_Decline"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1489
+msgid "Decline meeting request"
+msgstr "Decline meeting request"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1494
+msgid "D_ecline this instance"
+msgstr "D_ecline this instance"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1496
+msgid "Decline meeting request for selected instance only"
+msgstr "Decline meeting request for selected instance only"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1501
+msgid "_Tentatively accept"
+msgstr "_Tentatively accept"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1503
+msgid "Tentatively accept meeting request"
+msgstr "Tentatively accept meeting request"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1508
+msgid "Te_ntatively accept this instance"
+msgstr "Te_ntatively accept this instance"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1510
+msgid "Tentatively accept meeting request for selected instance only"
+msgstr "Tentatively accept meeting request for selected instance only"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1515
 msgid "Mo_ve to Calendar…"
 msgstr "Mo_ve to Calendar…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1431
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1529
 msgid "Make this Occurrence _Movable"
 msgstr "Make this Occurrence _Movable"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1438
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1536
 msgid "_Open Appointment"
 msgstr "_Open Appointment"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1538
 msgid "View the current appointment"
 msgstr "View the current appointment"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1557
 msgid "_Schedule Meeting…"
 msgstr "_Schedule Meeting…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1559
 msgid "Converts an appointment to a meeting"
 msgstr "Converts an appointment to a meeting"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1564
 msgid "Conv_ert to Appointment…"
 msgstr "Conv_ert to Appointment…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Converts a meeting to an appointment"
 msgstr "Converts a meeting to an appointment"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1473
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1571
 msgid "Quit"
 msgstr "Quit"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1707
 msgid "Day"
 msgstr "Day"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1709
 msgid "Show one day"
 msgstr "Show one day"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1616
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1714
 msgid "List"
 msgstr "List"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
 msgid "Show as list"
 msgstr "Show as list"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1623
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1721
 msgid "Month"
 msgstr "Month"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
 msgid "Show one month"
 msgstr "Show one month"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1630
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1728
 msgid "Week"
 msgstr "Week"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1730
 msgid "Show one week"
 msgstr "Show one week"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1737
 msgid "Show one work week"
 msgstr "Show one work week"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1745
 msgid "Active Appointments"
 msgstr "Active Appointments"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1661
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Next 7 Days’ Appointments"
 msgstr "Next 7 Days’ Appointments"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1668
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1766
 msgid "Occurs Less Than 5 Times"
 msgstr "Occurs Less Than 5 Times"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1699
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1797
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:814
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1043
 msgid "Description contains"
 msgstr "Description contains"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1804
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:821
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1036
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1050
 msgid "Summary contains"
 msgstr "Summary contains"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1730
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1814
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1828
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:269
 #: ../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:1046
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1060
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1074
 msgid "Print…"
 msgstr "Print…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1718
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1816
 msgid "Print this calendar"
 msgstr "Print this calendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1725
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1823
 msgid "Preview the calendar to be printed"
 msgstr "Preview the calendar to be printed"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1747
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1845
 #: ../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:1077
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1091
 msgid "_Save as iCalendar…"
 msgstr "_Save as iCalendar…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1824
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1922
 msgid "Go To"
 msgstr "Go To"
 
@@ -23042,29 +23260,29 @@ msgstr "Open _Web Page"
 msgid "Print the selected memo"
 msgstr "Print the selected memo"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1019
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1038
 msgid "Searching next matching event"
 msgstr "Searching next matching event"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1020
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1039
 msgid "Searching previous matching event"
 msgstr "Searching previous matching event"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1041
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1060
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "Cannot find matching event in the next %d year"
 msgstr[1] "Cannot find matching event in the next %d years"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1045
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1064
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "Cannot find matching event in the previous %d year"
 msgstr[1] "Cannot find matching event in the previous %d years"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1068
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1087
 msgid "Cannot search with no active calendar"
 msgstr "Cannot search with no active calendar"
 
@@ -23123,7 +23341,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:1062
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1076
 msgid "Print the selected task"
 msgstr "Print the selected task"
 
@@ -23247,12 +23465,6 @@ msgid_plural "%d memos"
 msgstr[0] "%d memo"
 msgstr[1] "%d memos"
 
-#: ../src/modules/calendar/e-memo-shell-view-private.c:365
-#: ../src/modules/calendar/e-task-shell-view-private.c:577
-#, c-format
-msgid "%d selected"
-msgstr "%d selected"
-
 #: ../src/modules/calendar/e-task-shell-backend.c:75
 msgctxt "New"
 msgid "_Task"
@@ -23383,39 +23595,58 @@ 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 "Scheduled Tasks"
+msgstr "Scheduled Tasks"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:986
+msgid "Show scheduled tasks, aka those with a Due date"
+msgstr "Show scheduled tasks, aka those with a Due date"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:991
 msgid "Next 7 Days’ Tasks"
 msgstr "Next 7 Days’ Tasks"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:991
+#: ../src/modules/calendar/e-task-shell-view-actions.c:998
 msgid "Overdue Tasks"
 msgstr "Overdue Tasks"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:998
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1005
 msgid "Tasks with Attachments"
 msgstr "Tasks with Attachments"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1019
+msgid "Started Tasks"
+msgstr "Started Tasks"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1021
+msgid ""
+"Filters for tasks that either do not have a start date or the start date is "
+"earlier than the time the filter is selected at"
+msgstr ""
+"Filters for tasks that either do not have a start date or the start date is "
+"earlier than the time the filter is selected at"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1062
 msgid "Print the list of tasks"
 msgstr "Print the list of tasks"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1069
 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:353
+#: ../src/modules/calendar/e-task-shell-view.c:368
 msgid "Delete Tasks"
 msgstr "Delete Tasks"
 
-#: ../src/modules/calendar/e-task-shell-view.c:355
+#: ../src/modules/calendar/e-task-shell-view.c:370
 msgid "Delete Task"
 msgstr "Delete Task"
 
-#: ../src/modules/calendar/e-task-shell-view-private.c:573
+#: ../src/modules/calendar/e-task-shell-view-private.c:570
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -23507,219 +23738,221 @@ msgstr "CardDAV: %s"
 msgid "CalDAV and CardDAV server"
 msgstr "CalDAV and CardDAV server"
 
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:162
+msgid "Requires password to continue."
+msgstr "Requires password to continue."
+
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:213
 msgid "Look up for a CalDAV/CardDAV server"
 msgstr "Look up for a CalDAV/CardDAV server"
 
-#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:165
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:164
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:166
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:165
 msgid "Display part as an invitation"
 msgstr "Display part as an invitation"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:264
+#: ../src/modules/itip-formatter/itip-view.c:265
 msgid "Today %H:%M"
 msgstr "Today %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:268
+#: ../src/modules/itip-formatter/itip-view.c:269
 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:277
+#: ../src/modules/itip-formatter/itip-view.c:278
 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:292
+#: ../src/modules/itip-formatter/itip-view.c:293
 msgid "Tomorrow %H:%M"
 msgstr "Tomorrow %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:296
+#: ../src/modules/itip-formatter/itip-view.c:297
 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:301
+#: ../src/modules/itip-formatter/itip-view.c:302
 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:305
+#: ../src/modules/itip-formatter/itip-view.c:306
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Tomorrow %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../src/modules/itip-formatter/itip-view.c:324
+#: ../src/modules/itip-formatter/itip-view.c:325
 #, 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:329
+#: ../src/modules/itip-formatter/itip-view.c:330
 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:333
+#: ../src/modules/itip-formatter/itip-view.c:334
 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:338
+#: ../src/modules/itip-formatter/itip-view.c:339
 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:342
+#: ../src/modules/itip-formatter/itip-view.c:343
 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:353
+#: ../src/modules/itip-formatter/itip-view.c:354
 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:359
+#: ../src/modules/itip-formatter/itip-view.c:360
 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:363
+#: ../src/modules/itip-formatter/itip-view.c:364
 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:368
+#: ../src/modules/itip-formatter/itip-view.c:369
 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:372
+#: ../src/modules/itip-formatter/itip-view.c:373
 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:380
+#: ../src/modules/itip-formatter/itip-view.c:381
 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:385
+#: ../src/modules/itip-formatter/itip-view.c:386
 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:389
+#: ../src/modules/itip-formatter/itip-view.c:390
 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:394
+#: ../src/modules/itip-formatter/itip-view.c:395
 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:398
+#: ../src/modules/itip-formatter/itip-view.c:399
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l:%M:%S %p"
 
 #. 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
+#: ../src/modules/itip-formatter/itip-view.c:426
 #, 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:465
 #: ../src/modules/itip-formatter/itip-view.c:554
-#: ../src/modules/itip-formatter/itip-view.c:643
+#: ../src/modules/itip-formatter/itip-view.c:555
+#: ../src/modules/itip-formatter/itip-view.c:644
 msgid "An unknown person"
 msgstr "An unknown person"
 
-#: ../src/modules/itip-formatter/itip-view.c:468
-#: ../src/modules/itip-formatter/itip-view.c:558
-#: ../src/modules/itip-formatter/itip-view.c:647
+#: ../src/modules/itip-formatter/itip-view.c:469
+#: ../src/modules/itip-formatter/itip-view.c:559
+#: ../src/modules/itip-formatter/itip-view.c:648
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Please respond on behalf of %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:470
-#: ../src/modules/itip-formatter/itip-view.c:560
-#: ../src/modules/itip-formatter/itip-view.c:649
+#: ../src/modules/itip-formatter/itip-view.c:471
+#: ../src/modules/itip-formatter/itip-view.c:561
+#: ../src/modules/itip-formatter/itip-view.c:650
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Received on behalf of %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:475
+#: ../src/modules/itip-formatter/itip-view.c:476
 #, 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:477
+#: ../src/modules/itip-formatter/itip-view.c:478
 #, 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:482
+#: ../src/modules/itip-formatter/itip-view.c:483
 #, 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:485
+#: ../src/modules/itip-formatter/itip-view.c:486
 #, 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:487
+#: ../src/modules/itip-formatter/itip-view.c:488
 #, 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:493
+#: ../src/modules/itip-formatter/itip-view.c:494
 #, 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:495
+#: ../src/modules/itip-formatter/itip-view.c:496
 #, 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:499
+#: ../src/modules/itip-formatter/itip-view.c:500
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -23728,87 +23961,87 @@ msgstr ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:501
+#: ../src/modules/itip-formatter/itip-view.c:502
 #, 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:505
+#: ../src/modules/itip-formatter/itip-view.c:506
 #, 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:507
+#: ../src/modules/itip-formatter/itip-view.c:508
 #, 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:511
+#: ../src/modules/itip-formatter/itip-view.c:512
 #, 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:513
+#: ../src/modules/itip-formatter/itip-view.c:514
 #, c-format
 msgid "%s has cancelled the following meeting:"
 msgstr "%s has cancelled the following meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:517
+#: ../src/modules/itip-formatter/itip-view.c:518
 #, 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:519
+#: ../src/modules/itip-formatter/itip-view.c:520
 #, 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:523
+#: ../src/modules/itip-formatter/itip-view.c:524
 #, 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:525
+#: ../src/modules/itip-formatter/itip-view.c:526
 #, 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:565
+#: ../src/modules/itip-formatter/itip-view.c:566
 #, 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:567
+#: ../src/modules/itip-formatter/itip-view.c:568
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s has published the following task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:572
+#: ../src/modules/itip-formatter/itip-view.c:573
 #, 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:575
+#: ../src/modules/itip-formatter/itip-view.c:576
 #, 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:577
+#: ../src/modules/itip-formatter/itip-view.c:578
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s has assigned you a task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:583
+#: ../src/modules/itip-formatter/itip-view.c:584
 #, 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:585
+#: ../src/modules/itip-formatter/itip-view.c:586
 #, 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:589
+#: ../src/modules/itip-formatter/itip-view.c:590
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -23817,212 +24050,208 @@ msgstr ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:591
+#: ../src/modules/itip-formatter/itip-view.c:592
 #, 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:595
+#: ../src/modules/itip-formatter/itip-view.c:596
 #, 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:597
+#: ../src/modules/itip-formatter/itip-view.c:598
 #, 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:601
+#: ../src/modules/itip-formatter/itip-view.c:602
 #, 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:603
+#: ../src/modules/itip-formatter/itip-view.c:604
 #, 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:607
+#: ../src/modules/itip-formatter/itip-view.c:608
 #, 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:609
+#: ../src/modules/itip-formatter/itip-view.c:610
 #, 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:613
+#: ../src/modules/itip-formatter/itip-view.c:614
 #, 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:615
+#: ../src/modules/itip-formatter/itip-view.c:616
 #, 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:654
+#: ../src/modules/itip-formatter/itip-view.c:655
 #, 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:656
+#: ../src/modules/itip-formatter/itip-view.c:657
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s has published the following memo:"
 
-#: ../src/modules/itip-formatter/itip-view.c:661
+#: ../src/modules/itip-formatter/itip-view.c:662
 #, 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:663
+#: ../src/modules/itip-formatter/itip-view.c:664
 #, 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:667
+#: ../src/modules/itip-formatter/itip-view.c:668
 #, 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:669
+#: ../src/modules/itip-formatter/itip-view.c:670
 #, 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:857
+#: ../src/modules/itip-formatter/itip-view.c:858
 msgid "All day:"
 msgstr "All day:"
 
-#: ../src/modules/itip-formatter/itip-view.c:863
+#: ../src/modules/itip-formatter/itip-view.c:864
 msgid "Start day:"
 msgstr "Start day:"
 
-#: ../src/modules/itip-formatter/itip-view.c:863
-#: ../src/modules/itip-formatter/itip-view.c:1701
+#: ../src/modules/itip-formatter/itip-view.c:864
+#: ../src/modules/itip-formatter/itip-view.c:1705
 msgid "Start time:"
 msgstr "Start time:"
 
-#: ../src/modules/itip-formatter/itip-view.c:872
+#: ../src/modules/itip-formatter/itip-view.c:873
 msgid "End day:"
 msgstr "End day:"
 
-#: ../src/modules/itip-formatter/itip-view.c:872
-#: ../src/modules/itip-formatter/itip-view.c:1702
+#: ../src/modules/itip-formatter/itip-view.c:873
+#: ../src/modules/itip-formatter/itip-view.c:1706
 msgid "End time:"
 msgstr "End time:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1248
+#: ../src/modules/itip-formatter/itip-view.c:1249
 msgid "Ope_n Calendar"
 msgstr "Ope_n Calendar"
 
-#: ../src/modules/itip-formatter/itip-view.c:1251
+#: ../src/modules/itip-formatter/itip-view.c:1252
 msgid "_Decline all"
 msgstr "_Decline all"
 
-#: ../src/modules/itip-formatter/itip-view.c:1254
-msgid "_Decline"
-msgstr "_Decline"
-
-#: ../src/modules/itip-formatter/itip-view.c:1257
+#: ../src/modules/itip-formatter/itip-view.c:1258
 msgid "_Tentative all"
 msgstr "_Tentative all"
 
-#: ../src/modules/itip-formatter/itip-view.c:1260
+#: ../src/modules/itip-formatter/itip-view.c:1261
 msgid "_Tentative"
 msgstr "_Tentative"
 
-#: ../src/modules/itip-formatter/itip-view.c:1263
+#: ../src/modules/itip-formatter/itip-view.c:1264
 msgid "Acce_pt all"
 msgstr "Acce_pt all"
 
-#: ../src/modules/itip-formatter/itip-view.c:1266
+#: ../src/modules/itip-formatter/itip-view.c:1267
 msgid "Acce_pt"
 msgstr "Acce_pt"
 
-#: ../src/modules/itip-formatter/itip-view.c:1269
+#: ../src/modules/itip-formatter/itip-view.c:1270
 msgid "Send _Information"
 msgstr "Send _Information"
 
-#: ../src/modules/itip-formatter/itip-view.c:1272
+#: ../src/modules/itip-formatter/itip-view.c:1273
 msgid "_Update Attendee Status"
 msgstr "_Update Attendee Status"
 
-#: ../src/modules/itip-formatter/itip-view.c:1275
-#: ../src/smime/gui/certificate-manager.c:1661
+#: ../src/modules/itip-formatter/itip-view.c:1276
+#: ../src/smime/gui/certificate-manager.c:1659
 msgid "_Update"
 msgstr "_Update"
 
-#: ../src/modules/itip-formatter/itip-view.c:1704
-#: ../src/modules/itip-formatter/itip-view.c:1752
-#: ../src/modules/itip-formatter/itip-view.c:1823
+#: ../src/modules/itip-formatter/itip-view.c:1708
+#: ../src/modules/itip-formatter/itip-view.c:1756
+#: ../src/modules/itip-formatter/itip-view.c:1830
 msgid "Comment:"
 msgstr "Comment:"
 
 #. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1740
+#: ../src/modules/itip-formatter/itip-view.c:1744
 msgid "Send reply to sender"
 msgstr "Send reply to sender"
 
 #. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1755
+#: ../src/modules/itip-formatter/itip-view.c:1759
 msgid "Send _updates to attendees"
 msgstr "Send _updates to attendees"
 
 #. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1758
+#: ../src/modules/itip-formatter/itip-view.c:1762
 msgid "_Apply to all instances"
 msgstr "_Apply to all instances"
 
-#: ../src/modules/itip-formatter/itip-view.c:1759
+#: ../src/modules/itip-formatter/itip-view.c:1763
 msgid "Show time as _free"
 msgstr "Show time as _free"
 
-#: ../src/modules/itip-formatter/itip-view.c:1760
+#: ../src/modules/itip-formatter/itip-view.c:1764
 msgid "_Preserve my reminder"
 msgstr "_Preserve my reminder"
 
-#: ../src/modules/itip-formatter/itip-view.c:1761
+#: ../src/modules/itip-formatter/itip-view.c:1765
 msgid "_Inherit reminder"
 msgstr "_Inherit reminder"
 
-#: ../src/modules/itip-formatter/itip-view.c:1975
+#: ../src/modules/itip-formatter/itip-view.c:1982
 msgid "_Tasks:"
 msgstr "_Tasks:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1978
+#: ../src/modules/itip-formatter/itip-view.c:1985
 msgid "_Memos:"
 msgstr "_Memos:"
 
-#: ../src/modules/itip-formatter/itip-view.c:2974
+#: ../src/modules/itip-formatter/itip-view.c:2992
 msgid "Sa_ve"
 msgstr "Sa_ve"
 
-#: ../src/modules/itip-formatter/itip-view.c:3535
-#: ../src/modules/itip-formatter/itip-view.c:5287
+#: ../src/modules/itip-formatter/itip-view.c:3519
+#: ../src/modules/itip-formatter/itip-view.c:5190
 msgid "Attendee status updated"
 msgstr "Attendee status updated"
 
-#: ../src/modules/itip-formatter/itip-view.c:3745
+#: ../src/modules/itip-formatter/itip-view.c:3729
 #, 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:3752
+#: ../src/modules/itip-formatter/itip-view.c:3736
 #, 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:3759
+#: ../src/modules/itip-formatter/itip-view.c:3743
 #, 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:3770
+#: ../src/modules/itip-formatter/itip-view.c:3754
 #, c-format
 msgid ""
 "The calendar “%s” contains an appointment which conflicts with this meeting"
@@ -24033,7 +24262,7 @@ msgstr[0] ""
 msgstr[1] ""
 "The calendar “%s” contains %d appointments which conflict with this meeting"
 
-#: ../src/modules/itip-formatter/itip-view.c:3779
+#: ../src/modules/itip-formatter/itip-view.c:3763
 #, c-format
 msgid "The task list “%s” contains a task which conflicts with this task"
 msgid_plural ""
@@ -24041,7 +24270,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:3788
+#: ../src/modules/itip-formatter/itip-view.c:3772
 #, c-format
 msgid "The memo list “%s” contains a memo which conflicts with this memo"
 msgid_plural ""
@@ -24049,221 +24278,219 @@ 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:3826
+#: ../src/modules/itip-formatter/itip-view.c:3810
 #, 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:3831
+#: ../src/modules/itip-formatter/itip-view.c:3815
 #, 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:3836
+#: ../src/modules/itip-formatter/itip-view.c:3820
 #, 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:3847
+#: ../src/modules/itip-formatter/itip-view.c:3831
 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:3989
+#: ../src/modules/itip-formatter/itip-view.c:3973
 msgid "Unable to find any calendars"
 msgstr "Unable to find any calendars"
 
-#: ../src/modules/itip-formatter/itip-view.c:3997
+#: ../src/modules/itip-formatter/itip-view.c:3981
 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:4002
+#: ../src/modules/itip-formatter/itip-view.c:3986
 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:4007
+#: ../src/modules/itip-formatter/itip-view.c:3991
 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:4301
+#: ../src/modules/itip-formatter/itip-view.c:4304
 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:4305
+#: ../src/modules/itip-formatter/itip-view.c:4308
 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:4309
+#: ../src/modules/itip-formatter/itip-view.c:4312
 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:4367
+#: ../src/modules/itip-formatter/itip-view.c:4370
 msgid "Opening the calendar. Please wait…"
 msgstr "Opening the calendar. Please wait…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4783
+#: ../src/modules/itip-formatter/itip-view.c:4716
 #, 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:4791
+#: ../src/modules/itip-formatter/itip-view.c:4724
 #, 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:4799
+#: ../src/modules/itip-formatter/itip-view.c:4732
 #, 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:4819
+#: ../src/modules/itip-formatter/itip-view.c:4752
 #, c-format
 msgid "Sent to calendar “%s” as accepted"
 msgstr "Sent to calendar “%s” as accepted"
 
-#: ../src/modules/itip-formatter/itip-view.c:4824
+#: ../src/modules/itip-formatter/itip-view.c:4757
 #, 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:4829
+#: ../src/modules/itip-formatter/itip-view.c:4762
 #, 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:4839
+#: ../src/modules/itip-formatter/itip-view.c:4772
 #, c-format
 msgid "Sent to calendar “%s” as tentative"
 msgstr "Sent to calendar “%s” as tentative"
 
-#: ../src/modules/itip-formatter/itip-view.c:4844
+#: ../src/modules/itip-formatter/itip-view.c:4777
 #, 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:4849
+#: ../src/modules/itip-formatter/itip-view.c:4782
 #, 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:4859
+#: ../src/modules/itip-formatter/itip-view.c:4792
 #, c-format
 msgid "Sent to calendar “%s” as declined"
 msgstr "Sent to calendar “%s” as declined"
 
-#: ../src/modules/itip-formatter/itip-view.c:4864
+#: ../src/modules/itip-formatter/itip-view.c:4797
 #, 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:4869
+#: ../src/modules/itip-formatter/itip-view.c:4802
 #, 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:4879
+#: ../src/modules/itip-formatter/itip-view.c:4812
 #, c-format
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "Sent to calendar “%s” as cancelled"
 
-#: ../src/modules/itip-formatter/itip-view.c:4884
+#: ../src/modules/itip-formatter/itip-view.c:4817
 #, 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:4889
+#: ../src/modules/itip-formatter/itip-view.c:4822
 #, 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:4907
+#: ../src/modules/itip-formatter/itip-view.c:4840
 msgid "Saving changes to the calendar. Please wait…"
 msgstr "Saving changes to the calendar. Please wait…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4910
+#: ../src/modules/itip-formatter/itip-view.c:4843
 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:4913
+#: ../src/modules/itip-formatter/itip-view.c:4846
 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:5004
+#: ../src/modules/itip-formatter/itip-view.c:4917
 msgid "Unable to parse item"
 msgstr "Unable to parse item"
 
-#: ../src/modules/itip-formatter/itip-view.c:5212
+#: ../src/modules/itip-formatter/itip-view.c:5115
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organiser has removed the delegate %s "
 
-#: ../src/modules/itip-formatter/itip-view.c:5229
-#| msgid "Sent a cancelation notice to the delegate"
+#: ../src/modules/itip-formatter/itip-view.c:5132
 msgid "Sent a cancellation notice to the delegate"
 msgstr "Sent a cancellation notice to the delegate"
 
-#: ../src/modules/itip-formatter/itip-view.c:5233
-#| msgid "Could not send the cancelation notice to the delegate"
+#: ../src/modules/itip-formatter/itip-view.c:5136
 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:5279
+#: ../src/modules/itip-formatter/itip-view.c:5182
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Unable to update attendee. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5312
+#: ../src/modules/itip-formatter/itip-view.c:5215
 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:5397
+#: ../src/modules/itip-formatter/itip-view.c:5300
 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:5472
-#: ../src/modules/itip-formatter/itip-view.c:5510
+#: ../src/modules/itip-formatter/itip-view.c:5376
+#: ../src/modules/itip-formatter/itip-view.c:5414
 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:5571
+#: ../src/modules/itip-formatter/itip-view.c:5475
 msgid "Meeting information sent"
 msgstr "Meeting information sent"
 
-#: ../src/modules/itip-formatter/itip-view.c:5576
+#: ../src/modules/itip-formatter/itip-view.c:5480
 msgid "Task information sent"
 msgstr "Task information sent"
 
-#: ../src/modules/itip-formatter/itip-view.c:5581
+#: ../src/modules/itip-formatter/itip-view.c:5485
 msgid "Memo information sent"
 msgstr "Memo information sent"
 
-#: ../src/modules/itip-formatter/itip-view.c:5592
+#: ../src/modules/itip-formatter/itip-view.c:5496
 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:5597
+#: ../src/modules/itip-formatter/itip-view.c:5501
 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:5602
+#: ../src/modules/itip-formatter/itip-view.c:5506
 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:5647
+#: ../src/modules/itip-formatter/itip-view.c:5551
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5652
+#: ../src/modules/itip-formatter/itip-view.c:5556
 msgid "Save Calendar"
 msgstr "Save Calendar"
 
-#: ../src/modules/itip-formatter/itip-view.c:5700
-#: ../src/modules/itip-formatter/itip-view.c:5713
+#: ../src/modules/itip-formatter/itip-view.c:5604
+#: ../src/modules/itip-formatter/itip-view.c:5617
 msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
-#: ../src/modules/itip-formatter/itip-view.c:5701
-#: ../src/modules/itip-formatter/itip-view.c:5714
+#: ../src/modules/itip-formatter/itip-view.c:5605
+#: ../src/modules/itip-formatter/itip-view.c:5618
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -24271,15 +24498,15 @@ msgstr ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 
-#: ../src/modules/itip-formatter/itip-view.c:5796
-#: ../src/modules/itip-formatter/itip-view.c:5880
-#: ../src/modules/itip-formatter/itip-view.c:5984
+#: ../src/modules/itip-formatter/itip-view.c:5700
+#: ../src/modules/itip-formatter/itip-view.c:5784
+#: ../src/modules/itip-formatter/itip-view.c:5888
 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:5797
-#: ../src/modules/itip-formatter/itip-view.c:5881
-#: ../src/modules/itip-formatter/itip-view.c:5985
+#: ../src/modules/itip-formatter/itip-view.c:5701
+#: ../src/modules/itip-formatter/itip-view.c:5785
+#: ../src/modules/itip-formatter/itip-view.c:5889
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -24287,11 +24514,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:5890
+#: ../src/modules/itip-formatter/itip-view.c:5794
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
-#: ../src/modules/itip-formatter/itip-view.c:5891
+#: ../src/modules/itip-formatter/itip-view.c:5795
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -24299,12 +24526,12 @@ msgstr ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 
-#: ../src/modules/itip-formatter/itip-view.c:6478
+#: ../src/modules/itip-formatter/itip-view.c:6375
 msgctxt "cal-itip"
 msgid "None"
 msgstr "None"
 
-#: ../src/modules/itip-formatter/itip-view.c:6496
+#: ../src/modules/itip-formatter/itip-view.c:6397
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
@@ -24323,35 +24550,35 @@ msgid "“{0}” has delegated the meeting. Do you want to add the delegate “{
 msgstr ""
 "“{0}” has delegated the meeting. Do you want to add the delegate “{1}”?"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:301
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:297
 msgid "Google Features"
 msgstr "Google Features"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:310
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:306
 msgid "Add Google Ca_lendar to this account"
 msgstr "Add Google Ca_lendar to this account"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:319
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:315
 msgid "Add Google Con_tacts to this account"
 msgstr "Add Google Con_tacts to this account"
 
 #. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:330
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:326
 msgctxt "GoggleSummary"
 msgid "IMAP access"
 msgstr "IMAP access"
 
 #. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:333
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:329
 msgctxt "GoggleSummary"
 msgid "Calendars to synchronize"
 msgstr "Calendars to synchronise"
 
 #. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:336
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:332
 #, c-format
 msgctxt "GoggleSummary"
 msgid "You may need to enable %s and %s"
@@ -24417,8 +24644,8 @@ msgstr "Mbox spool directory cannot be empty"
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:199
 #: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:59
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:155
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:193
-#: ../src/plugins/mail-notification/mail-notification.c:1220
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:194
+#: ../src/plugins/mail-notification/mail-notification.c:1271
 msgid "Configuration"
 msgstr "Configuration"
 
@@ -24496,11 +24723,11 @@ msgstr "Ser_ver requires authentication"
 msgid "T_ype:"
 msgstr "T_ype:"
 
-#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:252
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:248
 msgid "Yahoo! Features"
 msgstr "Yahoo! Features"
 
-#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:261
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:257
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Add Yahoo! Ca_lendar and Tasks to this account"
 
@@ -24511,93 +24738,93 @@ msgid_plural "%d attached messages"
 msgstr[0] "%d attached message"
 msgstr[1] "%d attached messages"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:399
+#: ../src/modules/mail/e-mail-shell-backend.c:420
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:401
+#: ../src/modules/mail/e-mail-shell-backend.c:422
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:409
+#: ../src/modules/mail/e-mail-shell-backend.c:430
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Mail Acco_unt"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:411
+#: ../src/modules/mail/e-mail-shell-backend.c:432
 msgid "Create a new mail account"
 msgstr "Create a new mail account"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:416
+#: ../src/modules/mail/e-mail-shell-backend.c:437
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:418
+#: ../src/modules/mail/e-mail-shell-backend.c:439
 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-friendly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:786
+#: ../src/modules/mail/e-mail-shell-backend.c:981
 msgctxt "NetworkMonitor"
 msgid "base"
 msgstr "base"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-friendly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:789
+#: ../src/modules/mail/e-mail-shell-backend.c:984
 msgctxt "NetworkMonitor"
 msgid "netlink"
 msgstr "netlink"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-friendly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:792
+#: ../src/modules/mail/e-mail-shell-backend.c:987
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "networkmanager"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:822
+#: ../src/modules/mail/e-mail-shell-backend.c:1017
 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:833
+#: ../src/modules/mail/e-mail-shell-backend.c:1028
 #, c-format
 msgctxt "NetworkMonitor"
 msgid "Default (%s)"
 msgstr "Default (%s)"
 
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:837
+#: ../src/modules/mail/e-mail-shell-backend.c:1032
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Default"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:854
+#: ../src/modules/mail/e-mail-shell-backend.c:1049
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Always Online"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:923
+#: ../src/modules/mail/e-mail-shell-backend.c:1118
 msgid "Mail Preferences"
 msgstr "Mail Preferences"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:932
+#: ../src/modules/mail/e-mail-shell-backend.c:1127
 msgid "Composer Preferences"
 msgstr "Composer Preferences"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:941
+#: ../src/modules/mail/e-mail-shell-backend.c:1136
 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:1302
+#: ../src/modules/mail/e-mail-shell-backend.c:1497
 msgctxt "label"
 msgid "None"
 msgstr "None"
@@ -24606,252 +24833,252 @@ msgstr "None"
 msgid "Marking messages as read…"
 msgstr "Marking messages as read…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1258
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Go to Folder"
 msgstr "Go to Folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1262
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1256
 msgid "_Select"
 msgstr "_Select"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1572
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1566
 msgid "_Disable Account"
 msgstr "_Disable Account"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1574
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1568
 msgid "Disable this account"
 msgstr "Disable this account"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1581
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1575
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Permanently remove all the deleted messages from all folders"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1586
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1580
 msgid "Empty _Junk"
 msgstr "Empty _Junk"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1588
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1582
 msgid "Delete all Junk messages from all folders"
 msgstr "Delete all Junk messages from all folders"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1595
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1589
 msgid "Edit properties of this account"
 msgstr "Edit properties of this account"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1602
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1596
 msgid "Refresh list of folders of this account"
 msgstr "Refresh list of folders of this account"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1607
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1601
 msgid "_Download Messages for Offline Usage"
 msgstr "_Download Messages for Offline Usage"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1609
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1603
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Download messages of accounts and folders marked for offline usage"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1614
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1608
 msgid "Fl_ush Outbox"
 msgstr "Fl_ush Outbox"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1621
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1615
 msgid "_Copy Folder To…"
 msgstr "_Copy Folder To…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1623
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1617
 msgid "Copy the selected folder into another folder"
 msgstr "Copy the selected folder into another folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1630
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Permanently remove this folder"
 msgstr "Permanently remove this folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1635
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1629
 msgid "Edit Sort _Order…"
 msgstr "Edit Sort _Order…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1637
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1631
 msgid "Change sort order of the folders in the folder tree"
 msgstr "Change sort order of the folders in the folder tree"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1642
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1636
 msgid "E_xpunge"
 msgstr "E_xpunge"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1644
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1638
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Permanently remove all deleted messages from this folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1649
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1741
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1643
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1735
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_k All Messages as Read"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1651
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1743
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1645
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Mark all messages in the folder as read"
 msgstr "Mark all messages in the folder as read"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1656
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1650
 msgid "_Move Folder To…"
 msgstr "_Move Folder To…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1658
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
 msgid "Move the selected folder into another folder"
 msgstr "Move the selected folder into another folder"
 
 #. Translators: An action caption to create a new mail folder
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1658
 msgid "_New…"
 msgstr "_New…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1660
 msgid "Create a new folder for storing mail"
 msgstr "Create a new folder for storing mail"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1667
 msgid "Change the properties of this folder"
 msgstr "Change the properties of this folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1674
 msgid "Refresh the folder"
 msgstr "Refresh the folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1681
 msgid "Change the name of this folder"
 msgstr "Change the name of this folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1686
 msgid "Select Message _Thread"
 msgstr "Select Message _Thread"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1688
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Select all messages in the same thread as the selected message"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1693
 msgid "Select Message S_ubthread"
 msgstr "Select Message S_ubthread"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1695
 msgid "Select all replies to the currently selected message"
 msgstr "Select all replies to the currently selected message"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1713
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1707
 msgid "Empty _Trash"
 msgstr "Empty Was_tebasket"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1715
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Permanently remove all the deleted messages from all accounts"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1720
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1714
 msgid "Go to _Folder"
 msgstr "Go to _Folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1722
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
 msgid "Opens a dialog to select a folder to go to"
-msgstr "Opens a dialog to select a folder to go to"
+msgstr "Opens a dialogue to select a folder to go to"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1734
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1728
 msgid "_Manage Subscriptions"
 msgstr "_Manage Subscriptions"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1736
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1820
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1814
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Subscribe or unsubscribe to folders on remote servers"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1748
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1769
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1742
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1763
 msgid "Send / _Receive"
 msgstr "Send / _Receive"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1750
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Send queued items and retrieve new items"
 msgstr "Send queued items and retrieve new items"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1755
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1749
 msgid "R_eceive All"
 msgstr "R_eceive All"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1757
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
 msgid "Receive new items from all accounts"
 msgstr "Receive new items from all accounts"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1762
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1756
 msgid "_Send All"
 msgstr "_Send All"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1764
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Send queued items in all accounts"
 msgstr "Send queued items in all accounts"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1792
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1786
 msgid "Cancel the current mail operation"
 msgstr "Cancel the current mail operation"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1791
 msgid "Collapse All _Threads"
 msgstr "Collapse All _Threads"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1799
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1793
 msgid "Collapse all message threads"
 msgstr "Collapse all message threads"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1798
 msgid "E_xpand All Threads"
 msgstr "E_xpand All Threads"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1806
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1800
 msgid "Expand all message threads"
 msgstr "Expand all message threads"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1805
 msgid "_Message Filters"
 msgstr "_Message Filters"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1813
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1807
 msgid "Create or edit rules for filtering new mail"
 msgstr "Create or edit rules for filtering new mail"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1812
 msgid "_Subscriptions…"
 msgstr "_Subscriptions…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1827
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1821
 msgid "F_older"
 msgstr "F_older"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1844
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1838
 msgid "C_reate Search Folder From Search…"
 msgstr "C_reate Search Folder From Search…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1845
 msgid "Search F_olders"
 msgstr "Search F_olders"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1853
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1847
 msgid "Create or edit search folder definitions"
 msgstr "Create or edit search folder definitions"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1890
 msgid "_New Folder…"
 msgstr "_New Folder…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1924
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1918
 msgid "Show Message _Preview"
 msgstr "Show Message _Preview"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1920
 msgid "Show message preview pane"
 msgstr "Show message preview pane"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1932
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
 msgid "Show _Attachment Bar"
 msgstr "Show _Attachment Bar"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1934
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1928
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments"
@@ -24859,210 +25086,210 @@ msgstr ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1934
 msgid "Show _Deleted Messages"
 msgstr "Show _Deleted Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1942
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1936
 msgid "Show deleted messages with a line through them"
 msgstr "Show deleted messages with a line through them"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1942
 msgid "Show _Junk Messages"
 msgstr "Show _Junk Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1950
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1944
 msgid "Show junk messages with a red line through them"
 msgstr "Show junk messages with a red line through them"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1956
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1950
 msgid "_Group By Threads"
 msgstr "_Group By Threads"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1952
 msgid "Threaded message list"
 msgstr "Threaded message list"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1964
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
 msgid "Show To _Do Bar"
 msgstr "Show To _Do Bar"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1966
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1960
 msgid "Show To Do bar with appointments and tasks"
 msgstr "Show To Do bar with appointments and tasks"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1972
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1966
 msgid "_Unmatched Folder Enabled"
 msgstr "_Unmatched Folder Enabled"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1974
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1968
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Toggles whether Unmatched search folder is enabled"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1994
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1988
 msgid "Show message preview below the message list"
 msgstr "Show message preview below the message list"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2001
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1995
 msgid "Show message preview alongside the message list"
 msgstr "Show message preview alongside the message list"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2009
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2003
 msgid "All Messages"
 msgstr "All Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2010
 msgid "Important Messages"
 msgstr "Important Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2023
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2017
 msgid "Last 5 Days’ Messages"
 msgstr "Last 5 Days’ Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2030
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
 msgid "Messages Not Junk"
 msgstr "Messages Not Junk"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2031
 msgid "Messages with Attachments"
 msgstr "Messages with Attachments"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2038
 msgid "Messages with Notes"
 msgstr "Messages with Notes"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2045
 msgid "No Label"
 msgstr "No Label"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2052
 msgid "Read Messages"
 msgstr "Read Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2059
 msgid "Unread Messages"
 msgstr "Unread Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2066
 msgid "Message Thread"
 msgstr "Message Thread"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2132
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2126
 msgid "Subject or Addresses contain"
 msgstr "Subject or Addresses contain"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2142
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2136
 msgid "All Accounts"
 msgstr "All Accounts"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2149
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2143
 msgid "Current Account"
 msgstr "Current Account"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2156
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2150
 msgid "Current Folder"
 msgstr "Current Folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2163
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2157
 msgid "Current Folder and Subfolders"
 msgstr "Current Folder and Subfolders"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1028
+#: ../src/modules/mail/e-mail-shell-view.c:1039
 msgid "Current Folder and Subfolders Search"
 msgstr "Current Folder and Subfolders Search"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1150
+#: ../src/modules/mail/e-mail-shell-view.c:1159
 msgid "All Account Search"
 msgstr "All Account Search"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1260
+#: ../src/modules/mail/e-mail-shell-view.c:1267
 msgid "Account Search"
 msgstr "Account Search"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:905
+#: ../src/modules/mail/e-mail-shell-view-private.c:918
 #, 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:920
-#: ../src/modules/mail/e-mail-shell-view-private.c:937
+#: ../src/modules/mail/e-mail-shell-view-private.c:933
+#: ../src/modules/mail/e-mail-shell-view-private.c:950
 #, 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:951
-#: ../src/modules/mail/e-mail-shell-view-private.c:957
+#: ../src/modules/mail/e-mail-shell-view-private.c:964
+#: ../src/modules/mail/e-mail-shell-view-private.c:970
 #, 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:964
+#: ../src/modules/mail/e-mail-shell-view-private.c:977
 #, 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:970
+#: ../src/modules/mail/e-mail-shell-view-private.c:983
 #, 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:976
+#: ../src/modules/mail/e-mail-shell-view-private.c:989
 #, 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:993
+#: ../src/modules/mail/e-mail-shell-view-private.c:1006
 #, 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:1511
+#: ../src/modules/mail/e-mail-shell-view-private.c:1524
 msgid "Send / Receive"
 msgstr "Send / Receive"
 
-#: ../src/modules/mail/em-composer-prefs.c:420
+#: ../src/modules/mail/em-composer-prefs.c:417
 msgid "Select Folder to Add"
 msgstr "Select Folder to Add"
 
-#: ../src/modules/mail/em-composer-prefs.c:896
+#: ../src/modules/mail/em-composer-prefs.c:893
 msgid "Folder"
 msgstr "Folder"
 
-#: ../src/modules/mail/em-composer-prefs.c:932
+#: ../src/modules/mail/em-composer-prefs.c:929
 msgid "Recipient"
 msgstr "Recipient"
 
-#: ../src/modules/mail/em-composer-prefs.c:1223
+#: ../src/modules/mail/em-composer-prefs.c:1220
 msgid "Keep in Outbox"
 msgstr "Keep in Outbox"
 
-#: ../src/modules/mail/em-composer-prefs.c:1224
+#: ../src/modules/mail/em-composer-prefs.c:1221
 msgid "Send immediately"
 msgstr "Send immediately"
 
-#: ../src/modules/mail/em-composer-prefs.c:1225
+#: ../src/modules/mail/em-composer-prefs.c:1222
 msgid "Send after 5 minutes"
 msgstr "Send after 5 minutes"
 
-#: ../src/modules/mail/em-composer-prefs.c:1310
+#: ../src/modules/mail/em-composer-prefs.c:1307
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: ../src/modules/mail/em-composer-prefs.c:1340
+#: ../src/modules/mail/em-composer-prefs.c:1337
 msgid "Same as user interface"
 msgstr "Same as user interface"
 
@@ -25176,28 +25403,28 @@ msgstr ""
 msgid "Author(s)"
 msgstr "Author(s)"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:303
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:304
 msgid "Plugin Manager"
 msgstr "Plug-in Manager"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:318
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:319
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Note: Some changes will not take effect until restart"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:346
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:347
 msgid "Overview"
 msgstr "Overview"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:415
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:498
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:416
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:499
 msgid "Plugin"
 msgstr "Plug-in"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:536
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:537
 msgid "_Plugins"
 msgstr "_Plug-ins"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:537
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:538
 msgid "Enable and disable plugins"
 msgstr "Enable and disable plug-ins"
 
@@ -25217,22 +25444,22 @@ msgstr "Display HTML version"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Display HTML version of multipart/alternative message"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:69
 #: ../src/modules/prefer-plain/plugin/config-ui.c:35
 msgid "Show HTML if present"
 msgstr "Show HTML if present"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:70
 #: ../src/modules/prefer-plain/plugin/config-ui.c:36
 msgid "Let Evolution choose the best part to show."
 msgstr "Let Evolution choose the best part to show."
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:73
 #: ../src/modules/prefer-plain/plugin/config-ui.c:39
 msgid "Show plain text if present"
 msgstr "Show plain text if present"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:74
 #: ../src/modules/prefer-plain/plugin/config-ui.c:40
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
@@ -25241,22 +25468,22 @@ msgstr ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:78
 #: ../src/modules/prefer-plain/plugin/config-ui.c:44
 msgid "Show plain text if present, or HTML source"
 msgstr "Show plain text if present, or HTML source"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:79
 #: ../src/modules/prefer-plain/plugin/config-ui.c:45
 msgid "Show plain text part, if present, otherwise the HTML part source."
 msgstr "Show plain text part, if present, otherwise the HTML part source."
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:91
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:83
 #: ../src/modules/prefer-plain/plugin/config-ui.c:49
 msgid "Only ever show plain text"
 msgstr "Only ever show plain text"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:92
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:84
 #: ../src/modules/prefer-plain/plugin/config-ui.c:50
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
@@ -25332,19 +25559,19 @@ msgstr "Junk filter using SpamAssassin"
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:271
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:340
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:336
 msgid "Importing Files"
 msgstr "Importing Files"
 
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:257
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:253
 msgid "Import cancelled."
 msgstr "Import cancelled."
 
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:274
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:270
 msgid "Import complete."
 msgstr "Import complete."
 
-#: ../src/modules/startup-wizard/e-startup-assistant.c:186
+#: ../src/modules/startup-wizard/e-startup-assistant.c:174
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -25356,18 +25583,18 @@ msgstr ""
 "The next few screens will allow Evolution to connect to your e-mail "
 "accounts, and to import files from other applications."
 
-#: ../src/modules/startup-wizard/e-startup-assistant.c:193
+#: ../src/modules/startup-wizard/e-startup-assistant.c:181
 msgid "Do not _show this wizard again"
 msgstr "Do not _show this wizard again"
 
 #. Translators: This is part of "Alternatively, you can %s (email, contacts and calendaring) instead." 
sentence from the same translation context.
-#: ../src/modules/startup-wizard/e-startup-assistant.c:206
+#: ../src/modules/startup-wizard/e-startup-assistant.c:194
 msgctxt "wizard-ca-note"
 msgid "create a collection account"
 msgstr "create a collection account"
 
 #. Translators: The '%s' is replaced with "create a collection account" from the same translation context.
-#: ../src/modules/startup-wizard/e-startup-assistant.c:208
+#: ../src/modules/startup-wizard/e-startup-assistant.c:196
 #, c-format
 msgctxt "wizard-ca-note"
 msgid "Alternatively, you can %s (email, contacts and calendaring) instead."
@@ -25638,7 +25865,7 @@ msgid "_Do not show this message again."
 msgstr "_Do not show this message again."
 
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:571
-#: ../src/plugins/templates/templates.c:489
+#: ../src/plugins/templates/templates.c:495
 msgid "Keywords"
 msgstr "Keywords"
 
@@ -25659,6 +25886,7 @@ msgid "_Add Attachment..."
 msgstr "_Add Attachment…"
 
 #: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:3
 msgid "_Edit Message"
 msgstr "_Edit Message"
 
@@ -25783,12 +26011,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "None"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:538
+#: ../src/plugins/email-custom-header/email-custom-header.c:528
 msgid "_Custom Header"
 msgstr "_Custom Header"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
-#: ../src/plugins/email-custom-header/email-custom-header.c:808
+#: ../src/plugins/email-custom-header/email-custom-header.c:795
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by “;”."
@@ -25796,12 +26024,12 @@ msgstr ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by “;”."
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:862
+#: ../src/plugins/email-custom-header/email-custom-header.c:849
 msgid "Key"
 msgstr "Key"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:879
-#: ../src/plugins/templates/templates.c:498
+#: ../src/plugins/email-custom-header/email-custom-header.c:866
+#: ../src/plugins/templates/templates.c:504
 msgid "Values"
 msgstr "Values"
 
@@ -26098,85 +26326,93 @@ msgstr ""
 "Header: {0}"
 
 #. Translators: '%d' is the count of mails received.
-#: ../src/plugins/mail-notification/mail-notification.c:462
+#: ../src/plugins/mail-notification/mail-notification.c:500
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "You have received %d new message."
 msgstr[1] "You have received %d new messages."
 
+#. Translators: The '%s' is replaced by the folder name, where a new
+#. * mail message arrived. Example: "Folder: On This Computer : Inbox"
+#: ../src/plugins/mail-notification/mail-notification.c:509
+#, c-format
+#| msgid "Folder '%s'"
+msgid "Folder: %s"
+msgstr "Folder: %s"
+
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../src/plugins/mail-notification/mail-notification.c:471
+#: ../src/plugins/mail-notification/mail-notification.c:517
 #, c-format
 msgid "From: %s"
 msgstr "From: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../src/plugins/mail-notification/mail-notification.c:485
+#: ../src/plugins/mail-notification/mail-notification.c:525
 #, c-format
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
 #. Translators: %d is the count of mails received in addition
 #. * to the one displayed in this notification.
-#: ../src/plugins/mail-notification/mail-notification.c:501
+#: ../src/plugins/mail-notification/mail-notification.c:536
 #, c-format
 msgid "(and %d more)"
 msgid_plural "(and %d more)"
 msgstr[0] "(and %d more)"
 msgstr[1] "(and %d more)"
 
-#: ../src/plugins/mail-notification/mail-notification.c:513
+#: ../src/plugins/mail-notification/mail-notification.c:542
 msgid "New email in Evolution"
 msgstr "New e-mail in Evolution"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../src/plugins/mail-notification/mail-notification.c:553
+#: ../src/plugins/mail-notification/mail-notification.c:583
 #, c-format
 msgid "Show %s"
 msgstr "Show %s"
 
-#: ../src/plugins/mail-notification/mail-notification.c:792
+#: ../src/plugins/mail-notification/mail-notification.c:843
 msgid "_Play sound when a new message arrives"
 msgstr "_Play sound when a new message arrives"
 
-#: ../src/plugins/mail-notification/mail-notification.c:824
+#: ../src/plugins/mail-notification/mail-notification.c:875
 msgid "_Beep"
 msgstr "_Beep"
 
-#: ../src/plugins/mail-notification/mail-notification.c:837
+#: ../src/plugins/mail-notification/mail-notification.c:888
 msgid "Use sound _theme"
 msgstr "Use sound _theme"
 
-#: ../src/plugins/mail-notification/mail-notification.c:856
+#: ../src/plugins/mail-notification/mail-notification.c:907
 msgid "Play _file:"
 msgstr "Play _file:"
 
-#: ../src/plugins/mail-notification/mail-notification.c:865
+#: ../src/plugins/mail-notification/mail-notification.c:916
 msgid "Select sound file"
 msgstr "Select sound file"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1014
+#: ../src/plugins/mail-notification/mail-notification.c:1065
 msgid "Select _accounts for which enable notifications:"
 msgstr "Select _accounts for which enable notifications:"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1176
+#: ../src/plugins/mail-notification/mail-notification.c:1227
 #: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr "Mail Notification"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1190
+#: ../src/plugins/mail-notification/mail-notification.c:1241
 msgid "Notify new messages for _Inbox only"
 msgstr "Notify new messages for _Inbox only"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1206
+#: ../src/plugins/mail-notification/mail-notification.c:1257
 msgid "Show _notification when a new message arrives"
 msgstr "Show _notification when a new message arrives"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1224
+#: ../src/plugins/mail-notification/mail-notification.c:1275
 msgid "Accounts"
 msgstr "Accounts"
 
@@ -26191,24 +26427,24 @@ msgid "Created from a mail by %s"
 msgstr "Created from a mail by %s"
 
 #. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:600
+#: ../src/plugins/mail-to-task/mail-to-task.c:598
 msgctxt "mail-to-task"
 msgid "_Cancel"
 msgstr "_Cancel"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:602
+#: ../src/plugins/mail-to-task/mail-to-task.c:600
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "_Edit"
 
 #. Translators: Dialog button to create a New event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:604
+#: ../src/plugins/mail-to-task/mail-to-task.c:602
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "_New"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:622
+#: ../src/plugins/mail-to-task/mail-to-task.c:620
 #, c-format
 msgid ""
 "Selected calendar contains event “%s” already. Would you like to edit the "
@@ -26217,7 +26453,7 @@ msgstr ""
 "Selected calendar contains event “%s” already. Would you like to edit the "
 "old event?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:625
+#: ../src/plugins/mail-to-task/mail-to-task.c:623
 #, c-format
 msgid ""
 "Selected task list contains task “%s” already. Would you like to edit the "
@@ -26226,7 +26462,7 @@ msgstr ""
 "Selected task list contains task “%s” already. Would you like to edit the "
 "old task?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:628
+#: ../src/plugins/mail-to-task/mail-to-task.c:626
 #, c-format
 msgid ""
 "Selected memo list contains memo “%s” already. Would you like to edit the "
@@ -26236,7 +26472,7 @@ msgstr ""
 "old memo?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:648
+#: ../src/plugins/mail-to-task/mail-to-task.c:646
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -26252,7 +26488,7 @@ msgstr[1] ""
 "add them all?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:655
+#: ../src/plugins/mail-to-task/mail-to-task.c:653
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -26268,7 +26504,7 @@ msgstr[1] ""
 "add them all?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:662
+#: ../src/plugins/mail-to-task/mail-to-task.c:660
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -26283,29 +26519,29 @@ msgstr[1] ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:683
+#: ../src/plugins/mail-to-task/mail-to-task.c:681
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Do you wish to continue converting remaining mails?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:759
+#: ../src/plugins/mail-to-task/mail-to-task.c:756
 msgid "[No Summary]"
 msgstr "[No Summary]"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:772
+#: ../src/plugins/mail-to-task/mail-to-task.c:769
 msgid "Invalid object returned from a server"
 msgstr "Invalid object returned from a server"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:826
+#: ../src/plugins/mail-to-task/mail-to-task.c:823
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "An error occurred during processing: %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:877
+#: ../src/plugins/mail-to-task/mail-to-task.c:874
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Cannot open calendar. %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:881
+#: ../src/plugins/mail-to-task/mail-to-task.c:878
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -26313,7 +26549,7 @@ msgstr ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:884
+#: ../src/plugins/mail-to-task/mail-to-task.c:881
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -26321,7 +26557,7 @@ msgstr ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:887
+#: ../src/plugins/mail-to-task/mail-to-task.c:884
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -26329,35 +26565,35 @@ msgstr ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1328
+#: ../src/plugins/mail-to-task/mail-to-task.c:1325
 msgid "Create an _Appointment"
 msgstr "Create an _Appointment"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1330
+#: ../src/plugins/mail-to-task/mail-to-task.c:1327
 msgid "Create a new event from the selected message"
 msgstr "Create a new event from the selected message"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1335
+#: ../src/plugins/mail-to-task/mail-to-task.c:1332
 msgid "Create a Mem_o"
 msgstr "Create a Mem_o"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1337
+#: ../src/plugins/mail-to-task/mail-to-task.c:1334
 msgid "Create a new memo from the selected message"
 msgstr "Create a new memo from the selected message"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1342
+#: ../src/plugins/mail-to-task/mail-to-task.c:1339
 msgid "Create a _Task"
 msgstr "Create a _Task"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1344
+#: ../src/plugins/mail-to-task/mail-to-task.c:1341
 msgid "Create a new task from the selected message"
 msgstr "Create a new task from the selected message"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1352
+#: ../src/plugins/mail-to-task/mail-to-task.c:1349
 msgid "Create a _Meeting"
 msgstr "Create a _Meeting"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1354
+#: ../src/plugins/mail-to-task/mail-to-task.c:1351
 msgid "Create a new meeting from the selected message"
 msgstr "Create a new meeting from the selected message"
 
@@ -26438,18 +26674,18 @@ msgstr "Publishing to %s finished successfully"
 msgid "Mount of %s failed:"
 msgstr "Mount of %s failed:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:788
+#: ../src/plugins/publish-calendar/publish-calendar.c:787
 msgid "Are you sure you want to remove this location?"
 msgstr "Are you sure you want to remove this location?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../src/plugins/publish-calendar/publish-calendar.c:1098
+#: ../src/plugins/publish-calendar/publish-calendar.c:1097
 msgid "Could not create publish thread."
 msgstr "Could not create publish thread."
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:1108
+#: ../src/plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "_Publish Calendar Information"
 
@@ -26539,11 +26775,11 @@ msgstr "Publishing Location"
 msgid "Invalid source UID “%s”"
 msgstr "Invalid source UID “%s”"
 
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:542
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:540
 msgid "New Location"
 msgstr "New Location"
 
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:544
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:542
 msgid "Edit Location"
 msgstr "Edit Location"
 
@@ -26648,30 +26884,66 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../src/plugins/save-calendar/save-calendar.c:116
+#: ../src/plugins/save-calendar/save-calendar.c:114
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../src/plugins/save-calendar/save-calendar.c:183
+#: ../src/plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Select destination file"
 
-#: ../src/plugins/save-calendar/save-calendar.c:186
+#: ../src/plugins/save-calendar/save-calendar.c:184
 msgid "_Save As"
 msgstr "_Save As"
 
-#: ../src/plugins/save-calendar/save-calendar.c:346
+#: ../src/plugins/save-calendar/save-calendar.c:343
 msgid "Save the selected calendar to disk"
 msgstr "Save the selected calendar to disk"
 
-#: ../src/plugins/save-calendar/save-calendar.c:385
+#: ../src/plugins/save-calendar/save-calendar.c:382
 msgid "Save the selected memo list to disk"
 msgstr "Save the selected memo list to disk"
 
-#: ../src/plugins/save-calendar/save-calendar.c:424
+#: ../src/plugins/save-calendar/save-calendar.c:421
 msgid "Save the selected task list to disk"
 msgstr "Save the selected task list to disk"
 
+#: ../src/plugins/sender-validation/org-gnome-evolution-sender-validation.eplug.xml.h:1
+msgid "Sender Validation"
+msgstr "Sender Validation"
+
+#: ../src/plugins/sender-validation/org-gnome-evolution-sender-validation.eplug.xml.h:2
+msgid ""
+"Validates sender before sending an e-mail against a list of recipients and "
+"for them assigned expected send account."
+msgstr ""
+"Validates sender before sending an e-mail against a list of recipients and "
+"for them assigned expected send account."
+
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:1
+msgid "Confirm sender address"
+msgstr "Confirm sender address"
+
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:2
+msgid ""
+"The message contains recipient “{0}” for which it is set up to use sender "
+"account “{1}”, but the account “{2}” is used instead."
+msgstr ""
+"The message contains recipient “{0}” for which it is set up to use sender "
+"account “{1}”, but the account “{2}” is used instead."
+
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:4
+msgid "_Send Anyway"
+msgstr "_Send Anyway"
+
+#: ../src/plugins/sender-validation/sender-validation.c:520
+msgid "Recipient Contains"
+msgstr "Recipient Contains"
+
+#: ../src/plugins/sender-validation/sender-validation.c:530
+msgid "Account to Use"
+msgstr "Account to Use"
+
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
@@ -26682,15 +26954,15 @@ msgstr ""
 "$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."
 
-#: ../src/plugins/templates/templates.c:878
+#: ../src/plugins/templates/templates.c:887
 msgid "Saving message template"
 msgstr "Saving message template"
 
-#: ../src/plugins/templates/templates.c:899
+#: ../src/plugins/templates/templates.c:908
 msgid "Save as _Template"
 msgstr "Save as _Template"
 
-#: ../src/plugins/templates/templates.c:901
+#: ../src/plugins/templates/templates.c:910
 msgid "Save as Template"
 msgstr "Save as Template"
 
@@ -26730,19 +27002,19 @@ msgstr "Save Search"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../src/shell/e-shell-searchbar.c:925
+#: ../src/shell/e-shell-searchbar.c:924
 msgid "Sho_w:"
 msgstr "Sho_w:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../src/shell/e-shell-searchbar.c:951
+#: ../src/shell/e-shell-searchbar.c:950
 msgid "Sear_ch:"
 msgstr "Sear_ch:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../src/shell/e-shell-searchbar.c:1019
+#: ../src/shell/e-shell-searchbar.c:1018
 msgid "i_n"
 msgstr "i_n"
 
@@ -26787,293 +27059,300 @@ msgstr "Bug Buddy is not installed."
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy could not be run."
 
-#: ../src/shell/e-shell-window-actions.c:851
+#: ../src/shell/e-shell-window-actions.c:895
 msgid "Collect_ion Account"
 msgstr "Collect_ion Account"
 
-#: ../src/shell/e-shell-window-actions.c:853
+#: ../src/shell/e-shell-window-actions.c:897
 msgid "Create a new collection account"
 msgstr "Create a new collection account"
 
-#: ../src/shell/e-shell-window-actions.c:861
+#: ../src/shell/e-shell-window-actions.c:905
 msgid "_About"
 msgstr "_About"
 
-#: ../src/shell/e-shell-window-actions.c:863
+#: ../src/shell/e-shell-window-actions.c:907
 msgid "Show information about Evolution"
 msgstr "Show information about Evolution"
 
-#: ../src/shell/e-shell-window-actions.c:868
+#: ../src/shell/e-shell-window-actions.c:912
 msgid "_Accounts"
 msgstr "_Accounts"
 
-#: ../src/shell/e-shell-window-actions.c:870
+#: ../src/shell/e-shell-window-actions.c:914
 msgid "Configure Evolution Accounts"
 msgstr "Configure Evolution Accounts"
 
-#: ../src/shell/e-shell-window-actions.c:875
-#: ../src/shell/e-shell-window-actions.c:889
+#: ../src/shell/e-shell-window-actions.c:919
+#: ../src/shell/e-shell-window-actions.c:933
 msgid "_Close Window"
 msgstr "_Close Window"
 
-#: ../src/shell/e-shell-window-actions.c:896
+#: ../src/shell/e-shell-window-actions.c:940
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../src/shell/e-shell-window-actions.c:898
+#: ../src/shell/e-shell-window-actions.c:942
 msgid "Open the Evolution User Guide"
 msgstr "Open the Evolution User Guide"
 
-#: ../src/shell/e-shell-window-actions.c:924
+#: ../src/shell/e-shell-window-actions.c:968
 msgid "I_mport…"
 msgstr "I_mport…"
 
-#: ../src/shell/e-shell-window-actions.c:926
+#: ../src/shell/e-shell-window-actions.c:970
 msgid "Import data from other programs"
 msgstr "Import data from other programs"
 
-#: ../src/shell/e-shell-window-actions.c:931
+#: ../src/shell/e-shell-window-actions.c:975
 msgid "New _Window"
 msgstr "New _Window"
 
-#: ../src/shell/e-shell-window-actions.c:933
+#: ../src/shell/e-shell-window-actions.c:977
 msgid "Create a new window displaying this view"
 msgstr "Create a new window displaying this view"
 
-#: ../src/shell/e-shell-window-actions.c:945
+#: ../src/shell/e-shell-window-actions.c:989
 msgid "Available Cate_gories"
 msgstr "Available Cate_gories"
 
-#: ../src/shell/e-shell-window-actions.c:947
+#: ../src/shell/e-shell-window-actions.c:991
 msgid "Manage available categories"
 msgstr "Manage available categories"
 
-#: ../src/shell/e-shell-window-actions.c:959
+#: ../src/shell/e-shell-window-actions.c:1003
 msgid "_Quit"
 msgstr "_Quit"
 
-#: ../src/shell/e-shell-window-actions.c:961
+#: ../src/shell/e-shell-window-actions.c:1005
 msgid "Exit the program"
 msgstr "Exit the program"
 
-#: ../src/shell/e-shell-window-actions.c:966
-#| msgid "Save Search"
+#: ../src/shell/e-shell-window-actions.c:1010
 msgid "_Saved Searches"
 msgstr "_Saved Searches"
 
-#: ../src/shell/e-shell-window-actions.c:973
+#: ../src/shell/e-shell-window-actions.c:1017
 msgid "_Advanced Search…"
 msgstr "_Advanced Search…"
 
-#: ../src/shell/e-shell-window-actions.c:975
+#: ../src/shell/e-shell-window-actions.c:1019
 msgid "Construct a more advanced search"
 msgstr "Construct a more advanced search"
 
-#: ../src/shell/e-shell-window-actions.c:982
+#: ../src/shell/e-shell-window-actions.c:1026
 msgid "Clear the current search parameters"
 msgstr "Clear the current search parameters"
 
-#: ../src/shell/e-shell-window-actions.c:987
+#: ../src/shell/e-shell-window-actions.c:1031
 msgid "_Edit Saved Searches…"
 msgstr "_Edit Saved Searches…"
 
-#: ../src/shell/e-shell-window-actions.c:989
+#: ../src/shell/e-shell-window-actions.c:1033
 msgid "Manage your saved searches"
 msgstr "Manage your saved searches"
 
-#: ../src/shell/e-shell-window-actions.c:996
+#: ../src/shell/e-shell-window-actions.c:1040
 msgid "Click here to change the search type"
 msgstr "Click here to change the search type"
 
-#: ../src/shell/e-shell-window-actions.c:1001
+#: ../src/shell/e-shell-window-actions.c:1045
 msgid "_Find Now"
 msgstr "_Find Now"
 
-#: ../src/shell/e-shell-window-actions.c:1003
+#: ../src/shell/e-shell-window-actions.c:1047
 msgid "Execute the current search parameters"
 msgstr "Execute the current search parameters"
 
-#: ../src/shell/e-shell-window-actions.c:1008
+#: ../src/shell/e-shell-window-actions.c:1052
 msgid "_Save Search…"
 msgstr "_Save Search…"
 
-#: ../src/shell/e-shell-window-actions.c:1010
+#: ../src/shell/e-shell-window-actions.c:1054
 msgid "Save the current search parameters"
 msgstr "Save the current search parameters"
 
-#: ../src/shell/e-shell-window-actions.c:1022
+#: ../src/shell/e-shell-window-actions.c:1066
 msgid "_Keyboard Shortcuts"
 msgstr "_Keyboard Shortcuts"
 
-#: ../src/shell/e-shell-window-actions.c:1024
+#: ../src/shell/e-shell-window-actions.c:1068
 msgid "Show keyboard shortcuts"
 msgstr "Show keyboard shortcuts"
 
-#: ../src/shell/e-shell-window-actions.c:1029
+#: ../src/shell/e-shell-window-actions.c:1073
+msgid "Show _WebKit GPU information"
+msgstr "Show _WebKit GPU information"
+
+#: ../src/shell/e-shell-window-actions.c:1075
+msgid "Show WebKit GPU information page in the preview panel"
+msgstr "Show WebKit GPU information page in the preview panel"
+
+#: ../src/shell/e-shell-window-actions.c:1080
 msgid "Submit _Bug Report…"
 msgstr "Submit _Bug Report…"
 
-#: ../src/shell/e-shell-window-actions.c:1031
+#: ../src/shell/e-shell-window-actions.c:1082
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Submit a bug report using Bug Buddy"
 
-#: ../src/shell/e-shell-window-actions.c:1036
+#: ../src/shell/e-shell-window-actions.c:1087
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: ../src/shell/e-shell-window-actions.c:1038
+#: ../src/shell/e-shell-window-actions.c:1089
 msgid "Put Evolution into offline mode"
 msgstr "Put Evolution into offline mode"
 
-#: ../src/shell/e-shell-window-actions.c:1043
+#: ../src/shell/e-shell-window-actions.c:1094
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: ../src/shell/e-shell-window-actions.c:1045
+#: ../src/shell/e-shell-window-actions.c:1096
 msgid "Put Evolution into online mode"
 msgstr "Put Evolution into online mode"
 
-#: ../src/shell/e-shell-window-actions.c:1073
+#: ../src/shell/e-shell-window-actions.c:1124
 msgid "Lay_out"
 msgstr "Lay_out"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:1081
+#: ../src/shell/e-shell-window-actions.c:1132
 msgid "_New"
 msgstr "_New"
 
-#: ../src/shell/e-shell-window-actions.c:1088
+#: ../src/shell/e-shell-window-actions.c:1139
 msgid "_Search"
 msgstr "_Search"
 
-#: ../src/shell/e-shell-window-actions.c:1095
+#: ../src/shell/e-shell-window-actions.c:1146
 msgid "_Switcher Appearance"
 msgstr "_Switcher Appearance"
 
-#: ../src/shell/e-shell-window-actions.c:1109
+#: ../src/shell/e-shell-window-actions.c:1160
 msgid "_Window"
 msgstr "_Window"
 
-#: ../src/shell/e-shell-window-actions.c:1138
+#: ../src/shell/e-shell-window-actions.c:1189
 msgid "Show _Menu Bar"
 msgstr "Show _Menu Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1140
+#: ../src/shell/e-shell-window-actions.c:1191
 msgid "Show the menu bar"
 msgstr "Show the menu bar"
 
-#: ../src/shell/e-shell-window-actions.c:1146
+#: ../src/shell/e-shell-window-actions.c:1197
 msgid "Show Side _Bar"
 msgstr "Show Side _Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1148
+#: ../src/shell/e-shell-window-actions.c:1199
 msgid "Show the side bar"
 msgstr "Show the side bar"
 
-#: ../src/shell/e-shell-window-actions.c:1154
+#: ../src/shell/e-shell-window-actions.c:1205
 msgid "Show _Buttons"
 msgstr "Show _Buttons"
 
-#: ../src/shell/e-shell-window-actions.c:1156
+#: ../src/shell/e-shell-window-actions.c:1207
 msgid "Show the switcher buttons"
 msgstr "Show the switcher buttons"
 
-#: ../src/shell/e-shell-window-actions.c:1162
+#: ../src/shell/e-shell-window-actions.c:1213
 msgid "Show _Status Bar"
 msgstr "Show _Status Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1164
+#: ../src/shell/e-shell-window-actions.c:1215
 msgid "Show the status bar"
 msgstr "Show the status bar"
 
-#: ../src/shell/e-shell-window-actions.c:1170
+#: ../src/shell/e-shell-window-actions.c:1221
 msgid "Show _Tool Bar"
 msgstr "Show _Tool Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1172
+#: ../src/shell/e-shell-window-actions.c:1223
 msgid "Show the tool bar"
 msgstr "Show the tool bar"
 
-#: ../src/shell/e-shell-window-actions.c:1194
+#: ../src/shell/e-shell-window-actions.c:1245
 msgid "_Icons Only"
 msgstr "_Icons Only"
 
-#: ../src/shell/e-shell-window-actions.c:1196
+#: ../src/shell/e-shell-window-actions.c:1247
 msgid "Display window buttons with icons only"
 msgstr "Display window buttons with icons only"
 
-#: ../src/shell/e-shell-window-actions.c:1201
+#: ../src/shell/e-shell-window-actions.c:1252
 msgid "_Text Only"
 msgstr "_Text Only"
 
-#: ../src/shell/e-shell-window-actions.c:1203
+#: ../src/shell/e-shell-window-actions.c:1254
 msgid "Display window buttons with text only"
 msgstr "Display window buttons with text only"
 
-#: ../src/shell/e-shell-window-actions.c:1208
+#: ../src/shell/e-shell-window-actions.c:1259
 msgid "Icons _and Text"
 msgstr "Icons _and Text"
 
-#: ../src/shell/e-shell-window-actions.c:1210
+#: ../src/shell/e-shell-window-actions.c:1261
 msgid "Display window buttons with icons and text"
 msgstr "Display window buttons with icons and text"
 
-#: ../src/shell/e-shell-window-actions.c:1215
+#: ../src/shell/e-shell-window-actions.c:1266
 msgid "Tool_bar Style"
 msgstr "Tool_bar Style"
 
-#: ../src/shell/e-shell-window-actions.c:1217
+#: ../src/shell/e-shell-window-actions.c:1268
 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:1225
+#: ../src/shell/e-shell-window-actions.c:1276
 msgid "Delete Current View"
 msgstr "Delete Current View"
 
-#: ../src/shell/e-shell-window-actions.c:1232
+#: ../src/shell/e-shell-window-actions.c:1283
 msgid "Save Custom View…"
 msgstr "Save Custom View…"
 
-#: ../src/shell/e-shell-window-actions.c:1234
+#: ../src/shell/e-shell-window-actions.c:1285
 msgid "Save current custom view"
 msgstr "Save current custom view"
 
-#: ../src/shell/e-shell-window-actions.c:1248
+#: ../src/shell/e-shell-window-actions.c:1299
 msgid "C_urrent View"
 msgstr "C_urrent View"
 
-#: ../src/shell/e-shell-window-actions.c:1258
+#: ../src/shell/e-shell-window-actions.c:1309
 msgid "Custom View"
 msgstr "Custom View"
 
-#: ../src/shell/e-shell-window-actions.c:1260
+#: ../src/shell/e-shell-window-actions.c:1311
 msgid "Current view is a customized view"
 msgstr "Current view is a customised view"
 
-#: ../src/shell/e-shell-window-actions.c:1268
+#: ../src/shell/e-shell-window-actions.c:1319
 msgid "Page Set_up…"
 msgstr "Page Set_up…"
 
-#: ../src/shell/e-shell-window-actions.c:1270
+#: ../src/shell/e-shell-window-actions.c:1321
 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:1640
+#: ../src/shell/e-shell-window-actions.c:1696
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: ../src/shell/e-shell-window-actions.c:1764
+#: ../src/shell/e-shell-window-actions.c:1820
 #, c-format
 msgid "Select view: %s"
 msgstr "Select view: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1781
+#: ../src/shell/e-shell-window-actions.c:1837
 #, c-format
 msgid "Delete view: %s"
 msgstr "Delete view: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1896
+#: ../src/shell/e-shell-window-actions.c:1952
 msgid "Execute these search parameters"
 msgstr "Execute these search parameters"
 
@@ -27379,81 +27658,82 @@ msgstr ""
 "Edit trust settings:"
 
 #: ../src/smime/gui/certificate-manager.c:82
-#: ../src/smime/gui/certificate-manager.c:101
-#: ../src/smime/gui/certificate-manager.c:121
+#: ../src/smime/gui/certificate-manager.c:102
+#: ../src/smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "Certificate Name"
 
 #: ../src/smime/gui/certificate-manager.c:83
-#: ../src/smime/gui/certificate-manager.c:103
+#: ../src/smime/gui/certificate-manager.c:104
 msgid "Issued To Organization"
 msgstr "Issued To Organisation"
 
 #: ../src/smime/gui/certificate-manager.c:84
-#: ../src/smime/gui/certificate-manager.c:104
+#: ../src/smime/gui/certificate-manager.c:105
 msgid "Issued To Organizational Unit"
 msgstr "Issued To Organisational Unit"
 
 #: ../src/smime/gui/certificate-manager.c:85
-#: ../src/smime/gui/certificate-manager.c:105
-#: ../src/smime/gui/certificate-manager.c:123
+#: ../src/smime/gui/certificate-manager.c:106
+#: ../src/smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "Serial Number"
 
 #: ../src/smime/gui/certificate-manager.c:86
-#: ../src/smime/gui/certificate-manager.c:106
-#: ../src/smime/gui/certificate-manager.c:124
+#: ../src/smime/gui/certificate-manager.c:107
+#: ../src/smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr "Purposes"
 
 #: ../src/smime/gui/certificate-manager.c:87
-#: ../src/smime/gui/certificate-manager.c:107
-#: ../src/smime/gui/certificate-manager.c:125
+#: ../src/smime/gui/certificate-manager.c:108
+#: ../src/smime/gui/certificate-manager.c:127
 msgid "Issued By"
 msgstr "Issued By"
 
 #: ../src/smime/gui/certificate-manager.c:88
-#: ../src/smime/gui/certificate-manager.c:108
-#: ../src/smime/gui/certificate-manager.c:126
+#: ../src/smime/gui/certificate-manager.c:109
+#: ../src/smime/gui/certificate-manager.c:128
 msgid "Issued By Organization"
 msgstr "Issued By Organisation"
 
 #: ../src/smime/gui/certificate-manager.c:89
-#: ../src/smime/gui/certificate-manager.c:109
-#: ../src/smime/gui/certificate-manager.c:127
+#: ../src/smime/gui/certificate-manager.c:110
+#: ../src/smime/gui/certificate-manager.c:129
 msgid "Issued By Organizational Unit"
 msgstr "Issued By Organisational Unit"
 
 #: ../src/smime/gui/certificate-manager.c:90
-#: ../src/smime/gui/certificate-manager.c:110
-#: ../src/smime/gui/certificate-manager.c:128
+#: ../src/smime/gui/certificate-manager.c:111
+#: ../src/smime/gui/certificate-manager.c:130
 msgid "Issued"
 msgstr "Issued"
 
 #: ../src/smime/gui/certificate-manager.c:91
-#: ../src/smime/gui/certificate-manager.c:111
-#: ../src/smime/gui/certificate-manager.c:129
+#: ../src/smime/gui/certificate-manager.c:112
+#: ../src/smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "Expires"
 
-#: ../src/smime/gui/certificate-manager.c:92
-#: ../src/smime/gui/certificate-manager.c:112
-#: ../src/smime/gui/certificate-manager.c:130
+#. { G_TYPE_STRING, N_("SHA256 Fingerprint"),          e_cert_get_sha256_fingerprint,  FALSE },
+#: ../src/smime/gui/certificate-manager.c:93
+#: ../src/smime/gui/certificate-manager.c:114
+#: ../src/smime/gui/certificate-manager.c:133
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 Fingerprint"
 
-#: ../src/smime/gui/certificate-manager.c:93
-#: ../src/smime/gui/certificate-manager.c:113
-#: ../src/smime/gui/certificate-manager.c:131
+#: ../src/smime/gui/certificate-manager.c:94
+#: ../src/smime/gui/certificate-manager.c:115
+#: ../src/smime/gui/certificate-manager.c:134
 msgid "MD5 Fingerprint"
 msgstr "MD5 Fingerprint"
 
-#: ../src/smime/gui/certificate-manager.c:102
-#: ../src/smime/gui/certificate-manager.c:122
+#: ../src/smime/gui/certificate-manager.c:103
+#: ../src/smime/gui/certificate-manager.c:124
 msgid "Email Address"
 msgstr "E-mail Address"
 
-#: ../src/smime/gui/certificate-manager.c:648
+#: ../src/smime/gui/certificate-manager.c:650
 msgid "Select a file to backup your key and certificate…"
 msgstr "Select a file to backup your key and certificate…"
 
@@ -27462,31 +27742,31 @@ msgstr "Select a file to backup your key and certificate…"
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../src/smime/gui/certificate-manager.c:658
+#: ../src/smime/gui/certificate-manager.c:660
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-backup.p12"
 
-#: ../src/smime/gui/certificate-manager.c:721
+#: ../src/smime/gui/certificate-manager.c:719
 msgid "Backup Certificate"
 msgstr "Backup Certificate"
 
 #. filename selection
-#: ../src/smime/gui/certificate-manager.c:736
+#: ../src/smime/gui/certificate-manager.c:734
 msgid "_File name:"
 msgstr "_File name:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../src/smime/gui/certificate-manager.c:741
+#: ../src/smime/gui/certificate-manager.c:739
 msgid "Please select a file…"
 msgstr "Please select a file…"
 
-#: ../src/smime/gui/certificate-manager.c:755
+#: ../src/smime/gui/certificate-manager.c:753
 msgid "_Include certificate chain in the backup"
 msgstr "_Include certificate chain in the backup"
 
 #. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:761
+#: ../src/smime/gui/certificate-manager.c:759
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
@@ -27496,16 +27776,16 @@ msgstr ""
 "you are about to create.\n"
 "You must set this password to proceed with the backup."
 
-#: ../src/smime/gui/certificate-manager.c:780
+#: ../src/smime/gui/certificate-manager.c:778
 msgid "_Repeat Password:"
 msgstr "_Repeat Password:"
 
-#: ../src/smime/gui/certificate-manager.c:799
+#: ../src/smime/gui/certificate-manager.c:797
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
 #. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:807
+#: ../src/smime/gui/certificate-manager.c:805
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -27517,92 +27797,92 @@ msgstr ""
 "restore this backup later.\n"
 "Please record it in a safe location."
 
-#: ../src/smime/gui/certificate-manager.c:852
+#: ../src/smime/gui/certificate-manager.c:850
 msgid "No file name provided"
 msgstr "No file name provided"
 
-#: ../src/smime/gui/certificate-manager.c:856
+#: ../src/smime/gui/certificate-manager.c:854
 msgid "Failed to backup key and certificate"
 msgstr "Failed to backup key and certificate"
 
-#: ../src/smime/gui/certificate-manager.c:948
+#: ../src/smime/gui/certificate-manager.c:946
 msgid "Select a certificate to import…"
 msgstr "Select a certificate to import…"
 
-#: ../src/smime/gui/certificate-manager.c:997
+#: ../src/smime/gui/certificate-manager.c:995
 msgid "Failed to import certificate"
 msgstr "Failed to import certificate"
 
-#: ../src/smime/gui/certificate-manager.c:1114
+#: ../src/smime/gui/certificate-manager.c:1112
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "Ask when used"
 
-#: ../src/smime/gui/certificate-manager.c:1116
+#: ../src/smime/gui/certificate-manager.c:1114
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Never"
 
-#: ../src/smime/gui/certificate-manager.c:1118
+#: ../src/smime/gui/certificate-manager.c:1116
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr "Marginally"
 
-#: ../src/smime/gui/certificate-manager.c:1120
+#: ../src/smime/gui/certificate-manager.c:1118
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "Fully"
 
-#: ../src/smime/gui/certificate-manager.c:1122
+#: ../src/smime/gui/certificate-manager.c:1120
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr "Ultimately"
 
-#: ../src/smime/gui/certificate-manager.c:1124
+#: ../src/smime/gui/certificate-manager.c:1122
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr "Temporarily"
 
-#: ../src/smime/gui/certificate-manager.c:1330
+#: ../src/smime/gui/certificate-manager.c:1328
 msgid "Change certificate trust"
 msgstr "Change certificate trust"
 
-#: ../src/smime/gui/certificate-manager.c:1342
+#: ../src/smime/gui/certificate-manager.c:1340
 #, c-format
 msgid "Change trust for the host “%s”:"
 msgstr "Change trust for the host “%s”:"
 
-#: ../src/smime/gui/certificate-manager.c:1366
+#: ../src/smime/gui/certificate-manager.c:1364
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "_Ask when used"
 
-#: ../src/smime/gui/certificate-manager.c:1367
+#: ../src/smime/gui/certificate-manager.c:1365
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "_Never trust this certificate"
 
-#: ../src/smime/gui/certificate-manager.c:1368
+#: ../src/smime/gui/certificate-manager.c:1366
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
 msgstr "_Temporarily trusted (this session only)"
 
-#: ../src/smime/gui/certificate-manager.c:1369
+#: ../src/smime/gui/certificate-manager.c:1367
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr "_Marginally trusted"
 
-#: ../src/smime/gui/certificate-manager.c:1370
+#: ../src/smime/gui/certificate-manager.c:1368
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "_Fully trusted"
 
-#: ../src/smime/gui/certificate-manager.c:1371
+#: ../src/smime/gui/certificate-manager.c:1369
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "_Ultimately trusted"
 
-#: ../src/smime/gui/certificate-manager.c:1375
+#: ../src/smime/gui/certificate-manager.c:1373
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
@@ -27610,43 +27890,43 @@ msgstr ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
 
-#: ../src/smime/gui/certificate-manager.c:1390
+#: ../src/smime/gui/certificate-manager.c:1388
 msgid "_Display certificate"
 msgstr "_Display certificate"
 
-#: ../src/smime/gui/certificate-manager.c:1595
+#: ../src/smime/gui/certificate-manager.c:1593
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "You have certificates on file that identify these mail servers:"
 
-#: ../src/smime/gui/certificate-manager.c:1626
+#: ../src/smime/gui/certificate-manager.c:1624
 msgid "Host name"
 msgstr "Host name"
 
-#: ../src/smime/gui/certificate-manager.c:1628
+#: ../src/smime/gui/certificate-manager.c:1626
 msgid "Issuer"
 msgstr "Issuer"
 
-#: ../src/smime/gui/certificate-manager.c:1629
+#: ../src/smime/gui/certificate-manager.c:1627
 msgid "Fingerprint"
 msgstr "Fingerprint"
 
-#: ../src/smime/gui/certificate-manager.c:1630
+#: ../src/smime/gui/certificate-manager.c:1628
 msgid "Trust"
 msgstr "Trust"
 
-#: ../src/smime/gui/certificate-manager.c:1651
+#: ../src/smime/gui/certificate-manager.c:1649
 msgid "_Edit Trust"
 msgstr "_Edit Trust"
 
-#: ../src/smime/gui/certificate-manager.c:2105
+#: ../src/smime/gui/certificate-manager.c:2085
 msgid "All PKCS12 files"
 msgstr "All PKCS12 files"
 
-#: ../src/smime/gui/certificate-manager.c:2122
+#: ../src/smime/gui/certificate-manager.c:2102
 msgid "All email certificate files"
 msgstr "All e-mail certificate files"
 
-#: ../src/smime/gui/certificate-manager.c:2139
+#: ../src/smime/gui/certificate-manager.c:2119
 msgid "All CA certificate files"
 msgstr "All CA certificate files"
 
@@ -27777,11 +28057,11 @@ msgid "C_ertificate:"
 msgstr "C_ertificate:"
 
 #. x509 certificate usage types
-#: ../src/smime/lib/e-cert.c:402
+#: ../src/smime/lib/e-cert.c:414
 msgid "Sign"
 msgstr "Sign"
 
-#: ../src/smime/lib/e-cert.c:403
+#: ../src/smime/lib/e-cert.c:415
 msgid "Encrypt"
 msgstr "Encrypt"
 
@@ -27826,6 +28106,12 @@ msgstr "Unable to write store to disk, err_code: %i"
 msgid "Imported Certificate"
 msgstr "Imported Certificate"
 
+#~ msgid "Event cannot be fully edited, because you are not the organizer"
+#~ msgstr "Event cannot be fully edited, because you are not the organiser"
+
+#~ msgid "Task cannot be fully edited, because you are not the organizer"
+#~ msgstr "Task cannot be fully edited, because you are not the organiser"
+
 #~ msgid "Ctrl-click to open a link"
 #~ msgstr "Ctrl-click to open a link"
 
@@ -27861,9 +28147,6 @@ msgstr "Imported Certificate"
 #~ msgid "%s %s."
 #~ msgstr "%s %s."
 
-#~ msgid "Security Information"
-#~ msgstr "Security Information"
-
 #~ msgid "%d week"
 #~ msgid_plural "%d weeks"
 #~ msgstr[0] "%d week"
@@ -29026,9 +29309,6 @@ msgstr "Imported Certificate"
 #~ msgid "Close current tab"
 #~ msgstr "Close current tab"
 
-#~ msgid "Folder '%s'"
-#~ msgstr "Folder '%s'"
-
 #~ msgid "Completed On"
 #~ msgstr "Completed On"
 
@@ -29460,9 +29740,6 @@ msgstr "Imported Certificate"
 #~ msgid "Sent Messages"
 #~ msgstr "Sent Messages"
 
-#~ msgid "Path:"
-#~ msgstr "Path:"
-
 #~ msgid "Loading calendars"
 #~ msgstr "Loading calendars"
 
@@ -29990,9 +30267,6 @@ msgstr "Imported Certificate"
 #~ "Evolution cannot render this e-mail as it is too large to process. You "
 #~ "can view it unformatted or with an external text editor."
 
-#~ msgid "Overdue:"
-#~ msgstr "Overdue:"
-
 #~ msgid "by"
 #~ msgstr "by"
 
@@ -30869,9 +31143,6 @@ msgstr "Imported Certificate"
 #~ msgid "Weather: Thunderstorms"
 #~ msgstr "Weather: Thunderstorms"
 
-#~ msgid "Select a location"
-#~ msgstr "Select a location"
-
 #~ msgctxt "weather-cal-location"
 #~ msgid "None"
 #~ msgstr "None"
@@ -32056,9 +32327,6 @@ msgstr "Imported Certificate"
 #~ msgid "Update"
 #~ msgstr "Update"
 
-#~ msgid "Tentatively accept"
-#~ msgstr "Tentatively accept"
-
 #~ msgid "Send Free/Busy Information"
 #~ msgstr "Send Free/Busy Information"
 
@@ -32483,9 +32751,6 @@ msgstr "Imported Certificate"
 #~ msgid "<b>Users:</b>"
 #~ msgstr "<b>Users:</b>"
 
-#~ msgid "_Accept"
-#~ msgstr "_Accept"
-
 #~ msgid "Guides you through your initial account setup."
 #~ msgstr "Guides you through your initial account setup."
 
@@ -32768,18 +33033,12 @@ msgstr "Imported Certificate"
 #~ msgid "Source List"
 #~ msgstr "Source List"
 
-#~ msgid "Current View"
-#~ msgstr "Current View"
-
 #~ msgid "The currently selected address book view"
 #~ msgstr "The currently selected address book view"
 
 #~ msgid "Previewed Contact"
 #~ msgstr "Previewed Contact"
 
-#~ msgid "The contact being shown in the preview pane"
-#~ msgstr "The contact being shown in the preview pane"
-
 #~ msgid "Preview is Visible"
 #~ msgstr "Preview is Visible"
 
@@ -33055,9 +33314,6 @@ msgstr "Imported Certificate"
 #~ msgid "Network Available"
 #~ msgstr "Network Available"
 
-#~ msgid "Online"
-#~ msgstr "Online"
-
 #~ msgid "Whether the shell is online"
 #~ msgstr "Whether the shell is online"
 
@@ -33934,9 +34190,6 @@ msgstr "Imported Certificate"
 #~ "This option will connect to the Exchange server using secure password "
 #~ "(NTLM) authentication."
 
-#~ msgid "Plaintext Password"
-#~ msgstr "Plaintext Password"
-
 #~ msgid ""
 #~ "This option will connect to the Exchange server using standard plaintext "
 #~ "password authentication."
@@ -34860,9 +35113,6 @@ msgstr "Imported Certificate"
 #~ msgid "There is no calendar available for creating events and meetings"
 #~ msgstr "There is no calendar available for creating events and meetings"
 
-#~ msgid "New appointment"
-#~ msgstr "New appointment"
-
 #~ msgid "New meeting"
 #~ msgstr "New meeting"
 
@@ -36181,9 +36431,6 @@ msgstr "Imported Certificate"
 #~ msgid "Portrait"
 #~ msgstr "Portrait"
 
-#~ msgid "Preview:"
-#~ msgstr "Preview:"
-
 #~ msgid "Print using gray shading"
 #~ msgstr "Print using grey shading"
 
@@ -36664,9 +36911,6 @@ msgstr "Imported Certificate"
 #~ msgid "Time &amp; Expenses"
 #~ msgstr "Time &amp; Expenses"
 
-#~ msgid "Next 7 Days"
-#~ msgstr "Next 7 Days"
-
 #~ msgid "A_dd Filter Criteria"
 #~ msgstr "A_dd Filter Criteria"
 


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