[evolution/gnome-3-32] Update British English translation



commit 48565a49f01aadbd2382bdd2ace39a5b4fa3fce5
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Sat Mar 16 10:43:12 2019 +0000

    Update British English translation

 po/en_GB.po | 4804 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 2515 insertions(+), 2289 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index e34bdc522e..193c1d2c62 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,14 +4,14 @@
 # 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 eu>, 2009, 2010, 2011, 2012, 2013, 2016, 2017, 2018.
+# Bruce Cowan <bruce bcowan me uk>, 2009-2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n";
-"POT-Creation-Date: 2018-08-12 22:10+0000\n"
-"PO-Revision-Date: 2018-08-19 16:18+0100\n"
+"POT-Creation-Date: 2019-03-11 09:00+0000\n"
+"PO-Revision-Date: 2019-03-16 10:42+0000\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.7\n"
+"X-Generator: Gtranslator 3.30.1\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
@@ -511,20 +511,28 @@ msgid "Number of units for determining when to hide tasks"
 msgstr "Number of units for determining when to hide tasks"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
-#| msgid "Hide completed tasks"
+#| msgid "Hide cancelled tasks"
+msgid "Hide cancelled events"
+msgstr "Hide cancelled events"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+#| msgid "Whether to hide cancelled tasks in the tasks view"
+msgid "Whether to hide cancelled events in the calendar view"
+msgstr "Whether to hide cancelled events in the calendar view"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
 msgid "Hide cancelled tasks"
 msgstr "Hide cancelled tasks"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
-#| msgid "Whether to hide completed tasks in the tasks view"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
 msgid "Whether to hide cancelled tasks in the tasks view"
 msgstr "Whether to hide cancelled tasks in the tasks view"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
 msgid "Horizontal pane position"
 msgstr "Horizontal pane position"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels"
@@ -532,54 +540,54 @@ msgstr ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
 msgid "Last reminder time"
 msgstr "Last reminder time"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
 msgid "Time the last reminder ran, in time_t"
 msgstr "Time the last reminder ran, in time_t"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
 msgid "Marcus Bains Line Color — Day View"
 msgstr "Marcus Bains Line Colour — Day View"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
 msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr "Colour to draw the Marcus Bains line in the Day View"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 msgid "Marcus Bains Line Color — Time bar"
 msgstr "Marcus Bains Line Colour — Time bar"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
 msgstr ""
 "Colour to draw the Marcus Bains Line in the Time bar (empty for default)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains Line"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
 msgstr ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
 msgid "Memo preview pane position (horizontal)"
 msgstr "Memo preview pane position (horizontal)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
 msgid "Position of the task preview pane when oriented horizontally"
 msgstr "Position of the task preview pane when oriented horizontally"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
 msgid "Memo layout style"
 msgstr "Memo layout style"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. “0” (Classic View) places the preview pane below the memo "
@@ -589,19 +597,19 @@ msgstr ""
 "the memo list. “0” (Classic View) places the preview pane below the memo "
 "list. “1” (Vertical View) places the preview pane next to the memo list"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 msgid "Memo preview pane position (vertical)"
 msgstr "Memo preview pane position (vertical)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
 msgid "Position of the memo preview pane when oriented vertically"
 msgstr "Position of the memo preview pane when oriented vertically"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
 msgid "Month view horizontal pane position"
 msgstr "Month view horizontal pane position"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels"
@@ -609,27 +617,27 @@ msgstr ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 msgid "Scroll Month View by a week, not by a month"
 msgstr "Scroll Month View by a week, not by a month"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr "Whether to scroll a Month View by a week, not by a month"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "Preferred New button item"
 msgstr "Preferred New button item"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "Name of the preferred New toolbar button item"
 msgstr "Name of the preferred New toolbar button item"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Primary calendar"
 msgstr "Primary calendar"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid ""
 "The UID of the selected (or “primary”) calendar in the sidebar of the "
 "“Calendar” view"
@@ -637,11 +645,11 @@ msgstr ""
 "The UID of the selected (or “primary”) calendar in the sidebar of the "
 "“Calendar” view"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Primary memo list"
 msgstr "Primary memo list"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid ""
 "The UID of the selected (or “primary”) memo list in the sidebar of the "
 "“Memos” view"
@@ -649,11 +657,11 @@ msgstr ""
 "The UID of the selected (or “primary”) memo list in the sidebar of the "
 "“Memos” view"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Primary task list"
 msgstr "Primary task list"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid ""
 "The UID of the selected (or “primary”) task list in the sidebar of the "
 "“Tasks” view"
@@ -661,11 +669,11 @@ msgstr ""
 "The UID of the selected (or “primary”) task list in the sidebar of the "
 "“Tasks” view"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid "Free/busy template URL"
 msgstr "Free/busy template URL"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -674,19 +682,19 @@ msgstr ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Recurrent Events in Italic"
 msgstr "Recurrent Events in Italic"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr "Show days with recurrent events in italic font in bottom left calendar"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid "Search range for time-based searching in years"
 msgstr "Search range for time-based searching in years"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid ""
 "How many years can the time-based search go forward or backward from "
 "currently selected day when searching for another occurrence; default is ten "
@@ -696,66 +704,66 @@ msgstr ""
 "currently selected day when searching for another occurrence; default is ten "
 "years"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 msgid "Show appointment end times in week and month views"
 msgstr "Show appointment end times in week and month views"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid "Whether to display the end time of events in the week and month views"
 msgstr "Whether to display the end time of events in the week and month views"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid "Show appointment icons in the month view"
 msgstr "Show appointment icons in the month view"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid "Whether to show icons of events in the month view"
 msgstr "Whether to show icons of events in the month view"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid "Show the memo preview pane"
 msgstr "Show the memo preview pane"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid "If “true”, show the memo preview pane in the main window"
 msgstr "If “true”, show the memo preview pane in the main window"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the task preview pane"
 msgstr "Show the task preview pane"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "If “true”, show the task preview pane in the main window"
 msgstr "If “true”, show the task preview pane in the main window"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "Show week numbers in Day View, Work Week View, and Date Navigator"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "Whether to show week numbers in various places in the Calendar"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Vertical position for the tag pane"
 msgstr "Vertical position for the tag pane"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Highlight tasks due today"
 msgstr "Highlight tasks due today"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 "Whether highlight tasks due today with a special colour (task-due-today-"
 "color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Tasks due today color"
 msgstr "Tasks due today colour"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid ""
 "Background color of tasks that are due today, in “#rrggbb” format. Used "
 "together with task-due-today-highlight"
@@ -763,15 +771,15 @@ msgstr ""
 "Background colour of tasks that are due today, in “#rrggbb” format. Used "
 "together with task-due-today-highlight"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Task preview pane position (horizontal)"
 msgstr "Task preview pane position (horizontal)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Task layout style"
 msgstr "Task layout style"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. “0” (Classic View) places the preview pane below the task "
@@ -781,29 +789,29 @@ msgstr ""
 "the task list. “0” (Classic View) places the preview pane below the task "
 "list. “1” (Vertical View) places the preview pane next to the task list"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Task preview pane position (vertical)"
 msgstr "Task preview pane position (vertical)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "Position of the task preview pane when oriented vertically"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Highlight overdue tasks"
 msgstr "Highlight overdue tasks"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 "Whether highlight overdue tasks with a special colour (task-overdue-color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Overdue tasks color"
 msgstr "Overdue tasks colour"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 msgid ""
 "Background color of tasks that are overdue, in “#rrggbb” format. Used "
 "together with task-overdue-highlight."
@@ -811,19 +819,19 @@ msgstr ""
 "Background colour of tasks that are overdue, in “#rrggbb” format. Used "
 "together with task-overdue-highlight."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Time divisions"
 msgstr "Time divisions"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "Intervals shown in Day and Work Week views, in minutes"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Timezone"
 msgstr "Timezone"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like “America/New York”"
@@ -831,80 +839,80 @@ msgstr ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like “America/New York”"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Twenty four hour time format"
 msgstr "Twenty four hour time format"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr ""
 "Whether to show times in twenty four hour format instead of using am/pm"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Birthday and anniversary reminder"
 msgstr "Birthday and anniversary reminder"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Whether to set a reminder for birthdays and anniversaries"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Default appointment reminder"
 msgstr "Default appointment reminder"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 msgid "Whether to set a default reminder for appointments"
 msgstr "Whether to set a default reminder for appointments"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Use system timezone"
 msgstr "Use system timezone"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "Use the system timezone instead of the timezone selected in Evolution"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "First day of the week"
 msgstr "First day of the week"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 msgid "Monday is a work day"
 msgstr "Monday is a work day"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "Tuesday is a work day"
 msgstr "Tuesday is a work day"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Wednesday is a work day"
 msgstr "Wednesday is a work day"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "Thursday is a work day"
 msgstr "Thursday is a work day"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Friday is a work day"
 msgstr "Friday is a work day"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Saturday is a work day"
 msgstr "Saturday is a work day"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Sunday is a work day"
 msgstr "Sunday is a work day"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "Create events, memos and tasks as Private by default"
 msgstr "Create events, memos and tasks as Private by default"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "Draw events as flat, not shaded."
 msgstr "Draw events as flat, not shaded."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 msgid ""
 "Whether to order days in the Week View from left to right, rather than from "
 "top to bottom."
@@ -912,7 +920,7 @@ msgstr ""
 "Whether to order days in the Week View from left to right, rather than from "
 "top to bottom."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 msgid ""
 "Allow direct edit of event Summary when clicking on it in the Day, Work "
 "Week, Week or Month view."
@@ -920,11 +928,11 @@ msgstr ""
 "Allow direct edit of event Summary when clicking on it in the Day, Work "
 "Week, Week or Month view."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 msgstr "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“week-start-day-name” instead."
@@ -932,11 +940,11 @@ msgstr ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“week-start-day-name” instead."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
 msgid "(Deprecated) Work days"
 msgstr "(Deprecated) Work days"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
 msgid ""
 "Days on which the start and end of work hours should be indicated. (This key "
 "was deprecated in version 3.10 and should no longer be used. Use the “work-"
@@ -1174,10 +1182,28 @@ msgid "List of dictionary language codes used for spell checking."
 msgstr "List of dictionary language codes used for spell checking."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+#| msgid "Spell checking languages"
+msgid "List of recently used spell checking languages"
+msgstr "List of recently used spell checking languages"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#| msgid "List of dictionary language codes used for spell checking."
+msgid ""
+"List of dictionary language codes used for spell checking, which had been "
+"used recently."
+msgstr ""
+"List of dictionary language codes used for spell checking, which had been "
+"used recently."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+msgid "How many recently used spell checking languages to remember"
+msgstr "How many recently used spell checking languages to remember"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
 msgid "Show “Bcc” field when sending a mail message"
 msgstr "Show “Bcc” field when sending a mail message"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
 msgid ""
 "Show the “Bcc” field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -1185,11 +1211,11 @@ msgstr ""
 "Show the “Bcc” field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 msgid "Show “Cc” field when sending a mail message"
 msgstr "Show “Cc” field when sending a mail message"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 msgid ""
 "Show the “Cc” field when sending a mail message. This is controlled from the "
 "View menu when a mail account is chosen."
@@ -1197,11 +1223,11 @@ msgstr ""
 "Show the “Cc” field when sending a mail message. This is controlled from the "
 "View menu when a mail account is chosen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 msgid "Show “From” override field when sending a mail message"
 msgstr "Show “From” override field when sending a mail message"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 msgid ""
 "Show the “From” override field when sending a mail message. This is "
 "controlled from the View menu when a mail account is chosen."
@@ -1209,11 +1235,11 @@ msgstr ""
 "Show the “From” override field when sending a mail message. This is "
 "controlled from the View menu when a mail account is chosen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 msgid "Show “Reply To” field when sending a mail message"
 msgstr "Show “Reply To” field when sending a mail message"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
 msgid ""
 "Show the “Reply To” field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -1221,11 +1247,11 @@ msgstr ""
 "Show the “Reply To” field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 msgid "Show “From” field when posting to a newsgroup"
 msgstr "Show “From” field when posting to a newsgroup"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid ""
 "Show the “From” field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -1233,11 +1259,11 @@ msgstr ""
 "Show the “From” field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
 msgid "Show “Reply To” field when posting to a newsgroup"
 msgstr "Show “Reply To” field when posting to a newsgroup"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
 msgid ""
 "Show the “Reply To” field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -1245,11 +1271,11 @@ msgstr ""
 "Show the “Reply To” field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
 msgid "Digitally sign replies when the original message is signed"
 msgstr "Digitally sign replies when the original message is signed"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
@@ -1257,11 +1283,11 @@ msgstr ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "Encode filenames in an Outlook/GMail way"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let "
 "them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -1273,11 +1299,11 @@ msgstr ""
 "because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
 "standard."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
 msgid "Send messages through Outbox folder"
 msgstr "Send messages through Outbox folder"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid ""
 "Always save messages to Outbox folder when sending, to let a user choose "
 "when the messages should be sent."
@@ -1285,11 +1311,11 @@ msgstr ""
 "Always save messages to Outbox folder when sending, to let a user choose "
 "when the messages should be sent."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 msgid "Include signature in new messages only"
 msgstr "Include signature in new messages only"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid ""
 "Include selected signature only for new messages, but have no signature "
 "added for Replies or Forwards."
@@ -1297,11 +1323,11 @@ msgstr ""
 "Include selected signature only for new messages, but have no signature "
 "added for Replies or Forwards."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid "Put personalized signatures at the top of replies"
 msgstr "Put personalised signatures at the top of replies"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -1311,11 +1337,11 @@ msgstr ""
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid "Do not add signature delimiter"
 msgstr "Do not add signature delimiter"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -1323,11 +1349,11 @@ msgstr ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid "Keep original message signature in replies"
 msgstr "Keep original message signature in replies"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid ""
 "When set to TRUE, keep original message signature in replies, otherwise "
 "strip the signature and everything below it when replying to the message."
@@ -1335,11 +1361,11 @@ msgstr ""
 "When set to TRUE, keep original message signature in replies, otherwise "
 "strip the signature and everything below it when replying to the message."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Ignore list Reply-To:"
 msgstr "Ignore list Reply-To:"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -1357,11 +1383,11 @@ msgstr ""
 "it will do that. It works by comparing the Reply-To: header with a List-"
 "Post: header, if there is one."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "List of localized “Re”"
 msgstr "List of localized “Re”"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid ""
 "Comma-separated list of localized “Re” abbreviations to skip in a subject "
 "text when replying to a message, as an addition to the standard “Re” prefix. "
@@ -1371,11 +1397,11 @@ msgstr ""
 "text when replying to a message, as an addition to the standard “Re” prefix. "
 "An example is “SV,AV”."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "List of localized “Re” separators"
 msgstr "List of localised “Re” separators"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid ""
 "A list of localized “Re” separators, used to skip in a subject text when "
 "replying to a message, as an addition to the standard “:” and the Unicode "
@@ -1385,11 +1411,11 @@ msgstr ""
 "replying to a message, as an addition to the standard “:” and the Unicode "
 "“︰” separators."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Use localized “Fwd”/“Re” in message Subject"
 msgstr "Use localised “Fwd”/“Re” in message Subject"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid ""
 "When set to true, uses localized “Fwd”/“Re” in message Subject on reply and "
 "forward as provided by current locale translation, otherwise uses "
@@ -1399,31 +1425,31 @@ msgstr ""
 "forward as provided by current locale translation, otherwise uses "
 "unlocalised version."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Number of characters for wrapping"
 msgstr "Number of characters for wrapping"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Will autowrap lines after given number of characters."
 msgstr "Will autowrap lines after given number of characters."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid ""
 "Number of To and CC recipients to ask “prompt-on-many-to-cc-recips” from"
 msgstr ""
 "Number of To and CC recipients to ask “prompt-on-many-to-cc-recips” from"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid ""
 "When to ask, when the number of To and CC recipients reaches this value."
 msgstr ""
 "When to ask, when the number of To and CC recipients reaches this value."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
 msgstr "Whether to always show Sign and Encrypt buttons on the toolbar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid ""
 "If set to “true”, the Sign and Encrypt buttons for either PGP or S/MIME are "
 "always shown in the composer’s toolbar. Otherwise they are shown only when "
@@ -1433,22 +1459,19 @@ msgstr ""
 "always shown in the composer’s toolbar. Otherwise they are shown only when "
 "being used."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Wrap quoted text in replies"
 msgstr "Wrap quoted text in replies"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 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:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 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:76
-#| msgid ""
-#| "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:79
 msgid ""
 "Whether the time in reply credits should be converted to local time when "
 "it’s in UTC in the message."
@@ -1456,11 +1479,36 @@ 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:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#| msgid "Failed to mark messages as read."
+msgid "Mark replied to messages as read"
+msgstr "Mark replied to messages as read"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+msgid ""
+"When replying to a message and marking it as being replied to, then whether "
+"also mark it as read."
+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
+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
+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."
+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
 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:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid ""
 "Set to “false” to block automatic display of attachments with Content-"
 "Disposition: inline."
@@ -1468,19 +1516,19 @@ msgstr ""
 "Set to “false” to block automatic display of attachments with Content-"
 "Disposition: inline."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 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:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Can be either “mbox” or “pdf”."
 msgstr "Can be either “mbox” or “pdf”."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show image animations"
 msgstr "Show image animations"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -1488,11 +1536,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:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 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:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -1500,11 +1548,11 @@ msgstr ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Enable or disable magic space bar"
 msgstr "Enable or disable magic space bar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -1512,55 +1560,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:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 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:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 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:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Mark citations in the message “Preview”"
 msgstr "Mark citations in the message “Preview”"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Mark citations in the message “Preview”."
 msgstr "Mark citations in the message “Preview”."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Citation highlight color"
 msgstr "Citation highlight colour"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Citation highlight color."
 msgstr "Citation highlight colour."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Enable/disable caret mode"
 msgstr "Enable/disable caret mode"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 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:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 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:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 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:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 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:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Show notification about missing remote content"
 msgstr "Show notification about missing remote content"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 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 "
@@ -1570,27 +1618,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:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Show Animations"
 msgstr "Show Animations"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Show animated images as animations."
 msgstr "Show animated images as animations."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Show all message headers"
 msgstr "Show all message headers"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 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:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 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:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 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 "
@@ -1600,35 +1648,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:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Show photo of the sender"
 msgstr "Show photo of the sender"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 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:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Search gravatar.com for photo of the sender"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr "Allow searching also at gravatar.com for photo of the sender."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Mark as Seen after specified timeout"
 msgstr "Mark as Seen after specified timeout"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Mark as Seen after specified timeout."
 msgstr "Mark as Seen after specified timeout."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 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:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout "
 "also after the folder change."
@@ -1636,19 +1684,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:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Timeout for marking messages as seen"
 msgstr "Timeout for marking messages as seen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 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:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Show Attachment Bar"
 msgstr "Show Attachment Bar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments."
@@ -1656,11 +1704,11 @@ msgstr ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 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:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -1668,27 +1716,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:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 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:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 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:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 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:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 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:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Enable Unmatched search folder"
 msgstr "Enable Unmatched search folder"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -1696,11 +1744,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:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 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:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 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."
@@ -1708,31 +1756,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:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Height of the message-list pane"
 msgstr "Height of the message-list pane"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Height of the message-list pane."
 msgstr "Height of the message-list pane."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 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:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Width of the message-list pane"
 msgstr "Width of the message-list pane"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Width of the message-list pane."
 msgstr "Width of the message-list pane."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Layout style"
 msgstr "Layout style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 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 "
@@ -1744,35 +1792,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:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Variable width font"
 msgstr "Variable width font"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 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:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Terminal font"
 msgstr "Terminal font"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "The terminal font for mail display."
 msgstr "The terminal font for mail display."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Use custom fonts"
 msgstr "Use custom fonts"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Use custom fonts for displaying mail."
 msgstr "Use custom fonts for displaying mail."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 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:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -1780,11 +1828,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:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 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:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a “...” is shown."
@@ -1792,13 +1840,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:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 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:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 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, "
@@ -1808,11 +1856,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:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 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:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -1820,11 +1868,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:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Default value for thread expand state"
 msgstr "Default value for thread expand state"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -1832,11 +1880,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:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 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:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 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 "
@@ -1846,11 +1894,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:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Whether sort thread children always ascending"
 msgstr "Whether sort thread children always ascending"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 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."
@@ -1858,11 +1906,11 @@ 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:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 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:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 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 "
@@ -1874,19 +1922,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:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Log filter actions"
 msgstr "Log filter actions"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 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:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Logfile to log filter actions"
 msgstr "Logfile to log filter actions"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid ""
 "If not set, or being “stdout”, then the logging is done to stdout, instead "
 "to a file."
@@ -1894,11 +1942,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:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Flush Outbox after filtering"
 msgstr "Flush Outbox after filtering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 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 "
@@ -1908,19 +1956,27 @@ 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:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Default forward style"
 msgstr "Default forward style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Default reply style"
 msgstr "Default reply style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+msgid ""
+"Forward and reply attribution language tag, like en_US. Empty string means "
+"to use the same language as the user interface."
+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
 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:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
@@ -1928,45 +1984,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:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Prompt on empty subject"
 msgstr "Prompt on empty subject"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt when emptying the trash"
 msgstr "Prompt when emptying the wastebasket"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 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:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 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:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Prompt when user calls Empty Junk"
 msgstr "Prompt when user calls Empty Junk"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 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:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 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:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -1974,19 +2030,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:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 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:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 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:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -1994,11 +2050,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:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 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:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -2006,19 +2062,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:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Prompt while marking multiple messages"
 msgstr "Prompt while marking multiple messages"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 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:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 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:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 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 "
@@ -2028,11 +2084,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:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 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:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 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 "
@@ -2044,11 +2100,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:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 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:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 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 "
@@ -2060,11 +2116,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:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 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:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 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."
@@ -2072,11 +2128,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:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 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:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 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 "
@@ -2086,11 +2142,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:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Prompt when replying to many recipients"
 msgstr "Prompt when replying to many recipients"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -2098,7 +2154,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:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid ""
 "Prompt when switching composer format and the content needs to lose its "
 "formatting"
@@ -2106,7 +2162,7 @@ msgstr ""
 "Prompt when switching composer format and the content needs to lose its "
 "formatting"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
 "composer format and the content needs to lose its formatting."
@@ -2114,11 +2170,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:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 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:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "“composer-many-to-cc-recips-num” defines the threshold."
@@ -2126,7 +2182,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:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -2134,42 +2190,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:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid "Empty Trash folders on exit"
 msgstr "Empty Wastebasket folders on exit"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 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:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 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:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 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:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "Last time Empty Trash was run"
 msgstr "Last time Empty Wastebasket was run"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 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:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 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:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 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:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid ""
 "This can have three possible values. “0” for errors. “1” for warnings. “2” "
 "for debug messages."
@@ -2177,11 +2233,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:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid "Show original “Date” header value."
 msgstr "Show original “Date” header value."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 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 "
@@ -2191,11 +2247,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:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 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:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 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."
@@ -2203,45 +2259,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:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid "Check incoming mail being junk"
 msgstr "Check incoming mail being junk"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "Run junk test on incoming mail."
 msgstr "Run junk test on incoming mail."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid "Empty Junk folders on exit"
 msgstr "Empty Junk folders on exit"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 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:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 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:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 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:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid "Last time Empty Junk was run"
 msgstr "Last time Empty Junk was run"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 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:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid "The default plugin for Junk hook"
 msgstr "The default plugin for Junk hook"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 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 "
@@ -2251,11 +2307,11 @@ msgstr ""
 "enabled. If the default listed plugin is disabled, then it won’t fall back "
 "to the other available plugins."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 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:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 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 "
@@ -2267,7 +2323,7 @@ msgstr ""
 "can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -2275,7 +2331,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:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 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 "
@@ -2285,11 +2341,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:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 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:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 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 "
@@ -2299,11 +2355,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:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 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:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format “headername=value”."
@@ -2311,31 +2367,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:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid "UID string of the default account."
 msgstr "UID string of the default account."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
 msgid "Save directory"
 msgstr "Save directory"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 msgid "Directory for saving mail component files."
 msgstr "Directory for saving mail component files."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
 msgid "Composer load/attach directory"
 msgstr "Composer load/attach directory"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 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:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
 msgid "Check for new messages on start"
 msgstr "Check for new messages on start"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -2343,11 +2399,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:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
 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:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
 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 "
@@ -2357,11 +2413,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:242
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
 msgid "Server synchronization interval"
 msgstr "Server synchronisation interval"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -2369,11 +2425,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:244
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
 msgid "Allow expunge in virtual folders"
 msgstr "Allow expunge in virtual folders"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
 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 "
@@ -2385,12 +2441,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:246
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
 #: ../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:247
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
 msgid ""
 "When enabled the theme colors for background, text and links are sent in "
 "resulting HTML formatted message."
@@ -2398,11 +2454,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:248
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
 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:249
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
@@ -2410,67 +2466,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:250
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
 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:251
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
 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:252
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
 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:253
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
 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:254
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
 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:255
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
 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:256
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
 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:257
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
 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:258
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
 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:259
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
 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:260
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
 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:261
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
 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:262
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
 msgid "Show start up wizard"
 msgstr "Show start up wizard"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
 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:264
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
 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:265
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
 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."
@@ -2478,11 +2534,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:266
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
 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:267
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
 msgid ""
 "Whether to show Subject above Sender (From/To) in the Messages column, "
 "usually shown in the Vertical/Wide view of the message list"
@@ -2490,30 +2546,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:268
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:276
 msgid "Visually wrap long lines in composer"
 msgstr "Visually wrap long lines in composer"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
-#: ../src/composer/e-composer-actions.c:552
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
+#: ../src/composer/e-composer-actions.c:542
 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:270
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
 msgid "Alternative reply style"
 msgstr "Alternative reply style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
 msgid "Format message in HTML"
 msgstr "Format message in HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
 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:273
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:281
 msgid ""
 "This determines whether the cursor is placed at the top of the message or "
 "the bottom when using Alternative Reply."
@@ -2521,21 +2577,19 @@ 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:274
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
 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:275
-#| msgid "Last chosen template's folder URI for Alternative Reply"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
 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:276
-#| msgid "Last chosen template's message UID for Alternative Reply"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
 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:277
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
 msgid ""
 "Whether preserve original message subject when applying template for "
 "Alternative Reply"
@@ -2543,7 +2597,7 @@ msgstr ""
 "Whether preserve original message subject when applying template for "
 "Alternative Reply"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
 msgid ""
 "Whether set “body” in mailto: URI as Preformatted paragraph style. If set to "
 "“false”, then Normal paragraph style will be used."
@@ -2551,7 +2605,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:279
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
 msgid ""
 "Close the message browser window when the selected message is deleted or "
 "marked as Junk."
@@ -2559,7 +2613,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:280
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
 msgid ""
 "Collapse archive folders in Move/Copy message to Folder and Go to Folder "
 "selectors."
@@ -2567,7 +2621,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:281
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
 msgid ""
 "Where to lookup recipient S/MIME certificates or PGP keys when encrypting "
 "messages."
@@ -2575,7 +2629,7 @@ msgstr ""
 "Where to lookup recipient S/MIME certificates or PGP keys when encrypting "
 "messages."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
 msgid ""
 "The “off” value completely disables certificate lookup; the “autocompleted” "
 "value provides certificates only for auto-completed contacts; the “books” "
@@ -2587,11 +2641,24 @@ 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:283
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
+#| msgid "Failed to download messages for offline viewing."
+msgid "Whether Send/Receive should also download of messages for offline."
+msgstr "Whether Send/Receive should also download of messages for offline."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
+msgid ""
+"If enabled, whenever Send/Receive is run it also runs synchronization of "
+"messages for offline use. The option is disabled by default."
+msgstr ""
+"If enabled, whenever Send/Receive is run it also runs synchronisation of "
+"messages for offline use. The option is disabled by default."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
 msgid "(Deprecated) Default forward style"
 msgstr "(Deprecated) Default forward style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“forward-style-name” instead."
@@ -2599,11 +2666,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:285
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
 msgid "(Deprecated) Default reply style"
 msgstr "(Deprecated) Default reply style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“reply-style-name” instead."
@@ -2611,11 +2678,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:287
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
 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:288
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“show-headers” instead."
@@ -2623,11 +2690,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:289
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
 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:290
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“image-loading-policy” instead."
@@ -2635,7 +2702,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:291
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -2643,7 +2710,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:292
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“browser-close-on-reply-policy” instead."
@@ -2879,7 +2946,6 @@ msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr "Play themed sound when new messages arrive, if not in beep mode."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:19
-#| msgid "Edit properties of this account"
 msgid "Do not notify for these accounts"
 msgstr "Do not notify for these accounts"
 
@@ -2978,7 +3044,7 @@ msgstr ""
 "Compression filter used when compressing attached directories with autoar."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../src/shell/main.c:317
+#: ../src/shell/main.c:318
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
@@ -3103,6 +3169,20 @@ msgstr ""
 "It can be either “.gz” or “.xz” and it influences what extension will be "
 "preselected in the file chooser."
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:38
+msgid "Prefix of the URI to use to search the web with selected text."
+msgstr "Prefix of the URI to use to search the web with selected text."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:39
+msgid ""
+"The prefix of a URL to be used for searches on the web. The actual text "
+"selection is escaped and appended to this string. The URI should start with "
+"https://.";
+msgstr ""
+"The prefix of a URL to be used for searches on the web. The actual text "
+"selection is escaped and appended to this string. The URI should start with "
+"https://.";
+
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
 msgid "Use only local spam tests."
 msgstr "Use only local spam tests."
@@ -3140,7 +3220,6 @@ msgstr ""
 "arguments."
 
 #: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:1
-#| msgid "Whether the plugin is enabled"
 msgid "Whether the text-highlight module is enabled"
 msgstr "Whether the text-highlight module is enabled"
 
@@ -3158,20 +3237,20 @@ msgstr ""
 "and then the value to one of them. The change requires only re-format of the "
 "message part to take into effect, like using right-click→Format As→...."
 
-#: ../data/org.gnome.Evolution.appdata.xml.in.h:1
+#: ../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:1190
+#: ../src/mail/e-mail-browser.c:1252
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
 #: ../src/shell/e-shell-window-private.c:240
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/org.gnome.Evolution.appdata.xml.in.h:2
+#: ../data/org.gnome.Evolution.appdata.xml.in.in.h:2
 #: ../data/org.gnome.Evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "Manage your e-mail, contacts and schedule"
 
-#: ../data/org.gnome.Evolution.appdata.xml.in.h:3
+#: ../data/org.gnome.Evolution.appdata.xml.in.in.h:3
 msgid ""
 "Evolution is a personal information management application that provides "
 "integrated mail, calendaring and address book functionality."
@@ -3179,7 +3258,7 @@ msgstr ""
 "Evolution is a personal information management application that provides "
 "integrated mail, calendaring and address book functionality."
 
-#: ../data/org.gnome.Evolution.appdata.xml.in.h:4
+#: ../data/org.gnome.Evolution.appdata.xml.in.in.h:4
 msgid ""
 "Evolution supports a wide range of industry standard data formats and "
 "network protocols for information exchange, with an emphasis on standards "
@@ -3191,8 +3270,15 @@ msgstr ""
 "compliance and security. Evolution can also integrate smoothly with "
 "Microsoft Exchange by way of the “Exchange Web Services” (EWS) extension."
 
+#: ../data/org.gnome.Evolution.appdata.xml.in.in.h:5
+#| msgid ""
+#| "Thanks\n"
+#| "The Evolution Team\n"
+msgid "The Evolution Team"
+msgstr "The Evolution Team"
+
 #: ../data/org.gnome.Evolution.desktop.in.in.h:2
-#: ../src/shell/e-shell-utils.c:362
+#: ../src/shell/e-shell-utils.c:352
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
@@ -3221,7 +3307,7 @@ msgstr "Contacts"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:9
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:845
-#: ../src/e-util/e-collection-account-wizard.c:581
+#: ../src/e-util/e-collection-account-wizard.c:784
 #: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:469
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:199
 #: ../src/modules/calendar/e-cal-shell-view.c:604
@@ -3233,14 +3319,14 @@ msgstr "Calendar"
 #: ../src/e-util/e-send-options.c:536 ../src/mail/importers/elm-importer.c:330
 #: ../src/mail/importers/kmail-importer.c:251
 #: ../src/mail/importers/pine-importer.c:423
-#: ../src/modules/mail/e-mail-shell-view.c:1483
-#: ../src/smime/gui/certificate-manager.c:1682
+#: ../src/modules/mail/e-mail-shell-view.c:1489
+#: ../src/smime/gui/certificate-manager.c:1666
 msgid "Mail"
 msgstr "Mail"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:11
-#: ../src/calendar/gui/e-memo-table.c:368 ../src/e-util/e-webdav-browser.c:459
-#: ../src/modules/calendar/e-cal-shell-content.c:1719
+#: ../src/calendar/gui/e-memo-table.c:374 ../src/e-util/e-webdav-browser.c:459
+#: ../src/modules/calendar/e-cal-shell-content.c:1736
 #: ../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
@@ -3248,12 +3334,12 @@ msgid "Memos"
 msgstr "Memos"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:12
-#: ../src/calendar/gui/e-task-table.c:697 ../src/calendar/gui/print.c:2408
+#: ../src/calendar/gui/e-task-table.c:697 ../src/calendar/gui/print.c:2417
 #: ../src/calendar/importers/icalendar-importer.c:77
 #: ../src/calendar/importers/icalendar-importer.c:1109
 #: ../src/e-util/e-webdav-browser.c:460
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
-#: ../src/modules/calendar/e-cal-shell-content.c:1679
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
+#: ../src/modules/calendar/e-cal-shell-content.c:1696
 #: ../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:507
@@ -3483,20 +3569,20 @@ msgstr ""
 #: ../src/addressbook/addressbook.error.xml.h:31
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1433
-#: ../src/e-util/e-accounts-window.c:1562
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1505
+#: ../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:1033 ../src/e-util/filter.ui.h:25
 #: ../src/mail/e-mail-account-manager.c:719
 #: ../src/mail/e-mail-label-manager.c:371
-#: ../src/mail/em-folder-properties.c:1023
+#: ../src/mail/em-folder-properties.c:1044
 #: ../src/mail/em-vfolder-editor-rule.c:408
-#: ../src/mail/em-vfolder-editor-rule.c:637 ../src/mail/mail-config.ui.h:61
-#: ../src/modules/mail/em-composer-prefs.c:422
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:543
-#: ../src/plugins/email-custom-header/email-custom-header.c:837
+#: ../src/mail/em-vfolder-editor-rule.c:637 ../src/mail/mail-config.ui.h:63
+#: ../src/modules/mail/em-composer-prefs.c:423
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:544
+#: ../src/plugins/email-custom-header/email-custom-header.c:838
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../src/plugins/templates/templates.c:462
+#: ../src/plugins/templates/templates.c:464
 msgid "_Add"
 msgstr "_Add"
 
@@ -3572,10 +3658,6 @@ msgid "Something has gone wrong when displaying the contact"
 msgstr "Something has gone wrong when displaying the contact"
 
 #: ../src/addressbook/addressbook.error.xml.h:47
-#| msgid ""
-#| "A WebKitWebProcess crashed when displaying the contact. You can try again "
-#| "by moving to another contact and back. If the issue persists, please file "
-#| "a bug report in the GNOME bugzilla."
 msgid ""
 "A WebKitWebProcess crashed when displaying the contact. You can try again by "
 "moving to another contact and back. If the issue persists, please file a bug "
@@ -3586,10 +3668,24 @@ msgstr ""
 "report in GNOME Gitlab."
 
 #: ../src/addressbook/addressbook.error.xml.h:48
-#| msgid "Failed to refresh address book “{0}”"
 msgid "Failed to refresh list of account address books"
 msgstr "Failed to refresh list of account address books"
 
+#: ../src/addressbook/addressbook.error.xml.h:49
+#| msgid "Do you want to resend the meeting?"
+msgid "Do you want to unset contact image?"
+msgstr "Do you want to unset contact image?"
+
+#: ../src/addressbook/addressbook.error.xml.h:50
+#| msgid "Do _Not Unsubscribe"
+msgid "Do _Not Unset"
+msgstr "Do _Not Unset"
+
+#: ../src/addressbook/addressbook.error.xml.h:51
+#| msgid "_Unsort"
+msgid "_Unset"
+msgstr "_Unset"
+
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:1
 msgid "Show Telephone"
 msgstr "Show Telephone"
@@ -3635,24 +3731,25 @@ msgid "Show Certificates"
 msgstr "Show Certificates"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:725
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:747
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:726
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:748
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3109
 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:1985
-#: ../src/mail/mail-config.ui.h:38
+#: ../src/mail/mail-config.ui.h:40
 msgid "Options"
 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:3271
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3504
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4321
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4334
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
 #: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:220
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:453
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:14
@@ -3663,19 +3760,23 @@ msgstr "Options"
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:1360
 #: ../src/calendar/gui/e-cal-dialogs.c:694
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:301
-#: ../src/composer/e-composer-actions.c:229 ../src/e-util/e-activity-bar.c:357
+#: ../src/composer/e-composer-actions.c:228 ../src/e-util/e-activity-bar.c:357
 #: ../src/e-util/e-attachment-dialog.c:309
-#: ../src/e-util/e-attachment-store.c:664
-#: ../src/e-util/e-attachment-store.c:832 ../src/e-util/e-attachment-view.c:302
-#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:140
-#: ../src/e-util/e-category-editor.c:211 ../src/e-util/e-charset-combo-box.c:99
-#: ../src/e-util/e-collection-account-wizard.c:1586
-#: ../src/e-util/e-collection-account-wizard.c:1821
+#: ../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:171
+#: ../src/e-util/e-category-editor.c:259 ../src/e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-collection-account-wizard.c:231
+#: ../src/e-util/e-collection-account-wizard.c:1801
+#: ../src/e-util/e-collection-account-wizard.c:2037
 #: ../src/e-util/e-color-chooser-widget.c:125
-#: ../src/e-util/e-filter-datespec.c:289
-#: ../src/e-util/e-html-editor-actions.c:321
-#: ../src/e-util/e-html-editor-actions.c:415
-#: ../src/e-util/e-image-chooser-dialog.c:169
+#: ../src/e-util/e-filter-datespec.c:300
+#: ../src/e-util/e-html-editor-actions.c:304
+#: ../src/e-util/e-html-editor-actions.c:348
+#: ../src/e-util/e-html-editor-actions.c:430
+#: ../src/e-util/e-image-chooser-dialog.c:179
 #: ../src/e-util/e-mail-signature-script-dialog.c:366
 #: ../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
@@ -3684,48 +3785,49 @@ msgstr "Options"
 #: ../src/e-util/e-source-selector-dialog.c:370
 #: ../src/e-util/e-table-config.c:548 ../src/e-util/e-table-config.ui.h:3
 #: ../src/e-util/e-timezone-dialog.ui.h:2
-#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4143
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4318
 #: ../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:3960
+#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4175
 #: ../src/mail/em-folder-selector.c:318 ../src/mail/mail-config.ui.h:2
-#: ../src/mail/mail.error.xml.h:16 ../src/mail/mail-send-recv.c:844
-#: ../src/mail/mail-send-recv.c:925 ../src/mail/mail-vfolder-ui.c:149
+#: ../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/calendar/e-cal-attachment-handler.c:283
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
-#: ../src/plugins/face/face.c:295
+#: ../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:185
+#: ../src/plugins/save-calendar/save-calendar.c:186
 #: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:748
-#: ../src/shell/e-shell-utils.c:70 ../src/shell/e-shell-utils.c:139
-#: ../src/smime/gui/certificate-manager.c:665
-#: ../src/smime/gui/certificate-manager.c:742
-#: ../src/smime/gui/certificate-manager.c:966
-#: ../src/smime/gui/certificate-manager.c:1348
+#: ../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/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:3505
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:719
 #: ../src/calendar/calendar.error.xml.h:47
 #: ../src/calendar/gui/e-comp-editor.c:2115
-#: ../src/composer/e-composer-actions.c:230
-#: ../src/composer/e-composer-actions.c:350
-#: ../src/e-util/e-attachment-store.c:833
+#: ../src/composer/e-composer-actions.c:228
+#: ../src/composer/e-composer-actions.c:340
+#: ../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:2467 ../src/e-util/e-web-view.c:4144
+#: ../src/e-util/e-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4318
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:268
-#: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:140
-#: ../src/smime/gui/certificate-manager.c:666
-#: ../src/smime/gui/certificate-manager.c:743
+#: ../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
 msgid "_Save"
 msgstr "_Save"
 
@@ -3735,12 +3837,12 @@ msgstr "_Save"
 #: ../src/e-util/e-preferences-window.c:390
 #: ../src/e-util/e-send-options.ui.h:15
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../src/shell/e-shell.c:1458 ../src/shell/e-shell-window-actions.c:971
+#: ../src/shell/e-shell.c:1474 ../src/shell/e-shell-window-actions.c:994
 msgid "_Help"
 msgstr "_Help"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
-#: ../src/e-util/e-misc-utils.c:3493
+#: ../src/e-util/e-misc-utils.c:3575
 msgid "Image"
 msgstr "Image"
 
@@ -3798,8 +3900,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:731
-#: ../src/modules/itip-formatter/itip-view.c:2049
+#: ../src/calendar/gui/e-comp-editor-event.c:835
+#: ../src/modules/itip-formatter/itip-view.c:2076
 msgid "_Calendar:"
 msgstr "_Calendar:"
 
@@ -3900,7 +4002,9 @@ msgstr "Anniversary"
 msgid "Birthday"
 msgstr "Birthday"
 
+#. Other options
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../src/mail/e-mail-config-defaults-page.c:887
 #: ../src/modules/addressbook/autocompletion-config.c:127
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
@@ -3952,7 +4056,7 @@ msgstr "Work"
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:525
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:927
-#: ../src/calendar/gui/e-cal-model.c:3820
+#: ../src/calendar/gui/e-cal-model.c:3827
 msgid "Other"
 msgstr "Other"
 
@@ -3976,20 +4080,20 @@ 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:1449
-#: ../src/e-util/e-attachment-view.c:356 ../src/e-util/e-filter-rule.c:409
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1521
+#: ../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:1037
 #: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:27
 #: ../src/mail/e-mail-config-identity-page.c:871
 #: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:678
-#: ../src/mail/em-folder-properties.c:1029
-#: ../src/mail/em-vfolder-editor-rule.c:642 ../src/mail/mail-config.ui.h:62
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:553
-#: ../src/plugins/email-custom-header/email-custom-header.c:847
+#: ../src/mail/em-folder-properties.c:1050
+#: ../src/mail/em-vfolder-editor-rule.c:642 ../src/mail/mail-config.ui.h:64
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:554
+#: ../src/plugins/email-custom-header/email-custom-header.c:848
 #: ../src/plugins/publish-calendar/publish-calendar.c:790
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:35
-#: ../src/plugins/templates/templates.c:472
+#: ../src/plugins/templates/templates.c:474
 msgid "_Remove"
 msgstr "_Remove"
 
@@ -4006,121 +4110,124 @@ msgstr "_Load X.509"
 msgid "Certificates"
 msgstr "Certificates"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:260
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:261
 #: ../src/calendar/gui/e-comp-editor.c:2047
-#: ../src/e-util/e-html-editor-actions.c:913
+#: ../src/e-util/e-html-editor-actions.c:945
 msgid "_Undo"
 msgstr "_Undo"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:262
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:263
 #: ../src/calendar/gui/e-comp-editor.c:2049 ../src/e-util/e-focus-tracker.c:120
 msgid "Undo"
 msgstr "Undo"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:267
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:268
 #: ../src/calendar/gui/e-comp-editor.c:2054
-#: ../src/e-util/e-html-editor-actions.c:899
+#: ../src/e-util/e-html-editor-actions.c:931
 msgid "_Redo"
 msgstr "_Redo"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:269
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:270
 #: ../src/calendar/gui/e-comp-editor.c:2056 ../src/e-util/e-focus-tracker.c:136
 msgid "Redo"
 msgstr "Redo"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:302
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:501
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:321
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:322
 msgid "Error modifying contact"
 msgstr "Error modifying contact"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:341
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:342
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:741
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3102
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:742
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3103
 #, c-format
 msgid "Contact Editor — %s"
 msgstr "Contact Editor — %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3238
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3239
 msgid "X.509 certificates"
 msgstr "X.509 certificates"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3243
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3244
 msgid "PGP keys"
 msgstr "PGP keys"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3249
-#: ../src/smime/gui/certificate-manager.c:689
-#: ../src/smime/gui/certificate-manager.c:978
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3250
+#: ../src/smime/gui/certificate-manager.c:672
+#: ../src/smime/gui/certificate-manager.c:961
 msgid "All files"
 msgstr "All files"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3269
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3270
 msgid "Open PGP key"
 msgstr "Open PGP key"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3269
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3270
 msgid "Open X.509 certificate"
 msgstr "Open X.509 certificate"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4322
-#: ../src/e-util/e-attachment-store.c:662 ../src/e-util/e-category-editor.c:148
-#: ../src/e-util/e-html-editor-actions.c:322
-#: ../src/e-util/e-html-editor-actions.c:416
-#: ../src/e-util/e-image-chooser-dialog.c:172 ../src/plugins/face/face.c:296
-#: ../src/shell/e-shell-utils.c:71 ../src/smime/gui/certificate-manager.c:967
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4334
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4341
+#: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:179
+#: ../src/e-util/e-html-editor-actions.c:304
+#: ../src/e-util/e-html-editor-actions.c:348
+#: ../src/e-util/e-html-editor-actions.c:430
+#: ../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
 msgid "_Open"
 msgstr "_Open"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3289
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3520
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3287
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3515
 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:3302
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3300
 #, c-format
 msgid "Failed to load certificate: %s"
 msgstr "Failed to load certificate: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3329
 msgctxt "cert-kind"
 msgid "X.509"
 msgstr "X.509"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3329
 msgctxt "cert-kind"
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3500
 msgid "Save PGP key"
 msgstr "Save PGP key"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3500
 msgid "Save X.509 certificate"
 msgstr "Save X.509 certificate"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3532
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3527
 #, c-format
 msgid "Failed to save certificate: %s"
 msgstr "Failed to save certificate: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4318
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4331
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4337
 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:4323
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4342
 msgid "_No image"
 msgstr "_No image"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4672
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4702
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -4128,28 +4235,28 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4678
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4708
 #, c-format
 msgid "“%s” has an invalid format"
 msgstr "“%s” has an invalid format"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4686
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4716
 #, 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:4694
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4724
 #, 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:4707
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4721
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4737
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4751
 #, c-format
 msgid "%s“%s” is empty"
 msgstr "%s“%s” is empty"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4736
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4766
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
@@ -4159,10 +4266,10 @@ msgstr "Invalid contact."
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:317
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:302
 #: ../src/e-util/e-attachment-dialog.c:311
-#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:212
+#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:260
 #: ../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:290
+#: ../src/e-util/e-filter-datespec.c:301
 #: ../src/e-util/e-html-editor-link-dialog.c:255
 #: ../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
@@ -4179,7 +4286,7 @@ msgstr "Invalid contact."
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../src/plugins/publish-calendar/url-editor-dialog.c:420
 #: ../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:1349
+#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1333
 #: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
 msgid "_OK"
 msgstr "_OK"
@@ -4383,22 +4490,22 @@ msgid "Copy _Email Address"
 msgstr "Copy _E-mail Address"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:187
-#: ../src/e-util/e-web-view.c:370
+#: ../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:382
+#: ../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:384
+#: ../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-web-view.c:1376
+#: ../src/e-util/e-web-view.c:1441
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
@@ -4563,11 +4670,11 @@ msgstr "Blog"
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:259
 #: ../src/calendar/gui/e-cal-component-preview.c:322
 #: ../src/calendar/gui/e-cal-model-tasks.c:272
-#: ../src/calendar/gui/e-cal-model-tasks.c:514
+#: ../src/calendar/gui/e-cal-model-tasks.c:526
 #: ../src/calendar/gui/e-task-table.c:210
 #: ../src/calendar/gui/e-task-table.c:225
-#: ../src/calendar/gui/e-task-table.c:635 ../src/calendar/gui/print.c:3591
-#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1062
+#: ../src/calendar/gui/e-task-table.c:635 ../src/calendar/gui/print.c:3600
+#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1146
 msgid "Cancelled"
 msgstr "Cancelled"
 
@@ -4799,7 +4906,7 @@ msgstr "Are you sure you want to delete this contact (%s)?"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:1361
 #: ../src/calendar/gui/e-comp-editor.c:2005
-#: ../src/e-util/e-accounts-window.c:1750 ../src/e-util/e-focus-tracker.c:783
+#: ../src/e-util/e-accounts-window.c:1753 ../src/e-util/e-focus-tracker.c:783
 #: ../src/e-util/evolution-source-viewer.c:806
 #: ../src/e-util/e-webdav-browser.c:2688
 #: ../src/mail/e-mail-account-manager.c:737
@@ -4807,9 +4914,9 @@ msgstr "Are you sure you want to delete this contact (%s)?"
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1547
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:699
 #: ../src/modules/calendar/e-task-shell-view-actions.c:853
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1503
-#: ../src/shell/e-shell-window-actions.c:836
-#: ../src/smime/gui/certificate-manager.c:1672 ../src/smime/gui/smime-ui.ui.h:8
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1589
+#: ../src/shell/e-shell-window-actions.c:859
+#: ../src/smime/gui/certificate-manager.c:1656 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "_Delete"
 
@@ -4944,7 +5051,7 @@ msgid "Title"
 msgstr "Title"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../src/calendar/gui/e-meeting-list-view.c:658
+#: ../src/calendar/gui/e-meeting-list-view.c:671
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Role"
@@ -5007,15 +5114,15 @@ msgstr "Zoom _In"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2809
+#: ../src/mail/e-mail-reader.c:2829
 msgid "Zoom _Out"
 msgstr "Zoom _Out"
 
 #. Search button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
-#: ../src/e-util/e-html-editor-actions.c:1872
+#: ../src/e-util/e-html-editor-actions.c:2015
 #: ../src/e-util/e-html-editor-find-dialog.c:250
-#: ../src/shell/e-shell-window-actions.c:906
+#: ../src/shell/e-shell-window-actions.c:929
 msgid "_Find"
 msgstr "_Find"
 
@@ -5896,10 +6003,6 @@ msgid "Something has gone wrong when displaying the event"
 msgstr "Something has gone wrong when displaying the event"
 
 #: ../src/calendar/calendar.error.xml.h:174
-#| msgid ""
-#| "A WebKitWebProcess crashed when displaying the event. You can try again "
-#| "by moving to another event and back. If the issue persists, please file a "
-#| "bug report in the GNOME bugzilla."
 msgid ""
 "A WebKitWebProcess crashed when displaying the event. You can try again by "
 "moving to another event and back. If the issue persists, please file a bug "
@@ -5914,10 +6017,6 @@ msgid "Something has gone wrong when displaying the memo"
 msgstr "Something has gone wrong when displaying the memo"
 
 #: ../src/calendar/calendar.error.xml.h:176
-#| msgid ""
-#| "A WebKitWebProcess crashed when displaying the memo. You can try again by "
-#| "moving to another memo and back. If the issue persists, please file a bug "
-#| "report in the GNOME bugzilla."
 msgid ""
 "A WebKitWebProcess crashed when displaying the memo. You can try again by "
 "moving to another memo and back. If the issue persists, please file a bug "
@@ -5932,10 +6031,6 @@ msgid "Something has gone wrong when displaying the task"
 msgstr "Something has gone wrong when displaying the task"
 
 #: ../src/calendar/calendar.error.xml.h:178
-#| msgid ""
-#| "A WebKitWebProcess crashed when displaying the task. You can try again by "
-#| "moving to another task and back. If the issue persists, please file a bug "
-#| "report in the GNOME bugzilla."
 msgid ""
 "A WebKitWebProcess crashed when displaying the task. You can try again by "
 "moving to another task and back. If the issue persists, please file a bug "
@@ -5974,7 +6069,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:1678
+#: ../src/e-util/e-collection-account-wizard.c:1893
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -6006,7 +6101,7 @@ msgid "is not"
 msgstr "is not"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:9
-#: ../src/calendar/gui/e-cal-list-view.c:238
+#: ../src/calendar/gui/e-cal-list-view.c:243
 #: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-cal-model.c:310
 #: ../src/calendar/gui/e-task-table.c:523
 #: ../src/calendar/gui/memotypes.xml.in.h:10
@@ -6014,14 +6109,14 @@ msgid "Public"
 msgstr "Public"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:10
-#: ../src/calendar/gui/e-cal-list-view.c:239
+#: ../src/calendar/gui/e-cal-list-view.c:244
 #: ../src/calendar/gui/e-cal-model.c:312 ../src/calendar/gui/e-task-table.c:524
 #: ../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:240
+#: ../src/calendar/gui/e-cal-list-view.c:245
 #: ../src/calendar/gui/e-cal-model.c:314 ../src/calendar/gui/e-task-table.c:525
 #: ../src/calendar/gui/memotypes.xml.in.h:12
 #: ../src/e-util/e-html-editor-page-dialog.c:113
@@ -6043,6 +6138,7 @@ msgstr "Attendee"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:14
 #: ../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.ui.h:23
@@ -6061,7 +6157,7 @@ msgstr "Category"
 #: ../src/calendar/gui/memotypes.xml.in.h:14
 #: ../src/calendar/gui/tasktypes.xml.in.h:15
 #: ../src/em-format/e-mail-formatter-print.c:51
-#: ../src/em-format/e-mail-formatter-print-headers.c:155
+#: ../src/em-format/e-mail-formatter-print-headers.c:156
 #: ../src/mail/filtertypes.xml.in.h:47 ../src/mail/searchtypes.xml.in.h:49
 #: ../src/mail/vfoldertypes.xml.in.h:50
 msgid "Attachments"
@@ -6117,7 +6213,7 @@ msgid "Description Contains"
 msgstr "Description Contains"
 
 #: ../src/calendar/gui/comp-util.c:1490
-#: ../src/modules/itip-formatter/itip-view.c:2366
+#: ../src/modules/itip-formatter/itip-view.c:2393
 #, c-format
 msgid "with one guest"
 msgid_plural "with %d guests"
@@ -6396,8 +6492,11 @@ msgid "Categories:"
 msgstr "Categories:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:258
-msgid "Summary:"
-msgstr "Summary:"
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
+#: ../src/modules/itip-formatter/itip-view.c:1682
+#: ../src/modules/itip-formatter/itip-view.c:1793
+msgid "Location:"
+msgstr "Location:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:266
 msgid "Start Date:"
@@ -6423,22 +6522,22 @@ msgstr "Status:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:316
 #: ../src/calendar/gui/e-cal-model-tasks.c:268
-#: ../src/calendar/gui/e-cal-model-tasks.c:510
-#: ../src/calendar/gui/e-cal-model-tasks.c:591
+#: ../src/calendar/gui/e-cal-model-tasks.c:522
+#: ../src/calendar/gui/e-cal-model-tasks.c:603
 #: ../src/calendar/gui/e-task-table.c:206
 #: ../src/calendar/gui/e-task-table.c:221
-#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3585
+#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3594
 msgid "In Progress"
 msgstr "In Progress"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:319
 #: ../src/calendar/gui/e-cal-model-tasks.c:270
-#: ../src/calendar/gui/e-cal-model-tasks.c:512
-#: ../src/calendar/gui/e-meeting-store.c:202
-#: ../src/calendar/gui/e-meeting-store.c:225
+#: ../src/calendar/gui/e-cal-model-tasks.c:524
+#: ../src/calendar/gui/e-meeting-store.c:205
+#: ../src/calendar/gui/e-meeting-store.c:228
 #: ../src/calendar/gui/e-task-table.c:208
 #: ../src/calendar/gui/e-task-table.c:223
-#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3588
+#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3597
 #: ../src/calendar/gui/tasktypes.xml.in.h:13
 #: ../src/plugins/save-calendar/csv-format.c:377
 msgid "Completed"
@@ -6446,10 +6545,10 @@ msgstr "Completed"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:326
 #: ../src/calendar/gui/e-cal-model-tasks.c:266
-#: ../src/calendar/gui/e-cal-model-tasks.c:508
+#: ../src/calendar/gui/e-cal-model-tasks.c:520
 #: ../src/calendar/gui/e-task-table.c:204
 #: ../src/calendar/gui/e-task-table.c:219
-#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3582
+#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3591
 #: ../src/calendar/gui/tasktypes.xml.in.h:11
 msgid "Not Started"
 msgstr "Not Started"
@@ -6466,7 +6565,7 @@ msgid "High"
 msgstr "High"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:343
-#: ../src/calendar/gui/e-cal-model.c:1905
+#: ../src/calendar/gui/e-cal-model.c:1911
 #: ../src/calendar/gui/e-task-table.c:550
 #: ../src/calendar/gui/tasktypes.xml.in.h:20
 #: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:327
@@ -6485,21 +6584,21 @@ msgstr "Low"
 msgid "Description:"
 msgstr "Description:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:395
+#: ../src/calendar/gui/e-cal-component-preview.c:408
 msgid "Web Page:"
 msgstr "Web Page:"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1696
+#: ../src/calendar/gui/e-cal-data-model.c:1709
 #, c-format
 msgid "Creating view for calendar “%s”"
 msgstr "Creating view for calendar “%s”"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1700
+#: ../src/calendar/gui/e-cal-data-model.c:1713
 #, c-format
 msgid "Creating view for task list “%s”"
 msgstr "Creating view for task list “%s”"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1704
+#: ../src/calendar/gui/e-cal-data-model.c:1717
 #, c-format
 msgid "Creating view for memo list “%s”"
 msgstr "Creating view for memo list “%s”"
@@ -6683,7 +6782,7 @@ msgstr "Pasting iCalendar data"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
 #: ../src/calendar/gui/e-calendar-view.c:1854
-#: ../src/calendar/gui/e-memo-table.c:493
+#: ../src/calendar/gui/e-memo-table.c:499
 #: ../src/calendar/gui/e-task-table.c:819
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -6693,17 +6792,18 @@ msgstr "Organiser: %s <%s>"
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
 #: ../src/calendar/gui/e-calendar-view.c:1858
-#: ../src/calendar/gui/e-memo-table.c:498
+#: ../src/calendar/gui/e-memo-table.c:504
 #: ../src/calendar/gui/e-task-table.c:823
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organiser: %s"
 
-#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#. Translators: It will display "Location: PlaceOfTheMeeting"
 #. Translators: It will display "Location: LocationOfTheAppointment"
 #: ../src/calendar/gui/e-calendar-view.c:1874
 #: ../src/calendar/gui/e-meeting-time-sel.c:2580
-#: ../src/calendar/gui/e-to-do-pane.c:346 ../src/calendar/gui/print.c:3536
+#: ../src/calendar/gui/e-task-table.c:839
+#: ../src/calendar/gui/e-to-do-pane.c:363 ../src/calendar/gui/print.c:3545
 #, c-format
 msgid "Location: %s"
 msgstr "Location: %s"
@@ -6711,7 +6811,7 @@ 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:1914
-#: ../src/calendar/gui/e-to-do-pane.c:443
+#: ../src/calendar/gui/e-to-do-pane.c:460
 #, c-format
 msgid "Time: %s %s"
 msgstr "Time: %s %s"
@@ -6729,7 +6829,7 @@ msgstr "%d %b %Y"
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
 #: ../src/calendar/gui/e-calendar-view.c:2311
-#: ../src/calendar/gui/e-day-view.c:3104
+#: ../src/calendar/gui/e-day-view.c:3095
 #: ../src/calendar/gui/e-day-view-top-item.c:865
 #: ../src/calendar/gui/e-week-view-main-item.c:228
 msgid "%d %b"
@@ -6746,7 +6846,7 @@ msgstr "%A %d %b %Y"
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
 #: ../src/calendar/gui/e-calendar-view.c:2324
-#: ../src/calendar/gui/e-day-view.c:3088
+#: ../src/calendar/gui/e-day-view.c:3079
 #: ../src/calendar/gui/e-day-view-top-item.c:861
 #: ../src/calendar/gui/e-week-view-main-item.c:214
 msgid "%a %d %b"
@@ -6769,20 +6869,20 @@ msgstr "End Date"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:7
 #: ../src/calendar/gui/e-memo-table.etspec.h:6
-#: ../src/calendar/gui/e-task-table.etspec.h:13
+#: ../src/calendar/gui/e-task-table.etspec.h:14
 #: ../src/plugins/save-calendar/csv-format.c:378
 msgid "Created"
 msgstr "Created"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:8
 #: ../src/calendar/gui/e-memo-table.etspec.h:7
-#: ../src/calendar/gui/e-task-table.etspec.h:14
+#: ../src/calendar/gui/e-task-table.etspec.h:15
 msgid "Last modified"
 msgstr "Last modified"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:9
 #: ../src/calendar/gui/e-memo-table.etspec.h:8
-#: ../src/calendar/gui/e-task-table.etspec.h:15
+#: ../src/calendar/gui/e-task-table.etspec.h:16
 #: ../src/em-format/e-mail-formatter-source.c:118
 msgid "Source"
 msgstr "Source"
@@ -6790,12 +6890,12 @@ msgstr "Source"
 #: ../src/calendar/gui/e-cal-model.c:316
 #: ../src/calendar/gui/e-meeting-list-view.c:183
 #: ../src/calendar/gui/e-meeting-list-view.c:197
-#: ../src/calendar/gui/e-meeting-store.c:132
-#: ../src/calendar/gui/e-meeting-store.c:167
-#: ../src/calendar/gui/e-meeting-store.c:230 ../src/calendar/gui/print.c:1247
-#: ../src/calendar/gui/print.c:1264 ../src/e-util/e-charset.c:49
-#: ../src/modules/itip-formatter/itip-view.c:3560
-#: ../src/modules/itip-formatter/itip-view.c:6332
+#: ../src/calendar/gui/e-meeting-store.c:135
+#: ../src/calendar/gui/e-meeting-store.c:170
+#: ../src/calendar/gui/e-meeting-store.c:233 ../src/calendar/gui/print.c:1256
+#: ../src/calendar/gui/print.c:1273 ../src/e-util/e-charset.c:49
+#: ../src/modules/itip-formatter/itip-view.c:3587
+#: ../src/modules/itip-formatter/itip-view.c:6409
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "Unknown"
@@ -6822,70 +6922,70 @@ msgstr "Creating a memo"
 msgid "Creating a task"
 msgstr "Creating a task"
 
-#: ../src/calendar/gui/e-cal-model.c:1907
+#: ../src/calendar/gui/e-cal-model.c:1913
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../src/calendar/gui/e-cal-model.c:1909
+#: ../src/calendar/gui/e-cal-model.c:1915
 msgid "Assigned"
 msgstr "Assigned"
 
-#: ../src/calendar/gui/e-cal-model.c:1911
-#: ../src/calendar/gui/e-cal-model-tasks.c:1094
+#: ../src/calendar/gui/e-cal-model.c:1918
+#: ../src/calendar/gui/e-cal-model-tasks.c:1144
 #: ../src/calendar/gui/e-meeting-list-view.c:207
-#: ../src/calendar/gui/e-meeting-store.c:174
-#: ../src/calendar/gui/e-meeting-store.c:184
-#: ../src/calendar/gui/e-meeting-store.c:1021
+#: ../src/calendar/gui/e-meeting-store.c:177
+#: ../src/calendar/gui/e-meeting-store.c:187
+#: ../src/calendar/gui/e-meeting-store.c:1098
 msgid "Yes"
 msgstr "Yes"
 
-#: ../src/calendar/gui/e-cal-model.c:1911
-#: ../src/calendar/gui/e-cal-model-tasks.c:1094
+#: ../src/calendar/gui/e-cal-model.c:1918
+#: ../src/calendar/gui/e-cal-model-tasks.c:1144
 #: ../src/calendar/gui/e-meeting-list-view.c:208
-#: ../src/calendar/gui/e-meeting-store.c:186
+#: ../src/calendar/gui/e-meeting-store.c:189
 msgid "No"
 msgstr "No"
 
-#: ../src/calendar/gui/e-cal-model.c:3815
+#: ../src/calendar/gui/e-cal-model.c:3822
 #: ../src/calendar/gui/e-meeting-list-view.c:219
-#: ../src/calendar/gui/e-meeting-store.c:194
-#: ../src/calendar/gui/e-meeting-store.c:217
-#: ../src/modules/itip-formatter/itip-view.c:6320
+#: ../src/calendar/gui/e-meeting-store.c:197
+#: ../src/calendar/gui/e-meeting-store.c:220
+#: ../src/modules/itip-formatter/itip-view.c:6397
 msgid "Accepted"
 msgstr "Accepted"
 
-#: ../src/calendar/gui/e-cal-model.c:3816
+#: ../src/calendar/gui/e-cal-model.c:3823
 #: ../src/calendar/gui/e-meeting-list-view.c:220
-#: ../src/calendar/gui/e-meeting-store.c:196
-#: ../src/calendar/gui/e-meeting-store.c:219
-#: ../src/modules/itip-formatter/itip-view.c:6326
+#: ../src/calendar/gui/e-meeting-store.c:199
+#: ../src/calendar/gui/e-meeting-store.c:222
+#: ../src/modules/itip-formatter/itip-view.c:6403
 msgid "Declined"
 msgstr "Declined"
 
-#: ../src/calendar/gui/e-cal-model.c:3817
+#: ../src/calendar/gui/e-cal-model.c:3824
 #: ../src/calendar/gui/e-meeting-list-view.c:221
-#: ../src/calendar/gui/e-meeting-store.c:198
-#: ../src/calendar/gui/e-meeting-store.c:221
+#: ../src/calendar/gui/e-meeting-store.c:201
+#: ../src/calendar/gui/e-meeting-store.c:224
 #: ../src/calendar/gui/e-meeting-time-sel.c:523
 msgid "Tentative"
 msgstr "Tentative"
 
-#: ../src/calendar/gui/e-cal-model.c:3818
+#: ../src/calendar/gui/e-cal-model.c:3825
 #: ../src/calendar/gui/e-meeting-list-view.c:222
-#: ../src/calendar/gui/e-meeting-store.c:200
-#: ../src/calendar/gui/e-meeting-store.c:223
-#: ../src/modules/itip-formatter/itip-view.c:6329
+#: ../src/calendar/gui/e-meeting-store.c:203
+#: ../src/calendar/gui/e-meeting-store.c:226
+#: ../src/modules/itip-formatter/itip-view.c:6406
 msgid "Delegated"
 msgstr "Delegated"
 
-#: ../src/calendar/gui/e-cal-model.c:3819
+#: ../src/calendar/gui/e-cal-model.c:3826
 msgid "Needs action"
 msgstr "Needs action"
 
 #. 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-model.c:3874
-#: ../src/calendar/gui/e-meeting-list-view.c:687
+#: ../src/calendar/gui/e-cal-model.c:3881
+#: ../src/calendar/gui/e-meeting-list-view.c:700
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../src/calendar/gui/e-task-table.etspec.h:11
 #: ../src/calendar/gui/tasktypes.xml.in.h:8 ../src/mail/filtertypes.xml.in.h:36
@@ -6905,7 +7005,7 @@ msgstr "Free"
 msgid "Busy"
 msgstr "Busy"
 
-#: ../src/calendar/gui/e-cal-model-tasks.c:454
+#: ../src/calendar/gui/e-cal-model-tasks.c:466
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6916,7 +7016,7 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../src/calendar/gui/e-cal-model-tasks.c:506
+#: ../src/calendar/gui/e-cal-model-tasks.c:518
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "None"
@@ -6933,15 +7033,15 @@ msgstr "Modifying a memo"
 msgid "Modifying a task"
 msgstr "Modifying a task"
 
-#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1946
+#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1954
 msgid "Removing an event"
 msgstr "Removing an event"
 
-#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1950
+#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1958
 msgid "Removing a memo"
 msgstr "Removing a memo"
 
-#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1954
+#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1962
 msgid "Removing a task"
 msgstr "Removing a task"
 
@@ -7124,154 +7224,154 @@ msgstr "Event cannot be edited, because the selected calendar is read only"
 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:442
-#: ../src/calendar/gui/e-comp-editor-task.c:541
+#: ../src/calendar/gui/e-comp-editor-event.c:460
+#: ../src/calendar/gui/e-comp-editor-task.c:546
 msgid "Start date is not a valid date"
 msgstr "Start date is not a valid date"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:444
+#: ../src/calendar/gui/e-comp-editor-event.c:462
 msgid "Start time is not a valid time"
 msgstr "Start time is not a valid time"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:448
-#: ../src/calendar/gui/e-comp-editor-event.c:464
+#: ../src/calendar/gui/e-comp-editor-event.c:466
+#: ../src/calendar/gui/e-comp-editor-event.c:482
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
 #: ../src/calendar/gui/e-comp-editor.c:337
 #: ../src/em-format/e-mail-part-secure-button.c:93
-#: ../src/e-util/e-misc-utils.c:4136 ../src/e-util/e-misc-utils.c:4148
-#: ../src/e-util/e-misc-utils.c:4162 ../src/mail/e-mail-autoconfig.c:976
-#: ../src/mail/e-mail-display.c:2256 ../src/mail/e-mail-reader-utils.c:805
-#: ../src/mail/em-composer-utils.c:3754 ../src/mail/em-composer-utils.c:3785
-#: ../src/mail/mail-send-recv.c:568 ../src/mail/mail-send-recv.c:1398
+#: ../src/e-util/e-misc-utils.c:4218 ../src/e-util/e-misc-utils.c:4230
+#: ../src/e-util/e-misc-utils.c:4244 ../src/mail/e-mail-autoconfig.c:1029
+#: ../src/mail/e-mail-display.c:2292 ../src/mail/e-mail-reader-utils.c:805
+#: ../src/mail/em-composer-utils.c:3969 ../src/mail/em-composer-utils.c:4000
+#: ../src/mail/mail-send-recv.c:598 ../src/mail/mail-send-recv.c:1496
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:172
-#: ../src/plugins/face/face.c:174 ../src/shell/e-shell.c:1221
-#: ../src/shell/e-shell.c:1245 ../src/smime/gui/certificate-manager.c:357
+#: ../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
 #, c-format
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:458
+#: ../src/calendar/gui/e-comp-editor-event.c:476
 msgid "End date is not a valid date"
 msgstr "End date is not a valid date"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:460
+#: ../src/calendar/gui/e-comp-editor-event.c:478
 msgid "End time is not a valid time"
 msgstr "End time is not a valid time"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:590
+#: ../src/calendar/gui/e-comp-editor-event.c:677
 #: ../src/calendar/gui/e-comp-editor-memo.c:134
-#: ../src/calendar/gui/e-comp-editor-task.c:646
+#: ../src/calendar/gui/e-comp-editor-task.c:651
 msgid "_Categories"
 msgstr "_Categories"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:592
+#: ../src/calendar/gui/e-comp-editor-event.c:679
 #: ../src/calendar/gui/e-comp-editor-memo.c:136
-#: ../src/calendar/gui/e-comp-editor-task.c:648
+#: ../src/calendar/gui/e-comp-editor-task.c:653
 msgid "Toggles whether to display categories"
 msgstr "Toggles whether to display categories"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:598
-#: ../src/calendar/gui/e-comp-editor-task.c:654
+#: ../src/calendar/gui/e-comp-editor-event.c:685
+#: ../src/calendar/gui/e-comp-editor-task.c:659
 msgid "Time _Zone"
 msgstr "Time _Zone"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:600
-#: ../src/calendar/gui/e-comp-editor-task.c:656
+#: ../src/calendar/gui/e-comp-editor-event.c:687
+#: ../src/calendar/gui/e-comp-editor-task.c:661
 msgid "Toggles whether the time zone is displayed"
 msgstr "Toggles whether the time zone is displayed"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:606
+#: ../src/calendar/gui/e-comp-editor-event.c:693
 msgid "All _Day Event"
 msgstr "All _Day Event"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:608
+#: ../src/calendar/gui/e-comp-editor-event.c:695
 msgid "Toggles whether to have All Day Event"
 msgstr "Toggles whether to have All Day Event"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:614
+#: ../src/calendar/gui/e-comp-editor-event.c:701
 msgid "Show Time as _Busy"
 msgstr "Show Time as _Busy"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:616
+#: ../src/calendar/gui/e-comp-editor-event.c:703
 msgid "Toggles whether to show time as busy"
 msgstr "Toggles whether to show time as busy"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:625
+#: ../src/calendar/gui/e-comp-editor-event.c:712
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:627
+#: ../src/calendar/gui/e-comp-editor-event.c:714
 msgid "Classify as public"
 msgstr "Classify as public"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:632
+#: ../src/calendar/gui/e-comp-editor-event.c:719
 msgid "_Private"
 msgstr "_Private"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:634
+#: ../src/calendar/gui/e-comp-editor-event.c:721
 msgid "Classify as private"
 msgstr "Classify as private"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:639
+#: ../src/calendar/gui/e-comp-editor-event.c:726
 msgid "_Confidential"
 msgstr "_Confidential"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:641
+#: ../src/calendar/gui/e-comp-editor-event.c:728
 msgid "Classify as confidential"
 msgstr "Classify as confidential"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:742
+#: ../src/calendar/gui/e-comp-editor-event.c:846
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Start time:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:747
+#: ../src/calendar/gui/e-comp-editor-event.c:851
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "_End time:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:757
+#: ../src/calendar/gui/e-comp-editor-event.c:861
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "All da_y event"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:811
+#: ../src/calendar/gui/e-comp-editor-event.c:919
 #: ../src/calendar/gui/e-comp-editor-memo.c:222
-#: ../src/calendar/gui/e-comp-editor-task.c:821
+#: ../src/calendar/gui/e-comp-editor-task.c:829
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "General"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:814
-#: ../src/calendar/gui/e-comp-editor-task.c:838
+#: ../src/calendar/gui/e-comp-editor-event.c:922
+#: ../src/calendar/gui/e-comp-editor-task.c:852
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Reminders"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:817
-#: ../src/calendar/gui/e-comp-editor-task.c:842
+#: ../src/calendar/gui/e-comp-editor-event.c:925
+#: ../src/calendar/gui/e-comp-editor-task.c:856
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Recurrence"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:820
+#: ../src/calendar/gui/e-comp-editor-event.c:928
 #: ../src/calendar/gui/e-comp-editor-memo.c:225
-#: ../src/calendar/gui/e-comp-editor-task.c:846
+#: ../src/calendar/gui/e-comp-editor-task.c:860
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Attachments"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:830
+#: ../src/calendar/gui/e-comp-editor-event.c:938
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "Schedule"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:862
+#: ../src/calendar/gui/e-comp-editor-event.c:973
 #, c-format
 msgid "Meeting — %s"
 msgstr "Meeting — %s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:863
+#: ../src/calendar/gui/e-comp-editor-event.c:974
 #, c-format
 msgid "Appointment — %s"
 msgstr "Appointment — %s"
@@ -7291,12 +7391,12 @@ msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Memo cannot be fully edited, because you are not the organiser"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:196
-#: ../src/calendar/gui/e-comp-editor-task.c:755
+#: ../src/calendar/gui/e-comp-editor-task.c:760
 msgid "_List:"
 msgstr "_List:"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:203
-#: ../src/calendar/gui/e-comp-editor-task.c:762
+#: ../src/calendar/gui/e-comp-editor-task.c:770
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "Sta_rt date:"
@@ -7354,13 +7454,13 @@ msgstr ""
 "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:647
-#: ../src/composer/e-composer-actions.c:322
+#: ../src/composer/e-composer-actions.c:312
 msgid "_Attachment..."
 msgstr "_Attachment…"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:649
-#: ../src/composer/e-composer-actions.c:324
-#: ../src/e-util/e-attachment-view.c:344
+#: ../src/composer/e-composer-actions.c:314
+#: ../src/e-util/e-attachment-view.c:343
 msgid "Attach a file"
 msgstr "Attach a file"
 
@@ -7382,87 +7482,87 @@ msgstr "Icon View"
 msgid "List View"
 msgstr "List View"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:315
+#: ../src/calendar/gui/e-comp-editor-page-general.c:387
 #, 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:322
+#: ../src/calendar/gui/e-comp-editor-page-general.c:394
 #, 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:352
+#: ../src/calendar/gui/e-comp-editor-page-general.c:424
 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:438
+#: ../src/calendar/gui/e-comp-editor-page-general.c:510
 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:599
+#: ../src/calendar/gui/e-comp-editor-page-general.c:675
 msgid "A_ttendees"
 msgstr "A_ttendees"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:601
+#: ../src/calendar/gui/e-comp-editor-page-general.c:677
 msgid "Toggles whether the Attendees are displayed"
 msgstr "Toggles whether the Attendees are displayed"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:610
+#: ../src/calendar/gui/e-comp-editor-page-general.c:686
 msgid "R_ole Field"
 msgstr "R_ole Field"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:612
+#: ../src/calendar/gui/e-comp-editor-page-general.c:688
 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:618
+#: ../src/calendar/gui/e-comp-editor-page-general.c:694
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:620
+#: ../src/calendar/gui/e-comp-editor-page-general.c:696
 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:626
+#: ../src/calendar/gui/e-comp-editor-page-general.c:702
 msgid "_Status Field"
 msgstr "_Status Field"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:628
+#: ../src/calendar/gui/e-comp-editor-page-general.c:704
 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:634
+#: ../src/calendar/gui/e-comp-editor-page-general.c:710
 msgid "_Type Field"
 msgstr "_Type Field"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:636
+#: ../src/calendar/gui/e-comp-editor-page-general.c:712
 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:981
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1058
 msgid "An organizer is required."
 msgstr "An organiser is required."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:991
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1122
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1068
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1199
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1246
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1323
 msgid "Or_ganizer:"
 msgstr "Or_ganiser:"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1348
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1420
 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:1350
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1422
 msgid ""
 "Override color of the memo. If not set, then color of the memo list is used."
 msgstr ""
@@ -7470,33 +7570,33 @@ msgstr ""
 "used."
 
 #. E_SOURCE_EXTENSION_TASK_LIST
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1352
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1424
 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:1364
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1436
 msgctxt "ECompEditor"
 msgid "Atte_ndees..."
 msgstr "Atte_ndees..."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1441
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1513
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
 #: ../src/calendar/gui/e-comp-editor.c:2070
-#: ../src/e-util/e-accounts-window.c:1742
-#: ../src/e-util/e-html-editor-actions.c:922
+#: ../src/e-util/e-accounts-window.c:1745
+#: ../src/e-util/e-html-editor-actions.c:954
 #: ../src/e-util/e-mail-signature-manager.c:358
 #: ../src/e-util/e-webdav-browser.c:2681 ../src/e-util/filter.ui.h:26
-#: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:175
+#: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:195
 #: ../src/mail/e-mail-label-manager.c:380
-#: ../src/mail/em-folder-properties.c:1026 ../src/mail/mail-config.ui.h:66
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:548
-#: ../src/plugins/email-custom-header/email-custom-header.c:842
+#: ../src/mail/em-folder-properties.c:1047 ../src/mail/mail-config.ui.h:68
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:549
+#: ../src/plugins/email-custom-header/email-custom-header.c:843
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../src/plugins/templates/templates.c:467
-#: ../src/shell/e-shell-window-actions.c:957 ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/plugins/templates/templates.c:469
+#: ../src/shell/e-shell-window-actions.c:980 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "_Edit"
 
@@ -7759,13 +7859,13 @@ msgstr "Exceptions"
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2223
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1774
 #: ../src/mail/e-mail-config-identity-page.c:853
-#: ../src/mail/mail-config.ui.h:65
+#: ../src/mail/mail-config.ui.h:67
 msgid "A_dd"
 msgstr "A_dd"
 
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1782
-#: ../src/mail/mail-config.ui.h:67
+#: ../src/mail/mail-config.ui.h:69
 msgid "Re_move"
 msgstr "Re_move"
 
@@ -7786,7 +7886,7 @@ msgid "Set or unset reminders"
 msgstr "Set or unset reminders"
 
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1614
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
 msgid "Reminders"
 msgstr "Reminders"
 
@@ -7982,161 +8082,160 @@ msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "D_ue date:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1148
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1154
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "Date _completed:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1164
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1170
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "Public"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1165
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "Private"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1166
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1172
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "Confidential"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1182
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1188
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "C_lassification:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1201
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1207
 msgctxt "ECompEditor"
 msgid "Not Started"
 msgstr "Not Started"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1202
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1208
 msgctxt "ECompEditor"
 msgid "In Progress"
 msgstr "In Progress"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1203
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1209
 msgctxt "ECompEditor"
 msgid "Completed"
 msgstr "Completed"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1204
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1210
 msgctxt "ECompEditor"
 msgid "Cancelled"
 msgstr "Cancelled"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1213
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1219
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1243
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1249
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "Undefined"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1244
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1250
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "High"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1245
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1251
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1246
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1252
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "Low"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1255
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1261
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "Priorit_y:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1309
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1315
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "Percent complete:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1390
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1396
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "Time _zone:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1515
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1521
 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:1642
-#| msgid "None"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1648
 msgctxt "ECompEditor"
 msgid "None"
 msgstr "None"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:236
+#: ../src/calendar/gui/e-comp-editor-task.c:241
 msgid "Task’s start date is in the past"
 msgstr "Task’s start date is in the past"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:244
+#: ../src/calendar/gui/e-comp-editor-task.c:249
 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:480
+#: ../src/calendar/gui/e-comp-editor-task.c:485
 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:482
+#: ../src/calendar/gui/e-comp-editor-task.c:487
 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:484
+#: ../src/calendar/gui/e-comp-editor-task.c:489
 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:555
+#: ../src/calendar/gui/e-comp-editor-task.c:560
 msgid "Start date is required for recurring tasks"
 msgstr "Start date is required for recurring tasks"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:567
+#: ../src/calendar/gui/e-comp-editor-task.c:572
 msgid "Due date is not a valid date"
 msgstr "Due date is not a valid date"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:578
+#: ../src/calendar/gui/e-comp-editor-task.c:583
 msgid "Completed date is not a valid date"
 msgstr "Completed date is not a valid date"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:589
+#: ../src/calendar/gui/e-comp-editor-task.c:594
 msgid "Completed date cannot be in the future"
 msgstr "Completed date cannot be in the future"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:662
+#: ../src/calendar/gui/e-comp-editor-task.c:667
 msgid "All _Day Task"
 msgstr "All _Day Task"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:664
+#: ../src/calendar/gui/e-comp-editor-task.c:669
 msgid "Toggles whether to have All Day Task"
 msgstr "Toggles whether to have All Day Task"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:879
+#: ../src/calendar/gui/e-comp-editor-task.c:893
 #, c-format
 msgid "Assigned Task — %s"
 msgstr "Assigned Task — %s"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:880
+#: ../src/calendar/gui/e-comp-editor-task.c:894
 #, 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:125
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:141
 msgid "attachment"
 msgstr "attachment"
 
@@ -8154,20 +8253,20 @@ msgstr "No Summary"
 
 #. == Button box ==
 #: ../src/calendar/gui/e-comp-editor.c:1984
-#: ../src/composer/e-composer-actions.c:329
-#: ../src/e-util/e-accounts-window.c:1775
+#: ../src/composer/e-composer-actions.c:319
+#: ../src/e-util/e-accounts-window.c:1778
 #: ../src/e-util/e-html-editor-dialog.c:194
 #: ../src/e-util/e-mail-signature-editor.c:309
 #: ../src/e-util/e-name-selector-dialog.c:548
 #: ../src/e-util/e-preferences-window.c:399
 #: ../src/e-util/e-table-field-chooser-dialog.c:205
-#: ../src/mail/e-mail-browser.c:131 ../src/mail/e-mail-notes.c:952
-#: ../src/mail/em-folder-properties.c:1151
+#: ../src/mail/e-mail-browser.c:144 ../src/mail/e-mail-notes.c:964
+#: ../src/mail/em-filter-editor.c:45 ../src/mail/em-folder-properties.c:1172
 #: ../src/mail/em-subscription-editor.c:1739
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:306
 #: ../src/shell/e-shell-window-actions.c:296
-#: ../src/shell/e-shell-window-actions.c:801
-#: ../src/smime/gui/certificate-manager.c:2212
+#: ../src/shell/e-shell-window-actions.c:824
+#: ../src/smime/gui/certificate-manager.c:2196
 msgid "_Close"
 msgstr "_Close"
 
@@ -8177,37 +8276,37 @@ msgstr "Close the current window"
 
 #. copy menu item
 #: ../src/calendar/gui/e-comp-editor.c:1991 ../src/e-util/e-focus-tracker.c:773
-#: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2075
-#: ../src/e-util/e-web-view.c:409 ../src/mail/e-mail-browser.c:138
-#: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:822
+#: ../src/e-util/e-html-editor-actions.c:910 ../src/e-util/e-text.c:2080
+#: ../src/e-util/e-web-view.c:467 ../src/mail/e-mail-browser.c:151
+#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:845
 msgid "_Copy"
 msgstr "_Copy"
 
 #: ../src/calendar/gui/e-comp-editor.c:1993 ../src/e-util/e-focus-tracker.c:173
 #: ../src/e-util/e-focus-tracker.c:229 ../src/e-util/e-focus-tracker.c:282
-#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:411
-#: ../src/e-util/e-web-view.c:2010 ../src/mail/e-mail-browser.c:140
-#: ../src/shell/e-shell-window-actions.c:824
+#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:469
+#: ../src/e-util/e-web-view.c:2075 ../src/mail/e-mail-browser.c:153
+#: ../src/shell/e-shell-window-actions.c:847
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
 #. cut menu item
 #: ../src/calendar/gui/e-comp-editor.c:1998 ../src/e-util/e-focus-tracker.c:768
-#: ../src/e-util/e-html-editor-actions.c:885 ../src/e-util/e-text.c:2061
-#: ../src/mail/e-mail-browser.c:145 ../src/shell/e-shell-window-actions.c:829
+#: ../src/e-util/e-html-editor-actions.c:917 ../src/e-util/e-text.c:2066
+#: ../src/mail/e-mail-browser.c:158 ../src/shell/e-shell-window-actions.c:852
 msgid "Cu_t"
 msgstr "Cu_t"
 
 #: ../src/calendar/gui/e-comp-editor.c:2000 ../src/e-util/e-focus-tracker.c:166
 #: ../src/e-util/e-focus-tracker.c:222 ../src/e-util/e-focus-tracker.c:276
-#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:2019
-#: ../src/mail/e-mail-browser.c:147 ../src/shell/e-shell-window-actions.c:831
+#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:2084
+#: ../src/mail/e-mail-browser.c:160 ../src/shell/e-shell-window-actions.c:854
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
 #: ../src/calendar/gui/e-comp-editor.c:2007 ../src/e-util/e-focus-tracker.c:187
 #: ../src/e-util/e-focus-tracker.c:243 ../src/e-util/e-focus-tracker.c:784
-#: ../src/shell/e-shell-window-actions.c:838
+#: ../src/shell/e-shell-window-actions.c:861
 msgid "Delete the selection"
 msgstr "Delete the selection"
 
@@ -8217,26 +8316,26 @@ msgstr "View help"
 
 #. paste menu item
 #: ../src/calendar/gui/e-comp-editor.c:2019 ../src/e-util/e-focus-tracker.c:778
-#: ../src/e-util/e-html-editor-actions.c:892 ../src/e-util/e-text.c:2087
-#: ../src/mail/e-mail-browser.c:152 ../src/shell/e-shell-window-actions.c:857
+#: ../src/e-util/e-html-editor-actions.c:924 ../src/e-util/e-text.c:2092
+#: ../src/mail/e-mail-browser.c:165 ../src/shell/e-shell-window-actions.c:880
 msgid "_Paste"
 msgstr "_Paste"
 
 #: ../src/calendar/gui/e-comp-editor.c:2021 ../src/e-util/e-focus-tracker.c:180
 #: ../src/e-util/e-focus-tracker.c:236 ../src/e-util/e-focus-tracker.c:288
-#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:2028
-#: ../src/mail/e-mail-browser.c:154 ../src/shell/e-shell-window-actions.c:859
+#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:2093
+#: ../src/mail/e-mail-browser.c:167 ../src/shell/e-shell-window-actions.c:882
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
 #: ../src/calendar/gui/e-comp-editor.c:2026
-#: ../src/composer/e-composer-actions.c:383 ../src/mail/e-mail-reader.c:2704
+#: ../src/composer/e-composer-actions.c:373 ../src/mail/e-mail-reader.c:2717
 #: ../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:2033 ../src/mail/e-mail-reader.c:2711
+#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2724
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1771
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:840
@@ -8245,14 +8344,14 @@ msgid "Pre_view..."
 msgstr "Pre_view..."
 
 #: ../src/calendar/gui/e-comp-editor.c:2040 ../src/e-util/e-focus-tracker.c:788
-#: ../src/e-util/e-html-editor-actions.c:906 ../src/e-util/e-web-view.c:419
-#: ../src/mail/e-mail-browser.c:159 ../src/shell/e-shell-window-actions.c:927
+#: ../src/e-util/e-html-editor-actions.c:938 ../src/e-util/e-web-view.c:484
+#: ../src/mail/e-mail-browser.c:172 ../src/shell/e-shell-window-actions.c:950
 msgid "Select _All"
 msgstr "Select _All"
 
 #: ../src/calendar/gui/e-comp-editor.c:2042 ../src/e-util/e-focus-tracker.c:194
 #: ../src/e-util/e-focus-tracker.c:250 ../src/e-util/e-focus-tracker.c:789
-#: ../src/mail/e-mail-browser.c:161 ../src/shell/e-shell-window-actions.c:929
+#: ../src/mail/e-mail-browser.c:174 ../src/shell/e-shell-window-actions.c:952
 msgid "Select all text"
 msgstr "Select all text"
 
@@ -8261,26 +8360,26 @@ msgid "_Classification"
 msgstr "_Classification"
 
 #: ../src/calendar/gui/e-comp-editor.c:2077
-#: ../src/e-util/e-html-editor-actions.c:929
-#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:168
-#: ../src/mail/e-mail-notes.c:966 ../src/shell/e-shell-window-actions.c:964
+#: ../src/e-util/e-html-editor-actions.c:961
+#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:188
+#: ../src/mail/e-mail-notes.c:978 ../src/shell/e-shell-window-actions.c:987
 msgid "_File"
 msgstr "_File"
 
 #: ../src/calendar/gui/e-comp-editor.c:2091
-#: ../src/e-util/e-html-editor-actions.c:950
+#: ../src/e-util/e-html-editor-actions.c:982
 msgid "_Insert"
 msgstr "_Insert"
 
 #: ../src/calendar/gui/e-comp-editor.c:2098
-#: ../src/composer/e-composer-actions.c:373
+#: ../src/composer/e-composer-actions.c:363
 msgid "_Options"
 msgstr "_Options"
 
 #: ../src/calendar/gui/e-comp-editor.c:2105
-#: ../src/e-util/e-html-editor-actions.c:971 ../src/mail/e-mail-browser.c:182
-#: ../src/shell/e-shell-window-actions.c:1007
-#: ../src/smime/gui/certificate-manager.c:1662 ../src/smime/gui/smime-ui.ui.h:3
+#: ../src/e-util/e-html-editor-actions.c:1003 ../src/mail/e-mail-browser.c:202
+#: ../src/shell/e-shell-window-actions.c:1030
+#: ../src/smime/gui/certificate-manager.c:1646 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "_View"
 
@@ -8289,7 +8388,7 @@ msgid "Save current changes"
 msgstr "Save current changes"
 
 #: ../src/calendar/gui/e-comp-editor.c:2122
-#: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:961
+#: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:973
 msgid "Save and Close"
 msgstr "Save and Close"
 
@@ -8298,18 +8397,18 @@ 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:2156 ../src/calendar/gui/e-to-do-pane.c:241
-#: ../src/calendar/gui/e-week-view.c:1781 ../src/calendar/gui/print.c:1070
-#: ../src/calendar/gui/print.c:1089 ../src/calendar/gui/print.c:2626
-#: ../src/calendar/gui/print.c:2646
+#: ../src/calendar/gui/e-day-view.c:2147 ../src/calendar/gui/e-to-do-pane.c:241
+#: ../src/calendar/gui/e-week-view.c:1772 ../src/calendar/gui/print.c:1079
+#: ../src/calendar/gui/print.c:1098 ../src/calendar/gui/print.c:2635
+#: ../src/calendar/gui/print.c:2655
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2159 ../src/calendar/gui/e-to-do-pane.c:245
-#: ../src/calendar/gui/e-week-view.c:1784 ../src/calendar/gui/print.c:1075
-#: ../src/calendar/gui/print.c:1091 ../src/calendar/gui/print.c:2631
-#: ../src/calendar/gui/print.c:2648
+#: ../src/calendar/gui/e-day-view.c:2150 ../src/calendar/gui/e-to-do-pane.c:245
+#: ../src/calendar/gui/e-week-view.c:1775 ../src/calendar/gui/print.c:1084
+#: ../src/calendar/gui/print.c:1100 ../src/calendar/gui/print.c:2640
+#: ../src/calendar/gui/print.c:2657
 msgid "pm"
 msgstr "pm"
 
@@ -8319,15 +8418,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:3071
+#: ../src/calendar/gui/e-day-view.c:3062
 #: ../src/calendar/gui/e-day-view-top-item.c:857
 #: ../src/calendar/gui/e-week-view-main-item.c:205
-#: ../src/calendar/gui/print.c:2093
+#: ../src/calendar/gui/print.c:2102
 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:3792
+#: ../src/calendar/gui/e-day-view.c:3790
 #, c-format
 msgid "Week %d"
 msgstr "Week %d"
@@ -8383,102 +8482,102 @@ msgid "Attendees"
 msgstr "Attendees"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:179
-#: ../src/calendar/gui/e-meeting-store.c:107
-#: ../src/calendar/gui/e-meeting-store.c:124
-#: ../src/calendar/gui/e-meeting-store.c:1015 ../src/calendar/gui/print.c:1243
+#: ../src/calendar/gui/e-meeting-store.c:110
+#: ../src/calendar/gui/e-meeting-store.c:127
+#: ../src/calendar/gui/e-meeting-store.c:1092 ../src/calendar/gui/print.c:1252
 msgid "Individual"
 msgstr "Individual"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:180
-#: ../src/calendar/gui/e-meeting-store.c:109
-#: ../src/calendar/gui/e-meeting-store.c:126 ../src/calendar/gui/print.c:1244
+#: ../src/calendar/gui/e-meeting-store.c:112
+#: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1253
 #: ../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-store.c:111
-#: ../src/calendar/gui/e-meeting-store.c:128 ../src/calendar/gui/print.c:1245
+#: ../src/calendar/gui/e-meeting-store.c:114
+#: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1254
 msgid "Resource"
 msgstr "Resource"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:182
-#: ../src/calendar/gui/e-meeting-store.c:113
-#: ../src/calendar/gui/e-meeting-store.c:130 ../src/calendar/gui/print.c:1246
+#: ../src/calendar/gui/e-meeting-store.c:116
+#: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1255
 msgid "Room"
 msgstr "Room"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:193
-#: ../src/calendar/gui/e-meeting-store.c:142
-#: ../src/calendar/gui/e-meeting-store.c:159 ../src/calendar/gui/print.c:1260
+#: ../src/calendar/gui/e-meeting-store.c:145
+#: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1269
 msgid "Chair"
 msgstr "Chair"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:194
-#: ../src/calendar/gui/e-meeting-store.c:144
-#: ../src/calendar/gui/e-meeting-store.c:161
-#: ../src/calendar/gui/e-meeting-store.c:1018 ../src/calendar/gui/print.c:1261
+#: ../src/calendar/gui/e-meeting-store.c:147
+#: ../src/calendar/gui/e-meeting-store.c:164
+#: ../src/calendar/gui/e-meeting-store.c:1095 ../src/calendar/gui/print.c:1270
 msgid "Required Participant"
 msgstr "Required Participant"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:195
-#: ../src/calendar/gui/e-meeting-store.c:146
-#: ../src/calendar/gui/e-meeting-store.c:163 ../src/calendar/gui/print.c:1262
+#: ../src/calendar/gui/e-meeting-store.c:149
+#: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1271
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:196
-#: ../src/calendar/gui/e-meeting-store.c:148
-#: ../src/calendar/gui/e-meeting-store.c:165 ../src/calendar/gui/print.c:1263
+#: ../src/calendar/gui/e-meeting-store.c:151
+#: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1272
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:218
-#: ../src/calendar/gui/e-meeting-store.c:192
-#: ../src/calendar/gui/e-meeting-store.c:215
-#: ../src/calendar/gui/e-meeting-store.c:1028
+#: ../src/calendar/gui/e-meeting-store.c:195
+#: ../src/calendar/gui/e-meeting-store.c:218
+#: ../src/calendar/gui/e-meeting-store.c:1105
 msgid "Needs Action"
 msgstr "Needs Action"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:618
+#: ../src/calendar/gui/e-meeting-list-view.c:631
 msgid "Attendee                          "
 msgstr "Attendee                          "
 
-#: ../src/calendar/gui/e-meeting-list-view.c:644
+#: ../src/calendar/gui/e-meeting-list-view.c:657
 #: ../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:1719
+#: ../src/e-util/e-collection-account-wizard.c:1934
 #: ../src/e-util/e-webdav-browser.c:2381
 #: ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "Type"
 
 #. To translators: RSVP means "please reply"
-#: ../src/calendar/gui/e-meeting-list-view.c:673
+#: ../src/calendar/gui/e-meeting-list-view.c:686
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../src/calendar/gui/e-meeting-store.c:204
-#: ../src/calendar/gui/e-meeting-store.c:227
+#: ../src/calendar/gui/e-meeting-store.c:207
+#: ../src/calendar/gui/e-meeting-store.c:230
 msgid "In Process"
 msgstr "In Process"
 
-#: ../src/calendar/gui/e-meeting-store.c:1899
+#: ../src/calendar/gui/e-meeting-store.c:1976
 #, 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:1909
+#: ../src/calendar/gui/e-meeting-store.c:1986
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Failure reason: %s"
 
-#: ../src/calendar/gui/e-meeting-store.c:1914
-#: ../src/e-util/e-collection-account-wizard.c:268
+#: ../src/calendar/gui/e-meeting-store.c:1991
+#: ../src/e-util/e-collection-account-wizard.c:470
 #: ../src/plugins/publish-calendar/publish-calendar.c:350
 #: ../src/smime/gui/component.c:61
 msgid "Enter password"
@@ -8558,7 +8657,7 @@ msgstr ""
 "Location: %s"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:2578
-#: ../src/calendar/gui/print.c:3525
+#: ../src/calendar/gui/print.c:3534
 #, c-format
 msgid "Summary: %s"
 msgstr "Summary: %s"
@@ -8587,41 +8686,41 @@ msgstr "Common Name"
 msgid "Language"
 msgstr "Language"
 
-#: ../src/calendar/gui/e-memo-table.c:455
+#: ../src/calendar/gui/e-memo-table.c:461
 #: ../src/calendar/gui/e-task-table.c:782
 msgid "* No Summary *"
 msgstr "* No Summary *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../src/calendar/gui/e-memo-table.c:540
-#: ../src/calendar/gui/e-task-table.c:864
+#: ../src/calendar/gui/e-memo-table.c:546
+#: ../src/calendar/gui/e-task-table.c:879
 msgid "Start: "
 msgstr "Start: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../src/calendar/gui/e-memo-table.c:560
-#: ../src/calendar/gui/e-task-table.c:883
+#: ../src/calendar/gui/e-memo-table.c:566
+#: ../src/calendar/gui/e-task-table.c:898
 msgid "Due: "
 msgstr "Due: "
 
-#: ../src/calendar/gui/e-memo-table.c:745
+#: ../src/calendar/gui/e-memo-table.c:775
 msgid "Cut selected memos to the clipboard"
 msgstr "Cut selected memos to the clipboard"
 
-#: ../src/calendar/gui/e-memo-table.c:751
+#: ../src/calendar/gui/e-memo-table.c:781
 msgid "Copy selected memos to the clipboard"
 msgstr "Copy selected memos to the clipboard"
 
-#: ../src/calendar/gui/e-memo-table.c:757
+#: ../src/calendar/gui/e-memo-table.c:787
 msgid "Paste memos from the clipboard"
 msgstr "Paste memos from the clipboard"
 
-#: ../src/calendar/gui/e-memo-table.c:763
+#: ../src/calendar/gui/e-memo-table.c:793
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:574
 msgid "Delete selected memos"
 msgstr "Delete selected memos"
 
-#: ../src/calendar/gui/e-memo-table.c:769
+#: ../src/calendar/gui/e-memo-table.c:799
 msgid "Select all visible memos"
 msgstr "Select all visible memos"
 
@@ -8644,24 +8743,24 @@ msgstr "Undefined"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/calendar/gui/e-task-table.c:1096
+#: ../src/calendar/gui/e-task-table.c:1135
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cut selected tasks to the clipboard"
 
-#: ../src/calendar/gui/e-task-table.c:1102
+#: ../src/calendar/gui/e-task-table.c:1141
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copy selected tasks to the clipboard"
 
-#: ../src/calendar/gui/e-task-table.c:1108
+#: ../src/calendar/gui/e-task-table.c:1147
 msgid "Paste tasks from the clipboard"
 msgstr "Paste tasks from the clipboard"
 
-#: ../src/calendar/gui/e-task-table.c:1114
+#: ../src/calendar/gui/e-task-table.c:1153
 #: ../src/modules/calendar/e-task-shell-view-actions.c:700
 msgid "Delete selected tasks"
 msgstr "Delete selected tasks"
 
-#: ../src/calendar/gui/e-task-table.c:1120
+#: ../src/calendar/gui/e-task-table.c:1159
 msgid "Select all visible tasks"
 msgstr "Select all visible tasks"
 
@@ -8678,7 +8777,7 @@ msgid "Completion date"
 msgstr "Completion date"
 
 #: ../src/calendar/gui/e-task-table.etspec.h:6
-#: ../src/mail/mail-send-recv.c:1064
+#: ../src/mail/mail-send-recv.c:1148
 msgid "Complete"
 msgstr "Complete"
 
@@ -8702,81 +8801,81 @@ msgid "Select Timezone"
 msgstr "Select Timezone"
 
 #. Translators: It will display "Start: StartDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:370
+#: ../src/calendar/gui/e-to-do-pane.c:390
 #, c-format
 msgid "Start: %s"
 msgstr "Start: %s"
 
 #. Translators: It will display "Due: DueDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:390
+#: ../src/calendar/gui/e-to-do-pane.c:410
 #, c-format
 msgid "Due: %s"
 msgstr "Due: %s"
 
 #. Translators: It will display "Completed: DateAndTimeWhenCompleted"
-#: ../src/calendar/gui/e-to-do-pane.c:404
+#: ../src/calendar/gui/e-to-do-pane.c:424
 #, c-format
 msgid "Completed: %s"
 msgstr "Completed: %s"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1452 ../src/e-util/e-cell-date-edit.c:328
-#: ../src/e-util/e-datetime-format.c:206
+#: ../src/calendar/gui/e-to-do-pane.c:1460 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/e-util/e-datetime-format.c:207
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1869
 #: ../src/modules/itip-formatter/itip-view.c:255
 msgid "Today"
 msgstr "Today"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1454
-#: ../src/e-util/e-datetime-format.c:217
+#: ../src/calendar/gui/e-to-do-pane.c:1462
+#: ../src/e-util/e-datetime-format.c:218
 #: ../src/modules/itip-formatter/itip-view.c:283
 msgid "Tomorrow"
 msgstr "Tomorrow"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1464
+#: ../src/calendar/gui/e-to-do-pane.c:1472
 msgid "Tasks without Due date"
 msgstr "Tasks without Due date"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2037
+#: ../src/calendar/gui/e-to-do-pane.c:2045
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1472
 msgid "New _Appointment..."
 msgstr "New _Appointment…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2045
+#: ../src/calendar/gui/e-to-do-pane.c:2053
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1458
 msgid "New _Meeting..."
 msgstr "New _Meeting…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2053
+#: ../src/calendar/gui/e-to-do-pane.c:2061
 msgid "New _Task..."
 msgstr "New _Task..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2061
+#: ../src/calendar/gui/e-to-do-pane.c:2069
 msgid "_New Assigned Task..."
 msgstr "_New Assigned Task..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2074
+#: ../src/calendar/gui/e-to-do-pane.c:2082
 msgid "_Open..."
 msgstr "_Open..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2088
+#: ../src/calendar/gui/e-to-do-pane.c:2096
 msgid "_Delete This Instance..."
 msgstr "_Delete This Instance..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2096
+#: ../src/calendar/gui/e-to-do-pane.c:2104
 msgid "D_elete All Instances..."
 msgstr "D_elete All Instances..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2104
+#: ../src/calendar/gui/e-to-do-pane.c:2112
 msgid "_Delete..."
 msgstr "_Delete..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2121
+#: ../src/calendar/gui/e-to-do-pane.c:2129
 msgid "_Show Tasks without Due date"
 msgstr "_Show Tasks without Due date"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2387
+#: ../src/calendar/gui/e-to-do-pane.c:2395
 msgid "To Do"
 msgstr "To Do"
 
@@ -8784,36 +8883,36 @@ msgstr "To Do"
 #. * 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/print.c:2072
+#: ../src/calendar/gui/print.c:2081
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../src/calendar/gui/itip-utils.c:785 ../src/calendar/gui/itip-utils.c:847
-#: ../src/calendar/gui/itip-utils.c:981
+#: ../src/calendar/gui/itip-utils.c:786 ../src/calendar/gui/itip-utils.c:848
+#: ../src/calendar/gui/itip-utils.c:982
 msgid "An organizer must be set."
 msgstr "An organiser must be set."
 
-#: ../src/calendar/gui/itip-utils.c:838
+#: ../src/calendar/gui/itip-utils.c:839
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: ../src/calendar/gui/itip-utils.c:1069 ../src/calendar/gui/itip-utils.c:1230
+#: ../src/calendar/gui/itip-utils.c:1070 ../src/calendar/gui/itip-utils.c:1231
 msgid "Event information"
 msgstr "Event information"
 
-#: ../src/calendar/gui/itip-utils.c:1072 ../src/calendar/gui/itip-utils.c:1233
+#: ../src/calendar/gui/itip-utils.c:1073 ../src/calendar/gui/itip-utils.c:1234
 msgid "Task information"
 msgstr "Task information"
 
-#: ../src/calendar/gui/itip-utils.c:1075 ../src/calendar/gui/itip-utils.c:1236
+#: ../src/calendar/gui/itip-utils.c:1076 ../src/calendar/gui/itip-utils.c:1237
 msgid "Memo information"
 msgstr "Memo information"
 
-#: ../src/calendar/gui/itip-utils.c:1078 ../src/calendar/gui/itip-utils.c:1254
+#: ../src/calendar/gui/itip-utils.c:1079 ../src/calendar/gui/itip-utils.c:1255
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
-#: ../src/calendar/gui/itip-utils.c:1081
+#: ../src/calendar/gui/itip-utils.c:1082
 msgid "Calendar information"
 msgstr "Calendar information"
 
@@ -8821,7 +8920,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:1118
+#: ../src/calendar/gui/itip-utils.c:1119
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Accepted"
@@ -8830,7 +8929,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:1125
+#: ../src/calendar/gui/itip-utils.c:1126
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
@@ -8842,7 +8941,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:1132 ../src/calendar/gui/itip-utils.c:1180
+#: ../src/calendar/gui/itip-utils.c:1133 ../src/calendar/gui/itip-utils.c:1181
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Declined"
@@ -8851,7 +8950,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:1139
+#: ../src/calendar/gui/itip-utils.c:1140
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegated"
@@ -8859,7 +8958,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:1152
+#: ../src/calendar/gui/itip-utils.c:1153
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Updated"
@@ -8867,7 +8966,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:1159
+#: ../src/calendar/gui/itip-utils.c:1160
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancel"
@@ -8875,7 +8974,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:1166
+#: ../src/calendar/gui/itip-utils.c:1167
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Refresh"
@@ -8883,42 +8982,42 @@ 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:1173
+#: ../src/calendar/gui/itip-utils.c:1174
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
 
-#: ../src/calendar/gui/itip-utils.c:1251
+#: ../src/calendar/gui/itip-utils.c:1252
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy information (%s to %s)"
 
-#: ../src/calendar/gui/itip-utils.c:1259
+#: ../src/calendar/gui/itip-utils.c:1260
 msgid "iCalendar information"
 msgstr "iCalendar information"
 
-#: ../src/calendar/gui/itip-utils.c:1288
+#: ../src/calendar/gui/itip-utils.c:1289
 #, 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:1293
+#: ../src/calendar/gui/itip-utils.c:1294
 msgid "Unable to book a resource, error: "
 msgstr "Unable to book a resource, error: "
 
-#: ../src/calendar/gui/itip-utils.c:1464
+#: ../src/calendar/gui/itip-utils.c:1465
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
-#: ../src/calendar/gui/itip-utils.c:2209
+#: ../src/calendar/gui/itip-utils.c:2210
 msgid "Sending an event"
 msgstr "Sending an event"
 
-#: ../src/calendar/gui/itip-utils.c:2213
+#: ../src/calendar/gui/itip-utils.c:2214
 msgid "Sending a memo"
 msgstr "Sending a memo"
 
-#: ../src/calendar/gui/itip-utils.c:2217
+#: ../src/calendar/gui/itip-utils.c:2218
 msgid "Sending a task"
 msgstr "Sending a task"
 
@@ -8926,114 +9025,114 @@ msgstr "Sending a task"
 #. Translators: These are workday abbreviations,
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_MONDAY
-#: ../src/calendar/gui/print.c:721
+#: ../src/calendar/gui/print.c:733
 msgid "Mo"
 msgstr "Mo"
 
 #. G_DATE_TUESDAY
-#: ../src/calendar/gui/print.c:722
+#: ../src/calendar/gui/print.c:734
 msgid "Tu"
 msgstr "Tu"
 
 #. G_DATE_WEDNESDAY
-#: ../src/calendar/gui/print.c:723
+#: ../src/calendar/gui/print.c:735
 msgid "We"
 msgstr "We"
 
 #. G_DATE_THURSDAY
-#: ../src/calendar/gui/print.c:724
+#: ../src/calendar/gui/print.c:736
 msgid "Th"
 msgstr "Th"
 
 #. G_DATE_FRIDAY
-#: ../src/calendar/gui/print.c:725
+#: ../src/calendar/gui/print.c:737
 msgid "Fr"
 msgstr "Fr"
 
 #. G_DATE_SATURDAY
-#: ../src/calendar/gui/print.c:726
+#: ../src/calendar/gui/print.c:738
 msgid "Sa"
 msgstr "Sa"
 
 #. G_DATE_SUNDAY
-#: ../src/calendar/gui/print.c:727
+#: ../src/calendar/gui/print.c:739
 msgid "Su"
 msgstr "Su"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../src/calendar/gui/print.c:3318
+#: ../src/calendar/gui/print.c:3327
 msgid " to "
 msgstr " to "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../src/calendar/gui/print.c:3328
+#: ../src/calendar/gui/print.c:3337
 msgid " (Completed "
 msgstr " (Completed "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../src/calendar/gui/print.c:3334
+#: ../src/calendar/gui/print.c:3343
 msgid "Completed "
 msgstr "Completed "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../src/calendar/gui/print.c:3344
+#: ../src/calendar/gui/print.c:3353
 msgid " (Due "
 msgstr " (Due "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../src/calendar/gui/print.c:3351
+#: ../src/calendar/gui/print.c:3360
 msgid "Due "
 msgstr "Due "
 
-#: ../src/calendar/gui/print.c:3495
+#: ../src/calendar/gui/print.c:3504
 msgid "Appointment"
 msgstr "Appointment"
 
-#: ../src/calendar/gui/print.c:3497 ../src/e-util/e-send-options.c:551
+#: ../src/calendar/gui/print.c:3506 ../src/e-util/e-send-options.c:551
 msgid "Task"
 msgstr "Task"
 
-#: ../src/calendar/gui/print.c:3499
+#: ../src/calendar/gui/print.c:3508
 msgid "Memo"
 msgstr "Memo"
 
-#: ../src/calendar/gui/print.c:3555
+#: ../src/calendar/gui/print.c:3564
 msgid "Attendees: "
 msgstr "Attendees: "
 
-#: ../src/calendar/gui/print.c:3599
+#: ../src/calendar/gui/print.c:3608
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../src/calendar/gui/print.c:3615
+#: ../src/calendar/gui/print.c:3624
 #, c-format
 msgid "Priority: %s"
 msgstr "Priority: %s"
 
-#: ../src/calendar/gui/print.c:3633
+#: ../src/calendar/gui/print.c:3642
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percent Complete: %i"
 
-#: ../src/calendar/gui/print.c:3647
+#: ../src/calendar/gui/print.c:3656
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../src/calendar/gui/print.c:3661
+#: ../src/calendar/gui/print.c:3670
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: ../src/calendar/gui/print.c:3672
+#: ../src/calendar/gui/print.c:3681
 msgid "Contacts: "
 msgstr "Contacts: "
 
@@ -10815,145 +10914,145 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: ../src/composer/e-composer-actions.c:227
+#: ../src/composer/e-composer-actions.c:226
 msgid "Save as..."
 msgstr "Save as…"
 
-#: ../src/composer/e-composer-actions.c:331
+#: ../src/composer/e-composer-actions.c:321
 msgid "Close the current file"
 msgstr "Close the current file"
 
-#: ../src/composer/e-composer-actions.c:336
+#: ../src/composer/e-composer-actions.c:326
 msgid "New _Message"
 msgstr "New _Message"
 
-#: ../src/composer/e-composer-actions.c:338
+#: ../src/composer/e-composer-actions.c:328
 msgid "Open New Message window"
 msgstr "Open New Message window"
 
-#: ../src/composer/e-composer-actions.c:343 ../src/shell/e-shell.c:1453
-#: ../src/shell/e-shell-window-actions.c:871
+#: ../src/composer/e-composer-actions.c:333 ../src/shell/e-shell.c:1469
+#: ../src/shell/e-shell-window-actions.c:894
 msgid "_Preferences"
 msgstr "_Preferences"
 
-#: ../src/composer/e-composer-actions.c:345
-#: ../src/shell/e-shell-window-actions.c:873
+#: ../src/composer/e-composer-actions.c:335
+#: ../src/shell/e-shell-window-actions.c:896
 msgid "Configure Evolution"
 msgstr "Configure Evolution"
 
-#: ../src/composer/e-composer-actions.c:352
+#: ../src/composer/e-composer-actions.c:342
 msgid "Save the current file"
 msgstr "Save the current file"
 
-#: ../src/composer/e-composer-actions.c:357
+#: ../src/composer/e-composer-actions.c:347
 msgid "Save _As..."
 msgstr "Save _As…"
 
-#: ../src/composer/e-composer-actions.c:359
+#: ../src/composer/e-composer-actions.c:349
 msgid "Save the current file with a different name"
 msgstr "Save the current file with a different name"
 
-#: ../src/composer/e-composer-actions.c:366
+#: ../src/composer/e-composer-actions.c:356
 msgid "Character _Encoding"
 msgstr "Character _Encoding"
 
-#: ../src/composer/e-composer-actions.c:390
+#: ../src/composer/e-composer-actions.c:380
 msgid "Print Pre_view"
 msgstr "Print Pre_view"
 
-#: ../src/composer/e-composer-actions.c:397
+#: ../src/composer/e-composer-actions.c:387
 msgid "Save as _Draft"
 msgstr "Save as _Draft"
 
-#: ../src/composer/e-composer-actions.c:399
+#: ../src/composer/e-composer-actions.c:389
 msgid "Save as draft"
 msgstr "Save as draft"
 
-#: ../src/composer/e-composer-actions.c:404
+#: ../src/composer/e-composer-actions.c:394
 msgid "S_end"
 msgstr "S_end"
 
-#: ../src/composer/e-composer-actions.c:406
+#: ../src/composer/e-composer-actions.c:396
 msgid "Send this message"
 msgstr "Send this message"
 
-#: ../src/composer/e-composer-actions.c:414
+#: ../src/composer/e-composer-actions.c:404
 msgid "PGP _Encrypt"
 msgstr "PGP _Encrypt"
 
-#: ../src/composer/e-composer-actions.c:416
+#: ../src/composer/e-composer-actions.c:406
 msgid "Encrypt this message with PGP"
 msgstr "Encrypt this message with PGP"
 
-#: ../src/composer/e-composer-actions.c:422
+#: ../src/composer/e-composer-actions.c:412
 msgid "PGP _Sign"
 msgstr "PGP _Sign"
 
-#: ../src/composer/e-composer-actions.c:424
+#: ../src/composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
 msgstr "Sign this message with your PGP key"
 
-#: ../src/composer/e-composer-actions.c:430
+#: ../src/composer/e-composer-actions.c:420
 msgid "_Picture Gallery"
 msgstr "_Picture Gallery"
 
-#: ../src/composer/e-composer-actions.c:432
+#: ../src/composer/e-composer-actions.c:422
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Show a collection of pictures that you can drag to your message"
 
-#: ../src/composer/e-composer-actions.c:438
+#: ../src/composer/e-composer-actions.c:428
 msgid "_Prioritize Message"
 msgstr "_Prioritise Message"
 
-#: ../src/composer/e-composer-actions.c:440
+#: ../src/composer/e-composer-actions.c:430
 msgid "Set the message priority to high"
 msgstr "Set the message priority to high"
 
-#: ../src/composer/e-composer-actions.c:446
+#: ../src/composer/e-composer-actions.c:436
 msgid "Re_quest Read Receipt"
 msgstr "Re_quest Read Receipt"
 
-#: ../src/composer/e-composer-actions.c:448
+#: ../src/composer/e-composer-actions.c:438
 msgid "Get delivery notification when your message is read"
 msgstr "Get delivery notification when your message is read"
 
-#: ../src/composer/e-composer-actions.c:454
+#: ../src/composer/e-composer-actions.c:444
 msgid "S/MIME En_crypt"
 msgstr "S/MIME En_crypt"
 
-#: ../src/composer/e-composer-actions.c:456
+#: ../src/composer/e-composer-actions.c:446
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Encrypt this message with your S/MIME Encryption Certificate"
 
-#: ../src/composer/e-composer-actions.c:462
+#: ../src/composer/e-composer-actions.c:452
 msgid "S/MIME Sig_n"
 msgstr "S/MIME Sig_n"
 
-#: ../src/composer/e-composer-actions.c:464
+#: ../src/composer/e-composer-actions.c:454
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sign this message with your S/MIME Signature Certificate"
 
-#: ../src/composer/e-composer-actions.c:518
+#: ../src/composer/e-composer-actions.c:508
 msgid "_Bcc Field"
 msgstr "_Bcc Field"
 
-#: ../src/composer/e-composer-actions.c:520
+#: ../src/composer/e-composer-actions.c:510
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Toggles whether the Bcc field is displayed"
 
-#: ../src/composer/e-composer-actions.c:526
+#: ../src/composer/e-composer-actions.c:516
 msgid "_Cc Field"
 msgstr "_Cc Field"
 
-#: ../src/composer/e-composer-actions.c:528
+#: ../src/composer/e-composer-actions.c:518
 msgid "Toggles whether the CC field is displayed"
 msgstr "Toggles whether the Cc field is displayed"
 
-#: ../src/composer/e-composer-actions.c:534
+#: ../src/composer/e-composer-actions.c:524
 msgid "_From Override Field"
 msgstr "_From Override Field"
 
-#: ../src/composer/e-composer-actions.c:536
+#: ../src/composer/e-composer-actions.c:526
 msgid ""
 "Toggles whether the From override field to change name or email address is "
 "displayed"
@@ -10961,28 +11060,28 @@ msgstr ""
 "Toggles whether the From override field to change name or e-mail address is "
 "displayed"
 
-#: ../src/composer/e-composer-actions.c:542
+#: ../src/composer/e-composer-actions.c:532
 msgid "_Reply-To Field"
 msgstr "_Reply-To Field"
 
-#: ../src/composer/e-composer-actions.c:544
+#: ../src/composer/e-composer-actions.c:534
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Toggles whether the Reply-To field is displayed"
 
-#: ../src/composer/e-composer-actions.c:550
+#: ../src/composer/e-composer-actions.c:540
 msgid "Visually _Wrap Long Lines"
 msgstr "Visually _Wrap Long Lines"
 
-#: ../src/composer/e-composer-actions.c:607
+#: ../src/composer/e-composer-actions.c:597
 msgid "Attach"
 msgstr "Attach"
 
-#: ../src/composer/e-composer-actions.c:613
+#: ../src/composer/e-composer-actions.c:603
 msgid "Save Draft"
 msgstr "Save Draft"
 
 #: ../src/composer/e-composer-from-header.c:108
-#: ../src/e-util/e-collection-account-wizard.c:1751
+#: ../src/e-util/e-collection-account-wizard.c:1966
 #: ../src/e-util/e-mail-signature-script-dialog.c:416
 #: ../src/e-util/e-webdav-browser.c:2408
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
@@ -11049,14 +11148,14 @@ msgstr "Click here for the address book"
 msgid "Click here to select folders to post to"
 msgstr "Click here to select folders to post to"
 
-#: ../src/composer/e-msg-composer.c:998
+#: ../src/composer/e-msg-composer.c:1003
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 
-#: ../src/composer/e-msg-composer.c:1007
+#: ../src/composer/e-msg-composer.c:1012
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -11065,11 +11164,11 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
-#: ../src/composer/e-msg-composer.c:1797 ../src/composer/e-msg-composer.c:2471
+#: ../src/composer/e-msg-composer.c:1792 ../src/composer/e-msg-composer.c:2466
 msgid "Compose Message"
 msgstr "Compose Message"
 
-#: ../src/composer/e-msg-composer.c:4903
+#: ../src/composer/e-msg-composer.c:4987
 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."
 
@@ -11210,7 +11309,7 @@ msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "An error occurred while sending. How do you want to proceed?"
 
 #: ../src/composer/mail-composer.error.xml.h:32
-#: ../src/mail/mail.error.xml.h:177
+#: ../src/mail/mail.error.xml.h:178
 msgid "The reported error was “{0}”."
 msgstr "The reported error was “{0}”."
 
@@ -11219,7 +11318,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:440
+#: ../src/e-util/e-collection-account-wizard.c:643
 msgid "_Try Again"
 msgstr "_Try Again"
 
@@ -11338,10 +11437,6 @@ msgid "Something has gone wrong when editing the message"
 msgstr "Something has gone wrong when editing the message"
 
 #: ../src/composer/mail-composer.error.xml.h:57
-#| msgid ""
-#| "A WebKitWebProcess crashed when editing the message. You can try again by "
-#| "closing the composer window and opening a new one. If the issue persists, "
-#| "please file a bug report in the GNOME bugzilla."
 msgid ""
 "A WebKitWebProcess crashed when editing the message. You can try again by "
 "closing the composer window and opening a new one. If the issue persists, "
@@ -11386,11 +11481,11 @@ msgstr "(no subject)"
 msgid "This message was sent by %s on behalf of %s"
 msgstr "This message was sent by %s on behalf of %s"
 
-#: ../src/em-format/e-mail-formatter-image.c:178
+#: ../src/em-format/e-mail-formatter-image.c:158
 msgid "Regular Image"
 msgstr "Regular Image"
 
-#: ../src/em-format/e-mail-formatter-image.c:179
+#: ../src/em-format/e-mail-formatter-image.c:159
 msgid "Display part as an image"
 msgstr "Display part as an image"
 
@@ -11422,7 +11517,7 @@ msgstr "Size"
 #: ../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:1643
+#: ../src/smime/gui/certificate-manager.c:1627
 msgid "Subject"
 msgstr "Subject"
 
@@ -11446,18 +11541,18 @@ msgid "Display part as enriched text"
 msgstr "Display part as enriched text"
 
 #: ../src/em-format/e-mail-formatter-quote-text-html.c:93
-#: ../src/em-format/e-mail-formatter-text-html.c:385
+#: ../src/em-format/e-mail-formatter-text-html.c:386
 msgid "HTML"
 msgstr "HTML"
 
 #: ../src/em-format/e-mail-formatter-quote-text-html.c:94
-#: ../src/em-format/e-mail-formatter-text-html.c:386
+#: ../src/em-format/e-mail-formatter-text-html.c:387
 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-text-plain.c:196
-#: ../src/e-util/e-html-editor-actions.c:1314
+#: ../src/e-util/e-html-editor-actions.c:1346
 msgid "Plain Text"
 msgstr "Plain Text"
 
@@ -11615,46 +11710,42 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../src/em-format/e-mail-formatter-utils.c:562
+#: ../src/em-format/e-mail-formatter-utils.c:564
 msgid "GPG signed"
 msgstr "GPG signed"
 
-#: ../src/em-format/e-mail-formatter-utils.c:562
-#| msgid "GPG signed"
+#: ../src/em-format/e-mail-formatter-utils.c:564
 msgid "partially GPG signed"
 msgstr "partially GPG signed"
 
-#: ../src/em-format/e-mail-formatter-utils.c:563
+#: ../src/em-format/e-mail-formatter-utils.c:565
 msgid "GPG encrypted"
 msgstr "GPG encrypted"
 
-#: ../src/em-format/e-mail-formatter-utils.c:563
-#| msgid "GPG encrypted"
+#: ../src/em-format/e-mail-formatter-utils.c:565
 msgid "partially GPG encrypted"
 msgstr "partially GPG encrypted"
 
-#: ../src/em-format/e-mail-formatter-utils.c:564
+#: ../src/em-format/e-mail-formatter-utils.c:566
 msgid "S/MIME signed"
 msgstr "S/MIME signed"
 
-#: ../src/em-format/e-mail-formatter-utils.c:564
-#| msgid "S/MIME signed"
+#: ../src/em-format/e-mail-formatter-utils.c:566
 msgid "partially S/MIME signed"
 msgstr "partially S/MIME signed"
 
-#: ../src/em-format/e-mail-formatter-utils.c:565
+#: ../src/em-format/e-mail-formatter-utils.c:567
 msgid "S/MIME encrypted"
 msgstr "S/MIME encrypted"
 
-#: ../src/em-format/e-mail-formatter-utils.c:565
-#| msgid "S/MIME encrypted"
+#: ../src/em-format/e-mail-formatter-utils.c:567
 msgid "partially S/MIME encrypted"
 msgstr "partially S/MIME encrypted"
 
-#: ../src/em-format/e-mail-formatter-utils.c:678
+#: ../src/em-format/e-mail-formatter-utils.c:680
 #: ../src/mail/e-mail-config-security-page.c:856
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:272
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:215
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:273
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:216
 msgid "Security"
 msgstr "Security"
 
@@ -11766,7 +11857,7 @@ msgstr "_Import Certificate"
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: ../src/em-format/e-mail-part-utils.c:556
+#: ../src/em-format/e-mail-part-utils.c:630
 #, c-format
 msgid "%s attachment"
 msgstr "%s attachment"
@@ -11786,7 +11877,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:853
+#: ../src/modules/mail/e-mail-shell-backend.c:870
 msgid "Mail Accounts"
 msgstr "Mail Accounts"
 
@@ -11797,25 +11888,25 @@ msgstr "Address Books"
 
 #: ../src/e-util/e-accounts-window.c:570 ../src/e-util/e-accounts-window.c:704
 #: ../src/e-util/e-accounts-window.c:909
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
 msgid "Calendars"
 msgstr "Calendars"
 
 #: ../src/e-util/e-accounts-window.c:576 ../src/e-util/e-accounts-window.c:705
 #: ../src/e-util/e-accounts-window.c:910
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 msgid "Memo Lists"
 msgstr "Memo Lists"
 
 #: ../src/e-util/e-accounts-window.c:582 ../src/e-util/e-accounts-window.c:706
 #: ../src/e-util/e-accounts-window.c:911
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
 msgid "Task Lists"
 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:1305
+#: ../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
@@ -11852,21 +11943,21 @@ msgstr "M_emo List"
 msgid "_Task List"
 msgstr "_Task List"
 
-#: ../src/e-util/e-accounts-window.c:1682
+#: ../src/e-util/e-accounts-window.c:1684
 msgid "Evolution Accounts"
 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:1758 ../src/e-util/e-webdav-browser.c:2699
+#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2699
 #: ../src/mail/em-subscription-editor.c:1950
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1475
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1546
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1561
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1632
 msgid "_Refresh"
 msgstr "_Refresh"
 
-#: ../src/e-util/e-accounts-window.c:1759
+#: ../src/e-util/e-accounts-window.c:1762
 msgid "Initiates refresh of account sources"
 msgstr "Initiates refresh of account sources"
 
@@ -11910,7 +12001,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:1658
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -11941,7 +12032,7 @@ 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:887
+#: ../src/e-util/e-attachment.c:3442 ../src/e-util/e-attachment-store.c:914
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -11987,7 +12078,7 @@ msgid "F_ilename:"
 msgstr "F_ilename:"
 
 #: ../src/e-util/e-attachment-dialog.c:354
-#: ../src/e-util/e-html-editor-image-dialog.c:508
+#: ../src/e-util/e-html-editor-image-dialog.c:513
 #: ../src/e-util/e-html-editor-link-dialog.c:241
 #: ../src/e-util/e-webdav-browser.c:2447
 msgid "_Description:"
@@ -11998,7 +12089,7 @@ msgid "MIME Type:"
 msgstr "MIME Type:"
 
 #: ../src/e-util/e-attachment-dialog.c:380
-#: ../src/e-util/e-attachment-store.c:694
+#: ../src/e-util/e-attachment-store.c:700
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggest automatic display of attachment"
 
@@ -12029,80 +12120,92 @@ msgstr "Hide Attachment _Bar"
 msgid "Show Attachment _Bar"
 msgstr "Show Attachment _Bar"
 
-#: ../src/e-util/e-attachment-store.c:659
+#: ../src/e-util/e-attachment-store.c:656
+#: ../src/e-util/e-attachment-store.c:663
 msgid "Add Attachment"
 msgstr "Add Attachment"
 
-#: ../src/e-util/e-attachment-store.c:666
-#: ../src/e-util/e-attachment-store.c:668
+#: ../src/e-util/e-attachment-store.c:658
+#: ../src/e-util/e-attachment-store.c:670
+#: ../src/e-util/e-attachment-store.c:672
 msgid "A_ttach"
 msgstr "A_ttach"
 
-#: ../src/e-util/e-attachment-store.c:715
+#: ../src/e-util/e-attachment-store.c:721
 msgid "Archive selected directories using this format:"
 msgstr "Archive selected directories using this format:"
 
-#: ../src/e-util/e-attachment-store.c:823
+#: ../src/e-util/e-attachment-store.c:838
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Save Attachment"
 msgstr[1] "Save Attachments"
 
-#: ../src/e-util/e-attachment-store.c:850
+#: ../src/e-util/e-attachment-store.c:876
 msgid "Do _not extract files from the attachment"
 msgstr "Do _not extract files from the attachment"
 
-#: ../src/e-util/e-attachment-store.c:855
+#: ../src/e-util/e-attachment-store.c:881
 msgid "Save extracted files _only"
 msgstr "Save extracted files _only"
 
-#: ../src/e-util/e-attachment-store.c:860
+#: ../src/e-util/e-attachment-store.c:886
 msgid "Save extracted files and the original _archive"
 msgstr "Save extracted files and the original _archive"
 
-#: ../src/e-util/e-attachment-view.c:309
+#: ../src/e-util/e-attachment-view.c:308
 msgid "Open With Other Application..."
 msgstr "Open With Other Application…"
 
-#: ../src/e-util/e-attachment-view.c:316
+#: ../src/e-util/e-attachment-view.c:315
 msgid "S_ave All"
 msgstr "S_ave All"
 
-#: ../src/e-util/e-attachment-view.c:323
+#: ../src/e-util/e-attachment-view.c:322
 msgid "Sa_ve As"
 msgstr "Sa_ve As"
 
-#: ../src/e-util/e-attachment-view.c:332
-#: ../src/plugins/save-calendar/save-calendar.c:351
-#: ../src/plugins/save-calendar/save-calendar.c:390
-#: ../src/plugins/save-calendar/save-calendar.c:429
+#: ../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
 msgid "Save _As"
 msgstr "Save _As"
 
-#: ../src/e-util/e-attachment-view.c:342
+#: ../src/e-util/e-attachment-view.c:341
 msgid "A_dd Attachment..."
 msgstr "A_dd Attachment…"
 
-#: ../src/e-util/e-attachment-view.c:349
+#: ../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:1332
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:621
 #: ../src/modules/calendar/e-task-shell-view-actions.c:747
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1468
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1539
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1554
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1625
 msgid "_Properties"
 msgstr "_Properties"
 
-#: ../src/e-util/e-attachment-view.c:778
+#: ../src/e-util/e-attachment-view.c:786
 #, c-format
 msgid "Open With “%s”"
 msgstr "Open With “%s”"
 
-#: ../src/e-util/e-attachment-view.c:781
+#: ../src/e-util/e-attachment-view.c:787
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Open this attachment in %s"
 
+#: ../src/e-util/e-attachment-view.c:789
+#| msgid "Open With Other Application..."
+msgid "Open With Default Application"
+msgstr "Open With Default Application"
+
+#: ../src/e-util/e-attachment-view.c:790
+#| msgid "Open this attachment in %s"
+msgid "Open this attachment in default application"
+msgstr "Open this attachment in default application"
+
 #: ../src/e-util/e-book-source-config.c:98
 msgid "Mark as default address book"
 msgstr "Mark as default address book"
@@ -12120,40 +12223,40 @@ msgstr "Copy book content locally for offline operation"
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-click to open a link"
 
-#: ../src/e-util/e-calendar.c:267
+#: ../src/e-util/e-calendar.c:310
 msgid "Previous month"
 msgstr "Previous month"
 
-#: ../src/e-util/e-calendar.c:286
+#: ../src/e-util/e-calendar.c:329
 msgid "Next month"
 msgstr "Next month"
 
-#: ../src/e-util/e-calendar.c:306
+#: ../src/e-util/e-calendar.c:349
 msgid "Previous year"
 msgstr "Previous year"
 
-#: ../src/e-util/e-calendar.c:325
+#: ../src/e-util/e-calendar.c:368
 msgid "Next year"
 msgstr "Next year"
 
-#: ../src/e-util/e-calendar.c:349
+#: ../src/e-util/e-calendar.c:392
 msgid "Month Calendar"
 msgstr "Month Calendar"
 
 #. This is a strftime() format. %B = Month name.
-#: ../src/e-util/e-calendar-item.c:1333 ../src/e-util/e-calendar-item.c:2216
+#: ../src/e-util/e-calendar-item.c:1357 ../src/e-util/e-calendar-item.c:2240
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1335
+#: ../src/e-util/e-calendar-item.c:1359
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1372
+#: ../src/e-util/e-calendar-item.c:1396
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -12218,27 +12321,32 @@ msgstr "Icon"
 msgid "Create category “%s”"
 msgstr "Create category “%s”"
 
-#: ../src/e-util/e-category-editor.c:138
+#: ../src/e-util/e-category-editor.c:169 ../src/e-util/e-category-editor.c:234
 msgid "Category Icon"
 msgstr "Category Icon"
 
-#: ../src/e-util/e-category-editor.c:142
+#: ../src/e-util/e-category-editor.c:173
 msgid "_No Image"
 msgstr "_No Image"
 
-#: ../src/e-util/e-category-editor.c:175
+#: ../src/e-util/e-category-editor.c:207
 msgid "Category _Name"
 msgstr "Category _Name"
 
-#: ../src/e-util/e-category-editor.c:188
+#: ../src/e-util/e-category-editor.c:220
 msgid "Category _Icon"
 msgstr "Category _Icon"
 
-#: ../src/e-util/e-category-editor.c:214
+#: ../src/e-util/e-category-editor.c:236
+#| msgid "Insert Emoticon"
+msgid "_Unset icon"
+msgstr "_Unset icon"
+
+#: ../src/e-util/e-category-editor.c:262
 msgid "Category Properties"
 msgstr "Category Properties"
 
-#: ../src/e-util/e-category-editor.c:275
+#: ../src/e-util/e-category-editor.c:323
 #, c-format
 msgid ""
 "There is already a category “%s” in the configuration. Please use another "
@@ -12252,7 +12360,7 @@ 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:2112
+#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2146
 msgid "?"
 msgstr "?"
 
@@ -12375,29 +12483,53 @@ msgstr "Other…"
 msgid "Cannot create a client object from extension name “%s”"
 msgstr "Cannot create a client object from extension name “%s”"
 
-#: ../src/e-util/e-collection-account-wizard.c:214
+#: ../src/e-util/e-collection-account-wizard.c:106
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:83
+msgid "_Finish"
+msgstr "_Finish"
+
+#: ../src/e-util/e-collection-account-wizard.c:108
+#: ../src/e-util/e-collection-account-wizard.c:266
+#: ../src/e-util/e-search-bar.c:677
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:85
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:244
+msgid "_Next"
+msgstr "_Next"
+
+#: ../src/e-util/e-collection-account-wizard.c:180
+#| msgid "Collection _Account"
+msgid "New Collection Account"
+msgstr "New Collection Account"
+
+#: ../src/e-util/e-collection-account-wizard.c:251
+#: ../src/e-util/e-search-bar.c:665
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:78
+msgid "_Previous"
+msgstr "_Previous"
+
+#: ../src/e-util/e-collection-account-wizard.c:416
 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:271
+#: ../src/e-util/e-collection-account-wizard.c:473
 #, c-format
 msgid "Requires password to continue. %s."
 msgstr "Requires password to continue. %s."
 
-#: ../src/e-util/e-collection-account-wizard.c:284
+#: ../src/e-util/e-collection-account-wizard.c:486
 msgid "View certificate"
 msgstr "View certificate"
 
 #. Translators: The first %s is replaced with actual error message about site certificate invalidity,
 #. like "The signing certificate authority is not known.", the second %s is replaced with a link "View 
certificate".
-#: ../src/e-util/e-collection-account-wizard.c:288
+#: ../src/e-util/e-collection-account-wizard.c:490
 #, c-format
 msgctxt "collection-account-wizard"
 msgid "%s %s."
 msgstr "%s %s."
 
-#: ../src/e-util/e-collection-account-wizard.c:326
+#: ../src/e-util/e-collection-account-wizard.c:528
 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 "
@@ -12407,80 +12539,80 @@ 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:328
+#: ../src/e-util/e-collection-account-wizard.c:530
 #, 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:423
+#: ../src/e-util/e-collection-account-wizard.c:625
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../src/smime/gui/certificate-manager.c:785
+#: ../src/smime/gui/certificate-manager.c:766
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../src/e-util/e-collection-account-wizard.c:434
+#: ../src/e-util/e-collection-account-wizard.c:637
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "_Remember password"
 msgstr "_Remember password"
 
-#: ../src/e-util/e-collection-account-wizard.c:577
+#: ../src/e-util/e-collection-account-wizard.c:780
 #: ../src/e-util/e-webdav-browser.c:473
 msgid "Collection"
 msgstr "Collection"
 
-#: ../src/e-util/e-collection-account-wizard.c:578
+#: ../src/e-util/e-collection-account-wizard.c:781
 msgid "Mail Receive"
 msgstr "Mail Receive"
 
-#: ../src/e-util/e-collection-account-wizard.c:579
+#: ../src/e-util/e-collection-account-wizard.c:782
 msgid "Mail Send"
 msgstr "Mail Send"
 
-#: ../src/e-util/e-collection-account-wizard.c:580
+#: ../src/e-util/e-collection-account-wizard.c:783
 #: ../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:582
+#: ../src/e-util/e-collection-account-wizard.c:785
 msgid "Memo List"
 msgstr "Memo List"
 
-#: ../src/e-util/e-collection-account-wizard.c:583
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
+#: ../src/e-util/e-collection-account-wizard.c:786
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Task List"
 msgstr "Task List"
 
-#: ../src/e-util/e-collection-account-wizard.c:919
+#: ../src/e-util/e-collection-account-wizard.c:1122
 msgid "Looking up LDAP server’s search base…"
 msgstr "Looking up LDAP server’s search base…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1216
+#: ../src/e-util/e-collection-account-wizard.c:1429
 msgid "Saving account settings, please wait…"
 msgstr "Saving account settings, please wait…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1360
+#: ../src/e-util/e-collection-account-wizard.c:1573
 msgid "User details"
 msgstr "User details"
 
-#: ../src/e-util/e-collection-account-wizard.c:1373
+#: ../src/e-util/e-collection-account-wizard.c:1586
 msgid "_Email Address or User name:"
 msgstr "_E-mail Address or User name:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1403
+#: ../src/e-util/e-collection-account-wizard.c:1617
 msgid "_Advanced Options"
 msgstr "_Advanced Options"
 
-#: ../src/e-util/e-collection-account-wizard.c:1408
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:216
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:172
+#: ../src/e-util/e-collection-account-wizard.c:1622
+#: ../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:1426
+#: ../src/e-util/e-collection-account-wizard.c:1641
 msgid ""
 "Semicolon (“;”) separated list of servers to look up information for, in "
 "addition to the domain of the e-mail address."
@@ -12488,11 +12620,11 @@ msgstr ""
 "Semicolon (“;”) separated list of servers to look up information for, in "
 "addition to the domain of the e-mail address."
 
-#: ../src/e-util/e-collection-account-wizard.c:1618
+#: ../src/e-util/e-collection-account-wizard.c:1833
 msgid "Select which parts should be configured:"
 msgstr "Select which parts should be configured:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1742
+#: ../src/e-util/e-collection-account-wizard.c:1957
 #: ../src/mail/e-mail-config-identity-page.c:541
 #: ../src/mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
@@ -12665,11 +12797,11 @@ msgstr "white"
 #: ../src/e-util/e-color-combo.c:641 ../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:4735 ../src/mail/mail-config.ui.h:76
+#: ../src/mail/e-mail-reader.c:4816 ../src/mail/mail-config.ui.h:78
 msgid "Default"
 msgstr "Default"
 
-#: ../src/e-util/e-config-lookup.c:817
+#: ../src/e-util/e-config-lookup.c:821
 msgid "Running…"
 msgstr "Running…"
 
@@ -12723,14 +12855,14 @@ msgstr "Invalid Date Value"
 msgid "Invalid Time Value"
 msgstr "Invalid Time Value"
 
-#: ../src/e-util/e-datetime-format.c:219
+#: ../src/e-util/e-datetime-format.c:220
 msgid "Yesterday"
 msgstr "Yesterday"
 
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:227
+#: ../src/e-util/e-datetime-format.c:228
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Next Mon"
@@ -12738,7 +12870,7 @@ msgstr "Next Mon"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:233
+#: ../src/e-util/e-datetime-format.c:234
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Next Tue"
@@ -12746,7 +12878,7 @@ msgstr "Next Tue"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:239
+#: ../src/e-util/e-datetime-format.c:240
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Next Wed"
@@ -12754,7 +12886,7 @@ msgstr "Next Wed"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:245
+#: ../src/e-util/e-datetime-format.c:246
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Next Thu"
@@ -12762,7 +12894,7 @@ msgstr "Next Thu"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:251
+#: ../src/e-util/e-datetime-format.c:252
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Next Fri"
@@ -12770,7 +12902,7 @@ msgstr "Next Fri"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:257
+#: ../src/e-util/e-datetime-format.c:258
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Next Sat"
@@ -12778,17 +12910,17 @@ msgstr "Next Sat"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:263
+#: ../src/e-util/e-datetime-format.c:264
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Next Sun"
 
-#: ../src/e-util/e-datetime-format.c:349 ../src/e-util/e-datetime-format.c:359
-#: ../src/e-util/e-datetime-format.c:368
+#: ../src/e-util/e-datetime-format.c:367 ../src/e-util/e-datetime-format.c:377
+#: ../src/e-util/e-datetime-format.c:386
 msgid "Use locale default"
 msgstr "Use locale default"
 
-#: ../src/e-util/e-datetime-format.c:592
+#: ../src/e-util/e-datetime-format.c:610
 msgid "Format:"
 msgstr "Format:"
 
@@ -12821,6 +12953,13 @@ msgstr "years"
 msgid "Do not synchronize locally mails older than"
 msgstr "Do not synchronise locally mails older than"
 
+#. Translators: The %s is replaced with a spin button; always keep it in the string at the right position
+#: ../src/e-util/e-dialog-widgets.c:437
+#, c-format
+#| msgid "_Mark messages as read after"
+msgid "Mark messages as read after %s seconds"
+msgstr "Mark messages as read after %s seconds"
+
 #. Translators: :-)
 #: ../src/e-util/e-emoticon-chooser.c:38
 msgid "_Smile"
@@ -13044,20 +13183,22 @@ msgstr[0] "1 year in the future"
 msgstr[1] "%d years in the future"
 
 #: ../src/e-util/e-filter-datespec.c:127
+#, c-format
 msgid "<click here to select a date>"
 msgstr "<click here to select a date>"
 
-#: ../src/e-util/e-filter-datespec.c:130 ../src/e-util/e-filter-datespec.c:141
-#: ../src/e-util/e-filter-datespec.c:152
+#: ../src/e-util/e-filter-datespec.c:132 ../src/e-util/e-filter-datespec.c:143
+#: ../src/e-util/e-filter-datespec.c:154
+#, c-format
 msgid "now"
 msgstr "now"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../src/e-util/e-filter-datespec.c:137
+#: ../src/e-util/e-filter-datespec.c:139
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../src/e-util/e-filter-datespec.c:286
+#: ../src/e-util/e-filter-datespec.c:297
 msgid "Select a time to compare against"
 msgstr "Select a time to compare against"
 
@@ -13094,7 +13235,7 @@ msgstr "Find items that meet the following conditions"
 #: ../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:741
+#: ../src/mail/e-mail-autoconfig.c:766
 #: ../src/mail/e-mail-config-summary-page.c:141
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "None"
@@ -13142,508 +13283,514 @@ msgstr "Failed to insert HTML file."
 msgid "Failed to insert text file."
 msgstr "Failed to insert text file."
 
-#: ../src/e-util/e-html-editor-actions.c:319
+#: ../src/e-util/e-html-editor-actions.c:302
 msgid "Insert HTML File"
 msgstr "Insert HTML File"
 
-#: ../src/e-util/e-html-editor-actions.c:325
+#: ../src/e-util/e-html-editor-actions.c:307
 msgid "HTML file"
 msgstr "HTML file"
 
+#: ../src/e-util/e-html-editor-actions.c:345
 #: ../src/e-util/e-html-editor-actions.c:355
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: ../src/e-util/e-html-editor-actions.c:413
+#: ../src/e-util/e-html-editor-actions.c:352
+#| msgid "Image files"
+msgid "Image file"
+msgstr "Image file"
+
+#: ../src/e-util/e-html-editor-actions.c:428
 msgid "Insert text file"
 msgstr "Insert text file"
 
-#: ../src/e-util/e-html-editor-actions.c:419
+#: ../src/e-util/e-html-editor-actions.c:433
 msgid "Text file"
 msgstr "Text file"
 
-#: ../src/e-util/e-html-editor-actions.c:880
+#: ../src/e-util/e-html-editor-actions.c:912
 msgid "Copy selected text to the clipboard"
 msgstr "Copy selected text to the clipboard"
 
-#: ../src/e-util/e-html-editor-actions.c:887
+#: ../src/e-util/e-html-editor-actions.c:919
 msgid "Cut selected text to the clipboard"
 msgstr "Cut selected text to the clipboard"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../src/e-util/e-html-editor-actions.c:894
+#: ../src/e-util/e-html-editor-actions.c:926
 msgid "Paste text from the clipboard"
 msgstr "Paste text from the clipboard"
 
-#: ../src/e-util/e-html-editor-actions.c:901
+#: ../src/e-util/e-html-editor-actions.c:933
 msgid "Redo the last undone action"
 msgstr "Redo the last undone action"
 
-#: ../src/e-util/e-html-editor-actions.c:915
+#: ../src/e-util/e-html-editor-actions.c:947
 msgid "Undo the last action"
 msgstr "Undo the last action"
 
-#: ../src/e-util/e-html-editor-actions.c:936
+#: ../src/e-util/e-html-editor-actions.c:968
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ../src/e-util/e-html-editor-actions.c:943
+#: ../src/e-util/e-html-editor-actions.c:975
 msgid "_Paragraph Style"
 msgstr "_Paragraph Style"
 
-#: ../src/e-util/e-html-editor-actions.c:957
-#: ../src/e-util/e-html-editor-image-dialog.c:585
+#: ../src/e-util/e-html-editor-actions.c:989
+#: ../src/e-util/e-html-editor-image-dialog.c:590
 msgid "_Alignment"
 msgstr "_Alignment"
 
-#: ../src/e-util/e-html-editor-actions.c:964
+#: ../src/e-util/e-html-editor-actions.c:996
 msgid "Current _Languages"
 msgstr "Current _Languages"
 
-#: ../src/e-util/e-html-editor-actions.c:981
+#: ../src/e-util/e-html-editor-actions.c:1013
 msgid "_Increase Indent"
 msgstr "_Increase Indent"
 
-#: ../src/e-util/e-html-editor-actions.c:983
+#: ../src/e-util/e-html-editor-actions.c:1015
 msgid "Increase Indent"
 msgstr "Increase Indent"
 
-#: ../src/e-util/e-html-editor-actions.c:988
+#: ../src/e-util/e-html-editor-actions.c:1020
 msgid "_HTML File..."
 msgstr "_HTML File..."
 
-#: ../src/e-util/e-html-editor-actions.c:995
+#: ../src/e-util/e-html-editor-actions.c:1027
 msgid "Te_xt File..."
 msgstr "Te_xt File..."
 
-#: ../src/e-util/e-html-editor-actions.c:1002
+#: ../src/e-util/e-html-editor-actions.c:1034
 msgid "Paste _Quotation"
 msgstr "Paste _Quotation"
 
-#: ../src/e-util/e-html-editor-actions.c:1009
+#: ../src/e-util/e-html-editor-actions.c:1041
 msgid "_Find..."
 msgstr "_Find..."
 
-#: ../src/e-util/e-html-editor-actions.c:1011
+#: ../src/e-util/e-html-editor-actions.c:1043
 msgid "Search for text"
 msgstr "Search for text"
 
-#: ../src/e-util/e-html-editor-actions.c:1016
+#: ../src/e-util/e-html-editor-actions.c:1048
 msgid "Find A_gain"
 msgstr "Find A_gain"
 
-#: ../src/e-util/e-html-editor-actions.c:1023
+#: ../src/e-util/e-html-editor-actions.c:1055
 msgid "Re_place..."
 msgstr "Re_place..."
 
-#: ../src/e-util/e-html-editor-actions.c:1025
+#: ../src/e-util/e-html-editor-actions.c:1057
 msgid "Search for and replace text"
 msgstr "Search for and replace text"
 
-#: ../src/e-util/e-html-editor-actions.c:1030
+#: ../src/e-util/e-html-editor-actions.c:1062
 msgid "Check _Spelling..."
 msgstr "Check _Spelling..."
 
-#: ../src/e-util/e-html-editor-actions.c:1037
+#: ../src/e-util/e-html-editor-actions.c:1069
 msgid "_Decrease Indent"
 msgstr "_Decrease Indent"
 
-#: ../src/e-util/e-html-editor-actions.c:1039
+#: ../src/e-util/e-html-editor-actions.c:1071
 msgid "Decrease Indent"
 msgstr "Decrease Indent"
 
-#: ../src/e-util/e-html-editor-actions.c:1044
+#: ../src/e-util/e-html-editor-actions.c:1076
 msgid "_Wrap Lines"
 msgstr "_Wrap Lines"
 
 #. Center
-#: ../src/e-util/e-html-editor-actions.c:1054
+#: ../src/e-util/e-html-editor-actions.c:1086
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:108
 msgid "_Center"
 msgstr "_Centre"
 
-#: ../src/e-util/e-html-editor-actions.c:1056
+#: ../src/e-util/e-html-editor-actions.c:1088
 msgid "Center Alignment"
 msgstr "Centre Alignment"
 
 #. Left
-#: ../src/e-util/e-html-editor-actions.c:1061
+#: ../src/e-util/e-html-editor-actions.c:1093
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:99
 msgid "_Left"
 msgstr "_Left"
 
-#: ../src/e-util/e-html-editor-actions.c:1063
+#: ../src/e-util/e-html-editor-actions.c:1095
 msgid "Left Alignment"
 msgstr "Left Alignment"
 
 #. Right
-#: ../src/e-util/e-html-editor-actions.c:1068
+#: ../src/e-util/e-html-editor-actions.c:1100
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:117
 msgid "_Right"
 msgstr "_Right"
 
-#: ../src/e-util/e-html-editor-actions.c:1070
+#: ../src/e-util/e-html-editor-actions.c:1102
 msgid "Right Alignment"
 msgstr "Right Alignment"
 
-#: ../src/e-util/e-html-editor-actions.c:1078
+#: ../src/e-util/e-html-editor-actions.c:1110
 #: ../src/modules/text-highlight/languages.c:70
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../src/e-util/e-html-editor-actions.c:1080
+#: ../src/e-util/e-html-editor-actions.c:1112
 msgid "HTML editing mode"
 msgstr "HTML editing mode"
 
-#: ../src/e-util/e-html-editor-actions.c:1085
+#: ../src/e-util/e-html-editor-actions.c:1117
 msgid "Plain _Text"
 msgstr "Plain _Text"
 
-#: ../src/e-util/e-html-editor-actions.c:1087
+#: ../src/e-util/e-html-editor-actions.c:1119
 msgid "Plain text editing mode"
 msgstr "Plain text editing mode"
 
-#: ../src/e-util/e-html-editor-actions.c:1095
+#: ../src/e-util/e-html-editor-actions.c:1127
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../src/e-util/e-html-editor-actions.c:1102
+#: ../src/e-util/e-html-editor-actions.c:1134
 msgid "Heading _1"
 msgstr "Heading _1"
 
-#: ../src/e-util/e-html-editor-actions.c:1109
+#: ../src/e-util/e-html-editor-actions.c:1141
 msgid "Heading _2"
 msgstr "Heading _2"
 
-#: ../src/e-util/e-html-editor-actions.c:1116
+#: ../src/e-util/e-html-editor-actions.c:1148
 msgid "Heading _3"
 msgstr "Heading _3"
 
-#: ../src/e-util/e-html-editor-actions.c:1123
+#: ../src/e-util/e-html-editor-actions.c:1155
 msgid "Heading _4"
 msgstr "Heading _4"
 
-#: ../src/e-util/e-html-editor-actions.c:1130
+#: ../src/e-util/e-html-editor-actions.c:1162
 msgid "Heading _5"
 msgstr "Heading _5"
 
-#: ../src/e-util/e-html-editor-actions.c:1137
+#: ../src/e-util/e-html-editor-actions.c:1169
 msgid "Heading _6"
 msgstr "Heading _6"
 
-#: ../src/e-util/e-html-editor-actions.c:1144
+#: ../src/e-util/e-html-editor-actions.c:1176
 msgid "_Preformatted"
 msgstr "_Preformatted"
 
-#: ../src/e-util/e-html-editor-actions.c:1151
+#: ../src/e-util/e-html-editor-actions.c:1183
 msgid "A_ddress"
 msgstr "A_ddress"
 
-#: ../src/e-util/e-html-editor-actions.c:1158
+#: ../src/e-util/e-html-editor-actions.c:1190
 msgid "_Bulleted List"
 msgstr "_Bulleted List"
 
-#: ../src/e-util/e-html-editor-actions.c:1165
+#: ../src/e-util/e-html-editor-actions.c:1197
 msgid "_Roman Numeral List"
 msgstr "_Roman Numeral List"
 
-#: ../src/e-util/e-html-editor-actions.c:1172
+#: ../src/e-util/e-html-editor-actions.c:1204
 msgid "Numbered _List"
 msgstr "Numbered _List"
 
-#: ../src/e-util/e-html-editor-actions.c:1179
+#: ../src/e-util/e-html-editor-actions.c:1211
 msgid "_Alphabetical List"
 msgstr "_Alphabetical List"
 
-#: ../src/e-util/e-html-editor-actions.c:1195
-#: ../src/e-util/e-html-editor-actions.c:1233
+#: ../src/e-util/e-html-editor-actions.c:1227
+#: ../src/e-util/e-html-editor-actions.c:1265
 msgid "_Image..."
 msgstr "_Image..."
 
 #. Translators: This is an action tooltip
-#: ../src/e-util/e-html-editor-actions.c:1198
+#: ../src/e-util/e-html-editor-actions.c:1230
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: ../src/e-util/e-html-editor-actions.c:1203
-#: ../src/e-util/e-html-editor-actions.c:1240
+#: ../src/e-util/e-html-editor-actions.c:1235
+#: ../src/e-util/e-html-editor-actions.c:1272
 msgid "_Link..."
 msgstr "_Link..."
 
-#: ../src/e-util/e-html-editor-actions.c:1205
+#: ../src/e-util/e-html-editor-actions.c:1237
 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:1211
-#: ../src/e-util/e-html-editor-actions.c:1255
+#: ../src/e-util/e-html-editor-actions.c:1243
+#: ../src/e-util/e-html-editor-actions.c:1287
 msgid "_Rule..."
 msgstr "_Rule..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1214
+#: ../src/e-util/e-html-editor-actions.c:1246
 msgid "Insert Rule"
 msgstr "Insert Rule"
 
-#: ../src/e-util/e-html-editor-actions.c:1219
-#: ../src/e-util/e-html-editor-actions.c:1262
+#: ../src/e-util/e-html-editor-actions.c:1251
+#: ../src/e-util/e-html-editor-actions.c:1294
 msgid "_Table..."
 msgstr "_Table..."
 
-#: ../src/e-util/e-html-editor-actions.c:1221
+#: ../src/e-util/e-html-editor-actions.c:1253
 msgid "Insert Table"
 msgstr "Insert Table"
 
-#: ../src/e-util/e-html-editor-actions.c:1226
+#: ../src/e-util/e-html-editor-actions.c:1258
 msgid "_Cell..."
 msgstr "_Cell..."
 
-#: ../src/e-util/e-html-editor-actions.c:1247
+#: ../src/e-util/e-html-editor-actions.c:1279
 msgid "Pa_ge..."
 msgstr "Pa_ge..."
 
-#: ../src/e-util/e-html-editor-actions.c:1271
+#: ../src/e-util/e-html-editor-actions.c:1303
 msgid "Font _Size"
 msgstr "Font _Size"
 
-#: ../src/e-util/e-html-editor-actions.c:1278
+#: ../src/e-util/e-html-editor-actions.c:1310
 msgid "_Font Style"
 msgstr "_Font Style"
 
-#: ../src/e-util/e-html-editor-actions.c:1285
+#: ../src/e-util/e-html-editor-actions.c:1317
 msgid "Paste As _Text"
 msgstr "Paste As _Text"
 
-#: ../src/e-util/e-html-editor-actions.c:1296
+#: ../src/e-util/e-html-editor-actions.c:1328
 #: ../src/e-util/e-html-editor-text-dialog.c:201
 msgid "_Bold"
 msgstr "_Bold"
 
-#: ../src/e-util/e-html-editor-actions.c:1298
+#: ../src/e-util/e-html-editor-actions.c:1330
 msgid "Bold"
 msgstr "Bold"
 
-#: ../src/e-util/e-html-editor-actions.c:1304
+#: ../src/e-util/e-html-editor-actions.c:1336
 #: ../src/e-util/e-html-editor-text-dialog.c:212
 msgid "_Italic"
 msgstr "_Italic"
 
-#: ../src/e-util/e-html-editor-actions.c:1306
+#: ../src/e-util/e-html-editor-actions.c:1338
 msgid "Italic"
 msgstr "Italic"
 
-#: ../src/e-util/e-html-editor-actions.c:1312
+#: ../src/e-util/e-html-editor-actions.c:1344
 msgid "_Plain Text"
 msgstr "_Plain Text"
 
-#: ../src/e-util/e-html-editor-actions.c:1320
+#: ../src/e-util/e-html-editor-actions.c:1352
 #: ../src/e-util/e-html-editor-text-dialog.c:233
 msgid "_Strikethrough"
 msgstr "_Strikethrough"
 
-#: ../src/e-util/e-html-editor-actions.c:1322
+#: ../src/e-util/e-html-editor-actions.c:1354
 msgid "Strikethrough"
 msgstr "Strikethrough"
 
-#: ../src/e-util/e-html-editor-actions.c:1328
+#: ../src/e-util/e-html-editor-actions.c:1360
 #: ../src/e-util/e-html-editor-text-dialog.c:223
 msgid "_Underline"
 msgstr "_Underline"
 
-#: ../src/e-util/e-html-editor-actions.c:1330
+#: ../src/e-util/e-html-editor-actions.c:1362
 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:1340
+#: ../src/e-util/e-html-editor-actions.c:1372
 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:1348
+#: ../src/e-util/e-html-editor-actions.c:1380
 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:1356
+#: ../src/e-util/e-html-editor-actions.c:1388
 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:1364
+#: ../src/e-util/e-html-editor-actions.c:1396
 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:1372
+#: ../src/e-util/e-html-editor-actions.c:1404
 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:1380
+#: ../src/e-util/e-html-editor-actions.c:1412
 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:1388
+#: ../src/e-util/e-html-editor-actions.c:1420
 msgid "+4"
 msgstr "+4"
 
-#: ../src/e-util/e-html-editor-actions.c:1407
+#: ../src/e-util/e-html-editor-actions.c:1439
 msgid "Cell Contents"
 msgstr "Cell Contents"
 
-#: ../src/e-util/e-html-editor-actions.c:1414
+#: ../src/e-util/e-html-editor-actions.c:1446
 msgid "Column"
 msgstr "Column"
 
-#: ../src/e-util/e-html-editor-actions.c:1421
+#: ../src/e-util/e-html-editor-actions.c:1453
 msgid "Row"
 msgstr "Row"
 
-#: ../src/e-util/e-html-editor-actions.c:1428
+#: ../src/e-util/e-html-editor-actions.c:1460
 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:1438
+#: ../src/e-util/e-html-editor-actions.c:1470
 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:1446
+#: ../src/e-util/e-html-editor-actions.c:1478
 msgid "Table Insert"
 msgstr "Table Insert"
 
-#: ../src/e-util/e-html-editor-actions.c:1453
+#: ../src/e-util/e-html-editor-actions.c:1485
 msgid "Properties"
 msgstr "Properties"
 
-#: ../src/e-util/e-html-editor-actions.c:1471
+#: ../src/e-util/e-html-editor-actions.c:1503
 msgid "Column After"
 msgstr "Column After"
 
-#: ../src/e-util/e-html-editor-actions.c:1478
+#: ../src/e-util/e-html-editor-actions.c:1510
 msgid "Column Before"
 msgstr "Column Before"
 
-#: ../src/e-util/e-html-editor-actions.c:1485
+#: ../src/e-util/e-html-editor-actions.c:1517
 msgid "Insert _Link"
 msgstr "Insert _Link"
 
-#: ../src/e-util/e-html-editor-actions.c:1492
+#: ../src/e-util/e-html-editor-actions.c:1524
 msgid "Row Above"
 msgstr "Row Above"
 
-#: ../src/e-util/e-html-editor-actions.c:1499
+#: ../src/e-util/e-html-editor-actions.c:1531
 msgid "Row Below"
 msgstr "Row Below"
 
-#: ../src/e-util/e-html-editor-actions.c:1506
+#: ../src/e-util/e-html-editor-actions.c:1538
 msgid "Cell..."
 msgstr "Cell..."
 
-#: ../src/e-util/e-html-editor-actions.c:1513
+#: ../src/e-util/e-html-editor-actions.c:1545
 msgid "Image..."
 msgstr "Image..."
 
-#: ../src/e-util/e-html-editor-actions.c:1520
+#: ../src/e-util/e-html-editor-actions.c:1552
 msgid "Link..."
 msgstr "Link..."
 
-#: ../src/e-util/e-html-editor-actions.c:1527
+#: ../src/e-util/e-html-editor-actions.c:1559
 msgid "Page..."
 msgstr "Page..."
 
-#: ../src/e-util/e-html-editor-actions.c:1534
+#: ../src/e-util/e-html-editor-actions.c:1566
 msgid "Paragraph..."
 msgstr "Paragraph..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1542
+#: ../src/e-util/e-html-editor-actions.c:1574
 msgid "Rule..."
 msgstr "Rule..."
 
-#: ../src/e-util/e-html-editor-actions.c:1549
+#: ../src/e-util/e-html-editor-actions.c:1581
 msgid "Table..."
 msgstr "Table..."
 
-#: ../src/e-util/e-html-editor-actions.c:1556
+#: ../src/e-util/e-html-editor-actions.c:1588
 msgid "Text..."
 msgstr "Text..."
 
-#: ../src/e-util/e-html-editor-actions.c:1563
+#: ../src/e-util/e-html-editor-actions.c:1595
 msgid "Remove Link"
 msgstr "Remove Link"
 
-#: ../src/e-util/e-html-editor-actions.c:1580
+#: ../src/e-util/e-html-editor-actions.c:1612
 msgid "Add Word to Dictionary"
 msgstr "Add Word to Dictionary"
 
-#: ../src/e-util/e-html-editor-actions.c:1587
+#: ../src/e-util/e-html-editor-actions.c:1619
 msgid "Ignore Misspelled Word"
 msgstr "Ignore Misspelt Word"
 
-#: ../src/e-util/e-html-editor-actions.c:1594
+#: ../src/e-util/e-html-editor-actions.c:1626
 msgid "Add Word To"
 msgstr "Add Word To"
 
-#: ../src/e-util/e-html-editor-actions.c:1603
+#: ../src/e-util/e-html-editor-actions.c:1635
 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:1727
+#: ../src/e-util/e-html-editor-actions.c:1870
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s Dictionary"
 
-#: ../src/e-util/e-html-editor-actions.c:1806
+#: ../src/e-util/e-html-editor-actions.c:1949
 msgid "_Emoticon"
 msgstr "_Emoticon"
 
-#: ../src/e-util/e-html-editor-actions.c:1807
+#: ../src/e-util/e-html-editor-actions.c:1950
 msgid "Insert Emoticon"
 msgstr "Insert Emoticon"
 
-#: ../src/e-util/e-html-editor-actions.c:1875
+#: ../src/e-util/e-html-editor-actions.c:2018
 msgid "Re_place"
 msgstr "Re_place"
 
-#: ../src/e-util/e-html-editor-actions.c:1878
+#: ../src/e-util/e-html-editor-actions.c:2021
 msgid "_Image"
 msgstr "_Image"
 
-#: ../src/e-util/e-html-editor-actions.c:1881
+#: ../src/e-util/e-html-editor-actions.c:2024
 msgid "_Link"
 msgstr "_Link"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1885
+#: ../src/e-util/e-html-editor-actions.c:2028
 msgid "_Rule"
 msgstr "_Rule"
 
-#: ../src/e-util/e-html-editor-actions.c:1888
+#: ../src/e-util/e-html-editor-actions.c:2031
 #: ../src/e-util/e-html-editor-cell-dialog.c:448
 msgid "_Table"
 msgstr "_Table"
 
-#: ../src/e-util/e-html-editor.c:742
+#: ../src/e-util/e-html-editor.c:743
 msgid "Paragraph Style"
 msgstr "Paragraph Style"
 
-#: ../src/e-util/e-html-editor.c:756
+#: ../src/e-util/e-html-editor.c:757
 msgid "Editing Mode"
 msgstr "Editing Mode"
 
-#: ../src/e-util/e-html-editor.c:768
+#: ../src/e-util/e-html-editor.c:769
 msgid "Font Color"
 msgstr "Font Colour"
 
-#: ../src/e-util/e-html-editor.c:778
+#: ../src/e-util/e-html-editor.c:779
 msgid "Font Size"
 msgstr "Font Size"
 
@@ -13669,19 +13816,19 @@ msgstr "<b>Alignment &amp; Behaviour</b>"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:484
 #: ../src/e-util/e-html-editor-hrule-dialog.c:328
-#: ../src/e-util/e-html-editor-table-dialog.c:649
+#: ../src/e-util/e-html-editor-table-dialog.c:648
 msgid "Left"
 msgstr "Left"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:485
 #: ../src/e-util/e-html-editor-hrule-dialog.c:330
-#: ../src/e-util/e-html-editor-table-dialog.c:650
+#: ../src/e-util/e-html-editor-table-dialog.c:649
 msgid "Center"
 msgstr "Centre"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:486
 #: ../src/e-util/e-html-editor-hrule-dialog.c:332
-#: ../src/e-util/e-html-editor-table-dialog.c:651
+#: ../src/e-util/e-html-editor-table-dialog.c:650
 msgid "Right"
 msgstr "Right"
 
@@ -13690,17 +13837,17 @@ msgid "_Horizontal:"
 msgstr "_Horizontal:"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:502
-#: ../src/e-util/e-html-editor-image-dialog.c:575
+#: ../src/e-util/e-html-editor-image-dialog.c:580
 msgid "Top"
 msgstr "Top"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:503
-#: ../src/e-util/e-html-editor-image-dialog.c:576
+#: ../src/e-util/e-html-editor-image-dialog.c:581
 msgid "Middle"
 msgstr "Middle"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:504
-#: ../src/e-util/e-html-editor-image-dialog.c:577
+#: ../src/e-util/e-html-editor-image-dialog.c:582
 msgid "Bottom"
 msgstr "Bottom"
 
@@ -13719,8 +13866,8 @@ 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:515
-#: ../src/e-util/e-html-editor-table-dialog.c:561
+#: ../src/e-util/e-html-editor-image-dialog.c:520
+#: ../src/e-util/e-html-editor-table-dialog.c:560
 msgid "<b>Layout</b>"
 msgstr "<b>Layout</b>"
 
@@ -13738,12 +13885,12 @@ msgid "Co_lumn Span:"
 msgstr "Co_lumn Span:"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:612
-#: ../src/e-util/e-html-editor-table-dialog.c:665
+#: ../src/e-util/e-html-editor-table-dialog.c:664
 msgid "<b>Background</b>"
 msgstr "<b>Background</b>"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:625
-#: ../src/e-util/e-html-editor-table-dialog.c:678
+#: ../src/e-util/e-html-editor-table-dialog.c:677
 msgid "Transparent"
 msgstr "Transparent"
 
@@ -13751,29 +13898,32 @@ msgstr "Transparent"
 msgid "C_olor:"
 msgstr "C_olour:"
 
-#: ../src/e-util/e-html-editor-cell-dialog.c:641
-#: ../src/e-util/e-html-editor-image-dialog.c:477
-#: ../src/e-util/e-html-editor-table-dialog.c:694
-msgid "Choose Background Image"
-msgstr "Choose Background Image"
-
-#: ../src/e-util/e-html-editor-cell-dialog.c:646
-#: ../src/e-util/e-html-editor-image-dialog.c:483
-#: ../src/e-util/e-html-editor-table-dialog.c:699
+#: ../src/e-util/e-html-editor-cell-dialog.c:640
+#: ../src/e-util/e-html-editor-image-dialog.c:476
+#: ../src/e-util/e-html-editor-table-dialog.c:692
 msgid "Images"
 msgstr "Images"
 
-#: ../src/e-util/e-html-editor-cell-dialog.c:659
+#: ../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-table-dialog.c:697
+#: ../src/e-util/e-html-editor-table-dialog.c:702
+msgid "Choose Background Image"
+msgstr "Choose Background Image"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:662
 msgid "_Image:"
 msgstr "_Image:"
 
-#: ../src/e-util/e-html-editor-cell-dialog.c:666
+#: ../src/e-util/e-html-editor-cell-dialog.c:669
 #: ../src/e-util/e-html-editor-page-dialog.c:495
-#: ../src/e-util/e-html-editor-table-dialog.c:719
+#: ../src/e-util/e-html-editor-table-dialog.c:723
 msgid "_Remove image"
 msgstr "_Remove image"
 
-#: ../src/e-util/e-html-editor-cell-dialog.c:686
+#: ../src/e-util/e-html-editor-cell-dialog.c:689
 msgid "Cell Properties"
 msgstr "Cell Properties"
 
@@ -13805,8 +13955,8 @@ msgstr "<b>Size</b>"
 
 #. Width
 #: ../src/e-util/e-html-editor-hrule-dialog.c:283
-#: ../src/e-util/e-html-editor-image-dialog.c:533
-#: ../src/e-util/e-html-editor-table-dialog.c:572
+#: ../src/e-util/e-html-editor-image-dialog.c:538
+#: ../src/e-util/e-html-editor-table-dialog.c:571
 msgid "_Width:"
 msgstr "_Width:"
 
@@ -13819,7 +13969,7 @@ msgid "<b>Style</b>"
 msgstr "<b>Style</b>"
 
 #: ../src/e-util/e-html-editor-hrule-dialog.c:340
-#: ../src/e-util/e-html-editor-table-dialog.c:658
+#: ../src/e-util/e-html-editor-table-dialog.c:657
 msgid "_Alignment:"
 msgstr "_Alignment:"
 
@@ -13834,46 +13984,46 @@ msgstr "Rule properties"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:465
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:64
-#: ../src/e-util/e-html-editor-table-dialog.c:515
+#: ../src/e-util/e-html-editor-table-dialog.c:514
 msgid "<b>General</b>"
 msgstr "<b>General</b>"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:494
+#: ../src/e-util/e-html-editor-image-dialog.c:499
 msgid "_Source:"
 msgstr "_Source:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:557
+#: ../src/e-util/e-html-editor-image-dialog.c:562
 msgid "_Height:"
 msgstr "_Height:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:598
+#: ../src/e-util/e-html-editor-image-dialog.c:603
 msgid "_X-Padding:"
 msgstr "_X-Padding:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:614
+#: ../src/e-util/e-html-editor-image-dialog.c:619
 msgid "_Y-Padding:"
 msgstr "_Y-Padding:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:630
-#: ../src/e-util/e-html-editor-table-dialog.c:639
+#: ../src/e-util/e-html-editor-image-dialog.c:635
+#: ../src/e-util/e-html-editor-table-dialog.c:638
 msgid "_Border:"
 msgstr "_Border:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:640
+#: ../src/e-util/e-html-editor-image-dialog.c:645
 msgid "<b>Link</b>"
 msgstr "<b>Link</b>"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:658
+#: ../src/e-util/e-html-editor-image-dialog.c:663
 #: ../src/e-util/e-html-editor-link-dialog.c:219
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:663
+#: ../src/e-util/e-html-editor-image-dialog.c:668
 #: ../src/e-util/e-html-editor-link-dialog.c:224
 msgid "_Test URL..."
 msgstr "_Test URL..."
 
-#: ../src/e-util/e-html-editor-image-dialog.c:680
+#: ../src/e-util/e-html-editor-image-dialog.c:685
 msgid "Image Properties"
 msgstr "Image Properties"
 
@@ -13940,7 +14090,7 @@ msgid "<b>Background Image</b>"
 msgstr "<b>Background Image</b>"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:473
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:90
 msgid "_Template:"
 msgstr "_Template:"
 
@@ -14015,77 +14165,77 @@ msgstr "Replace"
 msgid "<b>Suggestions for “%s”</b>"
 msgstr "<b>Suggestions for “%s”</b>"
 
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:388
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:387
 msgid "<b>Suggestions</b>"
 msgstr "<b>Suggestions</b>"
 
 #. Replace
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:423
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:422
 msgid "Replace"
 msgstr "Replace"
 
 #. Replace All
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:432
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:431
 msgid "Replace All"
 msgstr "Replace All"
 
 #. Ignore
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:441
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:440
 #: ../src/mail/mail.error.xml.h:116
 msgid "Ignore"
 msgstr "Ignore"
 
 #. Skip
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:450
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:449
 msgid "Skip"
 msgstr "Skip"
 
 #. Back
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:459
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:458
 msgid "Back"
 msgstr "Back"
 
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:468
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:467
 msgid "<b>Dictionary</b>"
 msgstr "<b>Dictionary</b>"
 
 #. Add Word button
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:488
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:487
 msgid "Add word"
 msgstr "Add word"
 
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:505
-#: ../src/mail/mail-config.ui.h:40
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:504
+#: ../src/mail/mail-config.ui.h:42
 msgid "Spell Checking"
 msgstr "Spell Checking"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:537
+#: ../src/e-util/e-html-editor-table-dialog.c:536
 msgid "_Rows:"
 msgstr "_Rows:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:554
+#: ../src/e-util/e-html-editor-table-dialog.c:553
 msgid "C_olumns:"
 msgstr "C_olumns:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:605
+#: ../src/e-util/e-html-editor-table-dialog.c:604
 msgid "_Spacing:"
 msgstr "_Spacing:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:622
+#: ../src/e-util/e-html-editor-table-dialog.c:621
 msgid "_Padding:"
 msgstr "_Padding:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:686
+#: ../src/e-util/e-html-editor-table-dialog.c:685
 #: ../src/e-util/e-html-editor-text-dialog.c:248
 #: ../src/e-util/e-webdav-browser.c:2418
 msgid "_Color:"
 msgstr "_Colour:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:712
+#: ../src/e-util/e-html-editor-table-dialog.c:716
 msgid "Image:"
 msgstr "Image:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:739
+#: ../src/e-util/e-html-editor-table-dialog.c:743
 msgid "Table Properties"
 msgstr "Table Properties"
 
@@ -14226,11 +14376,11 @@ msgstr "days"
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: ../src/e-util/e-mail-signature-editor.c:311 ../src/mail/e-mail-notes.c:954
+#: ../src/e-util/e-mail-signature-editor.c:311 ../src/mail/e-mail-notes.c:966
 msgid "Close"
 msgstr "Close"
 
-#: ../src/e-util/e-mail-signature-editor.c:316 ../src/mail/e-mail-notes.c:959
+#: ../src/e-util/e-mail-signature-editor.c:316 ../src/mail/e-mail-notes.c:971
 msgid "_Save and Close"
 msgstr "_Save and Close"
 
@@ -14288,40 +14438,40 @@ msgstr ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
 
-#: ../src/e-util/e-misc-utils.c:260
+#: ../src/e-util/e-misc-utils.c:278
 msgid "Could not open the link."
 msgstr "Could not open the link."
 
-#: ../src/e-util/e-misc-utils.c:343
+#: ../src/e-util/e-misc-utils.c:362
 msgid "Could not display help for Evolution."
 msgstr "Could not display help for Evolution."
 
-#: ../src/e-util/e-misc-utils.c:2508
+#: ../src/e-util/e-misc-utils.c:2563
 #, c-format
 msgid "Opening calendar “%s”"
 msgstr "Opening calendar “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2511
+#: ../src/e-util/e-misc-utils.c:2566
 #, c-format
 msgid "Opening memo list “%s”"
 msgstr "Opening memo list “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2514
+#: ../src/e-util/e-misc-utils.c:2569
 #, c-format
 msgid "Opening task list “%s”"
 msgstr "Opening task list “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2517
+#: ../src/e-util/e-misc-utils.c:2572
 #, c-format
 msgid "Opening address book “%s”"
 msgstr "Opening address book “%s”"
 
-#: ../src/e-util/e-misc-utils.c:3297
+#: ../src/e-util/e-misc-utils.c:3352
 #: ../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:4123
+#: ../src/e-util/e-misc-utils.c:4205
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -14329,18 +14479,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:4135
+#: ../src/e-util/e-misc-utils.c:4217
 #, 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:4147
+#: ../src/e-util/e-misc-utils.c:4229
 #, 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:4161
+#: ../src/e-util/e-misc-utils.c:4243
 #, c-format
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
@@ -14356,7 +14506,7 @@ msgstr ""
 "Detailed error (%d): %s"
 
 #  addressbook:ldap-search-base secondary
-#: ../src/e-util/e-misc-utils.c:4172
+#: ../src/e-util/e-misc-utils.c:4254
 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 "
@@ -14366,10 +14516,25 @@ msgstr ""
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 
-#: ../src/e-util/e-misc-utils.c:4205
+#: ../src/e-util/e-misc-utils.c:4287
 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:4601
+#, c-format
+msgctxt "language"
+msgid "Unknown (%s)"
+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:4610
+#, c-format
+msgctxt "language"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: ../src/e-util/e-name-selector-dialog.c:274
 msgid "Show Contacts"
 msgstr "Show Contacts"
@@ -14584,46 +14749,35 @@ msgstr "Edit Rule"
 msgid "Matches: %u"
 msgstr "Matches: %u"
 
-#: ../src/e-util/e-search-bar.c:611
+#: ../src/e-util/e-search-bar.c:621
 msgid "Close the find bar"
 msgstr "Close the find bar"
 
-#: ../src/e-util/e-search-bar.c:619
+#: ../src/e-util/e-search-bar.c:629
 msgid "Fin_d:"
 msgstr "Fin_d:"
 
-#: ../src/e-util/e-search-bar.c:631
+#: ../src/e-util/e-search-bar.c:641
 msgid "Clear the search"
 msgstr "Clear the search"
 
-#: ../src/e-util/e-search-bar.c:655
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:73
-msgid "_Previous"
-msgstr "_Previous"
-
-#: ../src/e-util/e-search-bar.c:658
+#: ../src/e-util/e-search-bar.c:668
 msgid "Find the previous occurrence of the phrase"
 msgstr "Find the previous occurrence of the phrase"
 
-#: ../src/e-util/e-search-bar.c:667
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:80
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:224
-msgid "_Next"
-msgstr "_Next"
-
-#: ../src/e-util/e-search-bar.c:670
+#: ../src/e-util/e-search-bar.c:680
 msgid "Find the next occurrence of the phrase"
 msgstr "Find the next occurrence of the phrase"
 
-#: ../src/e-util/e-search-bar.c:679
+#: ../src/e-util/e-search-bar.c:689
 msgid "Mat_ch case"
 msgstr "Mat_ch case"
 
-#: ../src/e-util/e-search-bar.c:707
+#: ../src/e-util/e-search-bar.c:717
 msgid "Reached bottom of page, continued from top"
 msgstr "Reached bottom of page, continued from top"
 
-#: ../src/e-util/e-search-bar.c:729
+#: ../src/e-util/e-search-bar.c:739
 msgid "Reached top of page, continued from bottom"
 msgstr "Reached top of page, continued from bottom"
 
@@ -14794,15 +14948,15 @@ msgstr "Name cannot be empty"
 msgid "Refresh every"
 msgstr "Refresh every"
 
-#: ../src/e-util/e-source-config.c:1446 ../src/e-util/e-source-config.c:1516
+#: ../src/e-util/e-source-config.c:1446 ../src/e-util/e-source-config.c:1520
 msgid "Use a secure connection"
 msgstr "Use a secure connection"
 
-#: ../src/e-util/e-source-config.c:1542
+#: ../src/e-util/e-source-config.c:1547
 msgid "Unset _trust for SSL/TLS certificate"
 msgstr "Unset _trust for SSL/TLS certificate"
 
-#: ../src/e-util/e-source-config.c:1578
+#: ../src/e-util/e-source-config.c:1583
 msgid "User:"
 msgstr "User:"
 
@@ -14814,7 +14968,7 @@ msgstr "Show"
 msgid "Group name"
 msgstr "Group name"
 
-#: ../src/e-util/e-source-selector.c:3379 ../src/mail/e-mail-display.c:793
+#: ../src/e-util/e-source-selector.c:3379 ../src/mail/e-mail-display.c:805
 msgid "_Hide"
 msgstr "_Hide"
 
@@ -14839,22 +14993,6 @@ msgstr "_Destination"
 msgid "Select destination"
 msgstr "Select destination"
 
-#. Translators: %s is the language ISO code.
-#: ../src/e-util/e-spell-dictionary.c:265
-#, c-format
-msgctxt "language"
-msgid "Unknown (%s)"
-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-spell-dictionary.c:280
-#: ../src/e-util/e-spell-dictionary.c:285
-#, c-format
-msgctxt "language"
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
 #. no suggestions. Put something in the menu anyway...
 #: ../src/e-util/e-spell-entry.c:479
 msgid "(no suggestions)"
@@ -14970,10 +15108,6 @@ msgid "Something has gone wrong"
 msgstr "Something has gone wrong"
 
 #: ../src/e-util/e-system.error.xml.h:24
-#| msgid ""
-#| "A WebKitWebProcess crashed when displaying the content. You can try again "
-#| "by reopening the window. If the issue persists, please file a bug report "
-#| "in the GNOME bugzilla."
 msgid ""
 "A WebKitWebProcess crashed when displaying the content. You can try again by "
 "reopening the window. If the issue persists, please file a bug report in "
@@ -14999,7 +15133,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:687
+#: ../src/e-util/e-table-click-to-add.c:688
 #: ../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"
@@ -15209,11 +15343,11 @@ msgstr "_Sort By"
 msgid "_Custom"
 msgstr "_Custom"
 
-#: ../src/e-util/e-text.c:2100
+#: ../src/e-util/e-text.c:2105
 msgid "Select All"
 msgstr "Select All"
 
-#: ../src/e-util/e-text.c:2113
+#: ../src/e-util/e-text.c:2118
 msgid "Input Methods"
 msgstr "Input Methods"
 
@@ -15250,11 +15384,11 @@ msgstr "_Selection"
 msgid "Timezone drop-down combination box"
 msgstr "Timezone drop-down combination box"
 
-#: ../src/e-util/e-url-entry.c:106
+#: ../src/e-util/e-url-entry.c:102
 msgid "Click here to open the URL"
 msgstr "Click here to open the URL"
 
-#: ../src/e-util/e-url-entry.c:108
+#: ../src/e-util/e-url-entry.c:104
 msgid "Enter a URL here"
 msgstr "Enter a URL here"
 
@@ -15401,91 +15535,103 @@ msgstr "Create _Calendar"
 msgid "Create Collectio_n"
 msgstr "Create Collectio_n"
 
-#: ../src/e-util/e-web-view.c:348
+#: ../src/e-util/e-web-view.c:406
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: ../src/e-util/e-web-view.c:350
+#: ../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:358
+#: ../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:360
+#: ../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:368
+#: ../src/e-util/e-web-view.c:426
 msgid "_Copy Email Address"
 msgstr "_Copy E-mail Address"
 
-#: ../src/e-util/e-web-view.c:375
+#: ../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:377
+#: ../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:392
+#: ../src/e-util/e-web-view.c:450
 msgid "_Copy Image"
 msgstr "_Copy Image"
 
-#: ../src/e-util/e-web-view.c:394
+#: ../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:399
+#: ../src/e-util/e-web-view.c:457
 msgid "Save _Image..."
 msgstr "Save _Image…"
 
-#: ../src/e-util/e-web-view.c:401
+#: ../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:421 ../src/e-util/e-web-view.c:2032
+#: ../src/e-util/e-web-view.c:474 ../src/mail/e-mail-browser.c:179
+#: ../src/mail/e-mail-reader.c:2787
+#| msgid "Search Rule"
+msgid "Search _Web…"
+msgstr "Search _Web…"
+
+#: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:181
+#: ../src/mail/e-mail-reader.c:2789
+#| msgid "Send a message to the selected contacts"
+msgid "Search the Web with the selected text"
+msgstr "Search the Web with the selected text"
+
+#: ../src/e-util/e-web-view.c:486 ../src/e-util/e-web-view.c:2097
 msgid "Select all text and images"
 msgstr "Select all text and images"
 
-#: ../src/e-util/e-web-view.c:1381
+#: ../src/e-util/e-web-view.c:1446
 #, c-format
 msgid "Click to call %s"
 msgstr "Click to call %s"
 
-#: ../src/e-util/e-web-view.c:1383
+#: ../src/e-util/e-web-view.c:1448
 msgid "Click to hide/unhide addresses"
 msgstr "Click to hide/unhide addresses"
 
-#: ../src/e-util/e-web-view.c:1394
+#: ../src/e-util/e-web-view.c:1459
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "Go to the section %s of the message"
 
-#: ../src/e-util/e-web-view.c:1396
+#: ../src/e-util/e-web-view.c:1461
 msgid "Go to the beginning of the message"
 msgstr "Go to the beginning of the message"
 
-#: ../src/e-util/e-web-view.c:1400
+#: ../src/e-util/e-web-view.c:1465
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
-#: ../src/e-util/e-web-view.c:3953
+#: ../src/e-util/e-web-view.c:4128
 msgid "Copying image to clipboard"
 msgstr "Copying image to clipboard"
 
-#: ../src/e-util/e-web-view.c:4141
+#: ../src/e-util/e-web-view.c:4316
 msgid "Save Image"
 msgstr "Save Image"
 
-#: ../src/e-util/e-web-view.c:4182
+#: ../src/e-util/e-web-view.c:4353
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "Saving image to “%s”"
 
-#: ../src/e-util/e-web-view.c:4277
+#: ../src/e-util/e-web-view.c:4500
 #, 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."
@@ -15586,7 +15732,7 @@ msgstr "the time you specify"
 msgid "a time relative to the current time"
 msgstr "a time relative to the current time"
 
-#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:93
+#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:95
 msgid "seconds"
 msgstr "seconds"
 
@@ -15644,7 +15790,7 @@ msgstr ""
 msgid "Show filters for mail:"
 msgstr "Show filters for mail:"
 
-#: ../src/e-util/filter.ui.h:22 ../src/mail/em-filter-editor.c:163
+#: ../src/e-util/filter.ui.h:22 ../src/mail/em-filter-editor.c:401
 msgid "_Filter Rules"
 msgstr "_Filter Rules"
 
@@ -15685,7 +15831,7 @@ msgstr "collapses the row in the ETree containing this cell"
 msgid "click"
 msgstr "click"
 
-#: ../src/e-util/gal-a11y-e-table-column-header.c:160
+#: ../src/e-util/gal-a11y-e-table-column-header.c:161
 msgid "sort"
 msgstr "sort"
 
@@ -15701,7 +15847,7 @@ msgstr "_Create new view"
 msgid "_Replace existing view"
 msgstr "_Replace existing view"
 
-#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:203
+#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:204
 msgid "Do you wish to save your changes?"
 msgstr "Do you wish to save your changes?"
 
@@ -15709,7 +15855,7 @@ msgstr "Do you wish to save your changes?"
 msgid "This signature has been changed, but has not been saved."
 msgstr "This signature has been changed, but has not been saved."
 
-#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:205
+#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:206
 msgid "_Discard changes"
 msgstr "_Discard changes"
 
@@ -15737,6 +15883,11 @@ msgstr "Could not load signature."
 msgid "Could not save signature."
 msgstr "Could not save signature."
 
+#: ../src/e-util/widgets.error.xml.h:10
+#| msgid "Could not get a selection to delete."
+msgid "Could not get selected text."
+msgstr "Could not get selected text."
+
 #: ../src/libemail-engine/e-mail-folder-utils.c:106
 #, c-format
 msgid "Saving message to folder “%s”"
@@ -15790,11 +15941,11 @@ msgstr "Invalid folder URI “%s”"
 
 #. Some local folders
 #: ../src/libemail-engine/e-mail-session.c:117
-#: ../src/mail/em-folder-properties.c:1143
+#: ../src/mail/em-folder-properties.c:1164
 #: ../src/mail/em-folder-tree-model.c:1237
 #: ../src/mail/importers/kmail-libs.c:139
-#: ../src/modules/mail/e-mail-shell-view-private.c:1003
-#: ../src/modules/mail/e-mail-shell-view-private.c:1014
+#: ../src/modules/mail/e-mail-shell-view-private.c:1032
+#: ../src/modules/mail/e-mail-shell-view-private.c:1043
 msgid "Inbox"
 msgstr "Inbox"
 
@@ -15802,7 +15953,7 @@ msgstr "Inbox"
 #: ../src/libemail-engine/e-mail-session.c:118
 #: ../src/mail/em-folder-tree-model.c:1230
 #: ../src/mail/importers/kmail-libs.c:145
-#: ../src/modules/mail/e-mail-shell-view-private.c:1001
+#: ../src/modules/mail/e-mail-shell-view-private.c:1030
 msgid "Drafts"
 msgstr "Drafts"
 
@@ -15810,7 +15961,7 @@ msgstr "Drafts"
 #: ../src/libemail-engine/e-mail-session.c:119
 #: ../src/mail/em-folder-tree-model.c:1241
 #: ../src/mail/importers/kmail-libs.c:141
-#: ../src/modules/mail/e-mail-shell-view-private.c:1005
+#: ../src/modules/mail/e-mail-shell-view-private.c:1034
 msgid "Outbox"
 msgstr "Outbox"
 
@@ -15818,7 +15969,7 @@ msgstr "Outbox"
 #: ../src/libemail-engine/e-mail-session.c:120
 #: ../src/mail/em-folder-tree-model.c:1245
 #: ../src/mail/importers/kmail-libs.c:143
-#: ../src/modules/mail/e-mail-shell-view-private.c:1007
+#: ../src/modules/mail/e-mail-shell-view-private.c:1036
 msgid "Sent"
 msgstr "Sent"
 
@@ -15827,7 +15978,7 @@ msgstr "Sent"
 #: ../src/mail/e-mail-templates-store.c:2211
 #: ../src/mail/em-folder-tree-model.c:1233
 #: ../src/mail/importers/kmail-libs.c:147
-#: ../src/modules/mail/e-mail-shell-view-private.c:1009
+#: ../src/modules/mail/e-mail-shell-view-private.c:1038
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Templates"
@@ -15865,7 +16016,7 @@ msgstr "Looking up recipient S/MIME certificates in address books…"
 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:2641
+#: ../src/libemail-engine/e-mail-session.c:2639
 #, c-format
 msgid "Waiting for “%s”"
 msgstr "Waiting for “%s”"
@@ -15909,9 +16060,9 @@ msgstr ""
 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:925
-#: ../src/libemail-engine/mail-ops.c:984 ../src/libemail-engine/mail-ops.c:1097
-#: ../src/mail/mail-send-recv.c:635
+#: ../src/libemail-engine/e-mail-session-utils.c:929
+#: ../src/libemail-engine/mail-ops.c:1019
+#: ../src/libemail-engine/mail-ops.c:1134 ../src/mail/mail-send-recv.c:665
 msgid "Sending message"
 msgstr "Sending message"
 
@@ -15926,6 +16077,7 @@ msgid "Reconnecting to “%s”"
 msgstr "Reconnecting to “%s”"
 
 #: ../src/libemail-engine/e-mail-store-utils.c:349
+#: ../src/mail/mail-send-recv.c:1089
 #, c-format
 msgid "Preparing account “%s” for offline"
 msgstr "Preparing account “%s” for offline"
@@ -15965,7 +16117,7 @@ msgstr ""
 "Filters.\n"
 "Original error was: %s"
 
-#: ../src/libemail-engine/mail-ops.c:995
+#: ../src/libemail-engine/mail-ops.c:1030
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
@@ -15973,52 +16125,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:1053
+#: ../src/libemail-engine/mail-ops.c:1088
 #, 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:1059
+#: ../src/libemail-engine/mail-ops.c:1094
 msgid "Cancelled."
 msgstr "Cancelled."
 
-#: ../src/libemail-engine/mail-ops.c:1061
+#: ../src/libemail-engine/mail-ops.c:1096
 msgid "Complete."
 msgstr "Complete."
 
-#: ../src/libemail-engine/mail-ops.c:1183
+#: ../src/libemail-engine/mail-ops.c:1220
 #, c-format
 msgid "Moving messages to “%s”"
 msgstr "Moving messages to “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1184
+#: ../src/libemail-engine/mail-ops.c:1221
 #, c-format
 msgid "Copying messages to “%s”"
 msgstr "Copying messages to “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1303
+#: ../src/libemail-engine/mail-ops.c:1340
 #, c-format
 msgid "Storing folder “%s”"
 msgstr "Storing folder “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1431
+#: ../src/libemail-engine/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account “%s”"
 msgstr "Expunging and storing account “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1432
+#: ../src/libemail-engine/mail-ops.c:1469
 #, c-format
 msgid "Storing account “%s”"
 msgstr "Storing account “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1507
+#: ../src/libemail-engine/mail-ops.c:1544
 #, c-format
 msgid "Emptying trash in “%s”"
 msgstr "Emptying wastebasket in “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1599
+#: ../src/libemail-engine/mail-ops.c:1636
 #, c-format
 msgid "Processing folder changes in “%s”"
 msgstr "Processing folder changes in “%s”"
@@ -16110,72 +16262,71 @@ msgstr "De_fault"
 
 #: ../src/mail/e-mail-autoconfig.c:436
 #, c-format
-#| msgid "Invalid folder URI “%s”"
 msgid "Invalid URI: “%s”"
 msgstr "Invalid URI: “%s”"
 
-#: ../src/mail/e-mail-autoconfig.c:731
+#: ../src/mail/e-mail-autoconfig.c:756
 #, c-format
 msgid "Host: %s:%d"
 msgstr "Host: %s:%d"
 
-#: ../src/mail/e-mail-autoconfig.c:735
+#: ../src/mail/e-mail-autoconfig.c:760
 #, c-format
 msgid "User: %s"
 msgstr "User: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:739
+#: ../src/mail/e-mail-autoconfig.c:764
 #, c-format
 msgid "Security method: %s"
 msgstr "Security method: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:740
+#: ../src/mail/e-mail-autoconfig.c:765
 #: ../src/mail/e-mail-config-summary-page.c:144
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/mail/e-mail-autoconfig.c:741
+#: ../src/mail/e-mail-autoconfig.c:766
 #: ../src/mail/e-mail-config-summary-page.c:147
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../src/mail/e-mail-autoconfig.c:745
+#: ../src/mail/e-mail-autoconfig.c:770
 #, c-format
 msgid "Authentication mechanism: %s"
 msgstr "Authentication mechanism: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:904
+#: ../src/mail/e-mail-autoconfig.c:950
 msgid "No email address provided"
 msgstr "No e-mail address provided"
 
-#: ../src/mail/e-mail-autoconfig.c:913
+#: ../src/mail/e-mail-autoconfig.c:959
 msgid "Missing domain in email address"
 msgstr "Missing domain in e-mail address"
 
-#: ../src/mail/e-mail-autoconfig.c:1252
+#: ../src/mail/e-mail-autoconfig.c:1309
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:82
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:83
 msgid "IMAP server"
 msgstr "IMAP server"
 
-#: ../src/mail/e-mail-autoconfig.c:1259
+#: ../src/mail/e-mail-autoconfig.c:1316
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:84
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:85
 msgid "POP3 server"
 msgstr "POP3 server"
 
-#: ../src/mail/e-mail-autoconfig.c:1266
+#: ../src/mail/e-mail-autoconfig.c:1323
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:86
 msgid "SMTP server"
 msgstr "SMTP server"
 
-#: ../src/mail/e-mail-browser.c:133 ../src/shell/e-shell-window-actions.c:796
-#: ../src/shell/e-shell-window-actions.c:803
-#: ../src/shell/e-shell-window-actions.c:810
+#: ../src/mail/e-mail-browser.c:146 ../src/shell/e-shell-window-actions.c:819
+#: ../src/shell/e-shell-window-actions.c:826
+#: ../src/shell/e-shell-window-actions.c:833
 msgid "Close this window"
 msgstr "Close this window"
 
-#: ../src/mail/e-mail-browser.c:291
+#: ../src/mail/e-mail-browser.c:314
 msgid "(No Subject)"
 msgstr "(No Subject)"
 
@@ -16205,79 +16356,96 @@ msgstr "Querying authentication types..."
 msgid "Check for Supported Types"
 msgstr "Check for Supported Types"
 
-#: ../src/mail/e-mail-config-composing-page.c:116
+#: ../src/mail/e-mail-config-composing-page.c:117
 msgctxt "ReplyForward"
 msgid "Use global setting"
 msgstr "Use global setting"
 
-#: ../src/mail/e-mail-config-composing-page.c:118
-#: ../src/mail/mail-config.ui.h:27
+#: ../src/mail/e-mail-config-composing-page.c:119
+#: ../src/mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Attachment"
 
-#: ../src/mail/e-mail-config-composing-page.c:120
-#: ../src/mail/mail-config.ui.h:28
+#: ../src/mail/e-mail-config-composing-page.c:121
+#: ../src/mail/mail-config.ui.h:30
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Inline (Outlook style)"
 
-#: ../src/mail/e-mail-config-composing-page.c:122
-#: ../src/mail/mail-config.ui.h:29
+#: ../src/mail/e-mail-config-composing-page.c:123
+#: ../src/mail/mail-config.ui.h:31
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Quoted"
 
-#: ../src/mail/e-mail-config-composing-page.c:124
-#: ../src/mail/mail-config.ui.h:30
+#: ../src/mail/e-mail-config-composing-page.c:125
+#: ../src/mail/mail-config.ui.h:32
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Do Not Quote"
 
-#: ../src/mail/e-mail-config-composing-page.c:397
-#: ../src/mail/e-mail-config-composing-page.c:606
+#: ../src/mail/e-mail-config-composing-page.c:157
+#| msgctxt "ReplyForward"
+#| msgid "Use global setting"
+msgid "Use global setting"
+msgstr "Use global setting"
+
+#: ../src/mail/e-mail-config-composing-page.c:408
+#: ../src/mail/e-mail-config-composing-page.c:642
 msgid "Composing Messages"
 msgstr "Composing Messages"
 
-#: ../src/mail/e-mail-config-composing-page.c:406
+#: ../src/mail/e-mail-config-composing-page.c:417
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Alway_s carbon-copy (cc) to:"
 
-#: ../src/mail/e-mail-config-composing-page.c:431
+#: ../src/mail/e-mail-config-composing-page.c:442
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Always _blind carbon-copy (bcc) to:"
 
-#: ../src/mail/e-mail-config-composing-page.c:462
+#: ../src/mail/e-mail-config-composing-page.c:467
 msgid "Re_ply style:"
 msgstr "Re_ply style:"
 
-#: ../src/mail/e-mail-config-composing-page.c:488
-#: ../src/mail/em-composer-utils.c:4058 ../src/mail/mail-config.ui.h:20
+#: ../src/mail/e-mail-config-composing-page.c:495
+#| msgid "Language"
+msgid "Lang_uage:"
+msgstr "Lang_uage:"
+
+#: ../src/mail/e-mail-config-composing-page.c:498
+#: ../src/mail/e-mail-config-composing-page.c:508
+#: ../src/mail/mail-config.ui.h:21
+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:4273 ../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:495
-#: ../src/mail/mail-config.ui.h:21
+#: ../src/mail/e-mail-config-composing-page.c:531
+#: ../src/mail/mail-config.ui.h:23
 msgid "_Keep signature above the original message"
 msgstr "_Keep signature above the original message"
 
-#: ../src/mail/e-mail-config-composing-page.c:512
+#: ../src/mail/e-mail-config-composing-page.c:548
 msgid "Message Receipts"
 msgstr "Message Receipts"
 
-#: ../src/mail/e-mail-config-composing-page.c:521
+#: ../src/mail/e-mail-config-composing-page.c:557
 msgid "S_end message receipts:"
 msgstr "S_end message receipts:"
 
-#: ../src/mail/e-mail-config-composing-page.c:546
+#: ../src/mail/e-mail-config-composing-page.c:582
 msgid "Never"
 msgstr "Never"
 
-#: ../src/mail/e-mail-config-composing-page.c:552
+#: ../src/mail/e-mail-config-composing-page.c:588
 msgid "Always"
 msgstr "Always"
 
-#: ../src/mail/e-mail-config-composing-page.c:558
+#: ../src/mail/e-mail-config-composing-page.c:594
 msgid "Ask for each message"
 msgstr "Ask for each message"
 
@@ -16368,7 +16536,7 @@ msgstr "Use a Real Folder for _Junk:"
 msgid "Choose a folder for junk messages."
 msgstr "Choose a folder for junk messages."
 
-#: ../src/mail/e-mail-config-defaults-page.c:981
+#: ../src/mail/e-mail-config-defaults-page.c:995
 msgid "Defaults"
 msgstr "Defaults"
 
@@ -16484,11 +16652,11 @@ msgid "%s — %s"
 msgstr "%s — %s"
 
 #: ../src/mail/e-mail-config-security-page.c:460
-#: ../src/mail/em-folder-properties.c:1062 ../src/mail/mail-config.ui.h:32
+#: ../src/mail/em-folder-properties.c:1083 ../src/mail/mail-config.ui.h:34
 #: ../src/modules/addressbook/autocompletion-config.c:115
 #: ../src/modules/calendar/e-calendar-preferences.c:643
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:754
+#: ../src/modules/mail/e-mail-shell-backend.c:771
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "General"
@@ -16511,25 +16679,25 @@ msgstr "Si_gning algorithm:"
 
 #: ../src/mail/e-mail-config-security-page.c:547
 #: ../src/mail/e-mail-config-security-page.c:711
-#: ../src/mail/mail-config.ui.h:77
+#: ../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/mail-config.ui.h:78
+#: ../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/mail-config.ui.h:79
+#: ../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/mail-config.ui.h:80
+#: ../src/mail/mail-config.ui.h:82
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -16568,7 +16736,7 @@ msgstr "Select"
 
 #: ../src/mail/e-mail-config-security-page.c:686
 #: ../src/mail/e-mail-config-security-page.c:784
-#: ../src/shell/e-shell-window-actions.c:892
+#: ../src/shell/e-shell-window-actions.c:915
 msgid "_Clear"
 msgstr "_Clear"
 
@@ -16663,7 +16831,7 @@ msgstr ""
 "Click “Next” to begin."
 
 #: ../src/mail/e-mail-config-welcome-page.c:171
-#: ../src/modules/startup-wizard/e-startup-assistant.c:154
+#: ../src/modules/startup-wizard/e-startup-assistant.c:182
 msgid "Welcome"
 msgstr "Welcome"
 
@@ -16695,31 +16863,31 @@ msgstr "Send a reply message to this address"
 msgid "Create Search _Folder"
 msgstr "Create Search _Folder"
 
-#: ../src/mail/e-mail-display.c:800
+#: ../src/mail/e-mail-display.c:812
 msgid "Hid_e All"
 msgstr "Hid_e All"
 
-#: ../src/mail/e-mail-display.c:807
+#: ../src/mail/e-mail-display.c:819
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: ../src/mail/e-mail-display.c:814
+#: ../src/mail/e-mail-display.c:826
 msgid "Vie_w All Inline"
 msgstr "Vie_w All Inline"
 
-#: ../src/mail/e-mail-display.c:821
+#: ../src/mail/e-mail-display.c:833
 msgid "_Zoom to 100%"
 msgstr "_Zoom to 100%"
 
-#: ../src/mail/e-mail-display.c:823
+#: ../src/mail/e-mail-display.c:835
 msgid "Zoom the image to its natural size"
 msgstr "Zoom the image to its natural size"
 
-#: ../src/mail/e-mail-display.c:828
+#: ../src/mail/e-mail-display.c:840
 msgid "_Zoom to window"
 msgstr "_Zoom to window"
 
-#: ../src/mail/e-mail-display.c:830
+#: ../src/mail/e-mail-display.c:842
 msgid "Zoom large images to not be wider than the window width"
 msgstr "Zoom large images to not be wider than the window width"
 
@@ -16814,12 +16982,12 @@ msgid "_Later"
 msgstr "_Later"
 
 #: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:906
-#: ../src/mail/em-folder-properties.c:834
+#: ../src/mail/em-folder-properties.c:855
 msgid "Add Label"
 msgstr "Add Label"
 
 #: ../src/mail/e-mail-label-manager.c:220
-#: ../src/mail/em-folder-properties.c:861
+#: ../src/mail/em-folder-properties.c:882
 msgid "Edit Label"
 msgstr "Edit Label"
 
@@ -16847,11 +17015,11 @@ msgstr "Cannot find message in its folder summary"
 msgid "Storing changes..."
 msgstr "Storing changes..."
 
-#: ../src/mail/e-mail-notes.c:989
+#: ../src/mail/e-mail-notes.c:1001
 msgid "Edit Message Note"
 msgstr "Edit Message Note"
 
-#: ../src/mail/e-mail-notes.c:1143
+#: ../src/mail/e-mail-notes.c:1159
 msgid "Retrieving message..."
 msgstr "Retrieving message..."
 
@@ -16883,7 +17051,7 @@ msgstr "Header Name"
 msgid "Header Value"
 msgstr "Header Value"
 
-#: ../src/mail/e-mail-printer.c:103 ../src/mail/mail-config.ui.h:130
+#: ../src/mail/e-mail-printer.c:103 ../src/mail/mail-config.ui.h:132
 msgid "Headers"
 msgstr "Headers"
 
@@ -16901,7 +17069,7 @@ msgid "Copy to Folder"
 msgstr "Copy to Folder"
 
 #: ../src/mail/e-mail-reader.c:362 ../src/mail/em-folder-utils.c:568
-#: ../src/mail/mail.error.xml.h:152
+#: ../src/mail/mail.error.xml.h:153
 msgid "_Move"
 msgstr "_Move"
 
@@ -16926,647 +17094,643 @@ msgstr "_Always ignore Reply-To: for mailing lists."
 msgid "Failed to retrieve message:"
 msgstr "Failed to retrieve message:"
 
-#: ../src/mail/e-mail-reader.c:2164 ../src/mail/e-mail-reader.c:3624
+#: ../src/mail/e-mail-reader.c:2164 ../src/mail/e-mail-reader.c:3641
 #, c-format
 msgid "Retrieving message “%s”"
 msgstr "Retrieving message “%s”"
 
-#: ../src/mail/e-mail-reader.c:2352
+#: ../src/mail/e-mail-reader.c:2365
 msgid "A_dd Sender to Address Book"
 msgstr "A_dd Sender to Address Book"
 
-#: ../src/mail/e-mail-reader.c:2354
+#: ../src/mail/e-mail-reader.c:2367
 msgid "Add sender to address book"
 msgstr "Add sender to address book"
 
-#: ../src/mail/e-mail-reader.c:2359
+#: ../src/mail/e-mail-reader.c:2372
 msgid "_Archive..."
 msgstr "_Archive..."
 
-#: ../src/mail/e-mail-reader.c:2361
+#: ../src/mail/e-mail-reader.c:2374
 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:2366
+#: ../src/mail/e-mail-reader.c:2379
 msgid "Check for _Junk"
 msgstr "Check for _Junk"
 
-#: ../src/mail/e-mail-reader.c:2368
+#: ../src/mail/e-mail-reader.c:2381
 msgid "Filter the selected messages for junk status"
 msgstr "Filter the selected messages for junk status"
 
-#: ../src/mail/e-mail-reader.c:2373
-#| msgid "Assign Color"
+#: ../src/mail/e-mail-reader.c:2386
 msgid "Assign C_olor…"
 msgstr "Assign C_olour…"
 
-#: ../src/mail/e-mail-reader.c:2375
-#| msgid "Add a note for the selected message"
+#: ../src/mail/e-mail-reader.c:2388
 msgid "Assign color for the selected messages"
 msgstr "Assign colour for the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2380
-#| msgid "Unset Color"
+#: ../src/mail/e-mail-reader.c:2393
 msgid "Unse_t Color"
 msgstr "Unse_t Colour"
 
-#: ../src/mail/e-mail-reader.c:2382
-#| msgid "Undelete the selected messages"
+#: ../src/mail/e-mail-reader.c:2395
 msgid "Unset color for the selected messages"
 msgstr "Unset colour for the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2387
+#: ../src/mail/e-mail-reader.c:2400
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder…"
 
-#: ../src/mail/e-mail-reader.c:2389
+#: ../src/mail/e-mail-reader.c:2402
 msgid "Copy selected messages to another folder"
 msgstr "Copy selected messages to another folder"
 
-#: ../src/mail/e-mail-reader.c:2394
+#: ../src/mail/e-mail-reader.c:2407
 msgid "_Delete Message"
 msgstr "_Delete Message"
 
-#: ../src/mail/e-mail-reader.c:2396
+#: ../src/mail/e-mail-reader.c:2409
 msgid "Mark the selected messages for deletion"
 msgstr "Mark the selected messages for deletion"
 
-#: ../src/mail/e-mail-reader.c:2401
+#: ../src/mail/e-mail-reader.c:2414
 msgid "_Add note..."
 msgstr "_Add note..."
 
-#: ../src/mail/e-mail-reader.c:2403
+#: ../src/mail/e-mail-reader.c:2416
 msgid "Add a note for the selected message"
 msgstr "Add a note for the selected message"
 
-#: ../src/mail/e-mail-reader.c:2408
+#: ../src/mail/e-mail-reader.c:2421
 msgid "Delete no_te"
 msgstr "Delete no_te"
 
-#: ../src/mail/e-mail-reader.c:2410
+#: ../src/mail/e-mail-reader.c:2423
 msgid "Delete the note for the selected message"
 msgstr "Delete the note for the selected message"
 
-#: ../src/mail/e-mail-reader.c:2415
+#: ../src/mail/e-mail-reader.c:2428
 msgid "_Edit note..."
 msgstr "_Edit note..."
 
-#: ../src/mail/e-mail-reader.c:2417
+#: ../src/mail/e-mail-reader.c:2430
 msgid "Edit a note for the selected message"
 msgstr "Edit a note for the selected message"
 
-#: ../src/mail/e-mail-reader.c:2422
+#: ../src/mail/e-mail-reader.c:2435
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Create a Filter Rule for Mailing _List…"
 
-#: ../src/mail/e-mail-reader.c:2424
+#: ../src/mail/e-mail-reader.c:2437
 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:2429
+#: ../src/mail/e-mail-reader.c:2442
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Create a Filter Rule for _Recipients…"
 
-#: ../src/mail/e-mail-reader.c:2431
+#: ../src/mail/e-mail-reader.c:2444
 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:2436
+#: ../src/mail/e-mail-reader.c:2449
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Create a Filter Rule for Se_nder…"
 
-#: ../src/mail/e-mail-reader.c:2438
+#: ../src/mail/e-mail-reader.c:2451
 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:2443
+#: ../src/mail/e-mail-reader.c:2456
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Create a Filter Rule for _Subject…"
 
-#: ../src/mail/e-mail-reader.c:2445
+#: ../src/mail/e-mail-reader.c:2458
 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:2450
+#: ../src/mail/e-mail-reader.c:2463
 msgid "A_pply Filters"
 msgstr "A_pply Filters"
 
-#: ../src/mail/e-mail-reader.c:2452
+#: ../src/mail/e-mail-reader.c:2465
 msgid "Apply filter rules to the selected messages"
 msgstr "Apply filter rules to the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2457
+#: ../src/mail/e-mail-reader.c:2470
 msgid "_Find in Message..."
 msgstr "_Find in Message…"
 
-#: ../src/mail/e-mail-reader.c:2459
+#: ../src/mail/e-mail-reader.c:2472
 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:2464
+#: ../src/mail/e-mail-reader.c:2477
 msgid "_Clear Flag"
 msgstr "_Clear Flag"
 
-#: ../src/mail/e-mail-reader.c:2466
+#: ../src/mail/e-mail-reader.c:2479
 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:2471
+#: ../src/mail/e-mail-reader.c:2484
 msgid "_Flag Completed"
 msgstr "_Flag Completed"
 
-#: ../src/mail/e-mail-reader.c:2473
+#: ../src/mail/e-mail-reader.c:2486
 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:2478
+#: ../src/mail/e-mail-reader.c:2491
 msgid "Follow _Up..."
 msgstr "Follow _Up…"
 
-#: ../src/mail/e-mail-reader.c:2480
+#: ../src/mail/e-mail-reader.c:2493
 msgid "Flag the selected messages for follow-up"
 msgstr "Flag the selected messages for follow-up"
 
-#: ../src/mail/e-mail-reader.c:2485
+#: ../src/mail/e-mail-reader.c:2498
 #: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "_Attached"
 
-#: ../src/mail/e-mail-reader.c:2487 ../src/mail/e-mail-reader.c:2494
+#: ../src/mail/e-mail-reader.c:2500 ../src/mail/e-mail-reader.c:2507
 #: ../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:2492
+#: ../src/mail/e-mail-reader.c:2505
 msgid "Forward As _Attached"
 msgstr "Forward As _Attached"
 
-#: ../src/mail/e-mail-reader.c:2499
+#: ../src/mail/e-mail-reader.c:2512
 #: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ../src/mail/e-mail-reader.c:2501 ../src/mail/e-mail-reader.c:2508
+#: ../src/mail/e-mail-reader.c:2514 ../src/mail/e-mail-reader.c:2521
 #: ../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:2506
+#: ../src/mail/e-mail-reader.c:2519
 msgid "Forward As _Inline"
 msgstr "Forward As _Inline"
 
-#: ../src/mail/e-mail-reader.c:2513
+#: ../src/mail/e-mail-reader.c:2526
 #: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ../src/mail/e-mail-reader.c:2515 ../src/mail/e-mail-reader.c:2522
+#: ../src/mail/e-mail-reader.c:2528 ../src/mail/e-mail-reader.c:2535
 #: ../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:2520
+#: ../src/mail/e-mail-reader.c:2533
 msgid "Forward As _Quoted"
 msgstr "Forward As _Quoted"
 
-#: ../src/mail/e-mail-reader.c:2527
+#: ../src/mail/e-mail-reader.c:2540
 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:2536
+#: ../src/mail/e-mail-reader.c:2549
 msgid "N_one"
 msgstr "N_one"
 
-#: ../src/mail/e-mail-reader.c:2543
+#: ../src/mail/e-mail-reader.c:2556
 msgid "_Load Images"
 msgstr "_Load Images"
 
-#: ../src/mail/e-mail-reader.c:2545
+#: ../src/mail/e-mail-reader.c:2558
 msgid "Force images in HTML mail to be loaded"
 msgstr "Force images in HTML mail to be loaded"
 
-#: ../src/mail/e-mail-reader.c:2550 ../src/mail/e-mail-reader.c:2962
+#: ../src/mail/e-mail-reader.c:2563 ../src/mail/e-mail-reader.c:2982
 msgid "_Ignore Subthread"
 msgstr "_Ignore Subthread"
 
-#: ../src/mail/e-mail-reader.c:2552
+#: ../src/mail/e-mail-reader.c:2565
 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:2557 ../src/mail/e-mail-reader.c:2966
+#: ../src/mail/e-mail-reader.c:2570 ../src/mail/e-mail-reader.c:2986
 msgid "_Ignore Thread"
 msgstr "_Ignore Thread"
 
-#: ../src/mail/e-mail-reader.c:2559
+#: ../src/mail/e-mail-reader.c:2572
 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:2564
+#: ../src/mail/e-mail-reader.c:2577
 msgid "_Important"
 msgstr "_Important"
 
-#: ../src/mail/e-mail-reader.c:2566
+#: ../src/mail/e-mail-reader.c:2579
 msgid "Mark the selected messages as important"
 msgstr "Mark the selected messages as important"
 
-#: ../src/mail/e-mail-reader.c:2571
+#: ../src/mail/e-mail-reader.c:2584
 msgid "_Junk"
 msgstr "_Junk"
 
-#: ../src/mail/e-mail-reader.c:2573
+#: ../src/mail/e-mail-reader.c:2586
 msgid "Mark the selected messages as junk"
 msgstr "Mark the selected messages as junk"
 
-#: ../src/mail/e-mail-reader.c:2578
+#: ../src/mail/e-mail-reader.c:2591
 msgid "_Not Junk"
 msgstr "_Not Junk"
 
-#: ../src/mail/e-mail-reader.c:2580
+#: ../src/mail/e-mail-reader.c:2593
 msgid "Mark the selected messages as not being junk"
 msgstr "Mark the selected messages as not being junk"
 
-#: ../src/mail/e-mail-reader.c:2585
+#: ../src/mail/e-mail-reader.c:2598
 msgid "_Read"
 msgstr "_Read"
 
-#: ../src/mail/e-mail-reader.c:2587
+#: ../src/mail/e-mail-reader.c:2600
 msgid "Mark the selected messages as having been read"
 msgstr "Mark the selected messages as having been read"
 
-#: ../src/mail/e-mail-reader.c:2592 ../src/mail/e-mail-reader.c:2986
+#: ../src/mail/e-mail-reader.c:2605 ../src/mail/e-mail-reader.c:3006
 msgid "Do not _Ignore Subthread"
 msgstr "Do not _Ignore Subthread"
 
-#: ../src/mail/e-mail-reader.c:2594
+#: ../src/mail/e-mail-reader.c:2607
 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:2599 ../src/mail/e-mail-reader.c:2990
+#: ../src/mail/e-mail-reader.c:2612 ../src/mail/e-mail-reader.c:3010
 msgid "Do not _Ignore Thread"
 msgstr "Do not _Ignore Thread"
 
-#: ../src/mail/e-mail-reader.c:2601
+#: ../src/mail/e-mail-reader.c:2614
 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:2606
+#: ../src/mail/e-mail-reader.c:2619
 msgid "Uni_mportant"
 msgstr "Uni_mportant"
 
-#: ../src/mail/e-mail-reader.c:2608
+#: ../src/mail/e-mail-reader.c:2621
 msgid "Mark the selected messages as unimportant"
 msgstr "Mark the selected messages as unimportant"
 
-#: ../src/mail/e-mail-reader.c:2613
+#: ../src/mail/e-mail-reader.c:2626
 msgid "_Unread"
 msgstr "_Unread"
 
-#: ../src/mail/e-mail-reader.c:2615
+#: ../src/mail/e-mail-reader.c:2628
 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:2620
+#: ../src/mail/e-mail-reader.c:2633
 #: ../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:2622
+#: ../src/mail/e-mail-reader.c:2635
 #: ../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:2627
+#: ../src/mail/e-mail-reader.c:2640
 msgid "Compose _New Message"
 msgstr "Compose _New Message"
 
-#: ../src/mail/e-mail-reader.c:2629
+#: ../src/mail/e-mail-reader.c:2642
 msgid "Open a window for composing a mail message"
 msgstr "Open a window for composing a mail message"
 
-#: ../src/mail/e-mail-reader.c:2634
+#: ../src/mail/e-mail-reader.c:2647
 msgid "_Open in New Window"
 msgstr "_Open in New Window"
 
-#: ../src/mail/e-mail-reader.c:2636
+#: ../src/mail/e-mail-reader.c:2649
 msgid "Open the selected messages in a new window"
 msgstr "Open the selected messages in a new window"
 
-#: ../src/mail/e-mail-reader.c:2641
+#: ../src/mail/e-mail-reader.c:2654
 msgid "_Move to Folder..."
 msgstr "_Move to Folder…"
 
-#: ../src/mail/e-mail-reader.c:2643
+#: ../src/mail/e-mail-reader.c:2656
 msgid "Move selected messages to another folder"
 msgstr "Move selected messages to another folder"
 
-#: ../src/mail/e-mail-reader.c:2648
+#: ../src/mail/e-mail-reader.c:2661
 msgid "_Next Message"
 msgstr "_Next Message"
 
-#: ../src/mail/e-mail-reader.c:2650
+#: ../src/mail/e-mail-reader.c:2663
 msgid "Display the next message"
 msgstr "Display the next message"
 
-#: ../src/mail/e-mail-reader.c:2655
+#: ../src/mail/e-mail-reader.c:2668
 msgid "Next _Important Message"
 msgstr "Next _Important Message"
 
-#: ../src/mail/e-mail-reader.c:2657
+#: ../src/mail/e-mail-reader.c:2670
 msgid "Display the next important message"
 msgstr "Display the next important message"
 
-#: ../src/mail/e-mail-reader.c:2662
+#: ../src/mail/e-mail-reader.c:2675
 msgid "Next _Thread"
 msgstr "Next _Thread"
 
-#: ../src/mail/e-mail-reader.c:2664
+#: ../src/mail/e-mail-reader.c:2677
 msgid "Display the next thread"
 msgstr "Display the next thread"
 
-#: ../src/mail/e-mail-reader.c:2669
+#: ../src/mail/e-mail-reader.c:2682
 msgid "Next _Unread Message"
 msgstr "Next _Unread Message"
 
-#: ../src/mail/e-mail-reader.c:2671
+#: ../src/mail/e-mail-reader.c:2684
 msgid "Display the next unread message"
 msgstr "Display the next unread message"
 
-#: ../src/mail/e-mail-reader.c:2676
+#: ../src/mail/e-mail-reader.c:2689
 msgid "_Previous Message"
 msgstr "_Previous Message"
 
-#: ../src/mail/e-mail-reader.c:2678
+#: ../src/mail/e-mail-reader.c:2691
 msgid "Display the previous message"
 msgstr "Display the previous message"
 
-#: ../src/mail/e-mail-reader.c:2683
+#: ../src/mail/e-mail-reader.c:2696
 msgid "Pr_evious Important Message"
 msgstr "Pr_evious Important Message"
 
-#: ../src/mail/e-mail-reader.c:2685
+#: ../src/mail/e-mail-reader.c:2698
 msgid "Display the previous important message"
 msgstr "Display the previous important message"
 
-#: ../src/mail/e-mail-reader.c:2690
+#: ../src/mail/e-mail-reader.c:2703
 msgid "Previous T_hread"
 msgstr "Previous T_hread"
 
-#: ../src/mail/e-mail-reader.c:2692
+#: ../src/mail/e-mail-reader.c:2705
 msgid "Display the previous thread"
 msgstr "Display the previous thread"
 
-#: ../src/mail/e-mail-reader.c:2697
+#: ../src/mail/e-mail-reader.c:2710
 msgid "P_revious Unread Message"
 msgstr "P_revious Unread Message"
 
-#: ../src/mail/e-mail-reader.c:2699
+#: ../src/mail/e-mail-reader.c:2712
 msgid "Display the previous unread message"
 msgstr "Display the previous unread message"
 
-#: ../src/mail/e-mail-reader.c:2706
+#: ../src/mail/e-mail-reader.c:2719
 msgid "Print this message"
 msgstr "Print this message"
 
-#: ../src/mail/e-mail-reader.c:2713
+#: ../src/mail/e-mail-reader.c:2726
 msgid "Preview the message to be printed"
 msgstr "Preview the message to be printed"
 
-#: ../src/mail/e-mail-reader.c:2718
+#: ../src/mail/e-mail-reader.c:2731
 #: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "Re_direct"
 
-#: ../src/mail/e-mail-reader.c:2720
+#: ../src/mail/e-mail-reader.c:2733
 #: ../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:2725
+#: ../src/mail/e-mail-reader.c:2738
 msgid "Remo_ve Attachments"
 msgstr "Remo_ve Attachments"
 
-#: ../src/mail/e-mail-reader.c:2727
+#: ../src/mail/e-mail-reader.c:2740
 msgid "Remove attachments"
 msgstr "Remove attachments"
 
-#: ../src/mail/e-mail-reader.c:2732
+#: ../src/mail/e-mail-reader.c:2745
 msgid "Remove Du_plicate Messages"
 msgstr "Remove Du_plicate Messages"
 
-#: ../src/mail/e-mail-reader.c:2734
+#: ../src/mail/e-mail-reader.c:2747
 msgid "Checks selected messages for duplicates"
 msgstr "Checks selected messages for duplicates"
 
-#: ../src/mail/e-mail-reader.c:2739 ../src/mail/em-composer-utils.c:4012
+#: ../src/mail/e-mail-reader.c:2752 ../src/mail/em-composer-utils.c:4227
 #: ../src/mail/mail.error.xml.h:28
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1500
 #: ../src/modules/mail/e-mail-attachment-handler.c:396
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: ../src/mail/e-mail-reader.c:2741
+#: ../src/mail/e-mail-reader.c:2754
 #: ../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:2746
+#: ../src/mail/e-mail-reader.c:2759
 msgid "Al_ternative Reply…"
 msgstr "Al_ternative Reply…"
 
-#: ../src/mail/e-mail-reader.c:2748
+#: ../src/mail/e-mail-reader.c:2761
 msgid "Choose reply options for the selected message"
 msgstr "Choose reply options for the selected message"
 
-#: ../src/mail/e-mail-reader.c:2753 ../src/mail/em-composer-utils.c:4007
+#: ../src/mail/e-mail-reader.c:2766 ../src/mail/em-composer-utils.c:4222
 #: ../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:2755
+#: ../src/mail/e-mail-reader.c:2768
 #: ../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:2760
+#: ../src/mail/e-mail-reader.c:2773
 #: ../src/modules/mail/e-mail-attachment-handler.c:410
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: ../src/mail/e-mail-reader.c:2762
+#: ../src/mail/e-mail-reader.c:2775
 #: ../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:2767
+#: ../src/mail/e-mail-reader.c:2780
 msgid "_Save as mbox..."
 msgstr "_Save as mbox…"
 
-#: ../src/mail/e-mail-reader.c:2769
+#: ../src/mail/e-mail-reader.c:2782
 msgid "Save selected messages as an mbox file"
 msgstr "Save selected messages as an mbox file"
 
-#: ../src/mail/e-mail-reader.c:2774
+#: ../src/mail/e-mail-reader.c:2794
 msgid "_Message Source"
 msgstr "_Message Source"
 
-#: ../src/mail/e-mail-reader.c:2776
+#: ../src/mail/e-mail-reader.c:2796
 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:2788
+#: ../src/mail/e-mail-reader.c:2808
 msgid "_Undelete Message"
 msgstr "_Undelete Message"
 
-#: ../src/mail/e-mail-reader.c:2790
+#: ../src/mail/e-mail-reader.c:2810
 msgid "Undelete the selected messages"
 msgstr "Undelete the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2795
+#: ../src/mail/e-mail-reader.c:2815
 msgid "_Normal Size"
 msgstr "_Normal Size"
 
-#: ../src/mail/e-mail-reader.c:2797
+#: ../src/mail/e-mail-reader.c:2817
 msgid "Reset the text to its original size"
 msgstr "Reset the text to its original size"
 
-#: ../src/mail/e-mail-reader.c:2802
+#: ../src/mail/e-mail-reader.c:2822
 msgid "_Zoom In"
 msgstr "_Zoom In"
 
-#: ../src/mail/e-mail-reader.c:2804
+#: ../src/mail/e-mail-reader.c:2824
 msgid "Increase the text size"
 msgstr "Increase the text size"
 
-#: ../src/mail/e-mail-reader.c:2811
+#: ../src/mail/e-mail-reader.c:2831
 msgid "Decrease the text size"
 msgstr "Decrease the text size"
 
-#: ../src/mail/e-mail-reader.c:2818
+#: ../src/mail/e-mail-reader.c:2838
 msgid "Cre_ate"
 msgstr "Cre_ate"
 
-#: ../src/mail/e-mail-reader.c:2825
+#: ../src/mail/e-mail-reader.c:2845
 msgid "Ch_aracter Encoding"
 msgstr "Ch_aracter Encoding"
 
-#: ../src/mail/e-mail-reader.c:2832
+#: ../src/mail/e-mail-reader.c:2852
 #: ../src/modules/mail/e-mail-attachment-handler.c:424
 msgid "F_orward As"
 msgstr "F_orward As"
 
-#: ../src/mail/e-mail-reader.c:2839
+#: ../src/mail/e-mail-reader.c:2859
 msgid "_Label"
 msgstr "_Label"
 
-#: ../src/mail/e-mail-reader.c:2846
+#: ../src/mail/e-mail-reader.c:2866
 msgid "_Group Reply"
 msgstr "_Group Reply"
 
-#: ../src/mail/e-mail-reader.c:2853
+#: ../src/mail/e-mail-reader.c:2873
 msgid "_Go To"
 msgstr "_Go To"
 
-#: ../src/mail/e-mail-reader.c:2860
+#: ../src/mail/e-mail-reader.c:2880
 msgid "Mar_k As"
 msgstr "Mar_k As"
 
-#: ../src/mail/e-mail-reader.c:2867
+#: ../src/mail/e-mail-reader.c:2887
 msgid "_Message"
 msgstr "_Message"
 
-#: ../src/mail/e-mail-reader.c:2874
+#: ../src/mail/e-mail-reader.c:2894
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../src/mail/e-mail-reader.c:2884
+#: ../src/mail/e-mail-reader.c:2904
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Create a Search Folder from Mailing _List…"
 
-#: ../src/mail/e-mail-reader.c:2886
+#: ../src/mail/e-mail-reader.c:2906
 msgid "Create a search folder for this mailing list"
 msgstr "Create a search folder for this mailing list"
 
-#: ../src/mail/e-mail-reader.c:2891
+#: ../src/mail/e-mail-reader.c:2911
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Create a Search Folder from Recipien_ts…"
 
-#: ../src/mail/e-mail-reader.c:2893
+#: ../src/mail/e-mail-reader.c:2913
 msgid "Create a search folder for these recipients"
 msgstr "Create a search folder for these recipients"
 
-#: ../src/mail/e-mail-reader.c:2898
+#: ../src/mail/e-mail-reader.c:2918
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Create a Search Folder from Sen_der…"
 
-#: ../src/mail/e-mail-reader.c:2900
+#: ../src/mail/e-mail-reader.c:2920
 msgid "Create a search folder for this sender"
 msgstr "Create a search folder for this sender"
 
-#: ../src/mail/e-mail-reader.c:2905
+#: ../src/mail/e-mail-reader.c:2925
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Create a Search Folder from S_ubject…"
 
-#: ../src/mail/e-mail-reader.c:2907
+#: ../src/mail/e-mail-reader.c:2927
 msgid "Create a search folder for this subject"
 msgstr "Create a search folder for this subject"
 
-#: ../src/mail/e-mail-reader.c:2954
+#: ../src/mail/e-mail-reader.c:2974
 msgid "Mark for Follo_w Up..."
 msgstr "Mark for Follo_w Up…"
 
-#: ../src/mail/e-mail-reader.c:2970
+#: ../src/mail/e-mail-reader.c:2990
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: ../src/mail/e-mail-reader.c:2974
+#: ../src/mail/e-mail-reader.c:2994
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: ../src/mail/e-mail-reader.c:2978
+#: ../src/mail/e-mail-reader.c:2998
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: ../src/mail/e-mail-reader.c:2982
+#: ../src/mail/e-mail-reader.c:3002
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: ../src/mail/e-mail-reader.c:2994
+#: ../src/mail/e-mail-reader.c:3014
 msgid "Mark as Uni_mportant"
 msgstr "Mark as Uni_mportant"
 
-#: ../src/mail/e-mail-reader.c:2998
+#: ../src/mail/e-mail-reader.c:3018
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: ../src/mail/e-mail-reader.c:3042
+#: ../src/mail/e-mail-reader.c:3066
 msgid "_Caret Mode"
 msgstr "_Caret Mode"
 
-#: ../src/mail/e-mail-reader.c:3044
+#: ../src/mail/e-mail-reader.c:3068
 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:3050
+#: ../src/mail/e-mail-reader.c:3074
 msgid "All Message _Headers"
 msgstr "All Message _Headers"
 
-#: ../src/mail/e-mail-reader.c:3052
+#: ../src/mail/e-mail-reader.c:3076
 msgid "Show messages with all email headers"
 msgstr "Show messages with all e-mail headers"
 
-#: ../src/mail/e-mail-reader.c:3630
+#: ../src/mail/e-mail-reader.c:3647
 msgid "Retrieving message"
 msgstr "Retrieving message"
 
-#: ../src/mail/e-mail-reader.c:4927
+#: ../src/mail/e-mail-reader.c:5008
 #: ../src/modules/mail/e-mail-attachment-handler.c:389
 msgid "_Forward"
 msgstr "_Forward"
 
-#: ../src/mail/e-mail-reader.c:4928
+#: ../src/mail/e-mail-reader.c:5009
 #: ../src/modules/mail/e-mail-attachment-handler.c:391
 msgid "Forward the selected message to someone"
 msgstr "Forward the selected message to someone"
@@ -17575,52 +17739,52 @@ 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:4947
+#: ../src/mail/e-mail-reader.c:5028
 msgid "Group Reply"
 msgstr "Group Reply"
 
-#: ../src/mail/e-mail-reader.c:4948
+#: ../src/mail/e-mail-reader.c:5029
 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:5014 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:5095 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Delete"
 
-#: ../src/mail/e-mail-reader.c:5026
+#: ../src/mail/e-mail-reader.c:5107
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
 msgid "Next"
 msgstr "Next"
 
-#: ../src/mail/e-mail-reader.c:5030
+#: ../src/mail/e-mail-reader.c:5111
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
 msgid "Previous"
 msgstr "Previous"
 
-#: ../src/mail/e-mail-reader.c:5039 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:5120 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Reply"
 
-#: ../src/mail/e-mail-reader.c:6194
+#: ../src/mail/e-mail-reader.c:6275
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr "Allow remote content for anyone from %s"
 
-#: ../src/mail/e-mail-reader.c:6196
+#: ../src/mail/e-mail-reader.c:6277
 #, c-format
 msgid "Allow remote content for %s"
 msgstr "Allow remote content for %s"
 
-#: ../src/mail/e-mail-reader.c:6213
+#: ../src/mail/e-mail-reader.c:6294
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "Allow remote content from %s"
 
-#: ../src/mail/e-mail-reader.c:6230
+#: ../src/mail/e-mail-reader.c:6311
 msgid "Do not show this message again"
 msgstr "Do not show this message again"
 
-#: ../src/mail/e-mail-reader.c:6282
+#: ../src/mail/e-mail-reader.c:6363
 msgid "Load remote content"
 msgstr "Load remote content"
 
@@ -17654,13 +17818,13 @@ msgstr "Marking subthread to be ignored"
 msgid "Unmarking subthread from being ignored"
 msgstr "Unmarking subthread from being ignored"
 
-#: ../src/mail/e-mail-reader-utils.c:1601
+#: ../src/mail/e-mail-reader-utils.c:1602
 msgid "Printing"
 msgstr "Printing"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../src/mail/e-mail-reader-utils.c:1838
+#: ../src/mail/e-mail-reader-utils.c:1839
 #, c-format
 msgid ""
 "Folder “%s” contains %u duplicate message. Are you sure you want to delete "
@@ -17675,7 +17839,7 @@ msgstr[1] ""
 "Folder “%s” contains %u duplicate messages. Are you sure you want to delete "
 "them?"
 
-#: ../src/mail/e-mail-reader-utils.c:2859
+#: ../src/mail/e-mail-reader-utils.c:2925
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Save Message"
@@ -17686,13 +17850,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:2880
+#: ../src/mail/e-mail-reader-utils.c:2946
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Message"
 msgstr[1] "Messages"
 
-#: ../src/mail/e-mail-reader-utils.c:3294
+#: ../src/mail/e-mail-reader-utils.c:3360
 msgid "Parsing message"
 msgstr "Parsing message"
 
@@ -17705,7 +17869,6 @@ msgid "Flag to Follow Up"
 msgstr "Flag to Follow Up"
 
 #: ../src/mail/e-mail-tag-editor.c:161
-#| msgid "Cl_ear Flag"
 msgid "Cl_ear"
 msgstr "Cl_ear"
 
@@ -17724,7 +17887,7 @@ msgid "No data source found for UID “%s”"
 msgstr "No data source found for UID “%s”"
 
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
-#: ../src/mail/em-composer-utils.c:394
+#: ../src/mail/em-composer-utils.c:395
 #, c-format
 msgid "Are you sure you want to send a message with %d To and CC recipients?"
 msgid_plural ""
@@ -17735,7 +17898,7 @@ msgstr[1] ""
 "Are you sure you want to send a message with %d To and CC recipients?"
 
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
-#: ../src/mail/em-composer-utils.c:400
+#: ../src/mail/em-composer-utils.c:401
 #, c-format
 msgid ""
 "You are trying to send a message to %d recipients in To and CC fields. This "
@@ -17764,7 +17927,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:828
+#: ../src/mail/em-composer-utils.c:829
 msgid "Waiting for attachments to load..."
 msgstr "Waiting for attachments to load..."
 
@@ -17772,7 +17935,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:2019
+#: ../src/mail/em-composer-utils.c:2176
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -17780,79 +17943,79 @@ msgstr ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
-#: ../src/mail/em-composer-utils.c:2025
+#: ../src/mail/em-composer-utils.c:2182
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: ../src/mail/em-composer-utils.c:2030
+#: ../src/mail/em-composer-utils.c:2187
 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:2714
+#: ../src/mail/em-composer-utils.c:2919
 #, c-format
 msgctxt "reply-attribution"
 msgid "Re: %s"
 msgstr "Re: %s"
 
-#: ../src/mail/em-composer-utils.c:3324
+#: ../src/mail/em-composer-utils.c:3529
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
-#: ../src/mail/em-composer-utils.c:3958
+#: ../src/mail/em-composer-utils.c:4173
 msgid "Alternative Reply"
 msgstr "Alternative Reply"
 
-#: ../src/mail/em-composer-utils.c:3961
+#: ../src/mail/em-composer-utils.c:4176
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1493
 msgid "_Reply"
 msgstr "_Reply"
 
-#: ../src/mail/em-composer-utils.c:3974
+#: ../src/mail/em-composer-utils.c:4189
 msgid "Recipients:"
 msgstr "Recipients:"
 
-#: ../src/mail/em-composer-utils.c:4002
+#: ../src/mail/em-composer-utils.c:4217
 msgid "Reply to _Sender"
 msgstr "Reply to _Sender"
 
-#: ../src/mail/em-composer-utils.c:4024
+#: ../src/mail/em-composer-utils.c:4239
 msgid "Reply style:"
 msgstr "Reply style:"
 
-#: ../src/mail/em-composer-utils.c:4032
+#: ../src/mail/em-composer-utils.c:4247
 msgid "_Default"
 msgstr "_Default"
 
-#: ../src/mail/em-composer-utils.c:4036
+#: ../src/mail/em-composer-utils.c:4251
 msgid "Attach_ment"
 msgstr "Attach_ment"
 
-#: ../src/mail/em-composer-utils.c:4040
+#: ../src/mail/em-composer-utils.c:4255
 msgid "Inline (_Outlook style)"
 msgstr "Inline (_Outlook style)"
 
-#: ../src/mail/em-composer-utils.c:4044
+#: ../src/mail/em-composer-utils.c:4259
 msgid "_Quote"
 msgstr "_Quote"
 
-#: ../src/mail/em-composer-utils.c:4048
+#: ../src/mail/em-composer-utils.c:4263
 msgid "Do _Not Quote"
 msgstr "Do _Not Quote"
 
-#: ../src/mail/em-composer-utils.c:4055
+#: ../src/mail/em-composer-utils.c:4270
 msgid "_Format message in HTML"
 msgstr "_Format message in HTML"
 
-#: ../src/mail/em-composer-utils.c:4065
+#: ../src/mail/em-composer-utils.c:4280
 msgid "Apply t_emplate"
 msgstr "Apply t_emplate"
 
-#: ../src/mail/em-composer-utils.c:4077
+#: ../src/mail/em-composer-utils.c:4292
 msgid "Preserve original message S_ubject"
 msgstr "Preserve original message S_ubject"
 
-#: ../src/mail/em-composer-utils.c:4143
+#: ../src/mail/em-composer-utils.c:4358
 #, c-format
 msgid "one recipient"
 msgid_plural "%d recipients"
@@ -17860,14 +18023,65 @@ msgstr[0] "one recipient"
 msgstr[1] "%d recipients"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:4564
+#: ../src/mail/em-composer-utils.c:4776
 msgid "Posting destination"
 msgstr "Posting destination"
 
-#: ../src/mail/em-composer-utils.c:4569
+#: ../src/mail/em-composer-utils.c:4781
 msgid "Choose folders to post the message to."
 msgstr "Choose folders to post the message to."
 
+#: ../src/mail/em-filter-editor.c:43
+#| msgid "Description List"
+msgid "Description of Filters"
+msgstr "Description of Filters"
+
+#. Translators: The first '%s' is replaced with the rule name;
+#. the second '%s' with 'enabled' or 'disabled' word;
+#. the third '%s' is replaced with the account name
+#: ../src/mail/em-filter-editor.c:167
+#, c-format
+#| msgid "List of accounts"
+msgid "%s (%s, for account %s)"
+msgstr "%s (%s, for account %s)"
+
+#: ../src/mail/em-filter-editor.c:167 ../src/mail/em-filter-editor.c:171
+#| msgid "Enabled"
+msgid "enabled"
+msgstr "enabled"
+
+#: ../src/mail/em-filter-editor.c:167 ../src/mail/em-filter-editor.c:171
+#| msgid "Disable"
+msgid "disabled"
+msgstr "disabled"
+
+#. Translators: The first '%s' is replaced with the rule name;
+#. the second '%s' with 'enabled' or 'disabled' word
+#: ../src/mail/em-filter-editor.c:171
+#, c-format
+msgid "%s (%s, for any account)"
+msgstr "%s (%s, for any account)"
+
+#: ../src/mail/em-filter-editor.c:183
+#| msgid "all the following conditions"
+msgid "If all the following conditions are met"
+msgstr "If all the following conditions are met"
+
+#: ../src/mail/em-filter-editor.c:186
+#| msgid "any of the following conditions"
+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:1068
+msgid "Then"
+msgstr "Then"
+
+#: ../src/mail/em-filter-editor.c:408
+#| msgid "Message Filters"
+msgid "De_scribe Filters…"
+msgstr "De_scribe Filters…"
+
 #: ../src/mail/em-filter-editor-folder-element.c:154
 msgid "Select Folder"
 msgstr "Select Folder"
@@ -17886,124 +18100,110 @@ msgstr "Rul_e type:"
 msgid "_For Account:"
 msgstr "_For Account:"
 
-#. and now for the action area
-#: ../src/mail/em-filter-rule.c:1068
-msgid "Then"
-msgstr "Then"
-
 #: ../src/mail/em-filter-rule.c:1141
 msgid "Add Ac_tion"
 msgstr "Add Ac_tion"
 
-#: ../src/mail/em-folder-properties.c:240
+#: ../src/mail/em-folder-properties.c:241
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Unread messages:"
 msgstr[1] "Unread messages:"
 
-#: ../src/mail/em-folder-properties.c:251
+#: ../src/mail/em-folder-properties.c:252
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total messages:"
 msgstr[1] "Total messages:"
 
-#: ../src/mail/em-folder-properties.c:272
+#: ../src/mail/em-folder-properties.c:273
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Quota usage (%s):"
 
-#: ../src/mail/em-folder-properties.c:274
+#: ../src/mail/em-folder-properties.c:275
 #, 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:398
+#: ../src/mail/em-folder-properties.c:419
 msgid "_Send Account Override:"
 msgstr "_Send Account Override:"
 
-#: ../src/mail/em-folder-properties.c:605
-#| msgid "_Archive this folder using these settings:"
+#: ../src/mail/em-folder-properties.c:626
 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:617
-#| msgctxt "autoarchive"
-#| msgid "_Cleanup messages older than"
+#: ../src/mail/em-folder-properties.c:638
 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:630
+#: ../src/mail/em-folder-properties.c:651
 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:632
+#: ../src/mail/em-folder-properties.c:653
 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:634
+#: ../src/mail/em-folder-properties.c:655
 msgctxt "autoarchive"
 msgid "months"
 msgstr "months"
 
-#: ../src/mail/em-folder-properties.c:640
-#| msgid "Move old messages to the default archive _folder"
+#: ../src/mail/em-folder-properties.c:661
 msgid "Move messages to the default archive _folder"
 msgstr "Move messages to the default archive _folder"
 
-#: ../src/mail/em-folder-properties.c:647
-#| msgid "_Move old messages to:"
+#: ../src/mail/em-folder-properties.c:668
 msgid "_Move messages to:"
 msgstr "_Move messages to:"
 
-#: ../src/mail/em-folder-properties.c:651
-#| msgid "AutoArchive folder"
+#: ../src/mail/em-folder-properties.c:672
 msgid "Archive folder"
 msgstr "Archive folder"
 
-#: ../src/mail/em-folder-properties.c:651
-#| msgid "Select folder to use for AutoArchive"
+#: ../src/mail/em-folder-properties.c:672
 msgid "Select folder to use for Archive"
 msgstr "Select folder to use for Archive"
 
-#: ../src/mail/em-folder-properties.c:655
-#| msgid "_Delete Message"
+#: ../src/mail/em-folder-properties.c:676
 msgid "_Delete messages"
 msgstr "_Delete messages"
 
-#: ../src/mail/em-folder-properties.c:1010
+#: ../src/mail/em-folder-properties.c:1031
 msgid "Server Tag"
 msgstr "Server Tag"
 
-#: ../src/mail/em-folder-properties.c:1014 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/em-folder-properties.c:1035 ../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"
 
 #. Translators: "Archive" is a noun (This is a tab heading in the mail folder properties)
-#: ../src/mail/em-folder-properties.c:1066
-#| msgid "_Archive..."
+#: ../src/mail/em-folder-properties.c:1087
 msgid "Archive"
 msgstr "Archive"
 
-#: ../src/mail/em-folder-properties.c:1069 ../src/mail/mail-config.ui.h:121
+#: ../src/mail/em-folder-properties.c:1090 ../src/mail/mail-config.ui.h:123
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Labels"
 
-#: ../src/mail/em-folder-properties.c:1148
+#: ../src/mail/em-folder-properties.c:1169
 msgid "Folder Properties"
 msgstr "Folder Properties"
 
-#: ../src/mail/em-folder-properties.c:1387
+#: ../src/mail/em-folder-properties.c:1408
 msgid "Gathering folder properties"
 msgstr "Gathering folder properties"
 
@@ -18057,12 +18257,12 @@ msgstr "Moving folder %s"
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: ../src/mail/em-folder-tree.c:2290 ../src/mail/message-list.c:2598
+#: ../src/mail/em-folder-tree.c:2290 ../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:2294 ../src/mail/message-list.c:2600
+#: ../src/mail/em-folder-tree.c:2294 ../src/mail/message-list.c:2634
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
@@ -18125,7 +18325,7 @@ msgstr "Subscribe To _All"
 
 #: ../src/mail/em-subscription-editor.c:936
 #: ../src/mail/em-subscription-editor.c:1888 ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1574
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1660
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
@@ -18138,9 +18338,9 @@ msgid "Unsubscribe From _All"
 msgstr "Unsubscribe From _All"
 
 #: ../src/mail/em-subscription-editor.c:1313
-#: ../src/modules/mail/e-mail-shell-view-private.c:904
-#: ../src/modules/mail/e-mail-shell-view-private.c:936
-#: ../src/modules/mail/e-mail-shell-view-private.c:980
+#: ../src/modules/mail/e-mail-shell-view-private.c:933
+#: ../src/modules/mail/e-mail-shell-view-private.c:965
+#: ../src/modules/mail/e-mail-shell-view-private.c:1009
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -18148,7 +18348,7 @@ msgstr[0] "%d unread, "
 msgstr[1] "%d unread, "
 
 #: ../src/mail/em-subscription-editor.c:1317
-#: ../src/modules/mail/e-mail-shell-view-private.c:990
+#: ../src/modules/mail/e-mail-shell-view-private.c:1019
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -18180,7 +18380,7 @@ msgid "Su_bscribe"
 msgstr "Su_bscribe"
 
 #: ../src/mail/em-subscription-editor.c:1887
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1576
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1662
 msgid "Unsubscribe from the selected folder"
 msgstr "Unsubscribe from the selected folder"
 
@@ -18436,7 +18636,7 @@ msgstr "Important"
 msgid "Read"
 msgstr "Read"
 
-#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:137
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:139
 #: ../src/mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "Junk"
@@ -18624,7 +18824,7 @@ msgid "From"
 msgstr "From"
 
 #: ../src/mail/importers/evolution-mbox-importer.c:569
-#: ../src/shell/e-shell-utils.c:176
+#: ../src/shell/e-shell-utils.c:166
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
@@ -18648,7 +18848,7 @@ msgid "Import mail and contacts from KMail."
 msgstr "Import mail and contacts from KMail."
 
 #: ../src/mail/importers/kmail-libs.c:150
-#: ../src/modules/mail/e-mail-shell-view-private.c:1011
+#: ../src/modules/mail/e-mail-shell-view-private.c:1040
 msgid "Trash"
 msgstr "Wastebasket"
 
@@ -18661,15 +18861,15 @@ msgid "Importing mail and contacts from KMail"
 msgstr "Importing mail and contacts from KMail"
 
 #. Destination folder, was set in our widget
-#: ../src/mail/importers/mail-importer.c:187
-#: ../src/mail/importers/mail-importer.c:312
+#: ../src/mail/importers/mail-importer.c:190
+#: ../src/mail/importers/mail-importer.c:315
 #: ../src/plugins/dbx-import/dbx-importer.c:612
 #: ../src/plugins/pst-import/pst-importer.c:756
 #, c-format
 msgid "Importing “%s”"
 msgstr "Importing “%s”"
 
-#: ../src/mail/importers/mail-importer.c:556
+#: ../src/mail/importers/mail-importer.c:559
 #, c-format
 msgid "Scanning %s"
 msgstr "Scanning %s"
@@ -18804,48 +19004,53 @@ msgstr "_Reply style:"
 msgid "_Forward style:"
 msgstr "_Forward style:"
 
-#: ../src/mail/mail-config.ui.h:22
+#: ../src/mail/mail-config.ui.h:20
+#| msgid "_Languages"
+msgid "_Language:"
+msgstr "_Language:"
+
+#: ../src/mail/mail-config.ui.h:24
 msgid "Include si_gnature in new messages only"
 msgstr "Include si_gnature in new messages only"
 
-#: ../src/mail/mail-config.ui.h:23
+#: ../src/mail/mail-config.ui.h:25
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "Ig_nore Reply-To: for mailing lists"
 
-#: ../src/mail/mail-config.ui.h:24
+#: ../src/mail/mail-config.ui.h:26
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "Gro_up Reply goes only to mailing list, if possible"
 
-#: ../src/mail/mail-config.ui.h:25
+#: ../src/mail/mail-config.ui.h:27
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr "Digitally _sign messages when original message signed (PGP or S/MIME)"
 
-#: ../src/mail/mail-config.ui.h:26
+#: ../src/mail/mail-config.ui.h:28
 msgid "_Wrap quoted text in replies"
 msgstr "_Wrap quoted text in replies"
 
-#: ../src/mail/mail-config.ui.h:31
+#: ../src/mail/mail-config.ui.h:33
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Inline"
 
-#: ../src/mail/mail-config.ui.h:33
+#: ../src/mail/mail-config.ui.h:35
 msgid "Sig_natures"
 msgstr "Sig_natures"
 
-#: ../src/mail/mail-config.ui.h:34
+#: ../src/mail/mail-config.ui.h:36
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../src/mail/mail-config.ui.h:35
+#: ../src/mail/mail-config.ui.h:37
 msgid "_Languages"
 msgstr "_Languages"
 
-#: ../src/mail/mail-config.ui.h:36
+#: ../src/mail/mail-config.ui.h:38
 msgid "Languages Table"
 msgstr "Languages Table"
 
-#: ../src/mail/mail-config.ui.h:37
+#: ../src/mail/mail-config.ui.h:39
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -18853,11 +19058,11 @@ msgstr ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 
-#: ../src/mail/mail-config.ui.h:39
+#: ../src/mail/mail-config.ui.h:41
 msgid "Check spelling while I _type"
 msgstr "Check spelling while I _type"
 
-#: ../src/mail/mail-config.ui.h:41
+#: ../src/mail/mail-config.ui.h:43
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -18866,74 +19071,74 @@ msgstr ""
 "before taking the following checkmarked actions:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:43
+#: ../src/mail/mail-config.ui.h:45
 msgid "Sending a message with an _empty subject line"
 msgstr "Sending a message with an _empty subject line"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:45
+#: ../src/mail/mail-config.ui.h:47
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Sending a message with only _Bcc recipients defined"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:47
+#: ../src/mail/mail-config.ui.h:49
 msgid "Sending a message to many _To and CC recipients"
 msgstr "Sending a message to many _To and CC recipients"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:49
+#: ../src/mail/mail-config.ui.h:51
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Sending a _private reply to a mailing list message"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:51
+#: ../src/mail/mail-config.ui.h:53
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Sending a reply to a large _number of recipients"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:53
+#: ../src/mail/mail-config.ui.h:55
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "Allowing a _mailing list to redirect a private reply to the list"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:55
+#: ../src/mail/mail-config.ui.h:57
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Sending a message with _recipients not entered as mail addresses"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:57
+#: ../src/mail/mail-config.ui.h:59
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Sending a message using _key accelerator (Ctrl+Enter)"
 
 #. Translators:
-#: ../src/mail/mail-config.ui.h:59
+#: ../src/mail/mail-config.ui.h:61
 msgid "Before composer _format changes from HTML to Plain Text"
 msgstr "Before composer _format changes from HTML to Plain Text"
 
-#: ../src/mail/mail-config.ui.h:60
+#: ../src/mail/mail-config.ui.h:62
 msgid "Confirmations"
 msgstr "Confirmations"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../src/mail/mail-config.ui.h:64
+#: ../src/mail/mail-config.ui.h:66
 msgid "Use for Folders"
 msgstr "Use for Folders"
 
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../src/mail/mail-config.ui.h:69
+#: ../src/mail/mail-config.ui.h:71
 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:71 ../src/modules/mail/em-composer-prefs.c:875
+#: ../src/mail/mail-config.ui.h:73 ../src/modules/mail/em-composer-prefs.c:876
 msgid "Account"
 msgstr "Account"
 
-#: ../src/mail/mail-config.ui.h:72
+#: ../src/mail/mail-config.ui.h:74
 msgid "Send account overrides"
 msgstr "Send account overrides"
 
-#: ../src/mail/mail-config.ui.h:73
+#: ../src/mail/mail-config.ui.h:75
 msgid ""
 "Assign which account should be used as a send account for respective folders "
 "or recipients, an override for usual send account detection. List of "
@@ -18945,237 +19150,237 @@ msgstr ""
 "recipients can contain partial addresses or names. The name and the address "
 "parts are compared separately."
 
-#: ../src/mail/mail-config.ui.h:74
+#: ../src/mail/mail-config.ui.h:76
 msgid "_Folder override has precedence over Recipient override"
 msgstr "_Folder override has precedence over Recipient override"
 
-#: ../src/mail/mail-config.ui.h:75
+#: ../src/mail/mail-config.ui.h:77
 msgid "Send Account"
 msgstr "Send Account"
 
-#: ../src/mail/mail-config.ui.h:81 ../src/smime/gui/smime-ui.ui.h:27
+#: ../src/mail/mail-config.ui.h:83 ../src/smime/gui/smime-ui.ui.h:27
 msgid "a"
 msgstr "a"
 
-#: ../src/mail/mail-config.ui.h:82 ../src/smime/gui/smime-ui.ui.h:28
+#: ../src/mail/mail-config.ui.h:84 ../src/smime/gui/smime-ui.ui.h:28
 msgid "b"
 msgstr "b"
 
-#: ../src/mail/mail-config.ui.h:83
+#: ../src/mail/mail-config.ui.h:85
 msgid "Start up"
 msgstr "Start up"
 
-#: ../src/mail/mail-config.ui.h:84
+#: ../src/mail/mail-config.ui.h:86
 msgid "Check for new _messages on start"
 msgstr "Check for new _messages on start"
 
-#: ../src/mail/mail-config.ui.h:85
+#: ../src/mail/mail-config.ui.h:87
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Check for new messa_ges in all active accounts"
 
-#: ../src/mail/mail-config.ui.h:86
+#: ../src/mail/mail-config.ui.h:88
 msgid "Message Display"
 msgstr "Message Display"
 
-#: ../src/mail/mail-config.ui.h:87
+#: ../src/mail/mail-config.ui.h:89
 msgid "_Use the same fonts as other applications"
 msgstr "_Use the same fonts as other applications"
 
-#: ../src/mail/mail-config.ui.h:88
+#: ../src/mail/mail-config.ui.h:90
 msgid "S_tandard Font:"
 msgstr "S_tandard Font:"
 
-#: ../src/mail/mail-config.ui.h:89
+#: ../src/mail/mail-config.ui.h:91
 msgid "Select HTML fixed width font"
 msgstr "Select HTML fixed width font"
 
-#: ../src/mail/mail-config.ui.h:90
+#: ../src/mail/mail-config.ui.h:92
 msgid "Select HTML variable width font"
 msgstr "Select HTML variable width font"
 
-#: ../src/mail/mail-config.ui.h:91
+#: ../src/mail/mail-config.ui.h:93
 msgid "Fix_ed Width Font:"
 msgstr "Fix_ed Width Font:"
 
-#: ../src/mail/mail-config.ui.h:92
+#: ../src/mail/mail-config.ui.h:94
 msgid "_Mark messages as read after"
 msgstr "_Mark messages as read after"
 
-#: ../src/mail/mail-config.ui.h:94
+#: ../src/mail/mail-config.ui.h:96
 msgid "Highlight _quotations with"
 msgstr "Highlight _quotations with"
 
-#: ../src/mail/mail-config.ui.h:95
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
+#: ../src/mail/mail-config.ui.h:97
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: ../src/mail/mail-config.ui.h:96
+#: ../src/mail/mail-config.ui.h:98
 msgid "color"
 msgstr "colour"
 
-#: ../src/mail/mail-config.ui.h:97
+#: ../src/mail/mail-config.ui.h:99
 msgid "Default character e_ncoding:"
 msgstr "Default character e_ncoding:"
 
-#: ../src/mail/mail-config.ui.h:98
+#: ../src/mail/mail-config.ui.h:100
 msgid "Apply the same _view settings to all folders"
 msgstr "Apply the same _view settings to all folders"
 
-#: ../src/mail/mail-config.ui.h:99
+#: ../src/mail/mail-config.ui.h:101
 msgid "F_all back to threading messages by subject"
 msgstr "F_all back to threading messages by subject"
 
-#: ../src/mail/mail-config.ui.h:100
+#: ../src/mail/mail-config.ui.h:102
 msgid "Delete Mail"
 msgstr "Delete Mail"
 
-#: ../src/mail/mail-config.ui.h:101
+#: ../src/mail/mail-config.ui.h:103
 msgid "Empty _trash folders"
 msgstr "Empty wastebaske_t folders"
 
-#: ../src/mail/mail-config.ui.h:102
+#: ../src/mail/mail-config.ui.h:104
 msgid "Confirm _when expunging a folder"
 msgstr "Confirm _when expunging a folder"
 
-#: ../src/mail/mail-config.ui.h:103
+#: ../src/mail/mail-config.ui.h:105
 msgid "Confirm when emptying a _Junk folder"
 msgstr "Confirm when emptying a _Junk folder"
 
-#: ../src/mail/mail-config.ui.h:104
+#: ../src/mail/mail-config.ui.h:106
 msgid "Go to the previ_ous message after message deletion"
 msgstr "Go to the previ_ous message after message deletion"
 
-#: ../src/mail/mail-config.ui.h:105
+#: ../src/mail/mail-config.ui.h:107
 msgid "Archive Mail"
 msgstr "Archive Mail"
 
-#: ../src/mail/mail-config.ui.h:106
+#: ../src/mail/mail-config.ui.h:108
 msgid "Archive folder to use for On This Computer messages"
 msgstr "Archive folder to use for On This Computer messages"
 
-#: ../src/mail/mail-config.ui.h:107
+#: ../src/mail/mail-config.ui.h:109
 msgid "On This Computer A_rchive folder:"
 msgstr "On This Computer A_rchive folder:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../src/mail/mail-config.ui.h:109
+#: ../src/mail/mail-config.ui.h:111
 msgid "_Show animated images"
 msgstr "_Show animated images"
 
-#: ../src/mail/mail-config.ui.h:110
+#: ../src/mail/mail-config.ui.h:112
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Prompt on sending HTML mail to contacts that do not want them"
 
-#: ../src/mail/mail-config.ui.h:111
+#: ../src/mail/mail-config.ui.h:113
 msgid "Loading Remote Content"
 msgstr "Loading Remote Content"
 
-#: ../src/mail/mail-config.ui.h:112
+#: ../src/mail/mail-config.ui.h:114
 msgid "_Never load remote content from the Internet"
 msgstr "_Never load remote content from the Internet"
 
-#: ../src/mail/mail-config.ui.h:113
+#: ../src/mail/mail-config.ui.h:115
 msgid "_Load remote content only in messages from contacts"
 msgstr "_Load remote content only in messages from contacts"
 
-#: ../src/mail/mail-config.ui.h:114
+#: ../src/mail/mail-config.ui.h:116
 msgid "_Always load remote content from the Internet"
 msgstr "_Always load remote content from the Internet"
 
-#: ../src/mail/mail-config.ui.h:115
+#: ../src/mail/mail-config.ui.h:117
 msgid "Notify about _missing remote content in the message preview"
 msgstr "Notify about _missing remote content in the message preview"
 
-#: ../src/mail/mail-config.ui.h:116
+#: ../src/mail/mail-config.ui.h:118
 msgid "Add"
 msgstr "Add"
 
-#: ../src/mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:119
 msgid "Remove"
 msgstr "Remove"
 
-#: ../src/mail/mail-config.ui.h:118
+#: ../src/mail/mail-config.ui.h:120
 msgid "Allow for sites:"
 msgstr "Allow for sites:"
 
-#: ../src/mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:121
 msgid "Allow for senders:"
 msgstr "Allow for senders:"
 
-#: ../src/mail/mail-config.ui.h:120
+#: ../src/mail/mail-config.ui.h:122
 msgid "HTML Messages"
 msgstr "HTML Messages"
 
-#: ../src/mail/mail-config.ui.h:122
+#: ../src/mail/mail-config.ui.h:124
 msgid "Sender Photograph"
 msgstr "Sender Photograph"
 
-#: ../src/mail/mail-config.ui.h:123
+#: ../src/mail/mail-config.ui.h:125
 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:124
+#: ../src/mail/mail-config.ui.h:126
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr "Search gra_vatar.com for the photograph of sender"
 
-#: ../src/mail/mail-config.ui.h:125
+#: ../src/mail/mail-config.ui.h:127
 msgid "Displayed Message Headers"
 msgstr "Displayed Message Headers"
 
-#: ../src/mail/mail-config.ui.h:126
+#: ../src/mail/mail-config.ui.h:128
 msgid "Show _full mail addresses in message preview"
 msgstr "Show _full mail addresses in message preview"
 
-#: ../src/mail/mail-config.ui.h:127
+#: ../src/mail/mail-config.ui.h:129
 msgid "Mail Headers Table"
 msgstr "Mail Headers Table"
 
-#: ../src/mail/mail-config.ui.h:128
+#: ../src/mail/mail-config.ui.h:130
 msgid "Re_set"
 msgstr "Re_set"
 
-#: ../src/mail/mail-config.ui.h:129
+#: ../src/mail/mail-config.ui.h:131
 #: ../src/modules/addressbook/autocompletion-config.c:118
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Date/Time Format"
 
-#: ../src/mail/mail-config.ui.h:131
+#: ../src/mail/mail-config.ui.h:133
 msgid "Check incoming _messages for junk"
 msgstr "Check incoming _messages for junk"
 
-#: ../src/mail/mail-config.ui.h:132
+#: ../src/mail/mail-config.ui.h:134
 msgid "_Delete junk messages"
 msgstr "_Delete junk messages"
 
-#: ../src/mail/mail-config.ui.h:133
+#: ../src/mail/mail-config.ui.h:135
 msgid "Junk Test Options"
 msgstr "Junk Test Options"
 
-#: ../src/mail/mail-config.ui.h:134
+#: ../src/mail/mail-config.ui.h:136
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Do not mar_k messages as junk if sender is in my address book"
 
-#: ../src/mail/mail-config.ui.h:135
+#: ../src/mail/mail-config.ui.h:137
 msgid "_Lookup in local address book only"
 msgstr "_Look up in local address book only"
 
-#: ../src/mail/mail-config.ui.h:136
+#: ../src/mail/mail-config.ui.h:138
 msgid "Check cu_stom headers for junk"
 msgstr "Check cu_stom headers for junk"
 
-#: ../src/mail/mail-config.ui.h:138
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:302
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:245
+#: ../src/mail/mail-config.ui.h:140
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:303
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:246
 msgid "No encryption"
 msgstr "No encryption"
 
-#: ../src/mail/mail-config.ui.h:139
+#: ../src/mail/mail-config.ui.h:141
 msgid "TLS encryption"
 msgstr "TLS encryption"
 
-#: ../src/mail/mail-config.ui.h:140
+#: ../src/mail/mail-config.ui.h:142
 msgid "SSL encryption"
 msgstr "SSL encryption"
 
@@ -19465,7 +19670,7 @@ msgstr ""
 "folders?"
 
 #: ../src/mail/mail.error.xml.h:42
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1454
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1540
 msgid "_Empty Trash"
 msgstr "_Empty Wastebasket"
 
@@ -19883,58 +20088,63 @@ msgid "In Current _Folder Only"
 msgstr "In Current _Folder Only"
 
 #: ../src/mail/mail.error.xml.h:141
+#| msgid "In Current _Folder Only"
+msgid "_Always In Current Folder Only"
+msgstr "_Always In Current Folder Only"
+
+#: ../src/mail/mail.error.xml.h:142
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr "Should Evolution close this window when replying or forwarding?"
 
-#: ../src/mail/mail.error.xml.h:142
+#: ../src/mail/mail.error.xml.h:143
 msgid "_Yes, Always"
 msgstr "_Yes, Always"
 
-#: ../src/mail/mail.error.xml.h:143
+#: ../src/mail/mail.error.xml.h:144
 msgid "_No, Never"
 msgstr "_No, Never"
 
-#: ../src/mail/mail.error.xml.h:144
+#: ../src/mail/mail.error.xml.h:145
 msgid "Copy folder in folder tree."
 msgstr "Copy folder in folder tree."
 
-#: ../src/mail/mail.error.xml.h:145
+#: ../src/mail/mail.error.xml.h:146
 msgid "Are you sure you want to copy folder “{0}” to folder “{1}”?"
 msgstr "Are you sure you want to copy folder “{0}” to folder “{1}”?"
 
-#: ../src/mail/mail.error.xml.h:147
+#: ../src/mail/mail.error.xml.h:148
 msgid "Do _not copy"
 msgstr "Do _not copy"
 
-#: ../src/mail/mail.error.xml.h:148
+#: ../src/mail/mail.error.xml.h:149
 msgid "_Always copy"
 msgstr "_Always copy"
 
-#: ../src/mail/mail.error.xml.h:149
+#: ../src/mail/mail.error.xml.h:150
 msgid "N_ever copy"
 msgstr "N_ever copy"
 
-#: ../src/mail/mail.error.xml.h:150
+#: ../src/mail/mail.error.xml.h:151
 msgid "Move folder in folder tree."
 msgstr "Move folder in folder tree."
 
-#: ../src/mail/mail.error.xml.h:151
+#: ../src/mail/mail.error.xml.h:152
 msgid "Are you sure you want to to move folder “{0}” to folder “{1}”?"
 msgstr "Are you sure you want to to move folder “{0}” to folder “{1}”?"
 
-#: ../src/mail/mail.error.xml.h:153
+#: ../src/mail/mail.error.xml.h:154
 msgid "Do _not move"
 msgstr "Do _not move"
 
-#: ../src/mail/mail.error.xml.h:154
+#: ../src/mail/mail.error.xml.h:155
 msgid "_Always move"
 msgstr "_Always move"
 
-#: ../src/mail/mail.error.xml.h:155
+#: ../src/mail/mail.error.xml.h:156
 msgid "N_ever move"
 msgstr "N_ever move"
 
-#: ../src/mail/mail.error.xml.h:156
+#: ../src/mail/mail.error.xml.h:157
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -19943,16 +20153,16 @@ msgstr ""
 "not enabled"
 
 #  mail:gw-accountsetup-error secondary
-#: ../src/mail/mail.error.xml.h:157
+#: ../src/mail/mail.error.xml.h:158
 msgid "Please enable the account or send using another account."
 msgstr "Please enable the account or send using another account."
 
-#: ../src/mail/mail.error.xml.h:158
+#: ../src/mail/mail.error.xml.h:159
 msgid "This message cannot be sent because there is no mail account configured"
 msgstr ""
 "This message cannot be sent because there is no mail account configured"
 
-#: ../src/mail/mail.error.xml.h:159
+#: ../src/mail/mail.error.xml.h:160
 msgid ""
 "There had not been found any active mail account to send the message. Create "
 "or enable one first, please."
@@ -19960,64 +20170,64 @@ msgstr ""
 "There had not been found any active mail account to send the message. Create "
 "or enable one first, please."
 
-#: ../src/mail/mail.error.xml.h:160
+#: ../src/mail/mail.error.xml.h:161
 msgid "Mail Deletion Failed"
 msgstr "Mail Deletion Failed"
 
-#: ../src/mail/mail.error.xml.h:161
+#: ../src/mail/mail.error.xml.h:162
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "You do not have sufficient permissions to delete this mail."
 
-#: ../src/mail/mail.error.xml.h:162
+#: ../src/mail/mail.error.xml.h:163
 msgid "“Check Junk” Failed"
 msgstr "“Check Junk” Failed"
 
-#: ../src/mail/mail.error.xml.h:163
+#: ../src/mail/mail.error.xml.h:164
 msgid "“Report Junk” Failed"
 msgstr "“Report Junk” Failed"
 
-#: ../src/mail/mail.error.xml.h:164
+#: ../src/mail/mail.error.xml.h:165
 msgid "“Report Not Junk” Failed"
 msgstr "“Report Not Junk” Failed"
 
-#: ../src/mail/mail.error.xml.h:165
+#: ../src/mail/mail.error.xml.h:166
 msgid "Remove duplicate messages?"
 msgstr "Remove duplicate messages?"
 
-#: ../src/mail/mail.error.xml.h:166
+#: ../src/mail/mail.error.xml.h:167
 msgid "No duplicate messages found."
 msgstr "No duplicate messages found."
 
 #. Translators: {0} is replaced with a folder name
-#: ../src/mail/mail.error.xml.h:168
+#: ../src/mail/mail.error.xml.h:169
 msgid "Folder “{0}” doesn’t contain any duplicate message."
 msgstr "Folder “{0}” doesn’t contain any duplicate message."
 
-#: ../src/mail/mail.error.xml.h:169
+#: ../src/mail/mail.error.xml.h:170
 msgid "Failed to connect account “{0}”."
 msgstr "Failed to connect account “{0}”."
 
-#: ../src/mail/mail.error.xml.h:170
+#: ../src/mail/mail.error.xml.h:171
 msgid "Failed to disconnect account “{0}”."
 msgstr "Failed to disconnect account “{0}”."
 
-#: ../src/mail/mail.error.xml.h:171
+#: ../src/mail/mail.error.xml.h:172
 msgid "Failed to unsubscribe from folder “{0}”."
 msgstr "Failed to unsubscribe from folder “{0}”."
 
-#: ../src/mail/mail.error.xml.h:172
+#: ../src/mail/mail.error.xml.h:173
 msgid "Unable to retrieve message."
 msgstr "Unable to retrieve message."
 
-#: ../src/mail/mail.error.xml.h:173
+#: ../src/mail/mail.error.xml.h:174
 msgid "{0}"
 msgstr "{0}"
 
-#: ../src/mail/mail.error.xml.h:174
+#: ../src/mail/mail.error.xml.h:175
 msgid "Message is not available in offline mode."
 msgstr "Message is not available in offline mode."
 
-#: ../src/mail/mail.error.xml.h:175
+#: ../src/mail/mail.error.xml.h:176
 msgid ""
 "This can be due to the message not being downloaded yet. The folder, or the "
 "account, can be marked for offline synchronization. Then, once the account "
@@ -20031,39 +20241,40 @@ msgstr ""
 "folder is selected, to make sure that all the messages in the folder will be "
 "available in offline mode."
 
-#: ../src/mail/mail.error.xml.h:176
+#: ../src/mail/mail.error.xml.h:177
 msgid "Failed to open folder."
 msgstr "Failed to open folder."
 
-#: ../src/mail/mail.error.xml.h:178
+#: ../src/mail/mail.error.xml.h:179
 msgid "Failed to find duplicate messages."
 msgstr "Failed to find duplicate messages."
 
-#: ../src/mail/mail.error.xml.h:179
+#: ../src/mail/mail.error.xml.h:180
 msgid "Failed to retrieve messages."
 msgstr "Failed to retrieve messages."
 
-#: ../src/mail/mail.error.xml.h:180
+#: ../src/mail/mail.error.xml.h:181
 msgid "Failed to mark messages as read."
 msgstr "Failed to mark messages as read."
 
-#: ../src/mail/mail.error.xml.h:181
+#: ../src/mail/mail.error.xml.h:182
 msgid "Failed to remove attachments from messages."
 msgstr "Failed to remove attachments from messages."
 
-#: ../src/mail/mail.error.xml.h:182
-msgid "Failed to download messages for offline viewing."
-msgstr "Failed to download messages for offline viewing."
-
 #: ../src/mail/mail.error.xml.h:183
+#| msgid "Failed to download messages for offline viewing."
+msgid "Failed to download messages for offline viewing for account “{0}”."
+msgstr "Failed to download messages for offline viewing for account “{0}”."
+
+#: ../src/mail/mail.error.xml.h:184
 msgid "Failed to save messages to disk."
 msgstr "Failed to save messages to disk."
 
-#: ../src/mail/mail.error.xml.h:184
+#: ../src/mail/mail.error.xml.h:185
 msgid "Hidden file is attached."
 msgstr "Hidden file is attached."
 
-#: ../src/mail/mail.error.xml.h:185
+#: ../src/mail/mail.error.xml.h:186
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -20071,47 +20282,47 @@ msgstr ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
 
-#: ../src/mail/mail.error.xml.h:186
+#: ../src/mail/mail.error.xml.h:187
 msgid "Printing failed."
 msgstr "Printing failed."
 
-#: ../src/mail/mail.error.xml.h:187
+#: ../src/mail/mail.error.xml.h:188
 msgid "The printer replied “{0}”."
 msgstr "The printer replied “{0}”."
 
-#: ../src/mail/mail.error.xml.h:188
+#: ../src/mail/mail.error.xml.h:189
 msgid "Could not perform this operation on {0}."
 msgstr "Could not perform this operation on {0}."
 
-#: ../src/mail/mail.error.xml.h:189
+#: ../src/mail/mail.error.xml.h:190
 msgid "You must be working online to complete this operation."
 msgstr "You must be working online to complete this operation."
 
-#: ../src/mail/mail.error.xml.h:190
+#: ../src/mail/mail.error.xml.h:191
 msgid "Message from “{0}” account:"
 msgstr "Message from “{0}” account:"
 
-#: ../src/mail/mail.error.xml.h:191
+#: ../src/mail/mail.error.xml.h:192
 msgid "Failed to mark thread to be ignored in folder “{0}”"
 msgstr "Failed to mark thread to be ignored in folder “{0}”"
 
-#: ../src/mail/mail.error.xml.h:192
+#: ../src/mail/mail.error.xml.h:193
 msgid "Failed to unmark thread from being ignored in folder “{0}”"
 msgstr "Failed to unmark thread from being ignored in folder “{0}”"
 
-#: ../src/mail/mail.error.xml.h:193
+#: ../src/mail/mail.error.xml.h:194
 msgid "Failed to mark subthread to be ignored in folder “{0}”"
 msgstr "Failed to mark subthread to be ignored in folder “{0}”"
 
-#: ../src/mail/mail.error.xml.h:194
+#: ../src/mail/mail.error.xml.h:195
 msgid "Failed to unmark subthread from being ignored in folder “{0}”"
 msgstr "Failed to unmark subthread from being ignored in folder “{0}”"
 
-#: ../src/mail/mail.error.xml.h:195
+#: ../src/mail/mail.error.xml.h:196
 msgid "Remote content download had been blocked for this message."
 msgstr "Remote content download had been blocked for this message."
 
-#: ../src/mail/mail.error.xml.h:196
+#: ../src/mail/mail.error.xml.h:197
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
@@ -20120,43 +20331,39 @@ msgstr ""
 "remote content for this sender or used sites."
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:198
+#: ../src/mail/mail.error.xml.h:199
 msgid "{0}, Completed on {1}"
 msgstr "{0}, Completed on {1}"
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:200
+#: ../src/mail/mail.error.xml.h:201
 msgid "{0} by {1}"
 msgstr "{0} by {1}"
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:202
+#: ../src/mail/mail.error.xml.h:203
 msgid "Overdue: {0} by {1}"
 msgstr "Overdue: {0} by {1}"
 
-#: ../src/mail/mail.error.xml.h:204
+#: ../src/mail/mail.error.xml.h:205
 msgid "This message note has been changed, but has not been saved."
 msgstr "This message note has been changed, but has not been saved."
 
 #. Translators: {0} is the name of the folder where the delete of the message note failed.
-#: ../src/mail/mail.error.xml.h:207
+#: ../src/mail/mail.error.xml.h:208
 msgid "Failed to delete message note in folder “{0}”"
 msgstr "Failed to delete message note in folder “{0}”"
 
 #. Translators: {0} is the name of the folder where the store of the message note failed.
-#: ../src/mail/mail.error.xml.h:209
+#: ../src/mail/mail.error.xml.h:210
 msgid "Failed to store message note in folder “{0}”"
 msgstr "Failed to store message note in folder “{0}”"
 
-#: ../src/mail/mail.error.xml.h:210
+#: ../src/mail/mail.error.xml.h:211
 msgid "Something has gone wrong when displaying the message"
 msgstr "Something has gone wrong when displaying the message"
 
-#: ../src/mail/mail.error.xml.h:211
-#| msgid ""
-#| "A WebKitWebProcess crashed when displaying the message. You can try again "
-#| "by moving to another message and back. If the issue persists, please file "
-#| "a bug report in the GNOME bugzilla."
+#: ../src/mail/mail.error.xml.h:212
 msgid ""
 "A WebKitWebProcess crashed when displaying the message. You can try again by "
 "moving to another message and back. If the issue persists, please file a bug "
@@ -20166,15 +20373,11 @@ msgstr ""
 "moving to another message and back. If the issue persists, please file a bug "
 "report in GNOME Gitlab."
 
-#: ../src/mail/mail.error.xml.h:212
+#: ../src/mail/mail.error.xml.h:213
 msgid "Something has gone wrong when displaying the signature"
 msgstr "Something has gone wrong when displaying the signature"
 
-#: ../src/mail/mail.error.xml.h:213
-#| msgid ""
-#| "A WebKitWebProcess crashed when displaying the signature. You can try "
-#| "again by moving to another signature and back. If the issue persists, "
-#| "please file a bug report in the GNOME bugzilla."
+#: ../src/mail/mail.error.xml.h:214
 msgid ""
 "A WebKitWebProcess crashed when displaying the signature. You can try again "
 "by moving to another signature and back. If the issue persists, please file "
@@ -20184,11 +20387,11 @@ msgstr ""
 "by moving to another signature and back. If the issue persists, please file "
 "a bug report in GNOME Gitlab."
 
-#: ../src/mail/mail.error.xml.h:214
+#: ../src/mail/mail.error.xml.h:215
 msgid "Are you sure you want to delete all the messages in the Junk folder?"
 msgstr "Are you sure you want to delete all the messages in the Junk folder?"
 
-#: ../src/mail/mail.error.xml.h:215
+#: ../src/mail/mail.error.xml.h:216
 msgid ""
 "These messages will be shown in the Trash folder, where they can be "
 "permanently deleted later."
@@ -20196,58 +20399,58 @@ msgstr ""
 "These messages will be shown in the Wastebasket folder, where they can be "
 "permanently deleted later."
 
-#: ../src/mail/mail.error.xml.h:216
+#: ../src/mail/mail.error.xml.h:217
 msgid "_Empty Junk"
 msgstr "_Empty Junk"
 
-#: ../src/mail/mail.error.xml.h:217
+#: ../src/mail/mail.error.xml.h:218
 msgid "Failed to empty Junk folder “{0}”"
 msgstr "Failed to empty Junk folder “{0}”"
 
-#: ../src/mail/mail-send-recv.c:192
+#: ../src/mail/mail-send-recv.c:193
 msgid "Canceling..."
 msgstr "Cancelling…"
 
-#: ../src/mail/mail-send-recv.c:580
+#: ../src/mail/mail-send-recv.c:610
 msgid "Edit Message"
 msgstr "Edit Message"
 
-#: ../src/mail/mail-send-recv.c:585
+#: ../src/mail/mail-send-recv.c:615
 msgid "Open Outbox Folder"
 msgstr "Open Outbox Folder"
 
-#: ../src/mail/mail-send-recv.c:738
+#: ../src/mail/mail-send-recv.c:768
 msgid "Send & Receive Mail"
 msgstr "Send & Receive Mail"
 
-#: ../src/mail/mail-send-recv.c:752
+#: ../src/mail/mail-send-recv.c:782
 msgid "Cancel _All"
 msgstr "Cancel _All"
 
-#: ../src/mail/mail-send-recv.c:841 ../src/mail/mail-send-recv.c:1372
+#: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:1470
 msgid "Updating..."
 msgstr "Updating…"
 
-#: ../src/mail/mail-send-recv.c:841 ../src/mail/mail-send-recv.c:922
+#: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:952
 msgid "Waiting..."
 msgstr "Waiting…"
 
-#: ../src/mail/mail-send-recv.c:1338
+#: ../src/mail/mail-send-recv.c:1436
 #, c-format
 msgid "Checking for new mail at “%s”"
 msgstr "Checking for new mail at “%s”"
 
-#: ../src/mail/mail-send-recv.c:1565
+#: ../src/mail/mail-send-recv.c:1663
 #, c-format
 msgid "Deleting junk and expunging trash at “%s”"
 msgstr "Deleting junk and expunging wastebasket at “%s”"
 
-#: ../src/mail/mail-send-recv.c:1567
+#: ../src/mail/mail-send-recv.c:1665
 #, c-format
 msgid "Deleting junk at “%s”"
 msgstr "Deleting junk at “%s”"
 
-#: ../src/mail/mail-send-recv.c:1569
+#: ../src/mail/mail-send-recv.c:1667
 #, c-format
 msgid "Expunging trash at “%s”"
 msgstr "Expunging wastebasket at “%s”"
@@ -20304,47 +20507,47 @@ msgstr "Higher"
 msgid "Highest"
 msgstr "Highest"
 
-#: ../src/mail/message-list.c:479 ../src/mail/message-list.c:6751
+#: ../src/mail/message-list.c:479 ../src/mail/message-list.c:6690
 msgid "Generating message list"
 msgstr "Generating message list"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2120
+#: ../src/mail/message-list.c:2154
 #: ../src/modules/itip-formatter/itip-view.c:269
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: ../src/mail/message-list.c:2129
+#: ../src/mail/message-list.c:2163
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: ../src/mail/message-list.c:2141
+#: ../src/mail/message-list.c:2175
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../src/mail/message-list.c:2149
+#: ../src/mail/message-list.c:2183
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../src/mail/message-list.c:2151
+#: ../src/mail/message-list.c:2185
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../src/mail/message-list.c:3191
+#: ../src/mail/message-list.c:3265
 msgid "Select all visible messages"
 msgstr "Select all visible messages"
 
-#: ../src/mail/message-list.c:3936 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4010 ../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:5400
+#: ../src/mail/message-list.c:5559
 msgid "Follow-up"
 msgstr "Follow-up"
 
-#: ../src/mail/message-list.c:6690
+#: ../src/mail/message-list.c:6629
 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 "
@@ -20356,7 +20559,7 @@ 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:6698
+#: ../src/mail/message-list.c:6637
 msgid "There are no messages in this folder."
 msgstr "There are no messages in this folder."
 
@@ -20410,32 +20613,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:1979
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
 msgid "Recipients contain"
 msgstr "Recipients contain"
 
 #: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1972
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
 msgid "Message contains"
 msgstr "Message contains"
 
 #: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1993
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2079
 msgid "Subject contains"
 msgstr "Subject contains"
 
 #: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1986
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
 msgid "Sender contains"
 msgstr "Sender contains"
 
 #: ../src/mail/searchtypes.xml.in.h:62
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
 msgid "Body contains"
 msgstr "Body contains"
 
 #: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1965
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
 msgid "Free form expression"
 msgstr "Free form expression"
 
@@ -20488,16 +20691,12 @@ msgstr "Memo List Properties"
 msgid "Task List Properties"
 msgstr "Task List Properties"
 
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:75
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:209
+#: ../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
 msgid "_Back"
 msgstr "_Back"
 
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:78
-msgid "_Finish"
-msgstr "_Finish"
-
 #: ../src/modules/accounts-window/e-webdav-browser-page.c:195
 msgid "_Browse"
 msgstr "_Browse"
@@ -20659,7 +20858,6 @@ msgid "Refresh the selected address book"
 msgstr "Refresh the selected address book"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1064
-#| msgid "Refresh the selected address book"
 msgid "Re_fresh list of account address books"
 msgstr "Re_fresh list of account address books"
 
@@ -20675,7 +20873,7 @@ msgstr "Show map with all contacts from selected address book"
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:642
 #: ../src/modules/calendar/e-task-shell-view-actions.c:768
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1553
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1639
 msgid "_Rename..."
 msgstr "_Rename…"
 
@@ -20756,7 +20954,7 @@ msgstr "_Actions"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1164
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:686
 #: ../src/modules/calendar/e-task-shell-view-actions.c:840
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1702
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1788
 msgid "_Preview"
 msgstr "_Preview"
 
@@ -20790,7 +20988,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:768
 #: ../src/modules/calendar/e-task-shell-view-actions.c:934
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1860
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1946
 msgid "_Classic View"
 msgstr "_Classic View"
 
@@ -20801,7 +20999,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:775
 #: ../src/modules/calendar/e-task-shell-view-actions.c:941
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1867
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1953
 msgid "_Vertical View"
 msgstr "_Vertical View"
 
@@ -20820,7 +21018,7 @@ msgstr "Unmatched"
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1733
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:802
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1010
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1951
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
 #: ../src/shell/e-shell-content.c:639
 msgid "Advanced Search"
 msgstr "Advanced Search"
@@ -20877,7 +21075,6 @@ msgstr "_Send Message to Contact"
 
 #: ../src/modules/alarm-notify/alarm-notify.c:169
 #, c-format
-#| msgid "Failed to open calendar “{0}”"
 msgid "Failed to launch command “%s”:"
 msgstr "Failed to launch command “%s”:"
 
@@ -20906,40 +21103,40 @@ msgstr "Choose a backup file to restore"
 msgid "Restore from Backup"
 msgstr "Restore from Backup"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:304
+#: ../src/modules/backup-restore/evolution-backup-restore.c:306
 msgid "Select name of the Evolution backup file"
 msgstr "Select name of the Evolution backup file"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:349
+#: ../src/modules/backup-restore/evolution-backup-restore.c:351
 msgid "_Restart Evolution after backup"
 msgstr "_Restart Evolution after backup"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:384
+#: ../src/modules/backup-restore/evolution-backup-restore.c:386
 msgid "Re_start Evolution after restore"
 msgstr "Re_start Evolution after restore"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:426
+#: ../src/modules/backup-restore/evolution-backup-restore.c:428
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Select name of the Evolution backup file to restore"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:435
+#: ../src/modules/backup-restore/evolution-backup-restore.c:437
 #, c-format
 msgid "Checking content of backup file “%s”, please wait..."
 msgstr "Checking content of backup file “%s”, please wait..."
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:456
+#: ../src/modules/backup-restore/evolution-backup-restore.c:458
 msgid "_Back up Evolution Data..."
 msgstr "_Back up Evolution Data…"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:458
+#: ../src/modules/backup-restore/evolution-backup-restore.c:460
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Back up Evolution data and settings to an archive file"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:463
+#: ../src/modules/backup-restore/evolution-backup-restore.c:465
 msgid "R_estore Evolution Data..."
 msgstr "R_estore Evolution Data…"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:465
+#: ../src/modules/backup-restore/evolution-backup-restore.c:467
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Restore Evolution data and settings from an archive file"
 
@@ -21134,8 +21331,8 @@ msgstr "Choose an Address Book"
 
 #: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:250
 #: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:263
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:293
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:309
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:294
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:310
 #: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:128
 msgid "URL:"
 msgstr "URL:"
@@ -21149,7 +21346,7 @@ 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:336
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:425
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:426
 #: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:185
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr "URL is not a valid http:// nor https:// URL"
@@ -21158,8 +21355,8 @@ msgstr "URL is not a valid http:// nor https:// URL"
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1069
 #: ../src/modules/cal-config-google/e-cal-config-google.c:190
 #: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:434
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:469
+#: ../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"
 
@@ -21198,8 +21395,8 @@ msgid "Port:"
 msgstr "Port:"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:675
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:246
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:201
+#: ../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"
 
@@ -21212,8 +21409,8 @@ msgid "Encryption:"
 msgstr "Encryption:"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:716
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:323
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:266
+#: ../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"
 
@@ -21222,7 +21419,6 @@ msgid "Anonymous"
 msgstr "Anonymous"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:749
-#| msgid "User name cannot be empty"
 msgid "Username can be left empty"
 msgstr "Username can be left empty"
 
@@ -21314,8 +21510,8 @@ 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/mail-config/e-mail-config-remote-accounts.c:415
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:451
+#: ../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"
 msgstr "Server address cannot be empty"
 
@@ -21334,23 +21530,23 @@ 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:325
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:326
 msgid "Find Calendars"
 msgstr "Find Calendars"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:328
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:329
 msgid "Find Memo Lists"
 msgstr "Find Memo Lists"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:331
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:332
 msgid "Find Task Lists"
 msgstr "Find Task Lists"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:350
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:351
 msgid "Email:"
 msgstr "E-mail:"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:355
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:356
 msgid "Server handles meeting invitations"
 msgstr "Server handles meeting invitations"
 
@@ -21401,12 +21597,6 @@ msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "default:mm"
 
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../src/modules/itip-formatter/itip-view.c:1682
-#: ../src/modules/itip-formatter/itip-view.c:1793
-msgid "Location:"
-msgstr "Location:"
-
 #. 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
@@ -21473,45 +21663,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:558
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:569
 #, 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:559
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:570
 #, 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:564
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:575
 #, 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:565
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:576
 #, 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:570
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:581
 #, 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:571
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:582
 #, 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:688
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:699
 msgid "Calendar Selector"
 msgstr "Calendar Selector"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:694
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:705
 msgid "Memo List Selector"
 msgstr "Memo List Selector"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:699
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:710
 msgid "Task List Selector"
 msgstr "Task List Selector"
 
@@ -21545,11 +21735,11 @@ msgstr "Conflict Search"
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Select the calendars to search for meeting conflicts"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1123
+#: ../src/modules/calendar/e-calendar-preferences.c:1129
 msgid "Ti_me and date:"
 msgstr "Ti_me and date:"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1124
+#: ../src/modules/calendar/e-calendar-preferences.c:1130
 msgid "_Date only:"
 msgstr "_Date only:"
 
@@ -21743,92 +21933,104 @@ msgid "Allo_w direct edit of event Summary"
 msgstr "Allo_w direct edit of event Summary"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:59
+#| msgid "Hide cancelled tasks"
+msgid "Hi_de cancelled events"
+msgstr "Hi_de cancelled events"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Alerts"
 msgstr "Alerts"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Ask for confirmation when deleting items"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Display"
 msgstr "Display"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Highlight t_asks due today"
 msgstr "Highlight t_asks due today"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Highlight _overdue tasks"
 msgstr "Highlight _overdue tasks"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
 msgid "_Hide completed tasks after"
 msgstr "_Hide completed tasks after"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
-#| msgid "Hide completed tasks"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
 msgid "Hid_e cancelled tasks"
 msgstr "Hid_e cancelled tasks"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
 msgid "To Do bar"
 msgstr "To Do bar"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Show Tasks without _Due date"
 msgstr "Show Tasks without _Due date"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Display reminders in _notification area only"
 msgstr "Display reminders in _notification area only"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Keep reminder notification _window always on top"
 msgstr "Keep reminder notification _window always on top"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Display reminders for completed _tasks"
 msgstr "Display reminders for completed _tasks"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
 msgid "Display reminders for _past events"
 msgstr "Display reminders for _past events"
 
 #. This is the first half of a user preference. "Set default reminder [time-period] before every new 
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:77
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:78
 msgid "Set _default reminder"
 msgstr "Set _default reminder"
 
 #. This is the last half of a user preference. "Set default reminder [time-period] before every new 
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:80
 msgid "before every new appointment"
 msgstr "before every new appointment"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
 msgid "Show a _reminder"
 msgstr "Show a _reminder"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
 msgid "before every anniversary/birthday"
 msgstr "before every anniversary/birthday"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
 msgid "Select the sources for reminder notification:"
 msgstr "Select the sources for reminder notification:"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
 msgid "Default Free/Busy Server"
 msgstr "Default Free/Busy Server"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:91
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u and %d will be replaced by user and domain from the e-mail address."
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:93
+msgid ""
+"Specify login user name as part of the URL in case the server requires "
+"authentication, like: https://USER example com/"
+msgstr ""
+"Specify login user name as part of the URL in case the server requires "
+"authentication, like: https://USER example com/"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:94
 msgid "Publishing Information"
 msgstr "Publishing Information"
 
@@ -21972,7 +22174,6 @@ msgid "Refresh the selected calendar"
 msgstr "Refresh the selected calendar"
 
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
-#| msgid "Refresh the selected calendar"
 msgid "Re_fresh list of account calendars"
 msgstr "Re_fresh list of account calendars"
 
@@ -22390,7 +22591,6 @@ msgid "Refresh the selected memo list"
 msgstr "Refresh the selected memo list"
 
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:635
-#| msgid "Refresh the selected memo list"
 msgid "Re_fresh list of account memo lists"
 msgstr "Re_fresh list of account memo lists"
 
@@ -22529,7 +22729,6 @@ msgid "Refresh the selected task list"
 msgstr "Refresh the selected task list"
 
 #: ../src/modules/calendar/e-task-shell-view-actions.c:761
-#| msgid "Refresh the selected task list"
 msgid "Re_fresh list of account task lists"
 msgstr "Re_fresh list of account task lists"
 
@@ -22574,7 +22773,6 @@ msgid "Active Tasks"
 msgstr "Active Tasks"
 
 #: ../src/modules/calendar/e-task-shell-view-actions.c:965
-#| msgid "Cancelled"
 msgid "Cancelled Tasks"
 msgstr "Cancelled Tasks"
 
@@ -22634,7 +22832,6 @@ msgid "Convert to the mail message"
 msgstr "Convert to the mail message"
 
 #: ../src/modules/config-lookup/e-gnome-config-lookup.c:67
-#| msgid "Last upgraded configuration version"
 msgid "Look up configuration with e-mail domain"
 msgstr "Look up configuration with e-mail domain"
 
@@ -22684,7 +22881,7 @@ msgstr "LDAP server"
 msgid "Looking up LDAP server…"
 msgstr "Looking up LDAP server…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:234
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:242
 msgid "Look up in SRV records"
 msgstr "Look up in SRV records"
 
@@ -23137,7 +23334,7 @@ msgid "_Update Attendee Status"
 msgstr "_Update Attendee Status"
 
 #: ../src/modules/itip-formatter/itip-view.c:1241
-#: ../src/smime/gui/certificate-manager.c:1677
+#: ../src/smime/gui/certificate-manager.c:1661
 msgid "_Update"
 msgstr "_Update"
 
@@ -23174,29 +23371,29 @@ msgstr "_Preserve my reminder"
 msgid "_Inherit reminder"
 msgstr "_Inherit reminder"
 
-#: ../src/modules/itip-formatter/itip-view.c:2052
+#: ../src/modules/itip-formatter/itip-view.c:2079
 msgid "_Tasks:"
 msgstr "_Tasks:"
 
-#: ../src/modules/itip-formatter/itip-view.c:2055
+#: ../src/modules/itip-formatter/itip-view.c:2082
 msgid "_Memos:"
 msgstr "_Memos:"
 
-#: ../src/modules/itip-formatter/itip-view.c:3112
+#: ../src/modules/itip-formatter/itip-view.c:3139
 msgid "Sa_ve"
 msgstr "Sa_ve"
 
-#: ../src/modules/itip-formatter/itip-view.c:3634
-#: ../src/modules/itip-formatter/itip-view.c:5199
+#: ../src/modules/itip-formatter/itip-view.c:3661
+#: ../src/modules/itip-formatter/itip-view.c:5227
 msgid "Attendee status updated"
 msgstr "Attendee status updated"
 
-#: ../src/modules/itip-formatter/itip-view.c:3849
+#: ../src/modules/itip-formatter/itip-view.c:3876
 #, 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:3855
+#: ../src/modules/itip-formatter/itip-view.c:3882
 #, c-format
 msgid ""
 "The calendar “%s” contains an appointment which conflicts with this meeting"
@@ -23207,145 +23404,145 @@ msgstr[0] ""
 msgstr[1] ""
 "The calendar “%s” contains %d appointments which conflict with this meeting"
 
-#: ../src/modules/itip-formatter/itip-view.c:3888
+#: ../src/modules/itip-formatter/itip-view.c:3915
 #, 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:3897
+#: ../src/modules/itip-formatter/itip-view.c:3924
 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:4039
+#: ../src/modules/itip-formatter/itip-view.c:4066
 msgid "Unable to find any calendars"
 msgstr "Unable to find any calendars"
 
-#: ../src/modules/itip-formatter/itip-view.c:4047
+#: ../src/modules/itip-formatter/itip-view.c:4074
 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:4052
+#: ../src/modules/itip-formatter/itip-view.c:4079
 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:4057
+#: ../src/modules/itip-formatter/itip-view.c:4084
 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:4398
+#: ../src/modules/itip-formatter/itip-view.c:4425
 msgid "Opening the calendar. Please wait..."
 msgstr "Opening the calendar. Please wait…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4403
+#: ../src/modules/itip-formatter/itip-view.c:4430
 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:4811
+#: ../src/modules/itip-formatter/itip-view.c:4838
 #, 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:4826
+#: ../src/modules/itip-formatter/itip-view.c:4853
 #, c-format
 msgid "Sent to calendar “%s” as accepted"
 msgstr "Sent to calendar “%s” as accepted"
 
-#: ../src/modules/itip-formatter/itip-view.c:4831
+#: ../src/modules/itip-formatter/itip-view.c:4858
 #, c-format
 msgid "Sent to calendar “%s” as tentative"
 msgstr "Sent to calendar “%s” as tentative"
 
-#: ../src/modules/itip-formatter/itip-view.c:4837
+#: ../src/modules/itip-formatter/itip-view.c:4864
 #, c-format
 msgid "Sent to calendar “%s” as declined"
 msgstr "Sent to calendar “%s” as declined"
 
-#: ../src/modules/itip-formatter/itip-view.c:4843
+#: ../src/modules/itip-formatter/itip-view.c:4870
 #, c-format
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "Sent to calendar “%s” as cancelled"
 
-#: ../src/modules/itip-formatter/itip-view.c:4879
-#: ../src/modules/itip-formatter/itip-view.c:5336
-#: ../src/modules/itip-formatter/itip-view.c:5439
+#: ../src/modules/itip-formatter/itip-view.c:4905
+#: ../src/modules/itip-formatter/itip-view.c:5364
+#: ../src/modules/itip-formatter/itip-view.c:5467
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Saving changes to the calendar. Please wait…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4931
+#: ../src/modules/itip-formatter/itip-view.c:4959
 msgid "Unable to parse item"
 msgstr "Unable to parse item"
 
-#: ../src/modules/itip-formatter/itip-view.c:5123
+#: ../src/modules/itip-formatter/itip-view.c:5151
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organiser has removed the delegate %s "
 
-#: ../src/modules/itip-formatter/itip-view.c:5140
+#: ../src/modules/itip-formatter/itip-view.c:5168
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Sent a cancellation notice to the delegate"
 
-#: ../src/modules/itip-formatter/itip-view.c:5144
+#: ../src/modules/itip-formatter/itip-view.c:5172
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Could not send the cancellation notice to the delegate"
 
-#: ../src/modules/itip-formatter/itip-view.c:5191
+#: ../src/modules/itip-formatter/itip-view.c:5219
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Unable to update attendee. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5226
+#: ../src/modules/itip-formatter/itip-view.c:5254
 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:5301
+#: ../src/modules/itip-formatter/itip-view.c:5329
 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:5372
-#: ../src/modules/itip-formatter/itip-view.c:5410
+#: ../src/modules/itip-formatter/itip-view.c:5400
+#: ../src/modules/itip-formatter/itip-view.c:5438
 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:5471
+#: ../src/modules/itip-formatter/itip-view.c:5499
 msgid "Meeting information sent"
 msgstr "Meeting information sent"
 
-#: ../src/modules/itip-formatter/itip-view.c:5476
+#: ../src/modules/itip-formatter/itip-view.c:5504
 msgid "Task information sent"
 msgstr "Task information sent"
 
-#: ../src/modules/itip-formatter/itip-view.c:5481
+#: ../src/modules/itip-formatter/itip-view.c:5509
 msgid "Memo information sent"
 msgstr "Memo information sent"
 
-#: ../src/modules/itip-formatter/itip-view.c:5492
+#: ../src/modules/itip-formatter/itip-view.c:5520
 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:5497
+#: ../src/modules/itip-formatter/itip-view.c:5525
 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:5502
+#: ../src/modules/itip-formatter/itip-view.c:5530
 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:5567
+#: ../src/modules/itip-formatter/itip-view.c:5595
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5572
+#: ../src/modules/itip-formatter/itip-view.c:5600
 msgid "Save Calendar"
 msgstr "Save Calendar"
 
-#: ../src/modules/itip-formatter/itip-view.c:5621
-#: ../src/modules/itip-formatter/itip-view.c:5634
+#: ../src/modules/itip-formatter/itip-view.c:5649
+#: ../src/modules/itip-formatter/itip-view.c:5662
 msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
-#: ../src/modules/itip-formatter/itip-view.c:5622
-#: ../src/modules/itip-formatter/itip-view.c:5635
+#: ../src/modules/itip-formatter/itip-view.c:5650
+#: ../src/modules/itip-formatter/itip-view.c:5663
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -23353,15 +23550,15 @@ msgstr ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 
-#: ../src/modules/itip-formatter/itip-view.c:5677
-#: ../src/modules/itip-formatter/itip-view.c:5758
-#: ../src/modules/itip-formatter/itip-view.c:5854
+#: ../src/modules/itip-formatter/itip-view.c:5725
+#: ../src/modules/itip-formatter/itip-view.c:5806
+#: ../src/modules/itip-formatter/itip-view.c:5902
 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:5678
-#: ../src/modules/itip-formatter/itip-view.c:5759
-#: ../src/modules/itip-formatter/itip-view.c:5855
+#: ../src/modules/itip-formatter/itip-view.c:5726
+#: ../src/modules/itip-formatter/itip-view.c:5807
+#: ../src/modules/itip-formatter/itip-view.c:5903
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -23369,11 +23566,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:5768
+#: ../src/modules/itip-formatter/itip-view.c:5816
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
-#: ../src/modules/itip-formatter/itip-view.c:5769
+#: ../src/modules/itip-formatter/itip-view.c:5817
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -23381,12 +23578,12 @@ msgstr ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 
-#: ../src/modules/itip-formatter/itip-view.c:6307
+#: ../src/modules/itip-formatter/itip-view.c:6384
 msgctxt "cal-itip"
 msgid "None"
 msgstr "None"
 
-#: ../src/modules/itip-formatter/itip-view.c:6323
+#: ../src/modules/itip-formatter/itip-view.c:6400
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
@@ -23496,42 +23693,42 @@ msgstr "Choose a mbox spool directory"
 msgid "Mbox spool directory cannot be empty"
 msgstr "Mbox spool directory cannot be empty"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:198
+#: ../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:154
+#: ../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
 msgid "Configuration"
 msgstr "Configuration"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:230
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:185
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:231
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:186
 msgid "_Port:"
 msgstr "_Port:"
 
 #. do not reference
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:251
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:313
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:252
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:314
 msgid "User_name:"
 msgstr "User_name:"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:265
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:327
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:266
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:328
 msgid "_Forget password"
 msgstr "_Forget password"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:291
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:234
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:292
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:235
 msgid "Encryption _method:"
 msgstr "Encryption _method:"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:306
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:249
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:307
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:250
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS after connecting"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:310
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:253
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:311
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:254
 msgid "TLS on a dedicated port"
 msgstr "TLS on a dedicated port"
 
@@ -23570,11 +23767,11 @@ msgid "Custom binary cannot be empty"
 msgstr "Custom binary cannot be empty"
 
 #. do not reference
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:206
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:207
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver requires authentication"
 
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:295
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:296
 msgid "T_ype:"
 msgstr "T_ype:"
 
@@ -23622,303 +23819,303 @@ msgstr "Create a new mail folder"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:734
+#: ../src/modules/mail/e-mail-shell-backend.c:751
 msgctxt "NetworkMonitor"
 msgid "base"
 msgstr "base"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:737
+#: ../src/modules/mail/e-mail-shell-backend.c:754
 msgctxt "NetworkMonitor"
 msgid "netlink"
 msgstr "netlink"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:740
+#: ../src/modules/mail/e-mail-shell-backend.c:757
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "networkmanager"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:770
+#: ../src/modules/mail/e-mail-shell-backend.c:787
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "Method to detect _online state:"
 
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:779
+#: ../src/modules/mail/e-mail-shell-backend.c:796
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Default"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:793
+#: ../src/modules/mail/e-mail-shell-backend.c:810
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Always Online"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:862
+#: ../src/modules/mail/e-mail-shell-backend.c:879
 msgid "Mail Preferences"
 msgstr "Mail Preferences"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:871
+#: ../src/modules/mail/e-mail-shell-backend.c:888
 msgid "Composer Preferences"
 msgstr "Composer Preferences"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:880
+#: ../src/modules/mail/e-mail-shell-backend.c:897
 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:1241
+#: ../src/modules/mail/e-mail-shell-backend.c:1258
 msgctxt "label"
 msgid "None"
 msgstr "None"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:781
+#: ../src/modules/mail/e-mail-shell-view-actions.c:821
 msgid "Marking messages as read..."
 msgstr "Marking messages as read..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1140
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Go to Folder"
 msgstr "Go to Folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1144
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1230
 msgid "_Select"
 msgstr "_Select"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1447
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1533
 msgid "_Disable Account"
 msgstr "_Disable Account"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1449
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1535
 msgid "Disable this account"
 msgstr "Disable this account"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1456
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1542
 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:1461
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1547
 msgid "Empty _Junk"
 msgstr "Empty _Junk"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1463
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1549
 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:1470
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1556
 msgid "Edit properties of this account"
 msgstr "Edit properties of this account"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1477
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1563
 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:1482
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1568
 msgid "_Download Messages for Offline Usage"
 msgstr "_Download Messages for Offline Usage"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1484
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1570
 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:1489
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1575
 msgid "Fl_ush Outbox"
 msgstr "Fl_ush Outbox"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1496
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1582
 msgid "_Copy Folder To..."
 msgstr "_Copy Folder To…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1498
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1584
 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:1505
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1591
 msgid "Permanently remove this folder"
 msgstr "Permanently remove this folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1510
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1596
 msgid "E_xpunge"
 msgstr "E_xpunge"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1512
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1598
 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:1517
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1609
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1603
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1695
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_k All Messages as Read"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1519
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1611
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1605
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1697
 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:1524
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1610
 msgid "_Move Folder To..."
 msgstr "_Move Folder To…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1526
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1612
 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:1532
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1618
 msgid "_New..."
 msgstr "_New…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1534
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1620
 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:1541
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1627
 msgid "Change the properties of this folder"
 msgstr "Change the properties of this folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1548
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1634
 msgid "Refresh the folder"
 msgstr "Refresh the folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1555
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1641
 msgid "Change the name of this folder"
 msgstr "Change the name of this folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1560
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1646
 msgid "Select Message _Thread"
 msgstr "Select Message _Thread"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1562
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1648
 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:1567
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1653
 msgid "Select Message S_ubthread"
 msgstr "Select Message S_ubthread"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1569
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1655
 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:1581
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1667
 msgid "Empty _Trash"
 msgstr "Empty Was_tebasket"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1583
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1669
 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:1588
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1674
 msgid "Go to _Folder"
 msgstr "Go to _Folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1590
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1676
 msgid "Opens a dialog to select a folder to go to"
 msgstr "Opens a dialog to select a folder to go to"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1602
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1688
 msgid "_Manage Subscriptions"
 msgstr "_Manage Subscriptions"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1604
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1688
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1690
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1774
 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:1616
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1637
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1702
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
 msgid "Send / _Receive"
 msgstr "Send / _Receive"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1618
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1704
 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:1623
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
 msgid "R_eceive All"
 msgstr "R_eceive All"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1625
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1711
 msgid "Receive new items from all accounts"
 msgstr "Receive new items from all accounts"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1630
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
 msgid "_Send All"
 msgstr "_Send All"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1632
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1718
 msgid "Send queued items in all accounts"
 msgstr "Send queued items in all accounts"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1660
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Cancel the current mail operation"
 msgstr "Cancel the current mail operation"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1665
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
 msgid "Collapse All _Threads"
 msgstr "Collapse All _Threads"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1667
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Collapse all message threads"
 msgstr "Collapse all message threads"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1672
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
 msgid "E_xpand All Threads"
 msgstr "E_xpand All Threads"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1674
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1760
 msgid "Expand all message threads"
 msgstr "Expand all message threads"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1679
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
 msgid "_Message Filters"
 msgstr "_Message Filters"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1681
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1767
 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:1686
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1772
 msgid "_Subscriptions..."
 msgstr "_Subscriptions…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1695
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1781
 msgid "F_older"
 msgstr "F_older"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1712
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1798
 msgid "C_reate Search Folder From Search..."
 msgstr "C_reate Search Folder From Search…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1719
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1805
 msgid "Search F_olders"
 msgstr "Search F_olders"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1721
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1807
 msgid "Create or edit search folder definitions"
 msgstr "Create or edit search folder definitions"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1764
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1850
 msgid "_New Folder..."
 msgstr "_New Folder…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1792
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1878
 msgid "Show Message _Preview"
 msgstr "Show Message _Preview"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1794
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1880
 msgid "Show message preview pane"
 msgstr "Show message preview pane"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1800
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1886
 msgid "Show _Attachment Bar"
 msgstr "Show _Attachment Bar"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1802
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1888
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments"
@@ -23926,211 +24123,214 @@ msgstr ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1808
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1894
 msgid "Show _Deleted Messages"
 msgstr "Show _Deleted Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1810
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
 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:1816
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1902
 msgid "Show _Junk Messages"
 msgstr "Show _Junk Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1904
 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:1824
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1910
 msgid "_Group By Threads"
 msgstr "_Group By Threads"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1826
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1912
 msgid "Threaded message list"
 msgstr "Threaded message list"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1832
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1918
 msgid "Show To _Do Bar"
 msgstr "Show To _Do Bar"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1834
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1920
 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:1840
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
 msgid "_Unmatched Folder Enabled"
 msgstr "_Unmatched Folder Enabled"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1842
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1928
 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:1862
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
 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:1869
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1955
 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:1877
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1963
 msgid "All Messages"
 msgstr "All Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1884
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1970
 msgid "Important Messages"
 msgstr "Important Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1891
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1977
 msgid "Last 5 Days’ Messages"
 msgstr "Last 5 Days’ Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1898
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1984
 msgid "Messages Not Junk"
 msgstr "Messages Not Junk"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1905
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1991
 msgid "Messages with Attachments"
 msgstr "Messages with Attachments"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1912
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1998
 msgid "Messages with Notes"
 msgstr "Messages with Notes"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1919
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2005
 msgid "No Label"
 msgstr "No Label"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2012
 msgid "Read Messages"
 msgstr "Read Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1933
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2019
 msgid "Unread Messages"
 msgstr "Unread Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2026
 msgid "Message Thread"
 msgstr "Message Thread"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2000
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2086
 msgid "Subject or Addresses contain"
 msgstr "Subject or Addresses contain"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2010
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2096
 msgid "All Accounts"
 msgstr "All Accounts"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2017
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2103
 msgid "Current Account"
 msgstr "Current Account"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2110
 msgid "Current Folder"
 msgstr "Current Folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2031
-#| msgid "In Current Folder and _Subfolders"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2117
 msgid "Current Folder and Subfolders"
 msgstr "Current Folder and Subfolders"
 
-#: ../src/modules/mail/e-mail-shell-view.c:893
-#| msgid "In Current Folder and _Subfolders"
+#: ../src/modules/mail/e-mail-shell-view.c:895
 msgid "Current Folder and Subfolders Search"
 msgstr "Current Folder and Subfolders Search"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1013
+#: ../src/modules/mail/e-mail-shell-view.c:1017
 msgid "All Account Search"
 msgstr "All Account Search"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1121
+#: ../src/modules/mail/e-mail-shell-view.c:1127
 msgid "Account Search"
 msgstr "Account Search"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:897
+#: ../src/modules/mail/e-mail-shell-view-private.c:926
 #, 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:912
-#: ../src/modules/mail/e-mail-shell-view-private.c:929
+#: ../src/modules/mail/e-mail-shell-view-private.c:941
+#: ../src/modules/mail/e-mail-shell-view-private.c:958
 #, 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:943
-#: ../src/modules/mail/e-mail-shell-view-private.c:949
+#: ../src/modules/mail/e-mail-shell-view-private.c:972
+#: ../src/modules/mail/e-mail-shell-view-private.c:978
 #, 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:956
+#: ../src/modules/mail/e-mail-shell-view-private.c:985
 #, 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:962
+#: ../src/modules/mail/e-mail-shell-view-private.c:991
 #, 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:968
+#: ../src/modules/mail/e-mail-shell-view-private.c:997
 #, 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:985
+#: ../src/modules/mail/e-mail-shell-view-private.c:1014
 #, 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:1503
+#: ../src/modules/mail/e-mail-shell-view-private.c:1532
 msgid "Send / Receive"
 msgstr "Send / Receive"
 
-#: ../src/modules/mail/em-composer-prefs.c:419
+#: ../src/modules/mail/em-composer-prefs.c:420
 msgid "Select Folder to Add"
 msgstr "Select Folder to Add"
 
-#: ../src/modules/mail/em-composer-prefs.c:895
+#: ../src/modules/mail/em-composer-prefs.c:896
 msgid "Folder"
 msgstr "Folder"
 
-#: ../src/modules/mail/em-composer-prefs.c:931
+#: ../src/modules/mail/em-composer-prefs.c:932
 msgid "Recipient"
 msgstr "Recipient"
 
-#: ../src/modules/mail/em-composer-prefs.c:1222
+#: ../src/modules/mail/em-composer-prefs.c:1223
 msgid "Keep in Outbox"
 msgstr "Keep in Outbox"
 
-#: ../src/modules/mail/em-composer-prefs.c:1223
+#: ../src/modules/mail/em-composer-prefs.c:1224
 msgid "Send immediately"
 msgstr "Send immediately"
 
-#: ../src/modules/mail/em-composer-prefs.c:1224
+#: ../src/modules/mail/em-composer-prefs.c:1225
 msgid "Send after 5 minutes"
 msgstr "Send after 5 minutes"
 
-#: ../src/modules/mail/em-composer-prefs.c:1309
+#: ../src/modules/mail/em-composer-prefs.c:1310
 msgid "Language(s)"
 msgstr "Language(s)"
 
+#: ../src/modules/mail/em-composer-prefs.c:1340
+#| msgid "Saving user interface state"
+msgid "Same as user interface"
+msgstr "Same as user interface"
+
 #: ../src/modules/mail/em-mailer-prefs.c:77
 msgid "On exit, every time"
 msgstr "On exit, every time"
@@ -24403,7 +24603,7 @@ msgstr "Import cancelled."
 msgid "Import complete."
 msgstr "Import complete."
 
-#: ../src/modules/startup-wizard/e-startup-assistant.c:158
+#: ../src/modules/startup-wizard/e-startup-assistant.c:186
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -24415,10 +24615,24 @@ 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:165
+#: ../src/modules/startup-wizard/e-startup-assistant.c:193
 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
+#| msgid "Collection _Account"
+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
+#, c-format
+msgctxt "wizard-ca-note"
+msgid "Alternatively, you can %s (email, contacts and calendaring) instead."
+msgstr "Alternatively, you can %s (e-mail, contacts and calendaring) instead."
+
 #: ../src/modules/startup-wizard/evolution-startup-wizard.c:212
 msgid "Loading accounts..."
 msgstr "Loading accounts…"
@@ -24685,8 +24899,8 @@ msgstr "Display the part as an addressbook contact"
 msgid "_Do not show this message again."
 msgstr "_Do not show this message again."
 
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:570
-#: ../src/plugins/templates/templates.c:487
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:571
+#: ../src/plugins/templates/templates.c:489
 msgid "Keywords"
 msgstr "Keywords"
 
@@ -24789,54 +25003,54 @@ msgstr "Outlook Express 5/6 personal folders (.dbx)"
 msgid "Import Outlook Express messages from DBX file"
 msgstr "Import Outlook Express messages from DBX file"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:291
+#: ../src/plugins/email-custom-header/email-custom-header.c:292
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Security:"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:295
+#: ../src/plugins/email-custom-header/email-custom-header.c:296
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Personal"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:296
+#: ../src/plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Unclassified"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:297
+#: ../src/plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Protected"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:298
+#: ../src/plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Confidential"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:299
+#: ../src/plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Secret"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:300
+#: ../src/plugins/email-custom-header/email-custom-header.c:301
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Top secret"
 
 #. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from 
Composer,
 #. * indicating the header will not be added to a mail message
-#: ../src/plugins/email-custom-header/email-custom-header.c:360
+#: ../src/plugins/email-custom-header/email-custom-header.c:361
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "None"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:537
+#: ../src/plugins/email-custom-header/email-custom-header.c:538
 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:807
+#: ../src/plugins/email-custom-header/email-custom-header.c:808
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by “;”."
@@ -24844,12 +25058,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:860
+#: ../src/plugins/email-custom-header/email-custom-header.c:861
 msgid "Key"
 msgstr "Key"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:877
-#: ../src/plugins/templates/templates.c:496
+#: ../src/plugins/email-custom-header/email-custom-header.c:878
+#: ../src/plugins/templates/templates.c:498
 msgid "Values"
 msgstr "Values"
 
@@ -24931,27 +25145,27 @@ msgstr ""
 "The external editor is still running. The mail composer window cannot be "
 "closed as long as the editor is active."
 
-#: ../src/plugins/face/face.c:292
+#: ../src/plugins/face/face.c:295
 msgid "Select a Face Picture"
 msgstr "Select a Face Picture"
 
-#: ../src/plugins/face/face.c:302
+#: ../src/plugins/face/face.c:301
 msgid "Image files"
 msgstr "Image files"
 
-#: ../src/plugins/face/face.c:390
+#: ../src/plugins/face/face.c:389
 msgid "_Insert Face picture by default"
 msgstr "_Insert Face picture by default"
 
-#: ../src/plugins/face/face.c:403
+#: ../src/plugins/face/face.c:402
 msgid "Load new _Face picture"
 msgstr "Load new _Face picture"
 
-#: ../src/plugins/face/face.c:447
+#: ../src/plugins/face/face.c:446
 msgid "Change Face Image"
 msgstr "Change Face Image"
 
-#: ../src/plugins/face/face.c:535
+#: ../src/plugins/face/face.c:534
 msgid "Include _Face"
 msgstr "Include _Face"
 
@@ -25212,7 +25426,6 @@ msgid "Select sound file"
 msgstr "Select sound file"
 
 #: ../src/plugins/mail-notification/mail-notification.c:1014
-#| msgid "Select the sources for reminder notification:"
 msgid "Select _accounts for which enable notifications:"
 msgstr "Select _accounts for which enable notifications:"
 
@@ -25230,7 +25443,6 @@ msgid "Show _notification when a new message arrives"
 msgstr "Show _notification when a new message arrives"
 
 #: ../src/plugins/mail-notification/mail-notification.c:1224
-#| msgid "_Accounts"
 msgid "Accounts"
 msgstr "Accounts"
 
@@ -25681,7 +25893,7 @@ msgid "Comma separated values (.csv)"
 msgstr "Comma separated values (.csv)"
 
 #: ../src/plugins/save-calendar/ical-format.c:181
-#: ../src/shell/e-shell-utils.c:182
+#: ../src/shell/e-shell-utils.c:172
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -25706,11 +25918,11 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../src/plugins/save-calendar/save-calendar.c:117
+#: ../src/plugins/save-calendar/save-calendar.c:116
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../src/plugins/save-calendar/save-calendar.c:182
+#: ../src/plugins/save-calendar/save-calendar.c:183
 msgid "Select destination file"
 msgstr "Select destination file"
 
@@ -25718,37 +25930,41 @@ msgstr "Select destination file"
 msgid "_Save As"
 msgstr "_Save As"
 
-#: ../src/plugins/save-calendar/save-calendar.c:349
+#: ../src/plugins/save-calendar/save-calendar.c:346
 msgid "Save the selected calendar to disk"
 msgstr "Save the selected calendar to disk"
 
-#: ../src/plugins/save-calendar/save-calendar.c:388
+#: ../src/plugins/save-calendar/save-calendar.c:385
 msgid "Save the selected memo list to disk"
 msgstr "Save the selected memo list to disk"
 
-#: ../src/plugins/save-calendar/save-calendar.c:427
+#: ../src/plugins/save-calendar/save-calendar.c:424
 msgid "Save the selected task list to disk"
 msgstr "Save the selected task list to disk"
 
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:2
+#| msgid ""
+#| "Drafts based template plugin. You can use variables like $ORIG[subject], "
+#| "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values "
+#| "from an email you are replying to."
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
-"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
-"an email you are replying to."
+"$ORIG[from], $ORIG[to], $ORIG[body], $ORIG[quoted-body] or $ORIG[reply-"
+"credits], which will be replaced by values from an email you are replying to."
 msgstr ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
-"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
-"an e-mail you are replying to."
+"$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:874
+#: ../src/plugins/templates/templates.c:878
 msgid "Saving message template"
 msgstr "Saving message template"
 
-#: ../src/plugins/templates/templates.c:895
+#: ../src/plugins/templates/templates.c:899
 msgid "Save as _Template"
 msgstr "Save as _Template"
 
-#: ../src/plugins/templates/templates.c:897
+#: ../src/plugins/templates/templates.c:901
 msgid "Save as Template"
 msgstr "Save as Template"
 
@@ -25768,23 +25984,23 @@ msgstr "Preparing to quit"
 msgid "Preparing to quit..."
 msgstr "Preparing to quit…"
 
-#: ../src/shell/e-shell.c:1074
+#: ../src/shell/e-shell.c:1088
 msgid "Open _Settings"
 msgstr "Open _Settings"
 
-#: ../src/shell/e-shell.c:1281
+#: ../src/shell/e-shell.c:1297
 msgid "Credentials are required to connect to the destination host."
 msgstr "Credentials are required to connect to the destination host."
 
-#: ../src/shell/e-shell.c:1448 ../src/shell/e-shell-window-actions.c:850
+#: ../src/shell/e-shell.c:1464 ../src/shell/e-shell-window-actions.c:873
 msgid "New _Window"
 msgstr "New _Window"
 
-#: ../src/shell/e-shell.c:1459 ../src/shell/e-shell-window-actions.c:780
+#: ../src/shell/e-shell.c:1475 ../src/shell/e-shell-window-actions.c:803
 msgid "_About"
 msgstr "_About"
 
-#: ../src/shell/e-shell.c:1460 ../src/shell/e-shell-window-actions.c:878
+#: ../src/shell/e-shell.c:1476 ../src/shell/e-shell-window-actions.c:901
 msgid "_Quit"
 msgstr "_Quit"
 
@@ -25806,28 +26022,28 @@ msgstr "Sho_w:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../src/shell/e-shell-searchbar.c:950
+#: ../src/shell/e-shell-searchbar.c:951
 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:1018
+#: ../src/shell/e-shell-searchbar.c:1019
 msgid "i_n"
 msgstr "i_n"
 
-#: ../src/shell/e-shell-utils.c:179
+#: ../src/shell/e-shell-utils.c:169
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../src/shell/e-shell-utils.c:205
+#: ../src/shell/e-shell-utils.c:195
 msgid "All Files (*)"
 msgstr "All Files (*)"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../src/shell/e-shell-utils.c:353
+#: ../src/shell/e-shell-utils.c:343
 msgid "translator-credits"
 msgstr ""
 "Gareth Owen <gowen72 yahoo com>\n"
@@ -25837,7 +26053,7 @@ msgstr ""
 "Chris Leonard <cjl laptop org>\n"
 "Waldo Luís Ribeiro <waldoribeiro sapo pt>"
 
-#: ../src/shell/e-shell-utils.c:364
+#: ../src/shell/e-shell-utils.c:354
 msgid "Evolution Website"
 msgstr "Evolution Website"
 
@@ -25857,272 +26073,282 @@ 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:782
+#: ../src/shell/e-shell-window-actions.c:793
+#| msgid "Collection _Account"
+msgid "Collect_ion Account"
+msgstr "Collect_ion Account"
+
+#: ../src/shell/e-shell-window-actions.c:795
+#| msgid "Create a new mail account"
+msgid "Create a new collection account"
+msgstr "Create a new collection account"
+
+#: ../src/shell/e-shell-window-actions.c:805
 msgid "Show information about Evolution"
 msgstr "Show information about Evolution"
 
-#: ../src/shell/e-shell-window-actions.c:787
+#: ../src/shell/e-shell-window-actions.c:810
 msgid "_Accounts"
 msgstr "_Accounts"
 
-#: ../src/shell/e-shell-window-actions.c:789
+#: ../src/shell/e-shell-window-actions.c:812
 msgid "Configure Evolution Accounts"
 msgstr "Configure Evolution Accounts"
 
-#: ../src/shell/e-shell-window-actions.c:794
-#: ../src/shell/e-shell-window-actions.c:808
+#: ../src/shell/e-shell-window-actions.c:817
+#: ../src/shell/e-shell-window-actions.c:831
 msgid "_Close Window"
 msgstr "_Close Window"
 
-#: ../src/shell/e-shell-window-actions.c:815
+#: ../src/shell/e-shell-window-actions.c:838
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../src/shell/e-shell-window-actions.c:817
+#: ../src/shell/e-shell-window-actions.c:840
 msgid "Open the Evolution User Guide"
 msgstr "Open the Evolution User Guide"
 
-#: ../src/shell/e-shell-window-actions.c:843
+#: ../src/shell/e-shell-window-actions.c:866
 msgid "I_mport..."
 msgstr "I_mport…"
 
-#: ../src/shell/e-shell-window-actions.c:845
+#: ../src/shell/e-shell-window-actions.c:868
 msgid "Import data from other programs"
 msgstr "Import data from other programs"
 
-#: ../src/shell/e-shell-window-actions.c:852
+#: ../src/shell/e-shell-window-actions.c:875
 msgid "Create a new window displaying this view"
 msgstr "Create a new window displaying this view"
 
-#: ../src/shell/e-shell-window-actions.c:864
+#: ../src/shell/e-shell-window-actions.c:887
 msgid "Available Cate_gories"
 msgstr "Available Cate_gories"
 
-#: ../src/shell/e-shell-window-actions.c:866
+#: ../src/shell/e-shell-window-actions.c:889
 msgid "Manage available categories"
 msgstr "Manage available categories"
 
-#: ../src/shell/e-shell-window-actions.c:880
+#: ../src/shell/e-shell-window-actions.c:903
 msgid "Exit the program"
 msgstr "Exit the program"
 
-#: ../src/shell/e-shell-window-actions.c:885
+#: ../src/shell/e-shell-window-actions.c:908
 msgid "_Advanced Search..."
 msgstr "_Advanced Search…"
 
-#: ../src/shell/e-shell-window-actions.c:887
+#: ../src/shell/e-shell-window-actions.c:910
 msgid "Construct a more advanced search"
 msgstr "Construct a more advanced search"
 
-#: ../src/shell/e-shell-window-actions.c:894
+#: ../src/shell/e-shell-window-actions.c:917
 msgid "Clear the current search parameters"
 msgstr "Clear the current search parameters"
 
-#: ../src/shell/e-shell-window-actions.c:899
+#: ../src/shell/e-shell-window-actions.c:922
 msgid "_Edit Saved Searches..."
 msgstr "_Edit Saved Searches…"
 
-#: ../src/shell/e-shell-window-actions.c:901
+#: ../src/shell/e-shell-window-actions.c:924
 msgid "Manage your saved searches"
 msgstr "Manage your saved searches"
 
-#: ../src/shell/e-shell-window-actions.c:908
+#: ../src/shell/e-shell-window-actions.c:931
 msgid "Click here to change the search type"
 msgstr "Click here to change the search type"
 
-#: ../src/shell/e-shell-window-actions.c:913
+#: ../src/shell/e-shell-window-actions.c:936
 msgid "_Find Now"
 msgstr "_Find Now"
 
-#: ../src/shell/e-shell-window-actions.c:915
+#: ../src/shell/e-shell-window-actions.c:938
 msgid "Execute the current search parameters"
 msgstr "Execute the current search parameters"
 
-#: ../src/shell/e-shell-window-actions.c:920
+#: ../src/shell/e-shell-window-actions.c:943
 msgid "_Save Search..."
 msgstr "_Save Search…"
 
-#: ../src/shell/e-shell-window-actions.c:922
+#: ../src/shell/e-shell-window-actions.c:945
 msgid "Save the current search parameters"
 msgstr "Save the current search parameters"
 
-#: ../src/shell/e-shell-window-actions.c:934
+#: ../src/shell/e-shell-window-actions.c:957
 msgid "Submit _Bug Report..."
 msgstr "Submit _Bug Report…"
 
-#: ../src/shell/e-shell-window-actions.c:936
+#: ../src/shell/e-shell-window-actions.c:959
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Submit a bug report using Bug Buddy"
 
-#: ../src/shell/e-shell-window-actions.c:941
+#: ../src/shell/e-shell-window-actions.c:964
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: ../src/shell/e-shell-window-actions.c:943
+#: ../src/shell/e-shell-window-actions.c:966
 msgid "Put Evolution into offline mode"
 msgstr "Put Evolution into offline mode"
 
-#: ../src/shell/e-shell-window-actions.c:948
+#: ../src/shell/e-shell-window-actions.c:971
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: ../src/shell/e-shell-window-actions.c:950
+#: ../src/shell/e-shell-window-actions.c:973
 msgid "Put Evolution into online mode"
 msgstr "Put Evolution into online mode"
 
-#: ../src/shell/e-shell-window-actions.c:978
+#: ../src/shell/e-shell-window-actions.c:1001
 msgid "Lay_out"
 msgstr "Lay_out"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:986
+#: ../src/shell/e-shell-window-actions.c:1009
 msgid "_New"
 msgstr "_New"
 
-#: ../src/shell/e-shell-window-actions.c:993
+#: ../src/shell/e-shell-window-actions.c:1016
 msgid "_Search"
 msgstr "_Search"
 
-#: ../src/shell/e-shell-window-actions.c:1000
+#: ../src/shell/e-shell-window-actions.c:1023
 msgid "_Switcher Appearance"
 msgstr "_Switcher Appearance"
 
-#: ../src/shell/e-shell-window-actions.c:1014
+#: ../src/shell/e-shell-window-actions.c:1037
 msgid "_Window"
 msgstr "_Window"
 
-#: ../src/shell/e-shell-window-actions.c:1043
+#: ../src/shell/e-shell-window-actions.c:1066
 msgid "Show _Menu Bar"
 msgstr "Show _Menu Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1045
+#: ../src/shell/e-shell-window-actions.c:1068
 msgid "Show the menu bar"
 msgstr "Show the menu bar"
 
-#: ../src/shell/e-shell-window-actions.c:1051
+#: ../src/shell/e-shell-window-actions.c:1074
 msgid "Show Side _Bar"
 msgstr "Show Side _Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1053
+#: ../src/shell/e-shell-window-actions.c:1076
 msgid "Show the side bar"
 msgstr "Show the side bar"
 
-#: ../src/shell/e-shell-window-actions.c:1059
+#: ../src/shell/e-shell-window-actions.c:1082
 msgid "Show _Buttons"
 msgstr "Show _Buttons"
 
-#: ../src/shell/e-shell-window-actions.c:1061
+#: ../src/shell/e-shell-window-actions.c:1084
 msgid "Show the switcher buttons"
 msgstr "Show the switcher buttons"
 
-#: ../src/shell/e-shell-window-actions.c:1067
+#: ../src/shell/e-shell-window-actions.c:1090
 msgid "Show _Status Bar"
 msgstr "Show _Status Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1069
+#: ../src/shell/e-shell-window-actions.c:1092
 msgid "Show the status bar"
 msgstr "Show the status bar"
 
-#: ../src/shell/e-shell-window-actions.c:1075
+#: ../src/shell/e-shell-window-actions.c:1098
 msgid "Show _Tool Bar"
 msgstr "Show _Tool Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1077
+#: ../src/shell/e-shell-window-actions.c:1100
 msgid "Show the tool bar"
 msgstr "Show the tool bar"
 
-#: ../src/shell/e-shell-window-actions.c:1099
+#: ../src/shell/e-shell-window-actions.c:1122
 msgid "_Icons Only"
 msgstr "_Icons Only"
 
-#: ../src/shell/e-shell-window-actions.c:1101
+#: ../src/shell/e-shell-window-actions.c:1124
 msgid "Display window buttons with icons only"
 msgstr "Display window buttons with icons only"
 
-#: ../src/shell/e-shell-window-actions.c:1106
+#: ../src/shell/e-shell-window-actions.c:1129
 msgid "_Text Only"
 msgstr "_Text Only"
 
-#: ../src/shell/e-shell-window-actions.c:1108
+#: ../src/shell/e-shell-window-actions.c:1131
 msgid "Display window buttons with text only"
 msgstr "Display window buttons with text only"
 
-#: ../src/shell/e-shell-window-actions.c:1113
+#: ../src/shell/e-shell-window-actions.c:1136
 msgid "Icons _and Text"
 msgstr "Icons _and Text"
 
-#: ../src/shell/e-shell-window-actions.c:1115
+#: ../src/shell/e-shell-window-actions.c:1138
 msgid "Display window buttons with icons and text"
 msgstr "Display window buttons with icons and text"
 
-#: ../src/shell/e-shell-window-actions.c:1120
+#: ../src/shell/e-shell-window-actions.c:1143
 msgid "Tool_bar Style"
 msgstr "Tool_bar Style"
 
-#: ../src/shell/e-shell-window-actions.c:1122
+#: ../src/shell/e-shell-window-actions.c:1145
 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:1130
+#: ../src/shell/e-shell-window-actions.c:1153
 msgid "Delete Current View"
 msgstr "Delete Current View"
 
-#: ../src/shell/e-shell-window-actions.c:1137
+#: ../src/shell/e-shell-window-actions.c:1160
 msgid "Save Custom View..."
 msgstr "Save Custom View…"
 
-#: ../src/shell/e-shell-window-actions.c:1139
+#: ../src/shell/e-shell-window-actions.c:1162
 msgid "Save current custom view"
 msgstr "Save current custom view"
 
-#: ../src/shell/e-shell-window-actions.c:1146
+#: ../src/shell/e-shell-window-actions.c:1169
 msgid "C_urrent View"
 msgstr "C_urrent View"
 
-#: ../src/shell/e-shell-window-actions.c:1156
+#: ../src/shell/e-shell-window-actions.c:1179
 msgid "Custom View"
 msgstr "Custom View"
 
-#: ../src/shell/e-shell-window-actions.c:1158
+#: ../src/shell/e-shell-window-actions.c:1181
 msgid "Current view is a customized view"
 msgstr "Current view is a customised view"
 
-#: ../src/shell/e-shell-window-actions.c:1166
+#: ../src/shell/e-shell-window-actions.c:1189
 msgid "Page Set_up..."
 msgstr "Page Set_up…"
 
-#: ../src/shell/e-shell-window-actions.c:1168
+#: ../src/shell/e-shell-window-actions.c:1191
 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:1535
+#: ../src/shell/e-shell-window-actions.c:1561
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: ../src/shell/e-shell-window-actions.c:1658
+#: ../src/shell/e-shell-window-actions.c:1684
 #, c-format
 msgid "Select view: %s"
 msgstr "Select view: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1675
+#: ../src/shell/e-shell-window-actions.c:1701
 #, c-format
 msgid "Delete view: %s"
 msgstr "Delete view: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1779
+#: ../src/shell/e-shell-window-actions.c:1805
 msgid "Execute these search parameters"
 msgstr "Execute these search parameters"
 
 #. Translators: a 'New' toolbar button caption which is context sensitive and
 #. runs one of the actions under File->New menu
-#: ../src/shell/e-shell-window.c:563
+#: ../src/shell/e-shell-window.c:514
 msgctxt "toolbar-button"
 msgid "New"
 msgstr "New"
 
 #. Translators: This is used for the main window title.
-#: ../src/shell/e-shell-window-private.c:756
+#: ../src/shell/e-shell-window-private.c:787
 #, c-format
 msgid "%s — Evolution"
 msgstr "%s — Evolution"
@@ -26130,6 +26356,22 @@ msgstr "%s — Evolution"
 #. Preview/Alpha/Beta version warning message
 #: ../src/shell/main.c:192
 #, no-c-format
+#| msgid ""
+#| "Hi.  Thanks for taking the time to download this preview release\n"
+#| "of the Evolution groupware suite.\n"
+#| "\n"
+#| "This version of Evolution is not yet complete. It is getting close,\n"
+#| "but some features are either unfinished or do not work properly.\n"
+#| "\n"
+#| "If you want a stable version of Evolution, we urge you to uninstall\n"
+#| "this version, and install version %s instead.\n"
+#| "\n"
+#| "If you find bugs, please report them to us at bugzilla.gnome.org.\n"
+#| "This product comes with no warranty and is not intended for\n"
+#| "individuals prone to violent fits of anger.\n"
+#| "\n"
+#| "We hope that you enjoy the results of our hard work, and we\n"
+#| "eagerly await your contributions!\n"
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -26140,7 +26382,8 @@ msgid ""
 "If you want a stable version of Evolution, we urge you to uninstall\n"
 "this version, and install version %s instead.\n"
 "\n"
-"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
+"If you find bugs, please report them at\n"
+"https://gitlab.gnome.org/GNOME/evolution/issues/.\n";
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
@@ -26156,14 +26399,15 @@ msgstr ""
 "If you want a stable version of Evolution, we urge you to uninstall\n"
 "this version, and install version %s instead.\n"
 "\n"
-"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
+"If you find bugs, please report them at\n"
+"https://gitlab.gnome.org/GNOME/evolution/issues/.\n";
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: ../src/shell/main.c:216
+#: ../src/shell/main.c:217
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -26171,13 +26415,13 @@ msgstr ""
 "Thanks\n"
 "The Evolution Team\n"
 
-#: ../src/shell/main.c:222
+#: ../src/shell/main.c:223
 msgid "Do not tell me again"
 msgstr "Do not tell me again"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../src/shell/main.c:311
+#: ../src/shell/main.c:312
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "“mail”, “calendar”, “contacts”, “tasks”, and “memos”"
@@ -26185,39 +26429,39 @@ msgstr ""
 "Start Evolution showing the specified component. Available options are "
 "“mail”, “calendar”, “contacts”, “tasks”, and “memos”"
 
-#: ../src/shell/main.c:315
+#: ../src/shell/main.c:316
 msgid "Apply the given geometry to the main window"
 msgstr "Apply the given geometry to the main window"
 
-#: ../src/shell/main.c:319
+#: ../src/shell/main.c:320
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: ../src/shell/main.c:321
+#: ../src/shell/main.c:322
 msgid "Ignore network availability"
 msgstr "Ignore network availability"
 
-#: ../src/shell/main.c:324
+#: ../src/shell/main.c:325
 msgid "Forcibly shut down Evolution"
 msgstr "Forcibly shut down Evolution"
 
-#: ../src/shell/main.c:327
+#: ../src/shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "Disable loading of any plugins."
 
-#: ../src/shell/main.c:329
+#: ../src/shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Disable preview pane of Mail, Contacts and Tasks."
 
-#: ../src/shell/main.c:333
+#: ../src/shell/main.c:334
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Import URIs or filenames given as rest of arguments."
 
-#: ../src/shell/main.c:335
+#: ../src/shell/main.c:336
 msgid "Request a running Evolution process to quit"
 msgstr "Request a running Evolution process to quit"
 
-#: ../src/shell/main.c:417
+#: ../src/shell/main.c:418
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -26226,11 +26470,11 @@ msgstr ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
 "System error: %s"
 
-#: ../src/shell/main.c:473 ../src/shell/main.c:478
+#: ../src/shell/main.c:474 ../src/shell/main.c:479
 msgid "— The Evolution PIM and Email Client"
 msgstr "— The Evolution PIM and Email Client"
 
-#: ../src/shell/main.c:540
+#: ../src/shell/main.c:541
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26239,7 +26483,7 @@ msgstr ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run “%s --help” for more information.\n"
 
-#: ../src/shell/main.c:546
+#: ../src/shell/main.c:547
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -26383,7 +26627,6 @@ msgid "SSL certificate for task list “{0}” is not trusted."
 msgstr "SSL certificate for task list “{0}” is not trusted."
 
 #: ../src/shell/shell.error.xml.h:34
-#| msgid "Menubar is visible"
 msgid "Menu Bar is hidden"
 msgstr "Menu Bar is hidden"
 
@@ -26392,7 +26635,6 @@ msgid "Press the “Alt” key to access the Menu Bar again."
 msgstr "Press the “Alt” key to access the Menu Bar again."
 
 #: ../src/shell/shell.error.xml.h:36
-#| msgid "Show _Menu Bar"
 msgid "_Show Menu Bar"
 msgstr "_Show Menu Bar"
 
@@ -26482,7 +26724,7 @@ msgstr "MD5 Fingerprint"
 msgid "Email Address"
 msgstr "E-mail Address"
 
-#: ../src/smime/gui/certificate-manager.c:663
+#: ../src/smime/gui/certificate-manager.c:648
 msgid "Select a file to backup your key and certificate..."
 msgstr "Select a file to backup your key and certificate..."
 
@@ -26491,31 +26733,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:675
+#: ../src/smime/gui/certificate-manager.c:658
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-backup.p12"
 
-#: ../src/smime/gui/certificate-manager.c:741
+#: ../src/smime/gui/certificate-manager.c:721
 msgid "Backup Certificate"
 msgstr "Backup Certificate"
 
 #. filename selection
-#: ../src/smime/gui/certificate-manager.c:755
+#: ../src/smime/gui/certificate-manager.c:736
 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:760
+#: ../src/smime/gui/certificate-manager.c:741
 msgid "Please select a file..."
 msgstr "Please select a file..."
 
-#: ../src/smime/gui/certificate-manager.c:774
+#: ../src/smime/gui/certificate-manager.c:755
 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:780
+#: ../src/smime/gui/certificate-manager.c:761
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
@@ -26525,16 +26767,16 @@ msgstr ""
 "you are about to create.\n"
 "You must set this password to proceed with the backup."
 
-#: ../src/smime/gui/certificate-manager.c:799
+#: ../src/smime/gui/certificate-manager.c:780
 msgid "_Repeat Password:"
 msgstr "_Repeat Password:"
 
-#: ../src/smime/gui/certificate-manager.c:818
+#: ../src/smime/gui/certificate-manager.c:799
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
 #. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:826
+#: ../src/smime/gui/certificate-manager.c:807
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -26546,92 +26788,92 @@ msgstr ""
 "restore this backup later.\n"
 "Please record it in a safe location."
 
-#: ../src/smime/gui/certificate-manager.c:871
+#: ../src/smime/gui/certificate-manager.c:852
 msgid "No file name provided"
 msgstr "No file name provided"
 
-#: ../src/smime/gui/certificate-manager.c:875
+#: ../src/smime/gui/certificate-manager.c:856
 msgid "Failed to backup key and certificate"
 msgstr "Failed to backup key and certificate"
 
-#: ../src/smime/gui/certificate-manager.c:964
+#: ../src/smime/gui/certificate-manager.c:948
 msgid "Select a certificate to import..."
 msgstr "Select a certificate to import…"
 
-#: ../src/smime/gui/certificate-manager.c:1014
+#: ../src/smime/gui/certificate-manager.c:997
 msgid "Failed to import certificate"
 msgstr "Failed to import certificate"
 
-#: ../src/smime/gui/certificate-manager.c:1130
+#: ../src/smime/gui/certificate-manager.c:1114
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "Ask when used"
 
-#: ../src/smime/gui/certificate-manager.c:1132
+#: ../src/smime/gui/certificate-manager.c:1116
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Never"
 
-#: ../src/smime/gui/certificate-manager.c:1134
+#: ../src/smime/gui/certificate-manager.c:1118
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr "Marginally"
 
-#: ../src/smime/gui/certificate-manager.c:1136
+#: ../src/smime/gui/certificate-manager.c:1120
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "Fully"
 
-#: ../src/smime/gui/certificate-manager.c:1138
+#: ../src/smime/gui/certificate-manager.c:1122
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr "Ultimately"
 
-#: ../src/smime/gui/certificate-manager.c:1140
+#: ../src/smime/gui/certificate-manager.c:1124
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr "Temporarily"
 
-#: ../src/smime/gui/certificate-manager.c:1346
+#: ../src/smime/gui/certificate-manager.c:1330
 msgid "Change certificate trust"
 msgstr "Change certificate trust"
 
-#: ../src/smime/gui/certificate-manager.c:1358
+#: ../src/smime/gui/certificate-manager.c:1342
 #, c-format
 msgid "Change trust for the host “%s”:"
 msgstr "Change trust for the host “%s”:"
 
-#: ../src/smime/gui/certificate-manager.c:1382
+#: ../src/smime/gui/certificate-manager.c:1366
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "_Ask when used"
 
-#: ../src/smime/gui/certificate-manager.c:1383
+#: ../src/smime/gui/certificate-manager.c:1367
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "_Never trust this certificate"
 
-#: ../src/smime/gui/certificate-manager.c:1384
+#: ../src/smime/gui/certificate-manager.c:1368
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
 msgstr "_Temporarily trusted (this session only)"
 
-#: ../src/smime/gui/certificate-manager.c:1385
+#: ../src/smime/gui/certificate-manager.c:1369
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr "_Marginally trusted"
 
-#: ../src/smime/gui/certificate-manager.c:1386
+#: ../src/smime/gui/certificate-manager.c:1370
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "_Fully trusted"
 
-#: ../src/smime/gui/certificate-manager.c:1387
+#: ../src/smime/gui/certificate-manager.c:1371
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "_Ultimately trusted"
 
-#: ../src/smime/gui/certificate-manager.c:1391
+#: ../src/smime/gui/certificate-manager.c:1375
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
@@ -26639,43 +26881,43 @@ msgstr ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
 
-#: ../src/smime/gui/certificate-manager.c:1406
+#: ../src/smime/gui/certificate-manager.c:1390
 msgid "_Display certificate"
 msgstr "_Display certificate"
 
-#: ../src/smime/gui/certificate-manager.c:1611
+#: ../src/smime/gui/certificate-manager.c:1595
 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:1642
+#: ../src/smime/gui/certificate-manager.c:1626
 msgid "Host name"
 msgstr "Host name"
 
-#: ../src/smime/gui/certificate-manager.c:1644
+#: ../src/smime/gui/certificate-manager.c:1628
 msgid "Issuer"
 msgstr "Issuer"
 
-#: ../src/smime/gui/certificate-manager.c:1645
+#: ../src/smime/gui/certificate-manager.c:1629
 msgid "Fingerprint"
 msgstr "Fingerprint"
 
-#: ../src/smime/gui/certificate-manager.c:1646
+#: ../src/smime/gui/certificate-manager.c:1630
 msgid "Trust"
 msgstr "Trust"
 
-#: ../src/smime/gui/certificate-manager.c:1667
+#: ../src/smime/gui/certificate-manager.c:1651
 msgid "_Edit Trust"
 msgstr "_Edit Trust"
 
-#: ../src/smime/gui/certificate-manager.c:2121
+#: ../src/smime/gui/certificate-manager.c:2105
 msgid "All PKCS12 files"
 msgstr "All PKCS12 files"
 
-#: ../src/smime/gui/certificate-manager.c:2138
+#: ../src/smime/gui/certificate-manager.c:2122
 msgid "All email certificate files"
 msgstr "All e-mail certificate files"
 
-#: ../src/smime/gui/certificate-manager.c:2155
+#: ../src/smime/gui/certificate-manager.c:2139
 msgid "All CA certificate files"
 msgstr "All CA certificate files"
 
@@ -26805,16 +27047,12 @@ msgstr "Do not trust the authenticity of this certificate"
 msgid "C_ertificate:"
 msgstr "C_ertificate:"
 
-#: ../src/smime/lib/e-cert.c:235 ../src/smime/lib/e-cert.c:247
-msgid "%d/%m/%Y"
-msgstr "%d/%m/%Y"
-
 #. x509 certificate usage types
-#: ../src/smime/lib/e-cert.c:403
+#: ../src/smime/lib/e-cert.c:402
 msgid "Sign"
 msgstr "Sign"
 
-#: ../src/smime/lib/e-cert.c:404
+#: ../src/smime/lib/e-cert.c:403
 msgid "Encrypt"
 msgstr "Encrypt"
 
@@ -26859,6 +27097,12 @@ msgstr "Unable to write store to disk, err_code: %i"
 msgid "Imported Certificate"
 msgstr "Imported Certificate"
 
+#~ msgid "Summary:"
+#~ msgstr "Summary:"
+
+#~ msgid "%d/%m/%Y"
+#~ msgstr "%d/%m/%Y"
+
 #~ msgid "Default reminder snooze interval, in minutes"
 #~ msgstr "Default reminder snooze interval, in minutes"
 
@@ -27510,9 +27754,6 @@ msgstr "Imported Certificate"
 #~ msgid "Could not get a selection to modify."
 #~ msgstr "Could not get a selection to modify."
 
-#~ msgid "Could not get a selection to delete."
-#~ msgstr "Could not get a selection to delete."
-
 #~ msgid "Date/Time"
 #~ msgstr "Date/Time"
 
@@ -27739,9 +27980,6 @@ msgstr "Imported Certificate"
 #~ msgid "Available Fields"
 #~ msgstr "Available Fields"
 
-#~ msgid "_Unsort"
-#~ msgstr "_Unsort"
-
 #~ msgid "Define Views"
 #~ msgstr "Define Views"
 
@@ -28911,9 +29149,6 @@ msgstr "Imported Certificate"
 #~ "Possible values are: never — to never close browser window; always — to "
 #~ "always close browser window; ask — (or any other value) will ask user"
 
-#~ msgid "List of accounts"
-#~ msgstr "List of accounts"
-
 #~ msgid ""
 #~ "List of accounts known to the mail component of Evolution. The list "
 #~ "contains strings naming subdirectories relative to /apps/evolution/mail/"
@@ -30299,9 +30534,6 @@ msgstr "Imported Certificate"
 #~ msgid "You have to specify a user name which you want to add to the list"
 #~ msgstr "You have to specify a username which you want to add to the list"
 
-#~ msgid "Do you want to resend the meeting?"
-#~ msgstr "Do you want to resend the meeting?"
-
 #~ msgid "Do you want to resend the recurring meeting?"
 #~ msgstr "Do you want to resend the recurring meeting?"
 
@@ -31750,9 +31982,6 @@ msgstr "Imported Certificate"
 #~ msgid "The notebook page number of the shell view"
 #~ msgstr "The notebook page number of the shell view"
 
-#~ msgid "Search Rule"
-#~ msgstr "Search Rule"
-
 #~ msgid "Criteria for the current search results"
 #~ msgstr "Criteria for the current search results"
 
@@ -35871,9 +36100,6 @@ msgstr "Imported Certificate"
 #~ msgid "_Search name:"
 #~ msgstr "_Search name:"
 
-#~ msgid "Disable"
-#~ msgstr "Disable"
-
 #~ msgid "Enable"
 #~ msgstr "Enable"
 


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