[evolution] Update British English translation



commit 53e24e1dac693cfe735203618360572681b818a6
Author: Zander Brown <zbrown gnome org>
Date:   Tue Feb 11 19:51:46 2020 +0000

    Update British English translation

 po/en_GB.po | 3950 ++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1895 insertions(+), 2055 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 02cc5538aa..8e90196f27 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,22 +4,23 @@
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
 # Philip Withnall <philip tecnocode co uk>, 2010.
 # Chris Leonard <cjlhomeaddress gmail com>, 2012.
-# Bruce Cowan <bruce bcowan me uk>, 2009-2019.
+# Zander Brown <zbrown gnome org>, 2019.
+# Bruce Cowan <bruce bcowan me uk>, 2009-2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n";
-"POT-Creation-Date: 2019-08-02 11:50+0000\n"
-"PO-Revision-Date: 2019-08-13 20:39+0100\n"
+"POT-Creation-Date: 2020-02-10 15:23+0000\n"
+"PO-Revision-Date: 2020-02-11 19:49+0000\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
-"Language-Team: British English <en li org>\n"
+"Language-Team: English - United Kingdom <en_GB li org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 3.32.1\n"
+"X-Generator: Gtranslator 3.34.0\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
@@ -624,18 +625,30 @@ 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:92
+msgid "Let the Month View start with the current week"
+msgstr "Let the Month View start with the current week"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+msgid ""
+"Whether the month view should show weeks starting with the current week "
+"instead of the first week of the month."
+msgstr ""
+"Whether the month view should show weeks starting with the current week "
+"instead of the first week of the month."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Preferred New button item"
 msgstr "Preferred New button item"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 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:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Primary calendar"
 msgstr "Primary calendar"
 
-#: ../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”) calendar in the sidebar of the "
 "“Calendar” view"
@@ -643,11 +656,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:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Primary memo list"
 msgstr "Primary memo 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”) memo list in the sidebar of the "
 "“Memos” view"
@@ -655,11 +668,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:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid "Primary task list"
 msgstr "Primary task list"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid ""
 "The UID of the selected (or “primary”) task list in the sidebar of the "
 "“Tasks” view"
@@ -667,11 +680,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:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid "Free/busy template URL"
 msgstr "Free/busy template URL"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -680,19 +693,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:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid "Recurrent Events in Italic"
 msgstr "Recurrent Events in Italic"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 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:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 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:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid ""
 "How many years can the time-based search go forward or backward from "
 "currently selected day when searching for another occurrence; default is ten "
@@ -702,66 +715,66 @@ msgstr ""
 "currently selected day when searching for another occurrence; default is ten "
 "years"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 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:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid "Whether to display the end time of events in the week and month views"
 msgstr "Whether to display the end time of events in the week and month views"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 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:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 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:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the memo preview pane"
 msgstr "Show the memo 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 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:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Show the task preview pane"
 msgstr "Show the task preview pane"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 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:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 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:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 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:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid "Vertical position for the tag pane"
 msgstr "Vertical position for the tag pane"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Highlight tasks due today"
 msgstr "Highlight tasks due today"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 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:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Tasks due today color"
 msgstr "Tasks due today colour"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid ""
 "Background color of tasks that are due today, in “#rrggbb” format. Used "
 "together with task-due-today-highlight"
@@ -769,15 +782,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:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid "Task preview pane position (horizontal)"
 msgstr "Task preview pane position (horizontal)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Task layout style"
 msgstr "Task layout style"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 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 "
@@ -787,29 +800,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:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Task preview pane position (vertical)"
 msgstr "Task preview pane position (vertical)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 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:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Highlight overdue tasks"
 msgstr "Highlight overdue tasks"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 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:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Overdue tasks color"
 msgstr "Overdue tasks colour"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 msgid ""
 "Background color of tasks that are overdue, in “#rrggbb” format. Used "
 "together with task-overdue-highlight."
@@ -817,19 +830,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:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Time divisions"
 msgstr "Time divisions"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 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:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Timezone"
 msgstr "Timezone"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like “America/New York”"
@@ -837,80 +850,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:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Twenty four hour time format"
 msgstr "Twenty four hour time format"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 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:137
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Birthday and anniversary reminder"
 msgstr "Birthday and anniversary 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 reminder for birthdays and anniversaries"
 msgstr "Whether to set a reminder for birthdays and anniversaries"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Default appointment reminder"
 msgstr "Default appointment reminder"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 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:141
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "Use system timezone"
 msgstr "Use system timezone"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 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:143
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "First day of the week"
 msgstr "First day of the week"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Monday is a work day"
 msgstr "Monday 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 "Tuesday is a work day"
 msgstr "Tuesday 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 "Wednesday is a work day"
 msgstr "Wednesday 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 "Thursday is a work day"
 msgstr "Thursday 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 "Friday is a work day"
 msgstr "Friday 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 "Saturday is a work day"
 msgstr "Saturday is a work day"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "Sunday is a work day"
 msgstr "Sunday is a work day"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 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:152
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 msgid "Draw events as flat, not shaded."
 msgstr "Draw events as flat, not shaded."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
 msgid ""
 "Whether to order days in the Week View from left to right, rather than from "
 "top to bottom."
@@ -918,7 +931,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:154
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 msgid ""
 "Allow direct edit of event Summary when clicking on it in the Day, Work "
 "Week, Week or Month view."
@@ -926,16 +939,15 @@ 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:155
-#| msgid "Default reminder snooze interval, in minutes"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
 msgid "User-defined reminder times, in minutes"
 msgstr "User-defined reminder times, in minutes"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
 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:157
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“week-start-day-name” instead."
@@ -943,11 +955,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:158
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
 msgid "(Deprecated) Work days"
 msgstr "(Deprecated) Work days"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
 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-"
@@ -2654,7 +2666,6 @@ msgstr ""
 "messages for offline use. The option is disabled by default."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
-#| msgid "Display reminders in _notification area only"
 msgid "Whether display delivery notification parts inline."
 msgstr "Whether display delivery notification parts inline."
 
@@ -2872,9 +2883,8 @@ msgid "Whether to delete processed iTip objects"
 msgstr "Whether to delete processed iTip objects"
 
 #: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:3
-#| msgid "_Preserve my reminder"
-msgid "Preserve exiting reminder by default"
-msgstr "Preserve exiting reminder by default"
+msgid "Preserve existing reminder by default"
+msgstr "Preserve existing reminder by default"
 
 #: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:4
 msgid "Whether to preset option to preserve existing reminder by default"
@@ -3260,7 +3270,7 @@ msgstr ""
 
 #: ../data/org.gnome.Evolution.appdata.xml.in.in.h:1
 #: ../data/org.gnome.Evolution.desktop.in.in.h:1
-#: ../src/mail/e-mail-browser.c:1252
+#: ../src/mail/e-mail-browser.c:1295
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
 #: ../src/shell/e-shell-window-private.c:240
 msgid "Evolution"
@@ -3319,14 +3329,14 @@ msgstr "Compose a Message"
 #: ../data/org.gnome.Evolution.desktop.in.in.h:8
 #: ../src/e-util/e-name-selector-dialog.c:448
 #: ../src/modules/addressbook/e-book-shell-backend.c:314
-#: ../src/modules/addressbook/e-book-shell-view.c:412
+#: ../src/modules/addressbook/e-book-shell-view.c:416
 msgid "Contacts"
 msgstr "Contacts"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:954
-#: ../src/e-util/e-collection-account-wizard.c:816
-#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:469
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1009
+#: ../src/e-util/e-collection-account-wizard.c:815
+#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:470
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:199
 #: ../src/modules/calendar/e-cal-shell-view.c:599
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
@@ -3343,8 +3353,8 @@ msgid "Mail"
 msgstr "Mail"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:11
-#: ../src/calendar/gui/e-memo-table.c:457 ../src/e-util/e-webdav-browser.c:459
-#: ../src/modules/calendar/e-cal-shell-content.c:1763
+#: ../src/calendar/gui/e-memo-table.c:457 ../src/e-util/e-webdav-browser.c:460
+#: ../src/modules/calendar/e-cal-shell-content.c:1769
 #: ../src/modules/calendar/e-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
@@ -3352,12 +3362,12 @@ msgid "Memos"
 msgstr "Memos"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:12
-#: ../src/calendar/gui/e-task-table.c:624 ../src/calendar/gui/print.c:2426
+#: ../src/calendar/gui/e-task-table.c:624 ../src/calendar/gui/print.c:2442
 #: ../src/calendar/importers/icalendar-importer.c:77
 #: ../src/calendar/importers/icalendar-importer.c:1141
-#: ../src/e-util/e-webdav-browser.c:460
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
-#: ../src/modules/calendar/e-cal-shell-content.c:1723
+#: ../src/e-util/e-webdav-browser.c:461
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+#: ../src/modules/calendar/e-cal-shell-content.c:1729
 #: ../src/modules/calendar/e-task-shell-view-actions.c:220
 #: ../src/modules/calendar/e-task-shell-view-actions.c:235
 #: ../src/modules/calendar/e-task-shell-view.c:508
@@ -3370,43 +3380,36 @@ msgid "Keyboard Shortcuts"
 msgstr "Keyboard Shortcuts"
 
 #: ../data/ui/evolution-shortcuts.ui.h:2
-#| msgid "General"
 msgctxt "shortcut window"
 msgid "General"
 msgstr "General"
 
 #: ../data/ui/evolution-shortcuts.ui.h:3
-#| msgid "Evolution Mail component"
 msgctxt "shortcut window"
 msgid "Select Mail component"
 msgstr "Select Mail component"
 
 #: ../data/ui/evolution-shortcuts.ui.h:4
-#| msgid "Select Contacts from Address Book"
 msgctxt "shortcut window"
 msgid "Select Contacts component"
 msgstr "Select Contacts component"
 
 #: ../data/ui/evolution-shortcuts.ui.h:5
-#| msgid "Evolution's Calendar component"
 msgctxt "shortcut window"
 msgid "Select Calendar component"
 msgstr "Select Calendar component"
 
 #: ../data/ui/evolution-shortcuts.ui.h:6
-#| msgid "Evolution's Tasks component"
 msgctxt "shortcut window"
 msgid "Select Tasks component"
 msgstr "Select Tasks component"
 
 #: ../data/ui/evolution-shortcuts.ui.h:7
-#| msgid "Evolution's Memos component"
 msgctxt "shortcut window"
 msgid "Select Memos component"
 msgstr "Select Memos component"
 
 #: ../data/ui/evolution-shortcuts.ui.h:8
-#| msgid "Create a new mail account"
 msgctxt "shortcut window"
 msgid "Create a new item in current component"
 msgstr "Create a new item in current component"
@@ -3417,133 +3420,111 @@ msgid "Cycle focus between panes"
 msgstr "Cycle focus between panes"
 
 #: ../data/ui/evolution-shortcuts.ui.h:10
-#| msgid "Open the Evolution User Guide"
 msgctxt "shortcut window"
 msgid "Open the Evolution user guide"
 msgstr "Open the Evolution user guide"
 
 #: ../data/ui/evolution-shortcuts.ui.h:11
-#| msgid "Clear Search"
 msgctxt "shortcut window"
 msgid "Clear search bar"
 msgstr "Clear search bar"
 
 #: ../data/ui/evolution-shortcuts.ui.h:12
-#| msgid "Move contacts to"
 msgctxt "shortcut window"
 msgid "Move mails or contacts to folder"
 msgstr "Move mails or contacts to folder"
 
 #: ../data/ui/evolution-shortcuts.ui.h:13
-#| msgid "Copy contacts to"
 msgctxt "shortcut window"
 msgid "Copy mails or contacts to folder"
 msgstr "Copy mails or contacts to folder"
 
 #: ../data/ui/evolution-shortcuts.ui.h:14
-#| msgid "_Preferences"
 msgctxt "shortcut window"
 msgid "Preferences"
 msgstr "Preferences"
 
 #: ../data/ui/evolution-shortcuts.ui.h:15
-#| msgid "_Open in New Window"
 msgctxt "shortcut window"
 msgid "Open new window"
 msgstr "Open new window"
 
 #: ../data/ui/evolution-shortcuts.ui.h:16
-#| msgid "_Close Window"
 msgctxt "shortcut window"
 msgid "Close window"
 msgstr "Close window"
 
 #: ../data/ui/evolution-shortcuts.ui.h:17
-#| msgid "_Exit Evolution"
 msgctxt "shortcut window"
 msgid "Quit Evolution"
 msgstr "Quit Evolution"
 
 #: ../data/ui/evolution-shortcuts.ui.h:18
-#| msgid "Mail"
 msgctxt "shortcut window"
 msgid "Mail"
 msgstr "Mail"
 
 #: ../data/ui/evolution-shortcuts.ui.h:19
-#| msgid "Create a new memo"
 msgctxt "shortcut window"
 msgid "Create a new message"
 msgstr "Create a new message"
 
 #: ../data/ui/evolution-shortcuts.ui.h:20
-#| msgid "Sent and Draft Messages"
 msgctxt "shortcut window"
 msgid "Send and receive messages"
 msgstr "Send and receive messages"
 
 #: ../data/ui/evolution-shortcuts.ui.h:21
-#| msgid "Copy the selection"
 msgctxt "shortcut window"
 msgid "Apply filters to selection"
 msgstr "Apply filters to selection"
 
 #: ../data/ui/evolution-shortcuts.ui.h:22
-#| msgid "Open the selected messages in a new window"
 msgctxt "shortcut window"
 msgid "Open selection in new window"
 msgstr "Open selection in new window"
 
 #: ../data/ui/evolution-shortcuts.ui.h:23
-#| msgid "Go to Folder"
 msgctxt "shortcut window"
 msgid "Go to folder"
 msgstr "Go to folder"
 
 #: ../data/ui/evolution-shortcuts.ui.h:24
-#| msgid "Mark replied to messages as read"
 msgctxt "shortcut window"
 msgid "Mark selected messages as read"
 msgstr "Mark selected messages as read"
 
 #: ../data/ui/evolution-shortcuts.ui.h:25
-#| msgid "Mark the selected messages as junk"
 msgctxt "shortcut window"
 msgid "Mark selected messages as unread"
 msgstr "Mark selected messages as unread"
 
 #: ../data/ui/evolution-shortcuts.ui.h:26
-#| msgid "Display the next unread message"
 msgctxt "shortcut window"
 msgid "Jump to the next unread message"
 msgstr "Jump to the next unread message"
 
 #: ../data/ui/evolution-shortcuts.ui.h:27
-#| msgid "Display the previous unread message"
 msgctxt "shortcut window"
 msgid "Jump to the previous unread message"
 msgstr "Jump to the previous unread message"
 
 #: ../data/ui/evolution-shortcuts.ui.h:28
-#| msgid "Forwarded messages"
 msgctxt "shortcut window"
 msgid "Forward selected messages"
 msgstr "Forward selected messages"
 
 #: ../data/ui/evolution-shortcuts.ui.h:29
-#| msgid "_Reply to sender"
 msgctxt "shortcut window"
 msgid "Reply to sender"
 msgstr "Reply to sender"
 
 #: ../data/ui/evolution-shortcuts.ui.h:30
-#| msgid "Reply to _List"
 msgctxt "shortcut window"
 msgid "Reply to list"
 msgstr "Reply to list"
 
 #: ../data/ui/evolution-shortcuts.ui.h:31
-#| msgid "Send reply to all recipients?"
 msgctxt "shortcut window"
 msgid "Reply to all recipients"
 msgstr "Reply to all recipients"
@@ -3559,91 +3540,76 @@ msgid "Scroll down"
 msgstr "Scroll down"
 
 #: ../data/ui/evolution-shortcuts.ui.h:34
-#| msgid "Calendar"
 msgctxt "shortcut window"
 msgid "Calendar"
 msgstr "Calendar"
 
 #: ../data/ui/evolution-shortcuts.ui.h:35
-#| msgid "Create a new appointment"
 msgctxt "shortcut window"
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
 #: ../data/ui/evolution-shortcuts.ui.h:36
-#| msgid "Create a new meeting"
 msgctxt "shortcut window"
 msgid "Create a new meeting"
 msgstr "Create a new meeting"
 
 #: ../data/ui/evolution-shortcuts.ui.h:37
-#| msgid "Create a new task"
 msgctxt "shortcut window"
 msgid "Create a new task"
 msgstr "Create a new task"
 
 #: ../data/ui/evolution-shortcuts.ui.h:38
-#| msgid "Create a new memo"
 msgctxt "shortcut window"
 msgid "Create a new memo"
 msgstr "Create a new memo"
 
 #: ../data/ui/evolution-shortcuts.ui.h:39
-#| msgid "Go to Today"
 msgctxt "shortcut window"
 msgid "Go to today"
 msgstr "Go to today"
 
 #: ../data/ui/evolution-shortcuts.ui.h:40
-#| msgid "Go to Date"
 msgctxt "shortcut window"
 msgid "Go to date"
 msgstr "Go to date"
 
 #: ../data/ui/evolution-shortcuts.ui.h:41
-#| msgid "Day View"
 msgctxt "shortcut window"
 msgid "Day View"
 msgstr "Day View"
 
 #: ../data/ui/evolution-shortcuts.ui.h:42
-#| msgid "Work Week View"
 msgctxt "shortcut window"
 msgid "Work Week View"
 msgstr "Work Week View"
 
 #: ../data/ui/evolution-shortcuts.ui.h:43
-#| msgid "Week View"
 msgctxt "shortcut window"
 msgid "Week View"
 msgstr "Week View"
 
 #: ../data/ui/evolution-shortcuts.ui.h:44
-#| msgid "Month View"
 msgctxt "shortcut window"
 msgid "Month View"
 msgstr "Month View"
 
 #: ../data/ui/evolution-shortcuts.ui.h:45
-#| msgid "List View"
 msgctxt "shortcut window"
 msgid "List View"
 msgstr "List View"
 
 #: ../data/ui/evolution-shortcuts.ui.h:46
-#| msgid "Contacts"
 msgctxt "shortcut window"
 msgid "Contacts"
 msgstr "Contacts"
 
 #: ../data/ui/evolution-shortcuts.ui.h:47
-#| msgid "Create a new contact"
 msgctxt "shortcut window"
 msgid "Create a new contact"
 msgstr "Create a new contact"
 
 #: ../data/ui/evolution-shortcuts.ui.h:48
-#| msgid "Create a new contact list"
 msgctxt "shortcut window"
 msgid "Create a new contact list"
 msgstr "Create a new contact list"
@@ -3709,11 +3675,11 @@ msgstr "For _Wide View"
 msgid "As Sent Folder for Wi_de View"
 msgstr "As Sent Folder for Wi_de View"
 
-#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2444
+#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2448
 msgid "_Memos"
 msgstr "_Memos"
 
-#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2448
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2452
 #: ../src/plugins/pst-import/pst-importer.c:571
 msgid "_Tasks"
 msgstr "_Tasks"
@@ -3874,19 +3840,19 @@ msgstr ""
 
 #: ../src/addressbook/addressbook.error.xml.h:32
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:751
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:757
 #: ../src/calendar/gui/e-comp-editor-page-general.c:1525
 #: ../src/e-util/e-accounts-window.c:1563
 #: ../src/e-util/e-mail-signature-manager.c:328
 #: ../src/e-util/e-name-selector-dialog.c:1029 ../src/e-util/filter.ui.h:25
-#: ../src/mail/e-mail-account-manager.c:719
+#: ../src/mail/e-mail-account-manager.c:721
 #: ../src/mail/e-mail-label-manager.c:371
 #: ../src/mail/em-folder-properties.c:1330
 #: ../src/mail/em-vfolder-editor-rule.c:408
 #: ../src/mail/em-vfolder-editor-rule.c:637 ../src/mail/mail-config.ui.h:63
 #: ../src/modules/mail/em-composer-prefs.c:423
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:544
-#: ../src/plugins/email-custom-header/email-custom-header.c:838
+#: ../src/plugins/email-custom-header/email-custom-header.c:839
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
 #: ../src/plugins/templates/templates.c:464
 msgid "_Add"
@@ -3925,7 +3891,7 @@ msgstr ""
 "to add it anyway?"
 
 #: ../src/addressbook/addressbook.error.xml.h:39
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1280
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1241
 msgid "Failed to delete contact"
 msgstr "Failed to delete contact"
 
@@ -4057,11 +4023,11 @@ msgstr "Options"
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:453
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:14
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:510
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:746
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:516
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:752
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:316
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1360
-#: ../src/calendar/gui/e-cal-dialogs.c:689
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1321
+#: ../src/calendar/gui/e-cal-dialogs.c:690
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:304
 #: ../src/composer/e-composer-actions.c:228 ../src/e-util/e-activity-bar.c:357
 #: ../src/e-util/e-attachment-dialog.c:309
@@ -4072,13 +4038,13 @@ msgstr "Options"
 #: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:169
 #: ../src/e-util/e-category-editor.c:257 ../src/e-util/e-charset-combo-box.c:99
 #: ../src/e-util/e-collection-account-wizard.c:238
-#: ../src/e-util/e-collection-account-wizard.c:1838
-#: ../src/e-util/e-collection-account-wizard.c:2074
+#: ../src/e-util/e-collection-account-wizard.c:1837
+#: ../src/e-util/e-collection-account-wizard.c:2073
 #: ../src/e-util/e-color-chooser-widget.c:125
 #: ../src/e-util/e-filter-datespec.c:300
-#: ../src/e-util/e-html-editor-actions.c:304
-#: ../src/e-util/e-html-editor-actions.c:348
-#: ../src/e-util/e-html-editor-actions.c:430
+#: ../src/e-util/e-html-editor-actions.c:342
+#: ../src/e-util/e-html-editor-actions.c:386
+#: ../src/e-util/e-html-editor-actions.c:489
 #: ../src/e-util/e-image-chooser-dialog.c:179
 #: ../src/e-util/e-mail-signature-script-dialog.c:366
 #: ../src/e-util/e-passwords.c:468 ../src/e-util/e-rule-context.c:816
@@ -4088,10 +4054,10 @@ 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:4347
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:3963
 #: ../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:4047
+#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4044
 #: ../src/mail/em-folder-selector.c:318 ../src/mail/mail-config.ui.h:2
 #: ../src/mail/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
@@ -4118,15 +4084,15 @@ msgstr "_Cancel"
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:749
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:755
 #: ../src/calendar/calendar.error.xml.h:47
-#: ../src/calendar/gui/e-comp-editor.c:2123
+#: ../src/calendar/gui/e-comp-editor.c:2158
 #: ../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:2472 ../src/e-util/e-web-view.c:4347
+#: ../src/e-util/e-webdav-browser.c:2476 ../src/e-util/e-web-view.c:3963
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:268
 #: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:133
 #: ../src/smime/gui/certificate-manager.c:651
@@ -4135,17 +4101,17 @@ msgid "_Save"
 msgstr "_Save"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../src/calendar/gui/e-comp-editor.c:2020
-#: ../src/calendar/gui/e-comp-editor.c:2092
+#: ../src/calendar/gui/e-comp-editor.c:2055
+#: ../src/calendar/gui/e-comp-editor.c:2127
 #: ../src/e-util/e-preferences-window.c:390
 #: ../src/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:1474 ../src/shell/e-shell-window-actions.c:1019
+#: ../src/shell/e-shell-window-actions.c:1053
 msgid "_Help"
 msgstr "_Help"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
-#: ../src/e-util/e-misc-utils.c:3573
+#: ../src/e-util/e-misc-utils.c:3574
 msgid "Image"
 msgstr "Image"
 
@@ -4171,8 +4137,8 @@ msgid "Full _Name..."
 msgstr "Full _Name…"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:835
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1291
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:925
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1345
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "E-mail"
@@ -4203,8 +4169,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:863
-#: ../src/modules/itip-formatter/itip-view.c:2071
+#: ../src/calendar/gui/e-comp-editor-event.c:884
+#: ../src/modules/itip-formatter/itip-view.c:1907
 msgid "_Calendar:"
 msgstr "_Calendar:"
 
@@ -4292,16 +4258,16 @@ msgid "_Anniversary:"
 msgstr "_Anniversary:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1055
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:2121
+#: ../src/calendar/gui/e-calendar-view.c:2098
 msgid "Anniversary"
 msgstr "Anniversary"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1000
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1054
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:2120
+#: ../src/calendar/gui/e-calendar-view.c:2097
 msgid "Birthday"
 msgstr "Birthday"
 
@@ -4350,7 +4316,7 @@ msgstr "Home"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:63
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:969
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1023
 #: ../src/addressbook/gui/widgets/e-contact-map.c:380
 msgid "Work"
 msgstr "Work"
@@ -4358,8 +4324,8 @@ msgstr "Work"
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:64
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:526
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1035
-#: ../src/calendar/gui/e-cal-model.c:3827
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1089
+#: ../src/calendar/gui/e-cal-model.c:3792
 msgid "Other"
 msgstr "Other"
 
@@ -4388,12 +4354,12 @@ msgstr "Add _X.509"
 #: ../src/e-util/e-mail-signature-manager.c:368
 #: ../src/e-util/e-name-selector-dialog.c:1033
 #: ../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-config-identity-page.c:872
 #: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:678
 #: ../src/mail/em-folder-properties.c:1336
 #: ../src/mail/em-vfolder-editor-rule.c:642 ../src/mail/mail-config.ui.h:64
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:554
-#: ../src/plugins/email-custom-header/email-custom-header.c:848
+#: ../src/plugins/email-custom-header/email-custom-header.c:849
 #: ../src/plugins/publish-calendar/publish-calendar.c:790
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:35
 #: ../src/plugins/templates/templates.c:474
@@ -4414,24 +4380,26 @@ msgid "Certificates"
 msgstr "Certificates"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../src/calendar/gui/e-comp-editor.c:2055
-#: ../src/e-util/e-html-editor-actions.c:945
+#: ../src/calendar/gui/e-comp-editor.c:2090
+#: ../src/e-util/e-html-editor-actions.c:1004
 msgid "_Undo"
 msgstr "_Undo"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:263
-#: ../src/calendar/gui/e-comp-editor.c:2057 ../src/e-util/e-focus-tracker.c:120
+#: ../src/calendar/gui/e-comp-editor.c:2092 ../src/e-util/e-focus-tracker.c:147
+#: ../src/e-util/e-focus-tracker.c:150
 msgid "Undo"
 msgstr "Undo"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:268
-#: ../src/calendar/gui/e-comp-editor.c:2062
-#: ../src/e-util/e-html-editor-actions.c:931
+#: ../src/calendar/gui/e-comp-editor.c:2097
+#: ../src/e-util/e-html-editor-actions.c:990
 msgid "_Redo"
 msgstr "_Redo"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:270
-#: ../src/calendar/gui/e-comp-editor.c:2064 ../src/e-util/e-focus-tracker.c:136
+#: ../src/calendar/gui/e-comp-editor.c:2099 ../src/e-util/e-focus-tracker.c:163
+#: ../src/e-util/e-focus-tracker.c:166
 msgid "Redo"
 msgstr "Redo"
 
@@ -4463,6 +4431,8 @@ msgid "PGP keys"
 msgstr "PGP keys"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3256
+#: ../src/e-util/e-html-editor-actions.c:395
+#: ../src/e-util/e-image-chooser-dialog.c:193
 #: ../src/smime/gui/certificate-manager.c:672
 #: ../src/smime/gui/certificate-manager.c:961
 msgid "All files"
@@ -4480,9 +4450,9 @@ msgstr "Open X.509 certificate"
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4347
 #: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:177
-#: ../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-html-editor-actions.c:342
+#: ../src/e-util/e-html-editor-actions.c:386
+#: ../src/e-util/e-html-editor-actions.c:489
 #: ../src/e-util/e-image-chooser-dialog.c:182 ../src/plugins/face/face.c:298
 #: ../src/shell/e-shell-utils.c:69 ../src/smime/gui/certificate-manager.c:951
 msgid "_Open"
@@ -4530,7 +4500,7 @@ msgstr "Please select an image for this contact"
 msgid "_No image"
 msgstr "_No image"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4708
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4711
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -4538,28 +4508,28 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4714
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4717
 #, c-format
 msgid "“%s” has an invalid format"
 msgstr "“%s” has an invalid format"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4722
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4725
 #, 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:4730
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4733
 #, 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:4743
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4757
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4746
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4760
 #, c-format
 msgid "%s“%s” is empty"
 msgstr "%s“%s” is empty"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4772
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4775
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
@@ -4583,8 +4553,7 @@ msgstr "Invalid contact."
 #: ../src/e-util/e-timezone-dialog.ui.h:3
 #: ../src/mail/e-mail-config-window.c:335 ../src/mail/e-mail-tag-editor.c:162
 #: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
-#: ../src/mail/mail-dialogs.ui.h:23 ../src/mail/mail-vfolder-ui.c:150
-#: ../src/mail/mail-vfolder-ui.c:272
+#: ../src/mail/mail-vfolder-ui.c:150 ../src/mail/mail-vfolder-ui.c:272
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:278
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../src/plugins/publish-calendar/url-editor-dialog.c:420
@@ -4685,7 +4654,7 @@ msgid "_Suffix:"
 msgstr "_Suffix:"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:815
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:822
 msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
@@ -4727,12 +4696,12 @@ msgid "_Top"
 msgstr "_Top"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../src/e-util/e-source-selector.c:3473 ../src/e-util/filter.ui.h:29
+#: ../src/e-util/e-source-selector.c:3492 ../src/e-util/filter.ui.h:29
 msgid "_Up"
 msgstr "_Up"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../src/e-util/e-source-selector.c:3474 ../src/e-util/filter.ui.h:30
+#: ../src/e-util/e-source-selector.c:3493 ../src/e-util/filter.ui.h:30
 msgid "_Down"
 msgstr "_Down"
 
@@ -4741,23 +4710,23 @@ msgstr "_Down"
 msgid "_Bottom"
 msgstr "_Bottom"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:940
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:947
 msgid "Contact List Members"
 msgstr "Contact List Members"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1499
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1506
 msgid "_Members"
 msgstr "_Members"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1639
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1659
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1679
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1686
 msgid "Error removing list"
 msgstr "Error removing list"
 
@@ -4793,23 +4762,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:428
+#: ../src/e-util/e-web-view.c:430
 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:440
-#| msgid "_Send New Message To..."
+#: ../src/e-util/e-web-view.c:442
 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:442
+#: ../src/e-util/e-web-view.c:444
 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:1446
+#: ../src/e-util/e-web-view.c:1668
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
@@ -4831,161 +4799,159 @@ msgstr "SIP"
 msgid "List Members:"
 msgstr "List Members:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:769
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:956
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:997
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:784
+msgid "Fax"
+msgstr "Fax"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:786
 msgid "Phone"
 msgstr "Phone"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:875
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:930
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Nickname"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:876
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:931
 msgid "AIM"
 msgstr "AIM"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:877
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:932
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:878
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:933
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:879
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:934
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:880
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:935
 msgid "MSN"
 msgstr "MSN"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:881
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:936
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:882
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:937
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:883
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:938
 msgid "Skype"
 msgstr "Skype"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:884
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:939
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:946
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Company"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:947
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
 msgid "Department"
 msgstr "Department"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:948
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1003
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "Office"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1004
 msgid "Profession"
 msgstr "Profession"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:950
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1005
 msgid "Position"
 msgstr "Position"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:951
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1006
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Manager"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:952
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1007
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Assistant"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:953
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1008
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:955
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1010
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Free/Busy"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:957
-msgid "Fax"
-msgstr "Fax"
-
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:959
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:999
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1025
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1013
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1053
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1079
 msgid "Address"
 msgstr "Address"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:995
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1049
 msgid "Home Page"
 msgstr "Home Page"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:996
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1050
 msgid "Web Log"
 msgstr "Web Log"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1056
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Spouse"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1012
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1066
 msgid "Personal"
 msgstr "Personal"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1057
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1111
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Note"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1253
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1307
 msgid "List Members"
 msgstr "List Members"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1276
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1330
 msgid "Job Title"
 msgstr "Job Title"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1317
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1371
 msgid "Home page"
 msgstr "Home page"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1327
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1381
 msgid "Blog"
 msgstr "Blog"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:299
-#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1146
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:305
+#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1143
 msgid "Cancelled"
 msgstr "Cancelled"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:489
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:495
 msgid "Merge Contact"
 msgstr "Merge Contact"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:511
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:752
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:517
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:758
 msgid "_Merge"
 msgstr "_Merge"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:741
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:747
 msgid "Duplicate Contact Detected"
 msgstr "Duplicate Contact Detected"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:799
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:805
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
@@ -4993,7 +4959,7 @@ msgstr ""
 "The name or e-mail address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:802
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:808
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
@@ -5001,19 +4967,19 @@ msgstr ""
 "The name or e-mail address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:817
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:823
 msgid "Changed Contact:"
 msgstr "Changed Contact:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:819
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:825
 msgid "New Contact:"
 msgstr "New Contact:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:858
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:864
 msgid "Conflicting Contact:"
 msgstr "Conflicting Contact:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:860
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:866
 msgid "Old Contact:"
 msgstr "Old Contact:"
 
@@ -5151,71 +5117,71 @@ msgstr "Search Interrupted"
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:680
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:678
 msgid "Cut selected contacts to the clipboard"
 msgstr "Cut selected contacts to the clipboard"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:686
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:684
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copy selected contacts to the clipboard"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:692
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:690
 msgid "Paste contacts from the clipboard"
 msgstr "Paste contacts from the clipboard"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:698
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:696
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
 msgid "Delete selected contacts"
 msgstr "Delete selected contacts"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:704
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "Select all visible contacts"
 msgstr "Select all visible contacts"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1328
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1289
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Are you sure you want to delete these contact lists?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1332
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1293
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Are you sure you want to delete this contact list?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1336
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1297
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Are you sure you want to delete this contact list (%s)?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1342
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1303
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Are you sure you want to delete these contacts?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1346
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1307
 msgid "Are you sure you want to delete this contact?"
 msgstr "Are you sure you want to delete this contact?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1350
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1311
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Are you sure you want to delete this contact (%s)?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1361
-#: ../src/calendar/gui/e-comp-editor.c:2013
-#: ../src/e-util/e-accounts-window.c:1753 ../src/e-util/e-focus-tracker.c:783
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1322
+#: ../src/calendar/gui/e-comp-editor.c:2048
+#: ../src/e-util/e-accounts-window.c:1753 ../src/e-util/e-focus-tracker.c:816
 #: ../src/e-util/evolution-source-viewer.c:806
-#: ../src/e-util/e-webdav-browser.c:2693
-#: ../src/mail/e-mail-account-manager.c:737
+#: ../src/e-util/e-webdav-browser.c:2697
+#: ../src/mail/e-mail-account-manager.c:739
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1173
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1499
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:697
 #: ../src/modules/calendar/e-task-shell-view-actions.c:851
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1628
-#: ../src/shell/e-shell-window-actions.c:877
+#: ../src/shell/e-shell-window-actions.c:911
 #: ../src/smime/gui/certificate-manager.c:1656 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "_Delete"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1509
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1470
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -5230,11 +5196,11 @@ msgstr[1] ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1478
 msgid "_Don’t Display"
 msgstr "_Don’t Display"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1518
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1479
 msgid "Display _All Contacts"
 msgstr "Display _All Contacts"
 
@@ -5349,7 +5315,7 @@ msgid "Title"
 msgstr "Title"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../src/calendar/gui/e-meeting-list-view.c:664
+#: ../src/calendar/gui/e-meeting-list-view.c:663
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Role"
@@ -5412,23 +5378,19 @@ msgstr "Zoom _In"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2862
+#: ../src/mail/e-mail-reader.c:2861
 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:2015
+#: ../src/e-util/e-html-editor-actions.c:2081
 #: ../src/e-util/e-html-editor-find-dialog.c:244
-#: ../src/shell/e-shell-window-actions.c:947
+#: ../src/shell/e-shell-window-actions.c:981
 msgid "_Find"
 msgstr "_Find"
 
 #: ../src/addressbook/gui/widgets/e-minicard-view.c:186
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "Searching for the Contacts..."
 msgid ""
 "\n"
 "\n"
@@ -5486,41 +5448,40 @@ msgstr ""
 "\n"
 "There are no items to show in this view."
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:789
+#: ../src/addressbook/importers/evolution-csv-importer.c:796
 #: ../src/addressbook/importers/evolution-ldif-importer.c:547
 #: ../src/addressbook/importers/evolution-vcard-importer.c:247
 #: ../src/calendar/importers/icalendar-importer.c:499
 #: ../src/calendar/importers/icalendar-importer.c:1003
 #: ../src/calendar/importers/icalendar-importer.c:1043
-#| msgid "Importing..."
 msgid "Importing…"
 msgstr "Importing…"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:971
+#: ../src/addressbook/importers/evolution-csv-importer.c:978
 msgid "Can’t open .csv file"
 msgstr "Can’t open .csv file"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1140
+#: ../src/addressbook/importers/evolution-csv-importer.c:1151
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlook Contacts CSV or Tab (.csv, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1141
+#: ../src/addressbook/importers/evolution-csv-importer.c:1152
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlook Contacts CSV and Tab Importer"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1149
+#: ../src/addressbook/importers/evolution-csv-importer.c:1160
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozilla Contacts CSV or Tab (.csv, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1150
+#: ../src/addressbook/importers/evolution-csv-importer.c:1161
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilla Contacts CSV and Tab Importer"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1158
+#: ../src/addressbook/importers/evolution-csv-importer.c:1169
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolution Contacts CSV or Tab (.csv, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1159
+#: ../src/addressbook/importers/evolution-csv-importer.c:1170
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolution Contacts CSV and Tab Importer"
 
@@ -6371,7 +6332,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:1930
+#: ../src/e-util/e-collection-account-wizard.c:1929
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -6433,6 +6394,7 @@ msgid "Organizer"
 msgstr "Organiser"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:13
+#: ../src/calendar/gui/e-meeting-list-view.c:623
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:2
 #: ../src/calendar/gui/tasktypes.xml.in.h:6
 msgid "Attendee"
@@ -6458,7 +6420,7 @@ msgstr "Category"
 #: ../src/calendar/gui/caltypes.xml.in.h:16
 #: ../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.c:50
 #: ../src/em-format/e-mail-formatter-print-headers.c:161
 #: ../src/mail/filtertypes.xml.in.h:47 ../src/mail/searchtypes.xml.in.h:49
 #: ../src/mail/vfoldertypes.xml.in.h:50
@@ -6514,74 +6476,65 @@ msgstr "Summary Contains"
 msgid "Description Contains"
 msgstr "Description Contains"
 
-#: ../src/calendar/gui/comp-util.c:1539
-#: ../src/modules/itip-formatter/itip-view.c:2391
+#: ../src/calendar/gui/comp-util.c:1544
+#: ../src/modules/itip-formatter/itip-view.c:2229
 #, c-format
 msgid "with one guest"
 msgid_plural "with %d guests"
 msgstr[0] "with one guest"
 msgstr[1] "with %d guests"
 
-#: ../src/calendar/gui/comp-util.c:1598
+#: ../src/calendar/gui/comp-util.c:1603
 #, c-format
 msgid "Comments: %s"
 msgstr "Comments: %s"
 
-#: ../src/calendar/gui/comp-util.c:1612 ../src/calendar/gui/comp-util.c:1615
-#| msgid "None"
+#: ../src/calendar/gui/comp-util.c:1617 ../src/calendar/gui/comp-util.c:1620
 msgctxt "iCalendarStatus"
 msgid "None"
 msgstr "None"
 
-#: ../src/calendar/gui/comp-util.c:1613
-#| msgid "Tentative"
+#: ../src/calendar/gui/comp-util.c:1618
 msgctxt "iCalendarStatus"
 msgid "Tentative"
 msgstr "Tentative"
 
-#: ../src/calendar/gui/comp-util.c:1614
-#| msgid "Confirm expunge"
+#: ../src/calendar/gui/comp-util.c:1619
 msgctxt "iCalendarStatus"
 msgid "Confirmed"
 msgstr "Confirmed"
 
-#: ../src/calendar/gui/comp-util.c:1616
-#| msgid "Draft"
+#: ../src/calendar/gui/comp-util.c:1621
 msgctxt "iCalendarStatus"
 msgid "Draft"
 msgstr "Draft"
 
-#: ../src/calendar/gui/comp-util.c:1617
+#: ../src/calendar/gui/comp-util.c:1622
 msgctxt "iCalendarStatus"
 msgid "Final"
 msgstr "Final"
 
-#: ../src/calendar/gui/comp-util.c:1618
-#| msgid "Not Started"
+#: ../src/calendar/gui/comp-util.c:1623
 msgctxt "iCalendarStatus"
 msgid "Not Started"
 msgstr "Not Started"
 
-#: ../src/calendar/gui/comp-util.c:1619
-#| msgid "Needs Action"
+#: ../src/calendar/gui/comp-util.c:1624
 msgctxt "iCalendarStatus"
 msgid "Needs Action"
 msgstr "Needs Action"
 
-#: ../src/calendar/gui/comp-util.c:1620
-#| msgid "In Progress"
+#: ../src/calendar/gui/comp-util.c:1625
 msgctxt "iCalendarStatus"
 msgid "In Progress"
 msgstr "In Progress"
 
-#: ../src/calendar/gui/comp-util.c:1621
-#| msgid "Completed"
+#: ../src/calendar/gui/comp-util.c:1626
 msgctxt "iCalendarStatus"
 msgid "Completed"
 msgstr "Completed"
 
-#: ../src/calendar/gui/comp-util.c:1622
-#| msgid "Cancelled"
+#: ../src/calendar/gui/comp-util.c:1627
 msgctxt "iCalendarStatus"
 msgid "Cancelled"
 msgstr "Cancelled"
@@ -6813,8 +6766,8 @@ msgstr "Categories:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:288
 #: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../src/modules/itip-formatter/itip-view.c:1677
-#: ../src/modules/itip-formatter/itip-view.c:1788
+#: ../src/modules/itip-formatter/itip-view.c:1635
+#: ../src/modules/itip-formatter/itip-view.c:1746
 msgid "Location:"
 msgstr "Location:"
 
@@ -6835,30 +6788,30 @@ msgid "Recurs:"
 msgstr "Recurs:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:338
-#: ../src/modules/itip-formatter/itip-view.c:1680
-#: ../src/modules/itip-formatter/itip-view.c:1797
+#: ../src/modules/itip-formatter/itip-view.c:1638
+#: ../src/modules/itip-formatter/itip-view.c:1755
 msgid "Status:"
 msgstr "Status:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:347
 #: ../src/calendar/gui/e-task-table.c:471
 #: ../src/calendar/gui/tasktypes.xml.in.h:19
-#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:331
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:334
 msgid "High"
 msgstr "High"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:349
-#: ../src/calendar/gui/e-cal-model.c:1907
+#: ../src/calendar/gui/e-cal-model.c:1872
 #: ../src/calendar/gui/e-task-table.c:472
 #: ../src/calendar/gui/tasktypes.xml.in.h:20
-#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:330
+#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:333
 msgid "Normal"
 msgstr "Normal"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:351
 #: ../src/calendar/gui/e-task-table.c:473
 #: ../src/calendar/gui/tasktypes.xml.in.h:21
-#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:329
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:332
 msgid "Low"
 msgstr "Low"
 
@@ -6871,7 +6824,6 @@ msgid "Organizer:"
 msgstr "Organiser:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:406
-#| msgid "Attendees: "
 msgid "Attendees:"
 msgstr "Attendees:"
 
@@ -6899,7 +6851,7 @@ msgstr "Creating view for task list “%s”"
 msgid "Creating view for memo list “%s”"
 msgstr "Creating view for memo list “%s”"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1964
+#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1976
 msgid "Destination is read only"
 msgstr "Destination is read only"
 
@@ -6918,157 +6870,157 @@ msgstr "Copying memos to the memo list “%s”"
 msgid "Copying tasks to the task list “%s”"
 msgstr "Copying tasks to the task list “%s”"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:527
+#: ../src/calendar/gui/e-cal-dialogs.c:528
 msgid "_Delete this item from all other recipient’s mailboxes?"
 msgstr "_Delete this item from all other recipient’s mailboxes?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:530
+#: ../src/calendar/gui/e-cal-dialogs.c:531
 msgid "_Retract comment"
 msgstr "_Retract comment"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:687
+#: ../src/calendar/gui/e-cal-dialogs.c:688
 msgid "Select Date"
 msgstr "Select Date"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:688
+#: ../src/calendar/gui/e-cal-dialogs.c:689
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Select _Today"
 msgstr "Select _Today"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:707
+#: ../src/calendar/gui/e-cal-dialogs.c:708
 msgid "January"
 msgstr "January"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:708
+#: ../src/calendar/gui/e-cal-dialogs.c:709
 msgid "February"
 msgstr "February"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:709
+#: ../src/calendar/gui/e-cal-dialogs.c:710
 msgid "March"
 msgstr "March"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:710
+#: ../src/calendar/gui/e-cal-dialogs.c:711
 msgid "April"
 msgstr "April"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:711
+#: ../src/calendar/gui/e-cal-dialogs.c:712
 msgid "May"
 msgstr "May"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:712
+#: ../src/calendar/gui/e-cal-dialogs.c:713
 msgid "June"
 msgstr "June"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:713
+#: ../src/calendar/gui/e-cal-dialogs.c:714
 msgid "July"
 msgstr "July"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:714
+#: ../src/calendar/gui/e-cal-dialogs.c:715
 msgid "August"
 msgstr "August"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:715
+#: ../src/calendar/gui/e-cal-dialogs.c:716
 msgid "September"
 msgstr "September"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:716
+#: ../src/calendar/gui/e-cal-dialogs.c:717
 msgid "October"
 msgstr "October"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:717
+#: ../src/calendar/gui/e-cal-dialogs.c:718
 msgid "November"
 msgstr "November"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:718
+#: ../src/calendar/gui/e-cal-dialogs.c:719
 msgid "December"
 msgstr "December"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:870
+#: ../src/calendar/gui/e-cal-dialogs.c:871
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "You are modifying a recurring event. What would you like to modify?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:872
+#: ../src/calendar/gui/e-cal-dialogs.c:873
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "You are delegating a recurring event. What would you like to delegate?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:876
+#: ../src/calendar/gui/e-cal-dialogs.c:877
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "You are modifying a recurring task. What would you like to modify?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:880
+#: ../src/calendar/gui/e-cal-dialogs.c:881
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "You are modifying a recurring memo. What would you like to modify?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:906
+#: ../src/calendar/gui/e-cal-dialogs.c:908
 msgid "This Instance Only"
 msgstr "This Instance Only"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:910
+#: ../src/calendar/gui/e-cal-dialogs.c:912
 msgid "This and Prior Instances"
 msgstr "This and Prior Instances"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:916
+#: ../src/calendar/gui/e-cal-dialogs.c:918
 msgid "This and Future Instances"
 msgstr "This and Future Instances"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:921
+#: ../src/calendar/gui/e-cal-dialogs.c:923
 msgid "All Instances"
 msgstr "All Instances"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1171
-#: ../src/calendar/gui/e-cal-dialogs.c:1253
+#: ../src/calendar/gui/e-cal-dialogs.c:1173
+#: ../src/calendar/gui/e-cal-dialogs.c:1255
 msgid "Send my reminders with this event"
 msgstr "Send my reminders with this event"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1173
-#: ../src/calendar/gui/e-cal-dialogs.c:1255
+#: ../src/calendar/gui/e-cal-dialogs.c:1175
+#: ../src/calendar/gui/e-cal-dialogs.c:1257
 msgid "Notify new attendees _only"
 msgstr "Notify new attendees _only"
 
-#: ../src/calendar/gui/e-calendar-view.c:476
+#: ../src/calendar/gui/e-calendar-view.c:478
 msgid "Cut selected events to the clipboard"
 msgstr "Cut selected events to the clipboard"
 
-#: ../src/calendar/gui/e-calendar-view.c:482
+#: ../src/calendar/gui/e-calendar-view.c:484
 msgid "Copy selected events to the clipboard"
 msgstr "Copy selected events to the clipboard"
 
-#: ../src/calendar/gui/e-calendar-view.c:488
+#: ../src/calendar/gui/e-calendar-view.c:490
 msgid "Paste events from the clipboard"
 msgstr "Paste events from the clipboard"
 
-#: ../src/calendar/gui/e-calendar-view.c:494
+#: ../src/calendar/gui/e-calendar-view.c:496
 msgid "Delete selected events"
 msgstr "Delete selected events"
 
-#: ../src/calendar/gui/e-calendar-view.c:904
+#: ../src/calendar/gui/e-calendar-view.c:906
 msgid "Pasted text doesn’t contain valid iCalendar data"
 msgstr "Pasted text doesn’t contain valid iCalendar data"
 
-#: ../src/calendar/gui/e-calendar-view.c:915
-#: ../src/calendar/gui/e-cal-ops.c:1555
+#: ../src/calendar/gui/e-calendar-view.c:917
+#: ../src/calendar/gui/e-cal-ops.c:1567
 msgid "Default calendar not found"
 msgstr "Default calendar not found"
 
-#: ../src/calendar/gui/e-calendar-view.c:920
-#: ../src/calendar/gui/e-cal-ops.c:1558
+#: ../src/calendar/gui/e-calendar-view.c:922
+#: ../src/calendar/gui/e-cal-ops.c:1570
 msgid "Default memo list not found"
 msgstr "Default memo list not found"
 
-#: ../src/calendar/gui/e-calendar-view.c:925
-#: ../src/calendar/gui/e-cal-ops.c:1561
+#: ../src/calendar/gui/e-calendar-view.c:927
+#: ../src/calendar/gui/e-cal-ops.c:1573
 msgid "Default task list not found"
 msgstr "Default task list not found"
 
-#: ../src/calendar/gui/e-calendar-view.c:1017
+#: ../src/calendar/gui/e-calendar-view.c:1019
 msgid "No suitable component found"
 msgstr "No suitable component found"
 
-#: ../src/calendar/gui/e-calendar-view.c:1087
+#: ../src/calendar/gui/e-calendar-view.c:1089
 msgid "Pasting iCalendar data"
 msgstr "Pasting iCalendar data"
 
@@ -7077,9 +7029,9 @@ msgstr "Pasting iCalendar data"
 #. * "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../src/calendar/gui/e-calendar-view.c:1896
-#: ../src/calendar/gui/e-memo-table.c:571
-#: ../src/calendar/gui/e-task-table.c:735
+#: ../src/calendar/gui/e-calendar-view.c:1889
+#: ../src/calendar/gui/e-memo-table.c:572
+#: ../src/calendar/gui/e-task-table.c:736
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organiser: %s <%s>"
@@ -7087,27 +7039,27 @@ msgstr "Organiser: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../src/calendar/gui/e-calendar-view.c:1899
-#: ../src/calendar/gui/e-memo-table.c:576
-#: ../src/calendar/gui/e-task-table.c:739
+#: ../src/calendar/gui/e-calendar-view.c:1892
+#: ../src/calendar/gui/e-memo-table.c:577
+#: ../src/calendar/gui/e-task-table.c:740
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organiser: %s"
 
 #. Translators: It will display "Location: PlaceOfTheMeeting"
 #. Translators: It will display "Location: LocationOfTheAppointment"
-#: ../src/calendar/gui/e-calendar-view.c:1918
+#: ../src/calendar/gui/e-calendar-view.c:1911
 #: ../src/calendar/gui/e-meeting-time-sel.c:2580
-#: ../src/calendar/gui/e-task-table.c:757
-#: ../src/calendar/gui/e-to-do-pane.c:375 ../src/calendar/gui/print.c:3565
+#: ../src/calendar/gui/e-task-table.c:758
+#: ../src/calendar/gui/e-to-do-pane.c:377 ../src/calendar/gui/print.c:3627
 #, c-format
 msgid "Location: %s"
 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:1963
-#: ../src/calendar/gui/e-to-do-pane.c:478
+#: ../src/calendar/gui/e-calendar-view.c:1970
+#: ../src/calendar/gui/e-to-do-pane.c:480
 #, c-format
 msgid "Time: %s %s"
 msgstr "Time: %s %s"
@@ -7116,18 +7068,16 @@ msgstr "Time: %s %s"
 #. The string is used for Birthday & Anniversary events where the first year is
 #. know, constructing a summary which also shows how many years the birthday or
 #. anniversary is for. Example: "Birthday: John Doe (13)"
-#: ../src/calendar/gui/e-calendar-view.c:2141
+#: ../src/calendar/gui/e-calendar-view.c:2117
 #, c-format
-#| msgctxt "language"
-#| msgid "%s (%s)"
 msgctxt "BirthdaySummary"
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: ../src/calendar/gui/e-calendar-view.c:2339
-#: ../src/calendar/gui/e-calendar-view.c:2342
-#: ../src/calendar/gui/e-calendar-view.c:2345
-#: ../src/calendar/gui/e-calendar-view.c:2346
+#: ../src/calendar/gui/e-calendar-view.c:2318
+#: ../src/calendar/gui/e-calendar-view.c:2321
+#: ../src/calendar/gui/e-calendar-view.c:2324
+#: ../src/calendar/gui/e-calendar-view.c:2325
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -7136,14 +7086,14 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2341
-#: ../src/calendar/gui/e-day-view.c:3078
+#: ../src/calendar/gui/e-calendar-view.c:2320
+#: ../src/calendar/gui/e-day-view.c:3079
 #: ../src/calendar/gui/e-day-view-top-item.c:858
 #: ../src/calendar/gui/e-week-view-main-item.c:228
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../src/calendar/gui/e-calendar-view.c:2352
+#: ../src/calendar/gui/e-calendar-view.c:2331
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -7153,16 +7103,16 @@ msgstr "%A %d %b %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2354
-#: ../src/calendar/gui/e-day-view.c:3062
+#: ../src/calendar/gui/e-calendar-view.c:2333
+#: ../src/calendar/gui/e-day-view.c:3063
 #: ../src/calendar/gui/e-day-view-top-item.c:854
 #: ../src/calendar/gui/e-week-view-main-item.c:214
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../src/calendar/gui/e-calendar-view.c:2355
-#: ../src/calendar/gui/e-calendar-view.c:2357
-#: ../src/calendar/gui/e-calendar-view.c:2358
+#: ../src/calendar/gui/e-calendar-view.c:2334
+#: ../src/calendar/gui/e-calendar-view.c:2336
+#: ../src/calendar/gui/e-calendar-view.c:2337
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -7198,8 +7148,8 @@ msgstr "Source"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:10
-#: ../src/calendar/gui/e-cal-model.c:3881
-#: ../src/calendar/gui/e-meeting-list-view.c:693
+#: ../src/calendar/gui/e-cal-model.c:3846
+#: ../src/calendar/gui/e-meeting-list-view.c:692
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../src/calendar/gui/e-memo-table.etspec.h:9
 #: ../src/calendar/gui/e-task-table.etspec.h:11
@@ -7210,14 +7160,14 @@ msgid "Status"
 msgstr "Status"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:11
-#: ../src/calendar/gui/e-meeting-list-view.c:650
+#: ../src/calendar/gui/e-meeting-list-view.c:649
 #: ../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:1971
-#: ../src/e-util/e-webdav-browser.c:2386
+#: ../src/e-util/e-collection-account-wizard.c:1970
+#: ../src/e-util/e-webdav-browser.c:2390
 #: ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "Type"
@@ -7227,71 +7177,71 @@ msgstr "Type"
 #: ../src/calendar/gui/e-meeting-list-view.c:197
 #: ../src/calendar/gui/e-meeting-store.c:135
 #: ../src/calendar/gui/e-meeting-store.c:170
-#: ../src/calendar/gui/e-meeting-store.c:215 ../src/calendar/gui/print.c:1257
-#: ../src/calendar/gui/print.c:1274 ../src/e-util/e-charset.c:49
-#: ../src/modules/itip-formatter/itip-view.c:3620
-#: ../src/modules/itip-formatter/itip-view.c:6666
+#: ../src/calendar/gui/e-meeting-store.c:215 ../src/calendar/gui/print.c:1265
+#: ../src/calendar/gui/print.c:1282 ../src/e-util/e-charset.c:49
+#: ../src/modules/itip-formatter/itip-view.c:3395
+#: ../src/modules/itip-formatter/itip-view.c:6440
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../src/calendar/gui/e-cal-model.c:1404 ../src/calendar/gui/e-cal-ops.c:609
-#: ../src/calendar/gui/e-cal-ops.c:1246
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:378
+#: ../src/calendar/gui/e-cal-model.c:1369 ../src/calendar/gui/e-cal-ops.c:615
+#: ../src/calendar/gui/e-cal-ops.c:1252
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:391
 #, c-format
 msgid "Source with UID “%s” not found"
 msgstr "Source with UID “%s” not found"
 
-#: ../src/calendar/gui/e-cal-model.c:1515 ../src/calendar/gui/e-cal-ops.c:185
-#: ../src/calendar/gui/e-cal-ops.c:1363
+#: ../src/calendar/gui/e-cal-model.c:1480 ../src/calendar/gui/e-cal-ops.c:191
+#: ../src/calendar/gui/e-cal-ops.c:1369
 msgid "Creating an event"
 msgstr "Creating an event"
 
-#: ../src/calendar/gui/e-cal-model.c:1519 ../src/calendar/gui/e-cal-ops.c:189
-#: ../src/calendar/gui/e-cal-ops.c:1367
+#: ../src/calendar/gui/e-cal-model.c:1484 ../src/calendar/gui/e-cal-ops.c:195
+#: ../src/calendar/gui/e-cal-ops.c:1373
 msgid "Creating a memo"
 msgstr "Creating a memo"
 
-#: ../src/calendar/gui/e-cal-model.c:1523 ../src/calendar/gui/e-cal-ops.c:193
-#: ../src/calendar/gui/e-cal-ops.c:1371
+#: ../src/calendar/gui/e-cal-model.c:1488 ../src/calendar/gui/e-cal-ops.c:199
+#: ../src/calendar/gui/e-cal-ops.c:1377
 msgid "Creating a task"
 msgstr "Creating a task"
 
-#: ../src/calendar/gui/e-cal-model.c:1909
+#: ../src/calendar/gui/e-cal-model.c:1874
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../src/calendar/gui/e-cal-model.c:1911
+#: ../src/calendar/gui/e-cal-model.c:1876
 msgid "Assigned"
 msgstr "Assigned"
 
-#: ../src/calendar/gui/e-cal-model.c:1914
-#: ../src/calendar/gui/e-cal-model-tasks.c:1133
+#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model-tasks.c:1097
 msgid "Yes"
 msgstr "Yes"
 
-#: ../src/calendar/gui/e-cal-model.c:1914
-#: ../src/calendar/gui/e-cal-model-tasks.c:1133
+#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model-tasks.c:1097
 msgid "No"
 msgstr "No"
 
-#: ../src/calendar/gui/e-cal-model.c:3822
+#: ../src/calendar/gui/e-cal-model.c:3787
 #: ../src/calendar/gui/e-meeting-list-view.c:208
 #: ../src/calendar/gui/e-meeting-store.c:179
 #: ../src/calendar/gui/e-meeting-store.c:202
-#: ../src/modules/itip-formatter/itip-view.c:6654
+#: ../src/modules/itip-formatter/itip-view.c:6428
 msgid "Accepted"
 msgstr "Accepted"
 
-#: ../src/calendar/gui/e-cal-model.c:3823
+#: ../src/calendar/gui/e-cal-model.c:3788
 #: ../src/calendar/gui/e-meeting-list-view.c:209
 #: ../src/calendar/gui/e-meeting-store.c:181
 #: ../src/calendar/gui/e-meeting-store.c:204
-#: ../src/modules/itip-formatter/itip-view.c:6660
+#: ../src/modules/itip-formatter/itip-view.c:6434
 msgid "Declined"
 msgstr "Declined"
 
-#: ../src/calendar/gui/e-cal-model.c:3824
+#: ../src/calendar/gui/e-cal-model.c:3789
 #: ../src/calendar/gui/e-meeting-list-view.c:210
 #: ../src/calendar/gui/e-meeting-store.c:183
 #: ../src/calendar/gui/e-meeting-store.c:206
@@ -7299,30 +7249,30 @@ msgstr "Declined"
 msgid "Tentative"
 msgstr "Tentative"
 
-#: ../src/calendar/gui/e-cal-model.c:3825
+#: ../src/calendar/gui/e-cal-model.c:3790
 #: ../src/calendar/gui/e-meeting-list-view.c:211
 #: ../src/calendar/gui/e-meeting-store.c:185
 #: ../src/calendar/gui/e-meeting-store.c:208
-#: ../src/modules/itip-formatter/itip-view.c:6663
+#: ../src/modules/itip-formatter/itip-view.c:6437
 msgid "Delegated"
 msgstr "Delegated"
 
-#: ../src/calendar/gui/e-cal-model.c:3826
+#: ../src/calendar/gui/e-cal-model.c:3791
 msgid "Needs action"
 msgstr "Needs action"
 
-#: ../src/calendar/gui/e-cal-model-calendar.c:157
+#: ../src/calendar/gui/e-cal-model-calendar.c:91
 #: ../src/calendar/gui/e-task-table.c:529
 msgid "Free"
 msgstr "Free"
 
-#: ../src/calendar/gui/e-cal-model-calendar.c:160
+#: ../src/calendar/gui/e-cal-model-calendar.c:94
 #: ../src/calendar/gui/e-meeting-time-sel.c:524
 #: ../src/calendar/gui/e-task-table.c:530
 msgid "Busy"
 msgstr "Busy"
 
-#: ../src/calendar/gui/e-cal-model-tasks.c:493
+#: ../src/calendar/gui/e-cal-model-tasks.c:458
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7332,170 +7282,170 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../src/calendar/gui/e-cal-model-tasks.c:590
+#: ../src/calendar/gui/e-cal-model-tasks.c:555
 msgid "In Progress"
 msgstr "In Progress"
 
-#: ../src/calendar/gui/e-cal-ops.c:305
+#: ../src/calendar/gui/e-cal-ops.c:311
 msgid "Modifying an event"
 msgstr "Modifying an event"
 
-#: ../src/calendar/gui/e-cal-ops.c:309
+#: ../src/calendar/gui/e-cal-ops.c:315
 msgid "Modifying a memo"
 msgstr "Modifying a memo"
 
-#: ../src/calendar/gui/e-cal-ops.c:313
+#: ../src/calendar/gui/e-cal-ops.c:319
 msgid "Modifying a task"
 msgstr "Modifying a task"
 
-#: ../src/calendar/gui/e-cal-ops.c:411 ../src/calendar/gui/e-to-do-pane.c:2042
+#: ../src/calendar/gui/e-cal-ops.c:417 ../src/calendar/gui/e-to-do-pane.c:2074
 msgid "Removing an event"
 msgstr "Removing an event"
 
-#: ../src/calendar/gui/e-cal-ops.c:415 ../src/calendar/gui/e-to-do-pane.c:2046
+#: ../src/calendar/gui/e-cal-ops.c:421 ../src/calendar/gui/e-to-do-pane.c:2078
 msgid "Removing a memo"
 msgstr "Removing a memo"
 
-#: ../src/calendar/gui/e-cal-ops.c:419 ../src/calendar/gui/e-to-do-pane.c:2050
+#: ../src/calendar/gui/e-cal-ops.c:425 ../src/calendar/gui/e-to-do-pane.c:2082
 msgid "Removing a task"
 msgstr "Removing a task"
 
-#: ../src/calendar/gui/e-cal-ops.c:507
+#: ../src/calendar/gui/e-cal-ops.c:513
 #, c-format
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
 msgstr[0] "Deleting an event"
 msgstr[1] "Deleting %d events"
 
-#: ../src/calendar/gui/e-cal-ops.c:511
+#: ../src/calendar/gui/e-cal-ops.c:517
 #, c-format
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
 msgstr[0] "Deleting a memo"
 msgstr[1] "Deleting %d memos"
 
-#: ../src/calendar/gui/e-cal-ops.c:515
+#: ../src/calendar/gui/e-cal-ops.c:521
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "Deleting a task"
 msgstr[1] "Deleting %d tasks"
 
-#: ../src/calendar/gui/e-cal-ops.c:721
+#: ../src/calendar/gui/e-cal-ops.c:727
 #, c-format
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
 msgstr[0] "Pasting an event"
 msgstr[1] "Pasting %d events"
 
-#: ../src/calendar/gui/e-cal-ops.c:736
+#: ../src/calendar/gui/e-cal-ops.c:742
 #, c-format
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
 msgstr[0] "Pasting a memo"
 msgstr[1] "Pasting %d memos"
 
-#: ../src/calendar/gui/e-cal-ops.c:751
+#: ../src/calendar/gui/e-cal-ops.c:757
 #, c-format
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
 msgstr[0] "Pasting a task"
 msgstr[1] "Pasting %d tasks"
 
-#: ../src/calendar/gui/e-cal-ops.c:847
+#: ../src/calendar/gui/e-cal-ops.c:853
 msgid "Updating an event"
 msgstr "Updating an event"
 
-#: ../src/calendar/gui/e-cal-ops.c:851
+#: ../src/calendar/gui/e-cal-ops.c:857
 msgid "Updating a memo"
 msgstr "Updating a memo"
 
-#: ../src/calendar/gui/e-cal-ops.c:855
+#: ../src/calendar/gui/e-cal-ops.c:861
 msgid "Updating a task"
 msgstr "Updating a task"
 
-#: ../src/calendar/gui/e-cal-ops.c:968
+#: ../src/calendar/gui/e-cal-ops.c:974
 #, c-format
 msgid "Getting events to purge in the calendar “%s”"
 msgstr "Getting events to purge in the calendar “%s”"
 
-#: ../src/calendar/gui/e-cal-ops.c:972
+#: ../src/calendar/gui/e-cal-ops.c:978
 #, c-format
 msgid "Getting memos to purge in the memo list “%s”"
 msgstr "Getting memos to purge in the memo list “%s”"
 
-#: ../src/calendar/gui/e-cal-ops.c:976
+#: ../src/calendar/gui/e-cal-ops.c:982
 #, c-format
 msgid "Getting tasks to purge in the task list “%s”"
 msgstr "Getting tasks to purge in the task list “%s”"
 
-#: ../src/calendar/gui/e-cal-ops.c:1002
+#: ../src/calendar/gui/e-cal-ops.c:1008
 #, c-format
 msgid "Purging events in the calendar “%s”"
 msgstr "Purging events in the calendar “%s”"
 
-#: ../src/calendar/gui/e-cal-ops.c:1006
+#: ../src/calendar/gui/e-cal-ops.c:1012
 #, c-format
 msgid "Purging memos in the memo list “%s”"
 msgstr "Purging memos in the memo list “%s”"
 
-#: ../src/calendar/gui/e-cal-ops.c:1010
+#: ../src/calendar/gui/e-cal-ops.c:1016
 #, c-format
 msgid "Purging tasks in the task list “%s”"
 msgstr "Purging tasks in the task list “%s”"
 
-#: ../src/calendar/gui/e-cal-ops.c:1105
+#: ../src/calendar/gui/e-cal-ops.c:1111
 msgid "Purging events"
 msgstr "Purging events"
 
-#: ../src/calendar/gui/e-cal-ops.c:1109
+#: ../src/calendar/gui/e-cal-ops.c:1115
 msgid "Purging memos"
 msgstr "Purging memos"
 
-#: ../src/calendar/gui/e-cal-ops.c:1113
+#: ../src/calendar/gui/e-cal-ops.c:1119
 msgid "Purging tasks"
 msgstr "Purging tasks"
 
-#: ../src/calendar/gui/e-cal-ops.c:1215
+#: ../src/calendar/gui/e-cal-ops.c:1221
 msgid "Expunging completed tasks"
 msgstr "Expunging completed tasks"
 
-#: ../src/calendar/gui/e-cal-ops.c:2057
+#: ../src/calendar/gui/e-cal-ops.c:2069
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] "Moving an event"
 msgstr[1] "Moving %d events"
 
-#: ../src/calendar/gui/e-cal-ops.c:2058
+#: ../src/calendar/gui/e-cal-ops.c:2070
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "Copying an event"
 msgstr[1] "Copying %d events"
 
-#: ../src/calendar/gui/e-cal-ops.c:2064
+#: ../src/calendar/gui/e-cal-ops.c:2076
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "Moving a memo"
 msgstr[1] "Moving %d memos"
 
-#: ../src/calendar/gui/e-cal-ops.c:2065
+#: ../src/calendar/gui/e-cal-ops.c:2077
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "Copying a memo"
 msgstr[1] "Copying %d memos"
 
-#: ../src/calendar/gui/e-cal-ops.c:2071
+#: ../src/calendar/gui/e-cal-ops.c:2083
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "Moving a task"
 msgstr[1] "Moving %d tasks"
 
-#: ../src/calendar/gui/e-cal-ops.c:2072
+#: ../src/calendar/gui/e-cal-ops.c:2084
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -7525,39 +7475,39 @@ msgstr ""
 msgid "Event’s time is in the past"
 msgstr "Event’s time is in the past"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:208
+#: ../src/calendar/gui/e-comp-editor-event.c:210
 msgid ""
 "Event cannot be edited, because the selected calendar could not be opened"
 msgstr ""
 "Event cannot be edited, because the selected calendar could not be opened"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:210
+#: ../src/calendar/gui/e-comp-editor-event.c:212
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "Event cannot be edited, because the selected calendar is read only"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:212
+#: ../src/calendar/gui/e-comp-editor-event.c:214
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Event cannot be fully edited, because you are not the organiser"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:485
-#: ../src/calendar/gui/e-comp-editor-task.c:566
+#: ../src/calendar/gui/e-comp-editor-event.c:506
+#: ../src/calendar/gui/e-comp-editor-task.c:591
 msgid "Start date is not a valid date"
 msgstr "Start date is not a valid date"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:487
+#: ../src/calendar/gui/e-comp-editor-event.c:508
 msgid "Start time is not a valid time"
 msgstr "Start time is not a valid time"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:491
-#: ../src/calendar/gui/e-comp-editor-event.c:507
+#: ../src/calendar/gui/e-comp-editor-event.c:512
+#: ../src/calendar/gui/e-comp-editor-event.c:528
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
 #: ../src/calendar/gui/e-comp-editor.c:338
-#: ../src/em-format/e-mail-part-secure-button.c:93
-#: ../src/e-util/e-misc-utils.c:4257 ../src/e-util/e-misc-utils.c:4269
-#: ../src/e-util/e-misc-utils.c:4283 ../src/mail/e-mail-autoconfig.c:1029
-#: ../src/mail/e-mail-display.c:2295 ../src/mail/e-mail-reader-utils.c:805
-#: ../src/mail/em-composer-utils.c:3841 ../src/mail/em-composer-utils.c:3872
-#: ../src/mail/mail-send-recv.c:598 ../src/mail/mail-send-recv.c:1496
+#: ../src/em-format/e-mail-part-secure-button.c:97
+#: ../src/e-util/e-misc-utils.c:4262 ../src/e-util/e-misc-utils.c:4274
+#: ../src/e-util/e-misc-utils.c:4288 ../src/mail/e-mail-autoconfig.c:1041
+#: ../src/mail/e-mail-display.c:2359 ../src/mail/e-mail-reader-utils.c:805
+#: ../src/mail/em-composer-utils.c:3838 ../src/mail/em-composer-utils.c:3869
+#: ../src/mail/mail-send-recv.c:598 ../src/mail/mail-send-recv.c:1493
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:172
 #: ../src/plugins/face/face.c:175 ../src/shell/e-shell.c:1235
 #: ../src/shell/e-shell.c:1260 ../src/smime/gui/certificate-manager.c:357
@@ -7565,128 +7515,128 @@ msgstr "Start time is not a valid time"
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:501
+#: ../src/calendar/gui/e-comp-editor-event.c:522
 msgid "End date is not a valid date"
 msgstr "End date is not a valid date"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:503
+#: ../src/calendar/gui/e-comp-editor-event.c:524
 msgid "End time is not a valid time"
 msgstr "End time is not a valid time"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:705
+#: ../src/calendar/gui/e-comp-editor-event.c:726
 #: ../src/calendar/gui/e-comp-editor-memo.c:134
-#: ../src/calendar/gui/e-comp-editor-task.c:679
+#: ../src/calendar/gui/e-comp-editor-task.c:704
 msgid "_Categories"
 msgstr "_Categories"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:707
+#: ../src/calendar/gui/e-comp-editor-event.c:728
 #: ../src/calendar/gui/e-comp-editor-memo.c:136
-#: ../src/calendar/gui/e-comp-editor-task.c:681
+#: ../src/calendar/gui/e-comp-editor-task.c:706
 msgid "Toggles whether to display categories"
 msgstr "Toggles whether to display categories"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:713
-#: ../src/calendar/gui/e-comp-editor-task.c:687
+#: ../src/calendar/gui/e-comp-editor-event.c:734
+#: ../src/calendar/gui/e-comp-editor-task.c:712
 msgid "Time _Zone"
 msgstr "Time _Zone"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:715
-#: ../src/calendar/gui/e-comp-editor-task.c:689
+#: ../src/calendar/gui/e-comp-editor-event.c:736
+#: ../src/calendar/gui/e-comp-editor-task.c:714
 msgid "Toggles whether the time zone is displayed"
 msgstr "Toggles whether the time zone is displayed"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:721
+#: ../src/calendar/gui/e-comp-editor-event.c:742
 msgid "All _Day Event"
 msgstr "All _Day Event"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:723
+#: ../src/calendar/gui/e-comp-editor-event.c:744
 msgid "Toggles whether to have All Day Event"
 msgstr "Toggles whether to have All Day Event"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:729
+#: ../src/calendar/gui/e-comp-editor-event.c:750
 msgid "Show Time as _Busy"
 msgstr "Show Time as _Busy"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:731
+#: ../src/calendar/gui/e-comp-editor-event.c:752
 msgid "Toggles whether to show time as busy"
 msgstr "Toggles whether to show time as busy"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:740
+#: ../src/calendar/gui/e-comp-editor-event.c:761
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:742
+#: ../src/calendar/gui/e-comp-editor-event.c:763
 msgid "Classify as public"
 msgstr "Classify as public"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:747
+#: ../src/calendar/gui/e-comp-editor-event.c:768
 msgid "_Private"
 msgstr "_Private"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:749
+#: ../src/calendar/gui/e-comp-editor-event.c:770
 msgid "Classify as private"
 msgstr "Classify as private"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:754
+#: ../src/calendar/gui/e-comp-editor-event.c:775
 msgid "_Confidential"
 msgstr "_Confidential"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:756
+#: ../src/calendar/gui/e-comp-editor-event.c:777
 msgid "Classify as confidential"
 msgstr "Classify as confidential"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:874
+#: ../src/calendar/gui/e-comp-editor-event.c:895
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Start time:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:879
+#: ../src/calendar/gui/e-comp-editor-event.c:900
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "_End time:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:889
+#: ../src/calendar/gui/e-comp-editor-event.c:910
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "All da_y event"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:957
+#: ../src/calendar/gui/e-comp-editor-event.c:978
 #: ../src/calendar/gui/e-comp-editor-memo.c:232
-#: ../src/calendar/gui/e-comp-editor-task.c:857
+#: ../src/calendar/gui/e-comp-editor-task.c:882
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "General"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:960
-#: ../src/calendar/gui/e-comp-editor-task.c:880
+#: ../src/calendar/gui/e-comp-editor-event.c:981
+#: ../src/calendar/gui/e-comp-editor-task.c:905
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Reminders"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:963
-#: ../src/calendar/gui/e-comp-editor-task.c:884
+#: ../src/calendar/gui/e-comp-editor-event.c:984
+#: ../src/calendar/gui/e-comp-editor-task.c:909
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Recurrence"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:966
+#: ../src/calendar/gui/e-comp-editor-event.c:987
 #: ../src/calendar/gui/e-comp-editor-memo.c:235
-#: ../src/calendar/gui/e-comp-editor-task.c:888
+#: ../src/calendar/gui/e-comp-editor-task.c:913
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Attachments"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:976
+#: ../src/calendar/gui/e-comp-editor-event.c:997
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "Schedule"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:1011
+#: ../src/calendar/gui/e-comp-editor-event.c:1032
 #, c-format
 msgid "Meeting — %s"
 msgstr "Meeting — %s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:1012
+#: ../src/calendar/gui/e-comp-editor-event.c:1033
 #, c-format
 msgid "Appointment — %s"
 msgstr "Appointment — %s"
@@ -7706,12 +7656,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:788
+#: ../src/calendar/gui/e-comp-editor-task.c:813
 msgid "_List:"
 msgstr "_List:"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:203
-#: ../src/calendar/gui/e-comp-editor-task.c:798
+#: ../src/calendar/gui/e-comp-editor-task.c:823
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "Sta_rt date:"
@@ -7749,7 +7699,7 @@ msgstr "Could not load “%s”"
 msgid "Could not load the attachment"
 msgstr "Could not load the attachment"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:422
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:416
 msgid ""
 "Some attachments are still being downloaded. Please wait until the download "
 "is finished."
@@ -7757,43 +7707,42 @@ msgstr ""
 "Some attachments are still being downloaded. Please wait until the download "
 "is finished."
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:449
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:443
 #, c-format
 msgid "Attachment “%s” cannot be found, remove it from the list, please"
 msgstr "Attachment “%s” cannot be found, remove it from the list, please"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:466
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:460
 #, c-format
 msgid "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
 msgstr ""
 "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:639
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:633
 #: ../src/composer/e-composer-actions.c:312
-#| msgid "_Attachments"
 msgid "_Attachment…"
 msgstr "_Attachment…"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:641
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:635
 #: ../src/composer/e-composer-actions.c:314
 #: ../src/e-util/e-attachment-view.c:343
 msgid "Attach a file"
 msgstr "Attach a file"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:648
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:642
 msgid "_Attachments"
 msgstr "_Attachments"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:650
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:644
 msgid "Show attachments"
 msgstr "Show attachments"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:803
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:797
 #: ../src/e-util/e-attachment-bar.c:764 ../src/e-util/e-attachment-paned.c:725
 msgid "Icon View"
 msgstr "Icon View"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:805
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:799
 #: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
 msgid "List View"
 msgstr "List View"
@@ -7894,26 +7843,25 @@ msgstr ""
 "used."
 
 #: ../src/calendar/gui/e-comp-editor-page-general.c:1450
-#| msgid "Atte_ndees"
 msgctxt "ECompEditor"
 msgid "Atte_ndees…"
 msgstr "Atte_ndees…"
 
 #: ../src/calendar/gui/e-comp-editor-page-general.c:1533
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2285
-#: ../src/calendar/gui/e-comp-editor.c:2078
+#: ../src/calendar/gui/e-comp-editor.c:2113
 #: ../src/e-util/e-accounts-window.c:1745
-#: ../src/e-util/e-html-editor-actions.c:954
+#: ../src/e-util/e-html-editor-actions.c:1013
 #: ../src/e-util/e-mail-signature-manager.c:358
-#: ../src/e-util/e-webdav-browser.c:2686 ../src/e-util/filter.ui.h:26
-#: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:195
+#: ../src/e-util/e-webdav-browser.c:2690 ../src/e-util/filter.ui.h:26
+#: ../src/mail/e-mail-account-manager.c:730 ../src/mail/e-mail-browser.c:217
 #: ../src/mail/e-mail-label-manager.c:380
 #: ../src/mail/em-folder-properties.c:1333 ../src/mail/mail-config.ui.h:68
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:549
-#: ../src/plugins/email-custom-header/email-custom-header.c:843
+#: ../src/plugins/email-custom-header/email-custom-header.c:844
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
 #: ../src/plugins/templates/templates.c:469
-#: ../src/shell/e-shell-window-actions.c:1005 ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/shell/e-shell-window-actions.c:1039 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "_Edit"
 
@@ -8175,7 +8123,7 @@ msgstr "Exceptions"
 
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2277
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:2142
-#: ../src/mail/e-mail-config-identity-page.c:853
+#: ../src/mail/e-mail-config-identity-page.c:854
 #: ../src/mail/mail-config.ui.h:67
 msgid "A_dd"
 msgstr "A_dd"
@@ -8213,14 +8161,11 @@ msgstr "None"
 #. "2 days 13 hours 1 minute before".
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1690
 #, c-format
-#| msgid "is before"
 msgctxt "cal-reminders"
 msgid "%s before"
 msgstr "%s before"
 
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
-#| msgctxt "cal-reminders"
-#| msgid "%s at the start"
 msgctxt "cal-reminders"
 msgid "at the start"
 msgstr "at the start"
@@ -8243,27 +8188,22 @@ msgstr "da_ys"
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1878
-#| msgctxt "cal-reminders"
-#| msgid "hours"
 msgctxt "cal-reminders"
 msgid "_hours"
 msgstr "_hours"
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1894
-#| msgctxt "cal-reminders"
-#| msgid "minutes"
 msgctxt "cal-reminders"
 msgid "_minutes"
 msgstr "_minutes"
 
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1900
-#| msgid "_End time:"
 msgid "_Add time"
 msgstr "_Add time"
 
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1980
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Reminders"
 msgstr "Reminders"
 
@@ -8386,165 +8326,164 @@ msgstr "_Schedule"
 msgid "Query free / busy information for the attendees"
 msgstr "Query free / busy information for the attendees"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:80
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:91
 msgctxt "ECompEditor"
 msgid "_Summary:"
 msgstr "_Summary:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:324
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:340
 msgctxt "ECompEditor"
 msgid "_Location:"
 msgstr "_Location:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:457
-#| msgid "_Categories"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:473
 msgctxt "ECompEditor"
 msgid "_Categories…"
 msgstr "_Categories…"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:556
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:572
 msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "_Description:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:688
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:704
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "_Web page:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1059
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1075
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "D_ue date:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1153
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1169
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "Date _completed:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1169
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1185
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "Public"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1170
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1186
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "Private"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1187
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "Confidential"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1187
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1203
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "C_lassification:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1250
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1266
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1280
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1296
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "Undefined"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1281
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1297
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "High"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1282
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1298
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1283
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1299
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "Low"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1292
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1308
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "Priorit_y:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1346
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1362
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "Percent complete:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1427
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1443
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "Time _zone:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1557
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1539
 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:1979
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1960
 msgctxt "ECompEditor"
 msgid "None"
 msgstr "None"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:256
+#: ../src/calendar/gui/e-comp-editor-task.c:281
 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:264
+#: ../src/calendar/gui/e-comp-editor-task.c:289
 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:505
+#: ../src/calendar/gui/e-comp-editor-task.c:530
 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:507
+#: ../src/calendar/gui/e-comp-editor-task.c:532
 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:509
+#: ../src/calendar/gui/e-comp-editor-task.c:534
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Task cannot be fully edited, because you are not the organiser"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:580
+#: ../src/calendar/gui/e-comp-editor-task.c:605
 msgid "Start date is required for recurring tasks"
 msgstr "Start date is required for recurring tasks"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:596
+#: ../src/calendar/gui/e-comp-editor-task.c:621
 msgid "Due date is not a valid date"
 msgstr "Due date is not a valid date"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:607
+#: ../src/calendar/gui/e-comp-editor-task.c:632
 msgid "Completed date is not a valid date"
 msgstr "Completed date is not a valid date"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:618
+#: ../src/calendar/gui/e-comp-editor-task.c:643
 msgid "Completed date cannot be in the future"
 msgstr "Completed date cannot be in the future"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:695
+#: ../src/calendar/gui/e-comp-editor-task.c:720
 msgid "All _Day Task"
 msgstr "All _Day Task"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:697
+#: ../src/calendar/gui/e-comp-editor-task.c:722
 msgid "Toggles whether to have All Day Task"
 msgstr "Toggles whether to have All Day Task"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:921
+#: ../src/calendar/gui/e-comp-editor-task.c:946
 #, c-format
 msgid "Assigned Task — %s"
 msgstr "Assigned Task — %s"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:922
+#: ../src/calendar/gui/e-comp-editor-task.c:947
 #, c-format
 msgid "Task — %s"
 msgstr "Task — %s"
@@ -8555,12 +8494,11 @@ msgid "attachment"
 msgstr "attachment"
 
 #: ../src/calendar/gui/e-comp-editor.c:610
-#| msgid "Sending notifications to attendees..."
 msgid "Sending notifications to attendees…"
 msgstr "Sending notifications to attendees…"
 
 #: ../src/calendar/gui/e-comp-editor.c:985
-#: ../src/e-util/e-webdav-browser.c:1814
+#: ../src/e-util/e-webdav-browser.c:1818
 msgid "Saving changes…"
 msgstr "Saving changes…"
 
@@ -8569,7 +8507,7 @@ msgid "No Summary"
 msgstr "No Summary"
 
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:1992
+#: ../src/calendar/gui/e-comp-editor.c:2027
 #: ../src/composer/e-composer-actions.c:319
 #: ../src/e-util/e-accounts-window.c:1778
 #: ../src/e-util/e-html-editor-dialog.c:194
@@ -8577,159 +8515,157 @@ msgstr "No Summary"
 #: ../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:144
+#: ../src/mail/e-mail-browser.c:166
 #: ../src/mail/e-mail-folder-sort-order-dialog.c:758
 #: ../src/mail/e-mail-notes.c:964 ../src/mail/em-filter-editor.c:45
 #: ../src/mail/em-folder-properties.c:1458
 #: ../src/mail/em-subscription-editor.c:1741
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:306
-#: ../src/shell/e-shell-window-actions.c:314
-#: ../src/shell/e-shell-window-actions.c:842
+#: ../src/shell/e-shell-window-actions.c:348
+#: ../src/shell/e-shell-window-actions.c:876
 #: ../src/smime/gui/certificate-manager.c:2196
 msgid "_Close"
 msgstr "_Close"
 
-#: ../src/calendar/gui/e-comp-editor.c:1994
+#: ../src/calendar/gui/e-comp-editor.c:2029
 msgid "Close the current window"
 msgstr "Close the current window"
 
 #. copy menu item
-#: ../src/calendar/gui/e-comp-editor.c:1999 ../src/e-util/e-focus-tracker.c:773
-#: ../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:863
+#: ../src/calendar/gui/e-comp-editor.c:2034 ../src/e-util/e-focus-tracker.c:806
+#: ../src/e-util/e-html-editor-actions.c:969 ../src/e-util/e-text.c:2080
+#: ../src/e-util/e-web-view.c:469 ../src/mail/e-mail-browser.c:173
+#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:897
 msgid "_Copy"
 msgstr "_Copy"
 
-#: ../src/calendar/gui/e-comp-editor.c:2001 ../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:469
-#: ../src/e-util/e-web-view.c:2080 ../src/mail/e-mail-browser.c:153
-#: ../src/shell/e-shell-window-actions.c:865
+#: ../src/calendar/gui/e-comp-editor.c:2036 ../src/e-util/e-focus-tracker.c:203
+#: ../src/e-util/e-focus-tracker.c:259 ../src/e-util/e-focus-tracker.c:312
+#: ../src/e-util/e-focus-tracker.c:807 ../src/e-util/e-web-view.c:471
+#: ../src/e-util/e-web-view.c:2044 ../src/mail/e-mail-browser.c:175
+#: ../src/shell/e-shell-window-actions.c:899
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
 #. cut menu item
-#: ../src/calendar/gui/e-comp-editor.c:2006 ../src/e-util/e-focus-tracker.c:768
-#: ../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:870
+#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:801
+#: ../src/e-util/e-html-editor-actions.c:976 ../src/e-util/e-text.c:2066
+#: ../src/mail/e-mail-browser.c:180 ../src/shell/e-shell-window-actions.c:904
 msgid "Cu_t"
 msgstr "Cu_t"
 
-#: ../src/calendar/gui/e-comp-editor.c:2008 ../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:2089
-#: ../src/mail/e-mail-browser.c:160 ../src/shell/e-shell-window-actions.c:872
+#: ../src/calendar/gui/e-comp-editor.c:2043 ../src/e-util/e-focus-tracker.c:196
+#: ../src/e-util/e-focus-tracker.c:252 ../src/e-util/e-focus-tracker.c:306
+#: ../src/e-util/e-focus-tracker.c:802 ../src/e-util/e-web-view.c:2053
+#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:906
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
-#: ../src/calendar/gui/e-comp-editor.c:2015 ../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:879
+#: ../src/calendar/gui/e-comp-editor.c:2050 ../src/e-util/e-focus-tracker.c:217
+#: ../src/e-util/e-focus-tracker.c:273 ../src/e-util/e-focus-tracker.c:817
+#: ../src/shell/e-shell-window-actions.c:913
 msgid "Delete the selection"
 msgstr "Delete the selection"
 
-#: ../src/calendar/gui/e-comp-editor.c:2022
+#: ../src/calendar/gui/e-comp-editor.c:2057
 msgid "View help"
 msgstr "View help"
 
 #. paste menu item
-#: ../src/calendar/gui/e-comp-editor.c:2027 ../src/e-util/e-focus-tracker.c:778
-#: ../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:898
+#: ../src/calendar/gui/e-comp-editor.c:2062 ../src/e-util/e-focus-tracker.c:811
+#: ../src/e-util/e-html-editor-actions.c:983 ../src/e-util/e-text.c:2092
+#: ../src/mail/e-mail-browser.c:187 ../src/shell/e-shell-window-actions.c:932
 msgid "_Paste"
 msgstr "_Paste"
 
-#: ../src/calendar/gui/e-comp-editor.c:2029 ../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:2098
-#: ../src/mail/e-mail-browser.c:167 ../src/shell/e-shell-window-actions.c:900
+#: ../src/calendar/gui/e-comp-editor.c:2064 ../src/e-util/e-focus-tracker.c:210
+#: ../src/e-util/e-focus-tracker.c:266 ../src/e-util/e-focus-tracker.c:318
+#: ../src/e-util/e-focus-tracker.c:812 ../src/e-util/e-web-view.c:2062
+#: ../src/mail/e-mail-browser.c:189 ../src/shell/e-shell-window-actions.c:934
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
-#: ../src/calendar/gui/e-comp-editor.c:2034
-#: ../src/composer/e-composer-actions.c:373 ../src/mail/e-mail-reader.c:2750
+#: ../src/calendar/gui/e-comp-editor.c:2069
+#: ../src/composer/e-composer-actions.c:373 ../src/mail/e-mail-reader.c:2749
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1319
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1333
-#| msgid "_Print"
 msgid "_Print…"
 msgstr "_Print…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/mail/e-mail-reader.c:2757
+#: ../src/calendar/gui/e-comp-editor.c:2076 ../src/mail/e-mail-reader.c:2756
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:838
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1046
-#| msgid "Preview"
 msgid "Pre_view…"
 msgstr "Pre_view…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2048 ../src/e-util/e-focus-tracker.c:788
-#: ../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:968
+#: ../src/calendar/gui/e-comp-editor.c:2083 ../src/e-util/e-focus-tracker.c:821
+#: ../src/e-util/e-html-editor-actions.c:997 ../src/e-util/e-web-view.c:486
+#: ../src/mail/e-mail-browser.c:194 ../src/shell/e-shell-window-actions.c:1002
 msgid "Select _All"
 msgstr "Select _All"
 
-#: ../src/calendar/gui/e-comp-editor.c:2050 ../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:174 ../src/shell/e-shell-window-actions.c:970
+#: ../src/calendar/gui/e-comp-editor.c:2085 ../src/e-util/e-focus-tracker.c:224
+#: ../src/e-util/e-focus-tracker.c:280 ../src/e-util/e-focus-tracker.c:822
+#: ../src/mail/e-mail-browser.c:196 ../src/shell/e-shell-window-actions.c:1004
 msgid "Select all text"
 msgstr "Select all text"
 
-#: ../src/calendar/gui/e-comp-editor.c:2071
+#: ../src/calendar/gui/e-comp-editor.c:2106
 msgid "_Classification"
 msgstr "_Classification"
 
-#: ../src/calendar/gui/e-comp-editor.c:2085
-#: ../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:1012
+#: ../src/calendar/gui/e-comp-editor.c:2120
+#: ../src/e-util/e-html-editor-actions.c:1020
+#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:210
+#: ../src/mail/e-mail-notes.c:978 ../src/shell/e-shell-window-actions.c:1046
 msgid "_File"
 msgstr "_File"
 
-#: ../src/calendar/gui/e-comp-editor.c:2099
-#: ../src/e-util/e-html-editor-actions.c:982
+#: ../src/calendar/gui/e-comp-editor.c:2134
+#: ../src/e-util/e-html-editor-actions.c:1041
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../src/calendar/gui/e-comp-editor.c:2106
+#: ../src/calendar/gui/e-comp-editor.c:2141
 #: ../src/composer/e-composer-actions.c:363
 msgid "_Options"
 msgstr "_Options"
 
-#: ../src/calendar/gui/e-comp-editor.c:2113
-#: ../src/e-util/e-html-editor-actions.c:1003 ../src/mail/e-mail-browser.c:202
-#: ../src/shell/e-shell-window-actions.c:1055
+#: ../src/calendar/gui/e-comp-editor.c:2148
+#: ../src/e-util/e-html-editor-actions.c:1062 ../src/mail/e-mail-browser.c:224
+#: ../src/shell/e-shell-window-actions.c:1089
 #: ../src/smime/gui/certificate-manager.c:1646 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "_View"
 
-#: ../src/calendar/gui/e-comp-editor.c:2125
+#: ../src/calendar/gui/e-comp-editor.c:2160
 msgid "Save current changes"
 msgstr "Save current changes"
 
-#: ../src/calendar/gui/e-comp-editor.c:2130
+#: ../src/calendar/gui/e-comp-editor.c:2165
 #: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:973
 msgid "Save and Close"
 msgstr "Save and Close"
 
-#: ../src/calendar/gui/e-comp-editor.c:2132
+#: ../src/calendar/gui/e-comp-editor.c:2167
 msgid "Save current changes and close editor"
 msgstr "Save current changes and close editor"
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../src/calendar/gui/e-day-view.c:2152 ../src/calendar/gui/e-to-do-pane.c:245
 #: ../src/calendar/gui/e-week-view.c:1756 ../src/calendar/gui/print.c:1076
-#: ../src/calendar/gui/print.c:1095 ../src/calendar/gui/print.c:2647
-#: ../src/calendar/gui/print.c:2667
+#: ../src/calendar/gui/print.c:1095 ../src/calendar/gui/print.c:2663
+#: ../src/calendar/gui/print.c:2683
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../src/calendar/gui/e-day-view.c:2155 ../src/calendar/gui/e-to-do-pane.c:249
 #: ../src/calendar/gui/e-week-view.c:1759 ../src/calendar/gui/print.c:1081
-#: ../src/calendar/gui/print.c:1097 ../src/calendar/gui/print.c:2652
-#: ../src/calendar/gui/print.c:2669
+#: ../src/calendar/gui/print.c:1097 ../src/calendar/gui/print.c:2668
+#: ../src/calendar/gui/print.c:2685
 msgid "pm"
 msgstr "pm"
 
@@ -8739,15 +8675,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:3045
+#: ../src/calendar/gui/e-day-view.c:3046
 #: ../src/calendar/gui/e-day-view-top-item.c:850
 #: ../src/calendar/gui/e-week-view-main-item.c:205
-#: ../src/calendar/gui/print.c:2109
+#: ../src/calendar/gui/print.c:2117
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../src/calendar/gui/e-day-view.c:3786
+#: ../src/calendar/gui/e-day-view.c:3787
 #, c-format
 msgid "Week %d"
 msgstr "Week %d"
@@ -8779,7 +8715,6 @@ msgstr "None"
 #: ../src/calendar/gui/e-day-view-time-item.c:887
 #: ../src/calendar/gui/e-timezone-entry.c:346
 #: ../src/modules/calendar/e-calendar-preferences.c:393
-#| msgid "Select"
 msgid "Select…"
 msgstr "Select…"
 
@@ -8806,51 +8741,51 @@ msgstr "Attendees"
 #: ../src/calendar/gui/e-meeting-list-view.c:179
 #: ../src/calendar/gui/e-meeting-store.c:110
 #: ../src/calendar/gui/e-meeting-store.c:127
-#: ../src/calendar/gui/e-meeting-store.c:1072 ../src/calendar/gui/print.c:1253
+#: ../src/calendar/gui/e-meeting-store.c:1072 ../src/calendar/gui/print.c:1261
 msgid "Individual"
 msgstr "Individual"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:180
 #: ../src/calendar/gui/e-meeting-store.c:112
-#: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1254
+#: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1262
 #: ../src/e-util/e-table-config.ui.h:1
 msgid "Group"
 msgstr "Group"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:181
 #: ../src/calendar/gui/e-meeting-store.c:114
-#: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1255
+#: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1263
 msgid "Resource"
 msgstr "Resource"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:182
 #: ../src/calendar/gui/e-meeting-store.c:116
-#: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1256
+#: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1264
 msgid "Room"
 msgstr "Room"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:193
 #: ../src/calendar/gui/e-meeting-store.c:145
-#: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1270
+#: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1278
 msgid "Chair"
 msgstr "Chair"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:194
 #: ../src/calendar/gui/e-meeting-store.c:147
 #: ../src/calendar/gui/e-meeting-store.c:164
-#: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1271
+#: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1279
 msgid "Required Participant"
 msgstr "Required Participant"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:195
 #: ../src/calendar/gui/e-meeting-store.c:149
-#: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1272
+#: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1280
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:196
 #: ../src/calendar/gui/e-meeting-store.c:151
-#: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1273
+#: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1281
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
@@ -8861,12 +8796,8 @@ msgstr "Non-Participant"
 msgid "Needs Action"
 msgstr "Needs Action"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:624
-msgid "Attendee                          "
-msgstr "Attendee                          "
-
 #. To translators: RSVP means "please reply"
-#: ../src/calendar/gui/e-meeting-list-view.c:679
+#: ../src/calendar/gui/e-meeting-list-view.c:678
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
@@ -8909,7 +8840,6 @@ msgid "No Information"
 msgstr "No Information"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:543
-#| msgid "Atte_ndees"
 msgid "Atte_ndees…"
 msgstr "Atte_ndees…"
 
@@ -8975,7 +8905,7 @@ msgstr ""
 "Location: %s"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:2578
-#: ../src/calendar/gui/print.c:3554
+#: ../src/calendar/gui/print.c:3616
 #, c-format
 msgid "Summary: %s"
 msgstr "Summary: %s"
@@ -9010,35 +8940,35 @@ msgid "* No Summary *"
 msgstr "* No Summary *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../src/calendar/gui/e-memo-table.c:621
-#: ../src/calendar/gui/e-task-table.c:799
+#: ../src/calendar/gui/e-memo-table.c:622
+#: ../src/calendar/gui/e-task-table.c:801
 msgid "Start: "
 msgstr "Start: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../src/calendar/gui/e-memo-table.c:641
-#: ../src/calendar/gui/e-task-table.c:832
+#: ../src/calendar/gui/e-memo-table.c:642
+#: ../src/calendar/gui/e-task-table.c:834
 msgid "Due: "
 msgstr "Due: "
 
-#: ../src/calendar/gui/e-memo-table.c:849
+#: ../src/calendar/gui/e-memo-table.c:850
 msgid "Cut selected memos to the clipboard"
 msgstr "Cut selected memos to the clipboard"
 
-#: ../src/calendar/gui/e-memo-table.c:855
+#: ../src/calendar/gui/e-memo-table.c:856
 msgid "Copy selected memos to the clipboard"
 msgstr "Copy selected memos to the clipboard"
 
-#: ../src/calendar/gui/e-memo-table.c:861
+#: ../src/calendar/gui/e-memo-table.c:862
 msgid "Paste memos from the clipboard"
 msgstr "Paste memos from the clipboard"
 
-#: ../src/calendar/gui/e-memo-table.c:867
+#: ../src/calendar/gui/e-memo-table.c:868
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "Delete selected memos"
 
-#: ../src/calendar/gui/e-memo-table.c:873
+#: ../src/calendar/gui/e-memo-table.c:874
 msgid "Select all visible memos"
 msgstr "Select all visible memos"
 
@@ -9061,24 +8991,24 @@ msgstr "Undefined"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/calendar/gui/e-task-table.c:1069
+#: ../src/calendar/gui/e-task-table.c:1072
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cut selected tasks to the clipboard"
 
-#: ../src/calendar/gui/e-task-table.c:1075
+#: ../src/calendar/gui/e-task-table.c:1078
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copy selected tasks to the clipboard"
 
-#: ../src/calendar/gui/e-task-table.c:1081
+#: ../src/calendar/gui/e-task-table.c:1084
 msgid "Paste tasks from the clipboard"
 msgstr "Paste tasks from the clipboard"
 
-#: ../src/calendar/gui/e-task-table.c:1087
+#: ../src/calendar/gui/e-task-table.c:1090
 #: ../src/modules/calendar/e-task-shell-view-actions.c:698
 msgid "Delete selected tasks"
 msgstr "Delete selected tasks"
 
-#: ../src/calendar/gui/e-task-table.c:1093
+#: ../src/calendar/gui/e-task-table.c:1096
 msgid "Select all visible tasks"
 msgstr "Select all visible tasks"
 
@@ -9095,7 +9025,7 @@ msgid "Completion date"
 msgstr "Completion date"
 
 #: ../src/calendar/gui/e-task-table.etspec.h:6
-#: ../src/mail/mail-send-recv.c:1148
+#: ../src/mail/mail-send-recv.c:1145
 msgid "Complete"
 msgstr "Complete"
 
@@ -9117,7 +9047,6 @@ msgstr "Priority"
 #. Translators: 'None' for a time zone, like 'No time zone being set'
 #: ../src/calendar/gui/e-timezone-entry.c:92
 #: ../src/e-util/e-timezone-dialog.c:55
-#| msgid "None"
 msgctxt "timezone"
 msgid "None"
 msgstr "None"
@@ -9127,89 +9056,81 @@ msgid "Select Timezone"
 msgstr "Select Timezone"
 
 #. Translators: It will display "Start: StartDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:404
+#: ../src/calendar/gui/e-to-do-pane.c:406
 #, c-format
 msgid "Start: %s"
 msgstr "Start: %s"
 
 #. Translators: It will display "Due: DueDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:426
+#: ../src/calendar/gui/e-to-do-pane.c:428
 #, c-format
 msgid "Due: %s"
 msgstr "Due: %s"
 
 #. Translators: It will display "Completed: DateAndTimeWhenCompleted"
-#: ../src/calendar/gui/e-to-do-pane.c:440
+#: ../src/calendar/gui/e-to-do-pane.c:442
 #, c-format
 msgid "Completed: %s"
 msgstr "Completed: %s"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1544 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/calendar/gui/e-to-do-pane.c:1576 ../src/e-util/e-cell-date-edit.c:328
 #: ../src/e-util/e-datetime-format.c:207
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1821
-#: ../src/modules/itip-formatter/itip-view.c:254
+#: ../src/modules/itip-formatter/itip-view.c:256
 msgid "Today"
 msgstr "Today"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1546
+#: ../src/calendar/gui/e-to-do-pane.c:1578
 #: ../src/e-util/e-datetime-format.c:218
-#: ../src/modules/itip-formatter/itip-view.c:282
+#: ../src/modules/itip-formatter/itip-view.c:284
 msgid "Tomorrow"
 msgstr "Tomorrow"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1556
+#: ../src/calendar/gui/e-to-do-pane.c:1588
 msgid "Tasks without Due date"
 msgstr "Tasks without Due date"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2133
+#: ../src/calendar/gui/e-to-do-pane.c:2165
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1424
-#| msgid "New Appointment"
 msgid "New _Appointment…"
 msgstr "New _Appointment…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2141
+#: ../src/calendar/gui/e-to-do-pane.c:2173
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1410
-#| msgid "New Meeting"
 msgid "New _Meeting…"
 msgstr "New _Meeting…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2149
-#| msgid "New _Task"
+#: ../src/calendar/gui/e-to-do-pane.c:2181
 msgid "New _Task…"
 msgstr "New _Task…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2157
-#| msgid "_New Assigned Task..."
+#: ../src/calendar/gui/e-to-do-pane.c:2189
 msgid "_New Assigned Task…"
 msgstr "_New Assigned Task…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2170
-#| msgid "_Open"
+#: ../src/calendar/gui/e-to-do-pane.c:2202
 msgid "_Open…"
 msgstr "_Open…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2184
-#| msgid "_Delete This Instance..."
+#: ../src/calendar/gui/e-to-do-pane.c:2216
 msgid "_Delete This Instance…"
 msgstr "_Delete This Instance…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2192
-#| msgid "D_elete All Instances..."
+#: ../src/calendar/gui/e-to-do-pane.c:2224
 msgid "D_elete All Instances…"
 msgstr "D_elete All Instances…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2200
-#| msgid "_Delete"
+#: ../src/calendar/gui/e-to-do-pane.c:2232
 msgid "_Delete…"
 msgstr "_Delete…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2217
+#: ../src/calendar/gui/e-to-do-pane.c:2249
 msgid "_Show Tasks without Due date"
 msgstr "_Show Tasks without Due date"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2483
+#: ../src/calendar/gui/e-to-do-pane.c:2515
 msgid "To Do"
 msgstr "To Do"
 
@@ -9218,8 +9139,6 @@ msgstr "To Do"
 #. Example: "Meet John Doe (Central Park)"
 #: ../src/calendar/gui/e-week-view.c:3705
 #, c-format
-#| msgctxt "language"
-#| msgid "%s (%s)"
 msgctxt "SummaryWithLocation"
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9228,7 +9147,7 @@ msgstr "%s (%s)"
 #. * 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:2088
+#: ../src/calendar/gui/print.c:2096
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -9354,22 +9273,20 @@ msgstr "Unable to book a resource, error: "
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
-#: ../src/calendar/gui/itip-utils.c:2311
+#: ../src/calendar/gui/itip-utils.c:2312
 msgid "Sending an event"
 msgstr "Sending an event"
 
-#: ../src/calendar/gui/itip-utils.c:2315
+#: ../src/calendar/gui/itip-utils.c:2316
 msgid "Sending a memo"
 msgstr "Sending a memo"
 
-#: ../src/calendar/gui/itip-utils.c:2319
+#: ../src/calendar/gui/itip-utils.c:2320
 msgid "Sending a task"
 msgstr "Sending a task"
 
 #. Translator: This is used as a placeholder when an event doesn't have set a location
-#: ../src/calendar/gui/itip-utils.c:2571
-#| msgctxt "email-custom-header-Security"
-#| msgid "Unclassified"
+#: ../src/calendar/gui/itip-utils.c:2572
 msgctxt "Location"
 msgid "Unspecified"
 msgstr "Unspecified"
@@ -9443,78 +9360,78 @@ msgstr "Su"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../src/calendar/gui/print.c:3346
+#: ../src/calendar/gui/print.c:3408
 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:3356
+#: ../src/calendar/gui/print.c:3418
 msgid " (Completed "
 msgstr " (Completed "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../src/calendar/gui/print.c:3362
+#: ../src/calendar/gui/print.c:3424
 msgid "Completed "
 msgstr "Completed "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../src/calendar/gui/print.c:3372
+#: ../src/calendar/gui/print.c:3434
 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:3379
+#: ../src/calendar/gui/print.c:3441
 msgid "Due "
 msgstr "Due "
 
-#: ../src/calendar/gui/print.c:3524
+#: ../src/calendar/gui/print.c:3586
 msgid "Appointment"
 msgstr "Appointment"
 
-#: ../src/calendar/gui/print.c:3526 ../src/e-util/e-send-options.c:551
+#: ../src/calendar/gui/print.c:3588 ../src/e-util/e-send-options.c:551
 msgid "Task"
 msgstr "Task"
 
-#: ../src/calendar/gui/print.c:3528
+#: ../src/calendar/gui/print.c:3590
 msgid "Memo"
 msgstr "Memo"
 
-#: ../src/calendar/gui/print.c:3585
+#: ../src/calendar/gui/print.c:3647
 msgid "Attendees: "
 msgstr "Attendees: "
 
-#: ../src/calendar/gui/print.c:3614
+#: ../src/calendar/gui/print.c:3676
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../src/calendar/gui/print.c:3630
+#: ../src/calendar/gui/print.c:3692
 #, c-format
 msgid "Priority: %s"
 msgstr "Priority: %s"
 
-#: ../src/calendar/gui/print.c:3645
+#: ../src/calendar/gui/print.c:3707
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percent Complete: %i"
 
-#: ../src/calendar/gui/print.c:3660
+#: ../src/calendar/gui/print.c:3722
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../src/calendar/gui/print.c:3676
+#: ../src/calendar/gui/print.c:3738
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: ../src/calendar/gui/print.c:3688
+#: ../src/calendar/gui/print.c:3750
 msgid "Contacts: "
 msgstr "Contacts: "
 
@@ -9549,15 +9466,15 @@ msgstr "Appointments and Meetings"
 
 #: ../src/calendar/importers/icalendar-importer.c:327
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:480
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:88
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:267
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:89
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:280
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:180
 msgid "New Calendar"
 msgstr "New Calendar"
 
 #: ../src/calendar/importers/icalendar-importer.c:330
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:488
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:275
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:288
 #: ../src/modules/calendar/e-task-shell-view-actions.c:204
 msgid "New Task List"
 msgstr "New Task List"
@@ -11301,7 +11218,6 @@ msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
 #: ../src/composer/e-composer-actions.c:226
-#| msgid "Save Task"
 msgid "Save as…"
 msgstr "Save as…"
 
@@ -11317,13 +11233,13 @@ msgstr "New _Message"
 msgid "Open New Message window"
 msgstr "Open New Message window"
 
-#: ../src/composer/e-composer-actions.c:333 ../src/shell/e-shell.c:1469
-#: ../src/shell/e-shell-window-actions.c:912
+#: ../src/composer/e-composer-actions.c:333
+#: ../src/shell/e-shell-window-actions.c:946
 msgid "_Preferences"
 msgstr "_Preferences"
 
 #: ../src/composer/e-composer-actions.c:335
-#: ../src/shell/e-shell-window-actions.c:914
+#: ../src/shell/e-shell-window-actions.c:948
 msgid "Configure Evolution"
 msgstr "Configure Evolution"
 
@@ -11332,7 +11248,6 @@ msgid "Save the current file"
 msgstr "Save the current file"
 
 #: ../src/composer/e-composer-actions.c:347
-#| msgid "Save _As"
 msgid "Save _As…"
 msgstr "Save _As…"
 
@@ -11469,12 +11384,12 @@ msgid "Save Draft"
 msgstr "Save Draft"
 
 #: ../src/composer/e-composer-from-header.c:108
-#: ../src/e-util/e-collection-account-wizard.c:2003
+#: ../src/e-util/e-collection-account-wizard.c:2002
 #: ../src/e-util/e-mail-signature-script-dialog.c:416
-#: ../src/e-util/e-webdav-browser.c:2413
+#: ../src/e-util/e-webdav-browser.c:2417
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../src/mail/e-mail-config-identity-page.c:550
-#: ../src/mail/e-mail-config-summary-page.c:332
+#: ../src/mail/e-mail-config-identity-page.c:551
+#: ../src/mail/e-mail-config-summary-page.c:334
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:297
 msgid "_Name:"
 msgstr "_Name:"
@@ -11524,7 +11439,7 @@ msgid "S_ubject:"
 msgstr "S_ubject:"
 
 #: ../src/composer/e-composer-header-table.c:883
-#: ../src/mail/e-mail-config-identity-page.c:743
+#: ../src/mail/e-mail-config-identity-page.c:744
 msgid "Si_gnature:"
 msgstr "Si_gnature:"
 
@@ -11706,7 +11621,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:675
+#: ../src/e-util/e-collection-account-wizard.c:674
 msgid "_Try Again"
 msgstr "_Try Again"
 
@@ -11850,21 +11765,27 @@ msgstr "Audio Player"
 msgid "Play the attachment in embedded audio player"
 msgstr "Play the attachment in embedded audio player"
 
-#: ../src/em-format/e-mail-formatter-headers.c:108
+#: ../src/em-format/e-mail-formatter-headers.c:109
 #: ../src/em-format/e-mail-part-headers.c:46
 #: ../src/mail/e-mail-tag-editor.c:196 ../src/mail/message-list.etspec.h:5
 #: ../src/modules/mail/em-mailer-prefs.c:60
 msgid "From"
 msgstr "From"
 
-#: ../src/em-format/e-mail-formatter-headers.c:133
+#: ../src/em-format/e-mail-formatter-headers.c:134
 msgid "(no subject)"
 msgstr "(no subject)"
 
+#: ../src/em-format/e-mail-formatter-headers.c:150
+#: ../src/em-format/e-mail-formatter-headers.c:514
+#: ../src/mail/e-mail-remote-content-popover.c:381
+msgid "Remote content download had been blocked for this message."
+msgstr "Remote content download had been blocked for this message."
+
 #. Translators: This message suggests to the receipients
 #. * that the sender of the mail is different from the one
 #. * listed in From field.
-#: ../src/em-format/e-mail-formatter-headers.c:344
+#: ../src/em-format/e-mail-formatter-headers.c:359
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "This message was sent by %s on behalf of %s"
@@ -11885,15 +11806,15 @@ msgstr "RFC822 message"
 msgid "Format part as an RFC822 message"
 msgstr "Format part as an RFC822 message"
 
-#: ../src/em-format/e-mail-formatter-print.c:51
-#: ../src/e-util/e-webdav-browser.c:2357
+#: ../src/em-format/e-mail-formatter-print.c:50
+#: ../src/e-util/e-webdav-browser.c:2361
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:92
 #: ../src/mail/e-mail-label-tree-view.c:96
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:64
 msgid "Name"
 msgstr "Name"
 
-#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/em-format/e-mail-formatter-print.c:50
 #: ../src/e-util/e-attachment-tree-view.c:193
 #: ../src/mail/message-list.etspec.h:10
 msgid "Size"
@@ -11940,7 +11861,7 @@ 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:1346
+#: ../src/e-util/e-html-editor-actions.c:1412
 msgid "Plain Text"
 msgstr "Plain Text"
 
@@ -11949,11 +11870,11 @@ msgstr "Plain Text"
 msgid "Format part as plain text"
 msgstr "Format part as plain text"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:45
+#: ../src/em-format/e-mail-formatter-secure-button.c:50
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:47
+#: ../src/em-format/e-mail-formatter-secure-button.c:52
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11961,15 +11882,15 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:49
+#: ../src/em-format/e-mail-formatter-secure-button.c:54
 msgid "Valid signature"
 msgstr "Valid signature"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:50
+#: ../src/em-format/e-mail-formatter-secure-button.c:55
 msgid "Valid signature, but sender address and signer address do not match"
 msgstr "Valid signature, but sender address and signer address do not match"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:51
+#: ../src/em-format/e-mail-formatter-secure-button.c:56
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11977,11 +11898,11 @@ msgstr ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:53
+#: ../src/em-format/e-mail-formatter-secure-button.c:58
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:55
+#: ../src/em-format/e-mail-formatter-secure-button.c:60
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11989,11 +11910,11 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:57
+#: ../src/em-format/e-mail-formatter-secure-button.c:62
 msgid "Valid signature, but cannot verify sender"
 msgstr "Valid signature, but cannot verify sender"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:59
+#: ../src/em-format/e-mail-formatter-secure-button.c:64
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12001,11 +11922,11 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:61
+#: ../src/em-format/e-mail-formatter-secure-button.c:66
 msgid "This message is signed, but the public key is not in your keyring"
 msgstr "This message is signed, but the public key is not in your keyring"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:63
+#: ../src/em-format/e-mail-formatter-secure-button.c:68
 msgid ""
 "This message was digitally signed, but the corresponding public key is not "
 "present in your keyring. If you want to be able to verify the authenticity "
@@ -12019,11 +11940,11 @@ msgstr ""
 "trusted method and add it to your keyring. Until then, there is no guarantee "
 "that this message truly came from that person and that it arrived unaltered."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:72
+#: ../src/em-format/e-mail-formatter-secure-button.c:77
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:72
+#: ../src/em-format/e-mail-formatter-secure-button.c:77
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12031,11 +11952,11 @@ msgstr ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:73
+#: ../src/em-format/e-mail-formatter-secure-button.c:78
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:73
+#: ../src/em-format/e-mail-formatter-secure-button.c:78
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12045,11 +11966,11 @@ msgstr ""
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:74
+#: ../src/em-format/e-mail-formatter-secure-button.c:79
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:74
+#: ../src/em-format/e-mail-formatter-secure-button.c:79
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12057,11 +11978,11 @@ msgstr ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:75
+#: ../src/em-format/e-mail-formatter-secure-button.c:80
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:75
+#: ../src/em-format/e-mail-formatter-secure-button.c:80
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12071,6 +11992,36 @@ msgstr ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 
+#: ../src/em-format/e-mail-formatter-secure-button.c:271
+msgid "View Certificate"
+msgstr "View Certificate"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:278
+msgid "Import Certificate"
+msgstr "Import Certificate"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:320
+msgid "Details"
+msgstr "Details"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:412
+msgid "Digital Signature"
+msgstr "Digital Signature"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:418
+msgid "Signer:"
+msgid_plural "Signers:"
+msgstr[0] "Signer:"
+msgstr[1] "Signers:"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:429
+msgid "Encryption"
+msgstr "Encryption"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:434
+msgid "Encrypted by:"
+msgstr "Encrypted by:"
+
 #: ../src/em-format/e-mail-formatter-source.c:119
 msgid "Display source of a MIME part"
 msgstr "Display source of a MIME part"
@@ -12210,8 +12161,8 @@ msgstr "Unsupported signature format"
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:550
-#: ../src/e-util/e-dateedit.c:573 ../src/mail/message-list.etspec.h:7
+#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:559
+#: ../src/e-util/e-dateedit.c:582 ../src/mail/message-list.etspec.h:7
 #: ../src/modules/mail/em-mailer-prefs.c:66
 msgid "Date"
 msgstr "Date"
@@ -12227,24 +12178,11 @@ msgstr "Newsgroups"
 msgid "Face"
 msgstr "Face"
 
-#: ../src/em-format/e-mail-part-secure-button.c:92
+#: ../src/em-format/e-mail-part-secure-button.c:96
 #, c-format
 msgid "Failed to import certificate: %s"
 msgstr "Failed to import certificate: %s"
 
-#: ../src/em-format/e-mail-part-secure-button.c:185
-#: ../src/shell/shell.error.xml.h:28 ../src/smime/gui/smime-ui.ui.h:16
-msgid "_View Certificate"
-msgstr "_View Certificate"
-
-#: ../src/em-format/e-mail-part-secure-button.c:198
-msgid "_Import Certificate"
-msgstr "_Import Certificate"
-
-#: ../src/em-format/e-mail-part-secure-button.c:207
-msgid "This certificate is not viewable"
-msgstr "This certificate is not viewable"
-
 #: ../src/em-format/e-mail-part-utils.c:634
 #, c-format
 msgid "%s attachment"
@@ -12276,7 +12214,7 @@ 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:86
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 msgid "Calendars"
 msgstr "Calendars"
 
@@ -12287,7 +12225,7 @@ 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"
 
@@ -12337,7 +12275,7 @@ msgstr "Evolution Accounts"
 #. widget = gtk_button_new_with_mnemonic (_("_Permissions"));
 #. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 #. webdav_browser->priv->permissions_button = widget;
-#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2704
+#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2708
 #: ../src/mail/em-subscription-editor.c:1952
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1600
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1678
@@ -12382,7 +12320,8 @@ msgstr "%s"
 #. *              percent complete is known.
 #. Translators: This is a running activity whose percent complete is known.
 #: ../src/e-util/e-activity.c:273
-#: ../src/modules/calendar/e-cal-base-shell-content.c:142
+#: ../src/modules/addressbook/e-book-shell-view-private.c:334
+#: ../src/modules/calendar/e-cal-base-shell-content.c:143
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
@@ -12460,14 +12399,14 @@ msgid "Attachment Properties"
 msgstr "Attachment Properties"
 
 #: ../src/e-util/e-attachment-dialog.c:337
-#: ../src/e-util/e-import-assistant.c:276
+#: ../src/e-util/e-import-assistant.c:277
 msgid "F_ilename:"
 msgstr "F_ilename:"
 
 #: ../src/e-util/e-attachment-dialog.c:354
 #: ../src/e-util/e-html-editor-image-dialog.c:513
 #: ../src/e-util/e-html-editor-link-dialog.c:229
-#: ../src/e-util/e-webdav-browser.c:2452
+#: ../src/e-util/e-webdav-browser.c:2456
 msgid "_Description:"
 msgstr "_Description:"
 
@@ -12541,7 +12480,6 @@ msgid "Save extracted files and the original _archive"
 msgstr "Save extracted files and the original _archive"
 
 #: ../src/e-util/e-attachment-view.c:308
-#| msgid "Open With Other Application..."
 msgid "Open With Other Application…"
 msgstr "Open With Other Application…"
 
@@ -12561,7 +12499,6 @@ msgid "Save _As"
 msgstr "Save _As"
 
 #: ../src/e-util/e-attachment-view.c:341
-#| msgid "Add Attachment"
 msgid "A_dd Attachment…"
 msgstr "A_dd Attachment…"
 
@@ -12746,7 +12683,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:2143
+#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2146
 msgid "?"
 msgstr "?"
 
@@ -12860,8 +12797,7 @@ msgstr "Character Encoding"
 msgid "Enter the character set to use"
 msgstr "Enter the character set to use"
 
-#: ../src/e-util/e-charset-combo-box.c:363
-#| msgid "Other"
+#: ../src/e-util/e-charset-combo-box.c:364
 msgid "Other…"
 msgstr "Other…"
 
@@ -12876,13 +12812,12 @@ msgid "_Finish"
 msgstr "_Finish"
 
 #: ../src/e-util/e-collection-account-wizard.c:110
-#| msgid "_Skip Lookup"
 msgid "_Look Up"
 msgstr "_Look Up"
 
 #: ../src/e-util/e-collection-account-wizard.c:112
 #: ../src/e-util/e-collection-account-wizard.c:273
-#: ../src/e-util/e-search-bar.c:677
+#: ../src/e-util/e-search-bar.c:680
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:85
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:244
 msgid "_Next"
@@ -12893,7 +12828,7 @@ msgid "New Collection Account"
 msgstr "New Collection Account"
 
 #: ../src/e-util/e-collection-account-wizard.c:258
-#: ../src/e-util/e-search-bar.c:665
+#: ../src/e-util/e-search-bar.c:668
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:78
 msgid "_Previous"
 msgstr "_Previous"
@@ -12912,15 +12847,7 @@ msgstr "Requires password to continue. %s."
 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:513
-#, c-format
-msgctxt "collection-account-wizard"
-msgid "%s %s."
-msgstr "%s %s."
-
-#: ../src/e-util/e-collection-account-wizard.c:551
+#: ../src/e-util/e-collection-account-wizard.c:550
 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 "
@@ -12930,80 +12857,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:553
+#: ../src/e-util/e-collection-account-wizard.c:552
 #, 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:657
+#: ../src/e-util/e-collection-account-wizard.c:656
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
 #: ../src/smime/gui/certificate-manager.c:766
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../src/e-util/e-collection-account-wizard.c:669
+#: ../src/e-util/e-collection-account-wizard.c:668
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "_Remember password"
 msgstr "_Remember password"
 
-#: ../src/e-util/e-collection-account-wizard.c:812
-#: ../src/e-util/e-webdav-browser.c:473
+#: ../src/e-util/e-collection-account-wizard.c:811
+#: ../src/e-util/e-webdav-browser.c:474
 msgid "Collection"
 msgstr "Collection"
 
-#: ../src/e-util/e-collection-account-wizard.c:813
+#: ../src/e-util/e-collection-account-wizard.c:812
 msgid "Mail Receive"
 msgstr "Mail Receive"
 
-#: ../src/e-util/e-collection-account-wizard.c:814
+#: ../src/e-util/e-collection-account-wizard.c:813
 msgid "Mail Send"
 msgstr "Mail Send"
 
-#: ../src/e-util/e-collection-account-wizard.c:815
+#: ../src/e-util/e-collection-account-wizard.c:814
 #: ../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:817
+#: ../src/e-util/e-collection-account-wizard.c:816
 msgid "Memo List"
 msgstr "Memo List"
 
-#: ../src/e-util/e-collection-account-wizard.c:818
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
+#: ../src/e-util/e-collection-account-wizard.c:817
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Task List"
 msgstr "Task List"
 
-#: ../src/e-util/e-collection-account-wizard.c:1154
+#: ../src/e-util/e-collection-account-wizard.c:1153
 msgid "Looking up LDAP server’s search base…"
 msgstr "Looking up LDAP server’s search base…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1461
+#: ../src/e-util/e-collection-account-wizard.c:1460
 msgid "Saving account settings, please wait…"
 msgstr "Saving account settings, please wait…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1612
+#: ../src/e-util/e-collection-account-wizard.c:1611
 msgid "User details"
 msgstr "User details"
 
-#: ../src/e-util/e-collection-account-wizard.c:1625
+#: ../src/e-util/e-collection-account-wizard.c:1624
 msgid "_Email Address or User name:"
 msgstr "_E-mail Address or User name:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1656
+#: ../src/e-util/e-collection-account-wizard.c:1655
 msgid "_Advanced Options"
 msgstr "_Advanced Options"
 
-#: ../src/e-util/e-collection-account-wizard.c:1661
+#: ../src/e-util/e-collection-account-wizard.c:1660
 #: ../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:1680
+#: ../src/e-util/e-collection-account-wizard.c:1679
 msgid ""
 "Semicolon (“;”) separated list of servers to look up information for, in "
 "addition to the domain of the e-mail address."
@@ -13011,13 +12938,13 @@ msgstr ""
 "Semicolon (“;”) separated list of servers to look up information for, in "
 "addition to the domain of the e-mail address."
 
-#: ../src/e-util/e-collection-account-wizard.c:1870
+#: ../src/e-util/e-collection-account-wizard.c:1869
 msgid "Select which parts should be configured:"
 msgstr "Select which parts should be configured:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1994
-#: ../src/mail/e-mail-config-identity-page.c:541
-#: ../src/mail/e-mail-config-summary-page.c:323
+#: ../src/e-util/e-collection-account-wizard.c:1993
+#: ../src/mail/e-mail-config-identity-page.c:542
+#: ../src/mail/e-mail-config-summary-page.c:325
 msgid "Account Information"
 msgstr "Account Information"
 
@@ -13025,224 +12952,224 @@ msgstr "Account Information"
 msgid "Choose custom color"
 msgstr "Choose custom colour"
 
-#: ../src/e-util/e-color-combo.c:76
+#: ../src/e-util/e-color-combo.c:488 ../src/mail/e-mail-account-tree-view.c:135
+#: ../src/mail/e-mail-config-security-page.c:544
+#: ../src/mail/e-mail-config-security-page.c:708
+#: ../src/mail/e-mail-reader.c:4870 ../src/mail/mail-config.ui.h:78
+msgid "Default"
+msgstr "Default"
+
+#: ../src/e-util/e-color-combo.c:576
 msgid "black"
 msgstr "black"
 
-#: ../src/e-util/e-color-combo.c:77
+#: ../src/e-util/e-color-combo.c:577
 msgid "light brown"
 msgstr "light brown"
 
-#: ../src/e-util/e-color-combo.c:78
+#: ../src/e-util/e-color-combo.c:578
 msgid "brown gold"
 msgstr "brown gold"
 
-#: ../src/e-util/e-color-combo.c:79
+#: ../src/e-util/e-color-combo.c:579
 msgid "dark green #2"
 msgstr "dark green #2"
 
-#: ../src/e-util/e-color-combo.c:80
+#: ../src/e-util/e-color-combo.c:580
 msgid "navy"
 msgstr "navy"
 
-#: ../src/e-util/e-color-combo.c:81
+#: ../src/e-util/e-color-combo.c:581
 msgid "dark blue"
 msgstr "dark blue"
 
-#: ../src/e-util/e-color-combo.c:82
+#: ../src/e-util/e-color-combo.c:582
 msgid "purple #2"
 msgstr "purple #2"
 
-#: ../src/e-util/e-color-combo.c:83
+#: ../src/e-util/e-color-combo.c:583
 msgid "very dark gray"
 msgstr "very dark grey"
 
-#: ../src/e-util/e-color-combo.c:85
+#: ../src/e-util/e-color-combo.c:585
 msgid "dark red"
 msgstr "dark red"
 
-#: ../src/e-util/e-color-combo.c:86
+#: ../src/e-util/e-color-combo.c:586
 msgid "red-orange"
 msgstr "red-orange"
 
-#: ../src/e-util/e-color-combo.c:87
+#: ../src/e-util/e-color-combo.c:587
 msgid "gold"
 msgstr "gold"
 
-#: ../src/e-util/e-color-combo.c:88
+#: ../src/e-util/e-color-combo.c:588
 msgid "dark green"
 msgstr "dark green"
 
-#: ../src/e-util/e-color-combo.c:89
+#: ../src/e-util/e-color-combo.c:589
 msgid "dull blue"
 msgstr "dull blue"
 
-#: ../src/e-util/e-color-combo.c:90
+#: ../src/e-util/e-color-combo.c:590
 msgid "blue"
 msgstr "blue"
 
-#: ../src/e-util/e-color-combo.c:91
+#: ../src/e-util/e-color-combo.c:591
 msgid "dull purple"
 msgstr "dull purple"
 
-#: ../src/e-util/e-color-combo.c:92
+#: ../src/e-util/e-color-combo.c:592
 msgid "dark grey"
 msgstr "dark grey"
 
-#: ../src/e-util/e-color-combo.c:94
+#: ../src/e-util/e-color-combo.c:594
 msgid "red"
 msgstr "red"
 
-#: ../src/e-util/e-color-combo.c:95
+#: ../src/e-util/e-color-combo.c:595
 msgid "orange"
 msgstr "orange"
 
-#: ../src/e-util/e-color-combo.c:96
+#: ../src/e-util/e-color-combo.c:596
 msgid "lime"
 msgstr "lime"
 
-#: ../src/e-util/e-color-combo.c:97
+#: ../src/e-util/e-color-combo.c:597
 msgid "dull green"
 msgstr "dull green"
 
-#: ../src/e-util/e-color-combo.c:98
+#: ../src/e-util/e-color-combo.c:598
 msgid "dull blue #2"
 msgstr "dull blue #2"
 
-#: ../src/e-util/e-color-combo.c:99
+#: ../src/e-util/e-color-combo.c:599
 msgid "sky blue #2"
 msgstr "sky blue #2"
 
-#: ../src/e-util/e-color-combo.c:100
+#: ../src/e-util/e-color-combo.c:600
 msgid "purple"
 msgstr "purple"
 
-#: ../src/e-util/e-color-combo.c:101
+#: ../src/e-util/e-color-combo.c:601
 msgid "gray"
 msgstr "grey"
 
-#: ../src/e-util/e-color-combo.c:103
+#: ../src/e-util/e-color-combo.c:603
 msgid "magenta"
 msgstr "magenta"
 
-#: ../src/e-util/e-color-combo.c:104
+#: ../src/e-util/e-color-combo.c:604
 msgid "bright orange"
 msgstr "bright orange"
 
-#: ../src/e-util/e-color-combo.c:105
+#: ../src/e-util/e-color-combo.c:605
 msgid "yellow"
 msgstr "yellow"
 
-#: ../src/e-util/e-color-combo.c:106
+#: ../src/e-util/e-color-combo.c:606
 msgid "green"
 msgstr "green"
 
-#: ../src/e-util/e-color-combo.c:107
+#: ../src/e-util/e-color-combo.c:607
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/e-util/e-color-combo.c:108
+#: ../src/e-util/e-color-combo.c:608
 msgid "bright blue"
 msgstr "bright blue"
 
-#: ../src/e-util/e-color-combo.c:109
+#: ../src/e-util/e-color-combo.c:609
 msgid "red purple"
 msgstr "red purple"
 
-#: ../src/e-util/e-color-combo.c:110
+#: ../src/e-util/e-color-combo.c:610
 msgid "light grey"
 msgstr "light grey"
 
-#: ../src/e-util/e-color-combo.c:112
+#: ../src/e-util/e-color-combo.c:612
 msgid "pink"
 msgstr "pink"
 
-#: ../src/e-util/e-color-combo.c:113
+#: ../src/e-util/e-color-combo.c:613
 msgid "light orange"
 msgstr "light orange"
 
-#: ../src/e-util/e-color-combo.c:114
+#: ../src/e-util/e-color-combo.c:614
 msgid "light yellow"
 msgstr "light yellow"
 
-#: ../src/e-util/e-color-combo.c:115
+#: ../src/e-util/e-color-combo.c:615
 msgid "light green"
 msgstr "light green"
 
-#: ../src/e-util/e-color-combo.c:116
+#: ../src/e-util/e-color-combo.c:616
 msgid "light cyan"
 msgstr "light cyan"
 
-#: ../src/e-util/e-color-combo.c:117
+#: ../src/e-util/e-color-combo.c:617
 msgid "light blue"
 msgstr "light blue"
 
-#: ../src/e-util/e-color-combo.c:118
+#: ../src/e-util/e-color-combo.c:618
 msgid "light purple"
 msgstr "light purple"
 
-#: ../src/e-util/e-color-combo.c:119
+#: ../src/e-util/e-color-combo.c:619
 msgid "white"
 msgstr "white"
 
-#: ../src/e-util/e-color-combo.c:539 ../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:4849 ../src/mail/mail-config.ui.h:78
-msgid "Default"
-msgstr "Default"
-
-#: ../src/e-util/e-config-lookup.c:821
+#: ../src/e-util/e-config-lookup.c:819
 msgid "Running…"
 msgstr "Running…"
 
-#: ../src/e-util/e-dateedit.c:524
+#: ../src/e-util/e-dateedit.c:526
 msgid "Date and Time"
 msgstr "Date and Time"
 
-#: ../src/e-util/e-dateedit.c:549
+#: ../src/e-util/e-dateedit.c:558
 msgid "Text entry to input date"
 msgstr "Text entry to input date"
 
-#: ../src/e-util/e-dateedit.c:572
+#: ../src/e-util/e-dateedit.c:581
 msgid "Click this button to show a calendar"
 msgstr "Click this button to show a calendar"
 
-#: ../src/e-util/e-dateedit.c:627
+#: ../src/e-util/e-dateedit.c:636
 msgid "Drop-down combination box to select time"
 msgstr "Drop-down combination box to select time"
 
-#: ../src/e-util/e-dateedit.c:628
+#: ../src/e-util/e-dateedit.c:637
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Time"
 
-#: ../src/e-util/e-dateedit.c:702
+#: ../src/e-util/e-dateedit.c:714
 msgid "No_w"
 msgstr "No_w"
 
-#: ../src/e-util/e-dateedit.c:709
+#: ../src/e-util/e-dateedit.c:721
 msgid "_Today"
 msgstr "_Today"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../src/e-util/e-dateedit.c:718
+#: ../src/e-util/e-dateedit.c:730
 msgid "_None"
 msgstr "_None"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../src/e-util/e-dateedit.c:1877 ../src/e-util/e-dateedit.c:2131
+#: ../src/e-util/e-dateedit.c:1889 ../src/e-util/e-dateedit.c:2140
 msgctxt "date"
 msgid "None"
 msgstr "None"
 
-#: ../src/e-util/e-dateedit.c:2017
+#: ../src/e-util/e-dateedit.c:2025 ../src/e-util/e-dateedit.c:2494
 msgid "Invalid Date Value"
 msgstr "Invalid Date Value"
 
-#: ../src/e-util/e-dateedit.c:2062
+#: ../src/e-util/e-dateedit.c:2063 ../src/e-util/e-dateedit.c:2551
 msgid "Invalid Time Value"
 msgstr "Invalid Time Value"
 
@@ -13625,8 +13552,8 @@ 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:766
-#: ../src/mail/e-mail-config-summary-page.c:141
+#: ../src/mail/e-mail-autoconfig.c:778
+#: ../src/mail/e-mail-config-summary-page.c:143
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "None"
 msgstr "None"
@@ -13656,531 +13583,574 @@ msgid "A_dd Condition"
 msgstr "A_dd Condition"
 
 #: ../src/e-util/e-filter-rule.c:1485 ../src/e-util/filter.ui.h:1
-#: ../src/mail/em-filter-rule.c:1043 ../src/mail/em-utils.c:166
+#: ../src/mail/em-filter-rule.c:1042 ../src/mail/em-utils.c:166
 msgid "Incoming"
 msgstr "Incoming"
 
-#: ../src/e-util/e-filter-rule.c:1485 ../src/mail/em-filter-rule.c:1044
+#: ../src/e-util/e-filter-rule.c:1485 ../src/mail/em-filter-rule.c:1043
 #: ../src/mail/em-utils.c:167
 msgid "Outgoing"
 msgstr "Outgoing"
 
-#: ../src/e-util/e-html-editor-actions.c:80
+#: ../src/e-util/e-gtkemojichooser.c:753
+msgid "Recent"
+msgstr "Recent"
+
+#: ../src/e-util/e-gtkemojichooser.c:757
+msgid "Smileys & People"
+msgstr "Smileys & People"
+
+#: ../src/e-util/e-gtkemojichooser.c:758
+msgid "Body & Clothing"
+msgstr "Body & Clothing"
+
+#: ../src/e-util/e-gtkemojichooser.c:759
+msgid "Animals & Nature"
+msgstr "Animals & Nature"
+
+#: ../src/e-util/e-gtkemojichooser.c:760
+msgid "Food & Drink"
+msgstr "Food & Drink"
+
+#: ../src/e-util/e-gtkemojichooser.c:761
+msgid "Travel & Places"
+msgstr "Travel & Places"
+
+#: ../src/e-util/e-gtkemojichooser.c:762
+msgid "Activities"
+msgstr "Activities"
+
+#: ../src/e-util/e-gtkemojichooser.c:763
+msgctxt "emoji category"
+msgid "Objects"
+msgstr "Objects"
+
+#: ../src/e-util/e-gtkemojichooser.c:764
+msgid "Symbols"
+msgstr "Symbols"
+
+#: ../src/e-util/e-gtkemojichooser.c:765
+#: ../src/e-util/evolution-source-viewer.c:677
+msgid "Flags"
+msgstr "Flags"
+
+#: ../src/e-util/e-gtkemojichooser.c:789
+msgid "No Results Found"
+msgstr "No Results Found"
+
+#: ../src/e-util/e-gtkemojichooser.c:797
+msgid "Try a different search"
+msgstr "No Results Found"
+
+#: ../src/e-util/e-html-editor-actions.c:81
 msgid "Failed to insert HTML file."
 msgstr "Failed to insert HTML file."
 
-#: ../src/e-util/e-html-editor-actions.c:118
+#: ../src/e-util/e-html-editor-actions.c:119
 msgid "Failed to insert text file."
 msgstr "Failed to insert text file."
 
-#: ../src/e-util/e-html-editor-actions.c:302
+#: ../src/e-util/e-html-editor-actions.c:340
 msgid "Insert HTML File"
 msgstr "Insert HTML File"
 
-#: ../src/e-util/e-html-editor-actions.c:307
+#: ../src/e-util/e-html-editor-actions.c:345
 msgid "HTML file"
 msgstr "HTML file"
 
-#: ../src/e-util/e-html-editor-actions.c:345
-#: ../src/e-util/e-html-editor-actions.c:355
+#: ../src/e-util/e-html-editor-actions.c:383
+#: ../src/e-util/e-html-editor-actions.c:401
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: ../src/e-util/e-html-editor-actions.c:352
-msgid "Image file"
-msgstr "Image file"
+#: ../src/e-util/e-html-editor-actions.c:390
+#: ../src/e-util/e-html-editor-actions.c:408
+#: ../src/e-util/e-image-chooser-dialog.c:188 ../src/plugins/face/face.c:301
+msgid "Image files"
+msgstr "Image files"
 
-#: ../src/e-util/e-html-editor-actions.c:428
+#: ../src/e-util/e-html-editor-actions.c:487
 msgid "Insert text file"
 msgstr "Insert text file"
 
-#: ../src/e-util/e-html-editor-actions.c:433
+#: ../src/e-util/e-html-editor-actions.c:492
 msgid "Text file"
 msgstr "Text file"
 
-#: ../src/e-util/e-html-editor-actions.c:912
+#: ../src/e-util/e-html-editor-actions.c:971
 msgid "Copy selected text to the clipboard"
 msgstr "Copy selected text to the clipboard"
 
-#: ../src/e-util/e-html-editor-actions.c:919
+#: ../src/e-util/e-html-editor-actions.c:978
 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:926
+#: ../src/e-util/e-html-editor-actions.c:985
 msgid "Paste text from the clipboard"
 msgstr "Paste text from the clipboard"
 
-#: ../src/e-util/e-html-editor-actions.c:933
+#: ../src/e-util/e-html-editor-actions.c:992
 msgid "Redo the last undone action"
 msgstr "Redo the last undone action"
 
-#: ../src/e-util/e-html-editor-actions.c:947
+#: ../src/e-util/e-html-editor-actions.c:1006
 msgid "Undo the last action"
 msgstr "Undo the last action"
 
-#: ../src/e-util/e-html-editor-actions.c:968
+#: ../src/e-util/e-html-editor-actions.c:1027
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ../src/e-util/e-html-editor-actions.c:975
+#: ../src/e-util/e-html-editor-actions.c:1034
 msgid "_Paragraph Style"
 msgstr "_Paragraph Style"
 
-#: ../src/e-util/e-html-editor-actions.c:989
+#: ../src/e-util/e-html-editor-actions.c:1048
 #: ../src/e-util/e-html-editor-image-dialog.c:590
 msgid "_Alignment"
 msgstr "_Alignment"
 
-#: ../src/e-util/e-html-editor-actions.c:996
+#: ../src/e-util/e-html-editor-actions.c:1055
 msgid "Current _Languages"
 msgstr "Current _Languages"
 
-#: ../src/e-util/e-html-editor-actions.c:1013
+#: ../src/e-util/e-html-editor-actions.c:1072
 msgid "_Increase Indent"
 msgstr "_Increase Indent"
 
-#: ../src/e-util/e-html-editor-actions.c:1015
+#: ../src/e-util/e-html-editor-actions.c:1074
 msgid "Increase Indent"
 msgstr "Increase Indent"
 
-#: ../src/e-util/e-html-editor-actions.c:1020
-#| msgid "_HTML File..."
+#: ../src/e-util/e-html-editor-actions.c:1079
+#: ../src/e-util/e-html-editor-actions.c:2087
+msgid "E_moji"
+msgstr "E_moji"
+
+#: ../src/e-util/e-html-editor-actions.c:1081
+msgid "Insert Emoji"
+msgstr "Insert Emoji"
+
+#: ../src/e-util/e-html-editor-actions.c:1086
 msgid "_HTML File…"
 msgstr "_HTML File…"
 
-#: ../src/e-util/e-html-editor-actions.c:1027
-#| msgid "Te_xt File..."
+#: ../src/e-util/e-html-editor-actions.c:1093
 msgid "Te_xt File…"
 msgstr "Te_xt File…"
 
-#: ../src/e-util/e-html-editor-actions.c:1034
+#: ../src/e-util/e-html-editor-actions.c:1100
 msgid "Paste _Quotation"
 msgstr "Paste _Quotation"
 
-#: ../src/e-util/e-html-editor-actions.c:1041
-#| msgid "_Find"
+#: ../src/e-util/e-html-editor-actions.c:1107
 msgid "_Find…"
 msgstr "_Find…"
 
-#: ../src/e-util/e-html-editor-actions.c:1043
+#: ../src/e-util/e-html-editor-actions.c:1109
 msgid "Search for text"
 msgstr "Search for text"
 
-#: ../src/e-util/e-html-editor-actions.c:1048
+#: ../src/e-util/e-html-editor-actions.c:1114
 msgid "Find A_gain"
 msgstr "Find A_gain"
 
-#: ../src/e-util/e-html-editor-actions.c:1055
-#| msgid "Re_place"
+#: ../src/e-util/e-html-editor-actions.c:1121
 msgid "Re_place…"
 msgstr "Re_place…"
 
-#: ../src/e-util/e-html-editor-actions.c:1057
+#: ../src/e-util/e-html-editor-actions.c:1123
 msgid "Search for and replace text"
 msgstr "Search for and replace text"
 
-#: ../src/e-util/e-html-editor-actions.c:1062
-#| msgid "Check _Spelling..."
+#: ../src/e-util/e-html-editor-actions.c:1128
 msgid "Check _Spelling…"
 msgstr "Check _Spelling…"
 
-#: ../src/e-util/e-html-editor-actions.c:1069
+#: ../src/e-util/e-html-editor-actions.c:1135
 msgid "_Decrease Indent"
 msgstr "_Decrease Indent"
 
-#: ../src/e-util/e-html-editor-actions.c:1071
+#: ../src/e-util/e-html-editor-actions.c:1137
 msgid "Decrease Indent"
 msgstr "Decrease Indent"
 
-#: ../src/e-util/e-html-editor-actions.c:1076
+#: ../src/e-util/e-html-editor-actions.c:1142
 msgid "_Wrap Lines"
 msgstr "_Wrap Lines"
 
 #. Center
-#: ../src/e-util/e-html-editor-actions.c:1086
+#: ../src/e-util/e-html-editor-actions.c:1152
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:108
 msgid "_Center"
 msgstr "_Centre"
 
-#: ../src/e-util/e-html-editor-actions.c:1088
+#: ../src/e-util/e-html-editor-actions.c:1154
 msgid "Center Alignment"
 msgstr "Centre Alignment"
 
 #. Left
-#: ../src/e-util/e-html-editor-actions.c:1093
+#: ../src/e-util/e-html-editor-actions.c:1159
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:99
 msgid "_Left"
 msgstr "_Left"
 
-#: ../src/e-util/e-html-editor-actions.c:1095
+#: ../src/e-util/e-html-editor-actions.c:1161
 msgid "Left Alignment"
 msgstr "Left Alignment"
 
 #. Right
-#: ../src/e-util/e-html-editor-actions.c:1100
+#: ../src/e-util/e-html-editor-actions.c:1166
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:117
 msgid "_Right"
 msgstr "_Right"
 
-#: ../src/e-util/e-html-editor-actions.c:1102
+#: ../src/e-util/e-html-editor-actions.c:1168
 msgid "Right Alignment"
 msgstr "Right Alignment"
 
-#: ../src/e-util/e-html-editor-actions.c:1110
+#: ../src/e-util/e-html-editor-actions.c:1176
 #: ../src/modules/text-highlight/languages.c:70
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../src/e-util/e-html-editor-actions.c:1112
+#: ../src/e-util/e-html-editor-actions.c:1178
 msgid "HTML editing mode"
 msgstr "HTML editing mode"
 
-#: ../src/e-util/e-html-editor-actions.c:1117
+#: ../src/e-util/e-html-editor-actions.c:1183
 msgid "Plain _Text"
 msgstr "Plain _Text"
 
-#: ../src/e-util/e-html-editor-actions.c:1119
+#: ../src/e-util/e-html-editor-actions.c:1185
 msgid "Plain text editing mode"
 msgstr "Plain text editing mode"
 
-#: ../src/e-util/e-html-editor-actions.c:1127
+#: ../src/e-util/e-html-editor-actions.c:1193
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../src/e-util/e-html-editor-actions.c:1134
+#: ../src/e-util/e-html-editor-actions.c:1200
 msgid "Heading _1"
 msgstr "Heading _1"
 
-#: ../src/e-util/e-html-editor-actions.c:1141
+#: ../src/e-util/e-html-editor-actions.c:1207
 msgid "Heading _2"
 msgstr "Heading _2"
 
-#: ../src/e-util/e-html-editor-actions.c:1148
+#: ../src/e-util/e-html-editor-actions.c:1214
 msgid "Heading _3"
 msgstr "Heading _3"
 
-#: ../src/e-util/e-html-editor-actions.c:1155
+#: ../src/e-util/e-html-editor-actions.c:1221
 msgid "Heading _4"
 msgstr "Heading _4"
 
-#: ../src/e-util/e-html-editor-actions.c:1162
+#: ../src/e-util/e-html-editor-actions.c:1228
 msgid "Heading _5"
 msgstr "Heading _5"
 
-#: ../src/e-util/e-html-editor-actions.c:1169
+#: ../src/e-util/e-html-editor-actions.c:1235
 msgid "Heading _6"
 msgstr "Heading _6"
 
-#: ../src/e-util/e-html-editor-actions.c:1176
+#: ../src/e-util/e-html-editor-actions.c:1242
 msgid "_Preformatted"
 msgstr "_Preformatted"
 
-#: ../src/e-util/e-html-editor-actions.c:1183
+#: ../src/e-util/e-html-editor-actions.c:1249
 msgid "A_ddress"
 msgstr "A_ddress"
 
-#: ../src/e-util/e-html-editor-actions.c:1190
+#: ../src/e-util/e-html-editor-actions.c:1256
 msgid "_Bulleted List"
 msgstr "_Bulleted List"
 
-#: ../src/e-util/e-html-editor-actions.c:1197
+#: ../src/e-util/e-html-editor-actions.c:1263
 msgid "_Roman Numeral List"
 msgstr "_Roman Numeral List"
 
-#: ../src/e-util/e-html-editor-actions.c:1204
+#: ../src/e-util/e-html-editor-actions.c:1270
 msgid "Numbered _List"
 msgstr "Numbered _List"
 
-#: ../src/e-util/e-html-editor-actions.c:1211
+#: ../src/e-util/e-html-editor-actions.c:1277
 msgid "_Alphabetical List"
 msgstr "_Alphabetical List"
 
-#: ../src/e-util/e-html-editor-actions.c:1227
-#: ../src/e-util/e-html-editor-actions.c:1265
-#| msgid "_Image"
+#: ../src/e-util/e-html-editor-actions.c:1293
+#: ../src/e-util/e-html-editor-actions.c:1331
 msgid "_Image…"
 msgstr "_Image…"
 
 #. Translators: This is an action tooltip
-#: ../src/e-util/e-html-editor-actions.c:1230
+#: ../src/e-util/e-html-editor-actions.c:1296
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: ../src/e-util/e-html-editor-actions.c:1235
-#: ../src/e-util/e-html-editor-actions.c:1272
-#| msgid "_Link"
+#: ../src/e-util/e-html-editor-actions.c:1301
+#: ../src/e-util/e-html-editor-actions.c:1338
 msgid "_Link…"
 msgstr "_Link…"
 
-#: ../src/e-util/e-html-editor-actions.c:1237
+#: ../src/e-util/e-html-editor-actions.c:1303
 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:1243
-#: ../src/e-util/e-html-editor-actions.c:1287
-#| msgid "_Rule"
+#: ../src/e-util/e-html-editor-actions.c:1309
+#: ../src/e-util/e-html-editor-actions.c:1353
 msgid "_Rule…"
 msgstr "_Rule…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1246
+#: ../src/e-util/e-html-editor-actions.c:1312
 msgid "Insert Rule"
 msgstr "Insert Rule"
 
-#: ../src/e-util/e-html-editor-actions.c:1251
-#: ../src/e-util/e-html-editor-actions.c:1294
-#| msgid "_Table"
+#: ../src/e-util/e-html-editor-actions.c:1317
+#: ../src/e-util/e-html-editor-actions.c:1360
 msgid "_Table…"
 msgstr "_Table…"
 
-#: ../src/e-util/e-html-editor-actions.c:1253
+#: ../src/e-util/e-html-editor-actions.c:1319
 msgid "Insert Table"
 msgstr "Insert Table"
 
-#: ../src/e-util/e-html-editor-actions.c:1258
-#| msgid "_Cell..."
+#: ../src/e-util/e-html-editor-actions.c:1324
 msgid "_Cell…"
 msgstr "_Cell…"
 
-#: ../src/e-util/e-html-editor-actions.c:1279
-#| msgid "Pa_ge..."
+#: ../src/e-util/e-html-editor-actions.c:1345
 msgid "Pa_ge…"
 msgstr "Pa_ge…"
 
-#: ../src/e-util/e-html-editor-actions.c:1303
+#: ../src/e-util/e-html-editor-actions.c:1369
 msgid "Font _Size"
 msgstr "Font _Size"
 
-#: ../src/e-util/e-html-editor-actions.c:1310
+#: ../src/e-util/e-html-editor-actions.c:1376
 msgid "_Font Style"
 msgstr "_Font Style"
 
-#: ../src/e-util/e-html-editor-actions.c:1317
+#: ../src/e-util/e-html-editor-actions.c:1383
 msgid "Paste As _Text"
 msgstr "Paste As _Text"
 
-#: ../src/e-util/e-html-editor-actions.c:1328
+#: ../src/e-util/e-html-editor-actions.c:1394
 #: ../src/e-util/e-html-editor-text-dialog.c:201
 msgid "_Bold"
 msgstr "_Bold"
 
-#: ../src/e-util/e-html-editor-actions.c:1330
+#: ../src/e-util/e-html-editor-actions.c:1396
 msgid "Bold"
 msgstr "Bold"
 
-#: ../src/e-util/e-html-editor-actions.c:1336
+#: ../src/e-util/e-html-editor-actions.c:1402
 #: ../src/e-util/e-html-editor-text-dialog.c:212
 msgid "_Italic"
 msgstr "_Italic"
 
-#: ../src/e-util/e-html-editor-actions.c:1338
+#: ../src/e-util/e-html-editor-actions.c:1404
 msgid "Italic"
 msgstr "Italic"
 
-#: ../src/e-util/e-html-editor-actions.c:1344
+#: ../src/e-util/e-html-editor-actions.c:1410
 msgid "_Plain Text"
 msgstr "_Plain Text"
 
-#: ../src/e-util/e-html-editor-actions.c:1352
+#: ../src/e-util/e-html-editor-actions.c:1418
 #: ../src/e-util/e-html-editor-text-dialog.c:233
 msgid "_Strikethrough"
 msgstr "_Strikethrough"
 
-#: ../src/e-util/e-html-editor-actions.c:1354
+#: ../src/e-util/e-html-editor-actions.c:1420
 msgid "Strikethrough"
 msgstr "Strikethrough"
 
-#: ../src/e-util/e-html-editor-actions.c:1360
+#: ../src/e-util/e-html-editor-actions.c:1426
 #: ../src/e-util/e-html-editor-text-dialog.c:223
 msgid "_Underline"
 msgstr "_Underline"
 
-#: ../src/e-util/e-html-editor-actions.c:1362
+#: ../src/e-util/e-html-editor-actions.c:1428
 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:1372
+#: ../src/e-util/e-html-editor-actions.c:1438
 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:1446
 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:1388
+#: ../src/e-util/e-html-editor-actions.c:1454
 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:1396
+#: ../src/e-util/e-html-editor-actions.c:1462
 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:1404
+#: ../src/e-util/e-html-editor-actions.c:1470
 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:1412
+#: ../src/e-util/e-html-editor-actions.c:1478
 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:1420
+#: ../src/e-util/e-html-editor-actions.c:1486
 msgid "+4"
 msgstr "+4"
 
-#: ../src/e-util/e-html-editor-actions.c:1439
+#: ../src/e-util/e-html-editor-actions.c:1505
 msgid "Cell Contents"
 msgstr "Cell Contents"
 
-#: ../src/e-util/e-html-editor-actions.c:1446
+#: ../src/e-util/e-html-editor-actions.c:1512
 msgid "Column"
 msgstr "Column"
 
-#: ../src/e-util/e-html-editor-actions.c:1453
+#: ../src/e-util/e-html-editor-actions.c:1519
 msgid "Row"
 msgstr "Row"
 
-#: ../src/e-util/e-html-editor-actions.c:1460
+#: ../src/e-util/e-html-editor-actions.c:1526
 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:1470
+#: ../src/e-util/e-html-editor-actions.c:1536
 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:1478
+#: ../src/e-util/e-html-editor-actions.c:1544
 msgid "Table Insert"
 msgstr "Table Insert"
 
-#: ../src/e-util/e-html-editor-actions.c:1485
+#: ../src/e-util/e-html-editor-actions.c:1551
 msgid "Properties"
 msgstr "Properties"
 
-#: ../src/e-util/e-html-editor-actions.c:1503
+#: ../src/e-util/e-html-editor-actions.c:1569
 msgid "Column After"
 msgstr "Column After"
 
-#: ../src/e-util/e-html-editor-actions.c:1510
+#: ../src/e-util/e-html-editor-actions.c:1576
 msgid "Column Before"
 msgstr "Column Before"
 
-#: ../src/e-util/e-html-editor-actions.c:1517
+#: ../src/e-util/e-html-editor-actions.c:1583
 msgid "Insert _Link"
 msgstr "Insert _Link"
 
-#: ../src/e-util/e-html-editor-actions.c:1524
+#: ../src/e-util/e-html-editor-actions.c:1590
 msgid "Row Above"
 msgstr "Row Above"
 
-#: ../src/e-util/e-html-editor-actions.c:1531
+#: ../src/e-util/e-html-editor-actions.c:1597
 msgid "Row Below"
 msgstr "Row Below"
 
-#: ../src/e-util/e-html-editor-actions.c:1538
+#: ../src/e-util/e-html-editor-actions.c:1604
 msgid "Cell…"
 msgstr "Cell…"
 
-#: ../src/e-util/e-html-editor-actions.c:1545
-#| msgid "Image"
+#: ../src/e-util/e-html-editor-actions.c:1611
 msgid "Image…"
 msgstr "Image…"
 
-#: ../src/e-util/e-html-editor-actions.c:1552
-#| msgid "_Link"
+#: ../src/e-util/e-html-editor-actions.c:1618
 msgid "Link…"
 msgstr "Link…"
 
-#: ../src/e-util/e-html-editor-actions.c:1559
-#| msgid "Pager"
+#: ../src/e-util/e-html-editor-actions.c:1625
 msgid "Page…"
 msgstr "Page…"
 
-#: ../src/e-util/e-html-editor-actions.c:1566
-#| msgid "Paragraph..."
+#: ../src/e-util/e-html-editor-actions.c:1632
 msgid "Paragraph…"
 msgstr "Paragraph…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1574
-#| msgid "_Rule"
+#: ../src/e-util/e-html-editor-actions.c:1640
 msgid "Rule…"
 msgstr "Rule…"
 
-#: ../src/e-util/e-html-editor-actions.c:1581
-#| msgid "Table"
+#: ../src/e-util/e-html-editor-actions.c:1647
 msgid "Table…"
 msgstr "Table…"
 
-#: ../src/e-util/e-html-editor-actions.c:1588
-#| msgid "_Text:"
+#: ../src/e-util/e-html-editor-actions.c:1654
 msgid "Text…"
 msgstr "Text…"
 
-#: ../src/e-util/e-html-editor-actions.c:1595
+#: ../src/e-util/e-html-editor-actions.c:1661
 msgid "Remove Link"
 msgstr "Remove Link"
 
-#: ../src/e-util/e-html-editor-actions.c:1612
+#: ../src/e-util/e-html-editor-actions.c:1678
 msgid "Add Word to Dictionary"
 msgstr "Add Word to Dictionary"
 
-#: ../src/e-util/e-html-editor-actions.c:1619
+#: ../src/e-util/e-html-editor-actions.c:1685
 msgid "Ignore Misspelled Word"
 msgstr "Ignore Misspelt Word"
 
-#: ../src/e-util/e-html-editor-actions.c:1626
+#: ../src/e-util/e-html-editor-actions.c:1692
 msgid "Add Word To"
 msgstr "Add Word To"
 
-#: ../src/e-util/e-html-editor-actions.c:1635
+#: ../src/e-util/e-html-editor-actions.c:1701
 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:1870
+#: ../src/e-util/e-html-editor-actions.c:1936
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s Dictionary"
 
-#: ../src/e-util/e-html-editor-actions.c:1949
+#: ../src/e-util/e-html-editor-actions.c:2015
 msgid "_Emoticon"
 msgstr "_Emoticon"
 
-#: ../src/e-util/e-html-editor-actions.c:1950
+#: ../src/e-util/e-html-editor-actions.c:2016
 msgid "Insert Emoticon"
 msgstr "Insert Emoticon"
 
-#: ../src/e-util/e-html-editor-actions.c:2018
+#: ../src/e-util/e-html-editor-actions.c:2084
 msgid "Re_place"
 msgstr "Re_place"
 
-#: ../src/e-util/e-html-editor-actions.c:2021
+#: ../src/e-util/e-html-editor-actions.c:2090
 msgid "_Image"
 msgstr "_Image"
 
-#: ../src/e-util/e-html-editor-actions.c:2024
+#: ../src/e-util/e-html-editor-actions.c:2093
 msgid "_Link"
 msgstr "_Link"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:2028
+#: ../src/e-util/e-html-editor-actions.c:2097
 msgid "_Rule"
 msgstr "_Rule"
 
-#: ../src/e-util/e-html-editor-actions.c:2031
+#: ../src/e-util/e-html-editor-actions.c:2100
 #: ../src/e-util/e-html-editor-cell-dialog.c:448
 msgid "_Table"
 msgstr "_Table"
@@ -14426,7 +14396,6 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:668
-#| msgid "_Test URL..."
 msgid "_Test URL…"
 msgstr "_Test URL…"
 
@@ -14497,12 +14466,12 @@ 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:"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:481
-#: ../src/e-util/e-import-assistant.c:286
+#: ../src/e-util/e-import-assistant.c:287
 msgid "Select a file"
 msgstr "Select a file"
 
@@ -14634,7 +14603,7 @@ msgstr "_Padding:"
 
 #: ../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:2423
+#: ../src/e-util/e-webdav-browser.c:2427
 msgid "_Color:"
 msgstr "_Colour:"
 
@@ -14662,34 +14631,34 @@ msgstr ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 
-#: ../src/e-util/e-import-assistant.c:300
-#: ../src/e-util/e-import-assistant.c:475
+#: ../src/e-util/e-import-assistant.c:301
+#: ../src/e-util/e-import-assistant.c:480
 msgid "File _type:"
 msgstr "File _type:"
 
-#: ../src/e-util/e-import-assistant.c:343
-#: ../src/e-util/e-import-assistant.c:956
+#: ../src/e-util/e-import-assistant.c:344
+#: ../src/e-util/e-import-assistant.c:962
 msgid "Choose the destination for this import"
 msgstr "Choose the destination for this import"
 
-#: ../src/e-util/e-import-assistant.c:368
+#: ../src/e-util/e-import-assistant.c:370
 msgid "Choose the type of importer to run:"
 msgstr "Choose the type of importer to run:"
 
-#: ../src/e-util/e-import-assistant.c:376
+#: ../src/e-util/e-import-assistant.c:379
 msgid "Import data and settings from _older programs"
 msgstr "Import data and settings from _older programs"
 
-#: ../src/e-util/e-import-assistant.c:384
+#: ../src/e-util/e-import-assistant.c:387
 msgid "Import a _single file"
 msgstr "Import a _single file"
 
-#: ../src/e-util/e-import-assistant.c:406
+#: ../src/e-util/e-import-assistant.c:409
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:209
 msgid "Please select the information that you would like to import:"
 msgstr "Please select the information that you would like to import:"
 
-#: ../src/e-util/e-import-assistant.c:536
+#: ../src/e-util/e-import-assistant.c:541
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
@@ -14699,44 +14668,44 @@ msgstr ""
 "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
 "would like to try again, please click the “Back” button."
 
-#: ../src/e-util/e-import-assistant.c:562
+#: ../src/e-util/e-import-assistant.c:568
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:238
 #, c-format
 msgid "From %s:"
 msgstr "From %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../src/e-util/e-import-assistant.c:808
+#: ../src/e-util/e-import-assistant.c:814
 msgid "_Cancel Import"
 msgstr "_Cancel Import"
 
-#: ../src/e-util/e-import-assistant.c:955
+#: ../src/e-util/e-import-assistant.c:961
 msgid "Preview data to be imported"
 msgstr "Preview data to be imported"
 
-#: ../src/e-util/e-import-assistant.c:961
-#: ../src/e-util/e-import-assistant.c:974
-#: ../src/e-util/e-import-assistant.c:1327
-#: ../src/e-util/e-import-assistant.c:1403
-#: ../src/e-util/e-import-assistant.c:1412
+#: ../src/e-util/e-import-assistant.c:967
+#: ../src/e-util/e-import-assistant.c:980
+#: ../src/e-util/e-import-assistant.c:1333
+#: ../src/e-util/e-import-assistant.c:1410
+#: ../src/e-util/e-import-assistant.c:1419
 msgid "Import Data"
 msgstr "Import Data"
 
-#: ../src/e-util/e-import-assistant.c:969
+#: ../src/e-util/e-import-assistant.c:975
 msgid "Select what type of file you want to import from the list."
 msgstr "Select what type of file you want to import from the list."
 
-#: ../src/e-util/e-import-assistant.c:1317
-#: ../src/e-util/e-import-assistant.c:1352
+#: ../src/e-util/e-import-assistant.c:1323
+#: ../src/e-util/e-import-assistant.c:1359
 msgid "Evolution Import Assistant"
 msgstr "Evolution Import Assistant"
 
-#: ../src/e-util/e-import-assistant.c:1334
-#: ../src/e-util/e-import-assistant.c:1390
+#: ../src/e-util/e-import-assistant.c:1340
+#: ../src/e-util/e-import-assistant.c:1397
 msgid "Import Location"
 msgstr "Import Location"
 
-#: ../src/e-util/e-import-assistant.c:1345
+#: ../src/e-util/e-import-assistant.c:1352
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -14746,24 +14715,24 @@ msgstr ""
 "With this assistant you will be guided through the process of importing "
 "external files into Evolution."
 
-#: ../src/e-util/e-import-assistant.c:1362
+#: ../src/e-util/e-import-assistant.c:1369
 msgid "Importer Type"
 msgstr "Importer Type"
 
-#: ../src/e-util/e-import-assistant.c:1372
+#: ../src/e-util/e-import-assistant.c:1379
 msgid "Select Information to Import"
 msgstr "Select Information to Import"
 
-#: ../src/e-util/e-import-assistant.c:1381
+#: ../src/e-util/e-import-assistant.c:1388
 msgid "Select a File"
 msgstr "Select a File"
 
-#: ../src/e-util/e-import-assistant.c:1398
+#: ../src/e-util/e-import-assistant.c:1405
 msgid "Click “Apply” to begin importing the file into Evolution."
 msgstr "Click “Apply” to begin importing the file into Evolution."
 
 #: ../src/e-util/e-interval-chooser.c:140 ../src/e-util/filter.ui.h:6
-#: ../src/mail/e-mail-config-provider-page.c:580
+#: ../src/mail/e-mail-config-provider-page.c:583
 msgid "minutes"
 msgstr "minutes"
 
@@ -14845,40 +14814,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:278
+#: ../src/e-util/e-misc-utils.c:279
 msgid "Could not open the link."
 msgstr "Could not open the link."
 
-#: ../src/e-util/e-misc-utils.c:362
+#: ../src/e-util/e-misc-utils.c:363
 msgid "Could not display help for Evolution."
 msgstr "Could not display help for Evolution."
 
-#: ../src/e-util/e-misc-utils.c:2561
+#: ../src/e-util/e-misc-utils.c:2562
 #, c-format
 msgid "Opening calendar “%s”"
 msgstr "Opening calendar “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2564
+#: ../src/e-util/e-misc-utils.c:2565
 #, c-format
 msgid "Opening memo list “%s”"
 msgstr "Opening memo list “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2567
+#: ../src/e-util/e-misc-utils.c:2568
 #, c-format
 msgid "Opening task list “%s”"
 msgstr "Opening task list “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2570
+#: ../src/e-util/e-misc-utils.c:2571
 #, c-format
 msgid "Opening address book “%s”"
 msgstr "Opening address book “%s”"
 
-#: ../src/e-util/e-misc-utils.c:3350
+#: ../src/e-util/e-misc-utils.c:3351
 #: ../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:4244
+#: ../src/e-util/e-misc-utils.c:4249
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -14886,18 +14855,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:4256
+#: ../src/e-util/e-misc-utils.c:4261
 #, 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:4268
+#: ../src/e-util/e-misc-utils.c:4273
 #, 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:4282
+#: ../src/e-util/e-misc-utils.c:4287
 #, c-format
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
@@ -14913,7 +14882,7 @@ msgstr ""
 "Detailed error (%d): %s"
 
 #  addressbook:ldap-search-base secondary
-#: ../src/e-util/e-misc-utils.c:4293
+#: ../src/e-util/e-misc-utils.c:4298
 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 "
@@ -14923,12 +14892,12 @@ msgstr ""
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 
-#: ../src/e-util/e-misc-utils.c:4326
+#: ../src/e-util/e-misc-utils.c:4331
 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:4640
+#: ../src/e-util/e-misc-utils.c:4654
 #, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
@@ -14936,7 +14905,7 @@ 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:4649
+#: ../src/e-util/e-misc-utils.c:4663
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -15029,19 +14998,19 @@ msgstr "Keyring key is unusable: no user or host name"
 msgid "You have the Caps Lock key on."
 msgstr "You have the Caps Lock key on."
 
-#: ../src/e-util/e-passwords.c:576
+#: ../src/e-util/e-passwords.c:577
 msgid "_Remember this passphrase"
 msgstr "_Remember this passphrase"
 
-#: ../src/e-util/e-passwords.c:577
+#: ../src/e-util/e-passwords.c:578
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Remember this passphrase for the remainder of this session"
 
-#: ../src/e-util/e-passwords.c:582
+#: ../src/e-util/e-passwords.c:583
 msgid "_Remember this password"
 msgstr "_Remember this password"
 
-#: ../src/e-util/e-passwords.c:583
+#: ../src/e-util/e-passwords.c:584
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Remember this password for the remainder of this session"
 
@@ -15156,35 +15125,35 @@ msgstr "Edit Rule"
 msgid "Matches: %u"
 msgstr "Matches: %u"
 
-#: ../src/e-util/e-search-bar.c:621
+#: ../src/e-util/e-search-bar.c:624
 msgid "Close the find bar"
 msgstr "Close the find bar"
 
-#: ../src/e-util/e-search-bar.c:629
+#: ../src/e-util/e-search-bar.c:632
 msgid "Fin_d:"
 msgstr "Fin_d:"
 
-#: ../src/e-util/e-search-bar.c:641
+#: ../src/e-util/e-search-bar.c:644
 msgid "Clear the search"
 msgstr "Clear the search"
 
-#: ../src/e-util/e-search-bar.c:668
+#: ../src/e-util/e-search-bar.c:671
 msgid "Find the previous occurrence of the phrase"
 msgstr "Find the previous occurrence of the phrase"
 
-#: ../src/e-util/e-search-bar.c:680
+#: ../src/e-util/e-search-bar.c:683
 msgid "Find the next occurrence of the phrase"
 msgstr "Find the next occurrence of the phrase"
 
-#: ../src/e-util/e-search-bar.c:689
+#: ../src/e-util/e-search-bar.c:692
 msgid "Mat_ch case"
 msgstr "Mat_ch case"
 
-#: ../src/e-util/e-search-bar.c:717
+#: ../src/e-util/e-search-bar.c:720
 msgid "Reached bottom of page, continued from top"
 msgstr "Reached bottom of page, continued from top"
 
-#: ../src/e-util/e-search-bar.c:739
+#: ../src/e-util/e-search-bar.c:742
 msgid "Reached top of page, continued from bottom"
 msgstr "Reached top of page, continued from bottom"
 
@@ -15230,13 +15199,13 @@ msgstr "Send Options"
 msgid "R_eply requested"
 msgstr "R_eply requested"
 
-#. Translators: This is part of
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
 #: ../src/e-util/e-send-options.ui.h:20
 msgctxt "ESendOptionsWithin"
 msgid "Wi_thin"
 msgstr "Wi_thin"
 
-#. Translators: This is part of
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
 #: ../src/e-util/e-send-options.ui.h:22
 msgctxt "ESendOptionsWithin"
 msgid "days"
@@ -15251,13 +15220,13 @@ msgstr "_When convenient"
 msgid "_Delay message delivery"
 msgstr "_Delay message delivery"
 
-#. Translators: This is part of
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../src/e-util/e-send-options.ui.h:28
 msgctxt "ESendOptionsAfter"
 msgid "_After"
 msgstr "_After"
 
-#. Translators: This is part of
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../src/e-util/e-send-options.ui.h:30
 msgctxt "ESendOptionsAfter"
 msgid "days"
@@ -15267,7 +15236,7 @@ msgstr "days"
 msgid "_Set expiration date"
 msgstr "_Set expiration date"
 
-#. Translators: This is part of
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
 #: ../src/e-util/e-send-options.ui.h:33
 msgctxt "ESendOptions"
 msgid "_Until"
@@ -15337,58 +15306,58 @@ msgstr "Return Notification"
 msgid "Sta_tus Tracking"
 msgstr "Sta_tus Tracking"
 
-#: ../src/e-util/e-source-config.c:724 ../src/e-util/e-source-config.c:728
+#: ../src/e-util/e-source-config.c:725 ../src/e-util/e-source-config.c:729
 msgid "Type:"
 msgstr "Type:"
 
-#: ../src/e-util/e-source-config.c:738 ../src/e-util/e-source-config.c:742
+#: ../src/e-util/e-source-config.c:739 ../src/e-util/e-source-config.c:743
 msgid "Name:"
 msgstr "Name:"
 
-#: ../src/e-util/e-source-config.c:849 ../src/e-util/e-webdav-browser.c:1748
+#: ../src/e-util/e-source-config.c:850 ../src/e-util/e-webdav-browser.c:1752
 msgid "Name cannot be empty"
 msgstr "Name cannot be empty"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../src/e-util/e-source-config.c:1416
+#: ../src/e-util/e-source-config.c:1417
 msgid "Refresh every"
 msgstr "Refresh every"
 
-#: ../src/e-util/e-source-config.c:1446 ../src/e-util/e-source-config.c:1520
+#: ../src/e-util/e-source-config.c:1447 ../src/e-util/e-source-config.c:1521
 msgid "Use a secure connection"
 msgstr "Use a secure connection"
 
-#: ../src/e-util/e-source-config.c:1547
+#: ../src/e-util/e-source-config.c:1548
 msgid "Unset _trust for SSL/TLS certificate"
 msgstr "Unset _trust for SSL/TLS certificate"
 
-#: ../src/e-util/e-source-config.c:1583
+#: ../src/e-util/e-source-config.c:1584
 msgid "User:"
 msgstr "User:"
 
-#: ../src/e-util/e-source-selector.c:3217
+#: ../src/e-util/e-source-selector.c:3236
 msgid "Show"
 msgstr "Show"
 
-#: ../src/e-util/e-source-selector.c:3223
+#: ../src/e-util/e-source-selector.c:3242
 msgid "Group name"
 msgstr "Group name"
 
-#: ../src/e-util/e-source-selector.c:3378 ../src/mail/e-mail-display.c:805
+#: ../src/e-util/e-source-selector.c:3397 ../src/mail/e-mail-display.c:714
 msgid "_Hide"
 msgstr "_Hide"
 
-#: ../src/e-util/e-source-selector.c:3378
-#: ../src/e-util/e-source-selector.c:3476
+#: ../src/e-util/e-source-selector.c:3397
+#: ../src/e-util/e-source-selector.c:3495
 msgid "_Show"
 msgstr "_Show"
 
-#: ../src/e-util/e-source-selector.c:3430
+#: ../src/e-util/e-source-selector.c:3449
 msgid "Manage Groups"
 msgstr "Manage Groups"
 
-#: ../src/e-util/e-source-selector.c:3442
+#: ../src/e-util/e-source-selector.c:3461
 msgid "Available Groups:"
 msgstr "Available Groups:"
 
@@ -15598,11 +15567,11 @@ msgstr "Clear _All"
 msgid "_Show field in View"
 msgstr "_Show field in View"
 
-#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1782
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1792
 msgid "Ascending"
 msgstr "Ascending"
 
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1782
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1792
 msgid "Descending"
 msgstr "Descending"
 
@@ -15693,63 +15662,61 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d item)"
 msgstr[1] "%s (%d items)"
 
-#: ../src/e-util/e-table-header-item.c:1609
+#: ../src/e-util/e-table-header-item.c:1610
 msgid "Customize Current View"
 msgstr "Customise Current View"
 
-#: ../src/e-util/e-table-header-item.c:1632
+#: ../src/e-util/e-table-header-item.c:1642
 msgid "Sort _Ascending"
 msgstr "Sort _Ascending"
 
-#: ../src/e-util/e-table-header-item.c:1635
+#: ../src/e-util/e-table-header-item.c:1645
 msgid "Sort _Descending"
 msgstr "Sort _Descending"
 
-#: ../src/e-util/e-table-header-item.c:1638
+#: ../src/e-util/e-table-header-item.c:1648
 msgid "_Reset sort"
 msgstr "_Reset sort"
 
-#: ../src/e-util/e-table-header-item.c:1641
+#: ../src/e-util/e-table-header-item.c:1651
 msgid "Group By This _Field"
 msgstr "Group By This _Field"
 
-#: ../src/e-util/e-table-header-item.c:1644
+#: ../src/e-util/e-table-header-item.c:1654
 msgid "Group By _Box"
 msgstr "Group By _Box"
 
-#: ../src/e-util/e-table-header-item.c:1648
+#: ../src/e-util/e-table-header-item.c:1658
 msgid "Remove This _Column"
 msgstr "Remove This _Column"
 
-#: ../src/e-util/e-table-header-item.c:1651
-#| msgid "Add a Column"
+#: ../src/e-util/e-table-header-item.c:1661
 msgid "Add a C_olumn…"
 msgstr "Add a C_olumn…"
 
-#: ../src/e-util/e-table-header-item.c:1655
+#: ../src/e-util/e-table-header-item.c:1665
 msgid "A_lignment"
 msgstr "A_lignment"
 
-#: ../src/e-util/e-table-header-item.c:1658
+#: ../src/e-util/e-table-header-item.c:1668
 msgid "B_est Fit"
 msgstr "B_est Fit"
 
-#: ../src/e-util/e-table-header-item.c:1661
-#| msgid "Format Column_s..."
+#: ../src/e-util/e-table-header-item.c:1671
 msgid "Format Column_s…"
 msgstr "Format Column_s…"
 
-#: ../src/e-util/e-table-header-item.c:1665
-#| msgid "Customize Current View"
+#: ../src/e-util/e-table-header-item.c:1675
+#: ../src/shell/e-shell-window-actions.c:1226
 msgid "Custo_mize Current View…"
 msgstr "Custo_mise Current View…"
 
-#: ../src/e-util/e-table-header-item.c:1732
+#: ../src/e-util/e-table-header-item.c:1742
 msgid "_Sort By"
 msgstr "_Sort By"
 
 #. Custom
-#: ../src/e-util/e-table-header-item.c:1755
+#: ../src/e-util/e-table-header-item.c:1765
 msgid "_Custom"
 msgstr "_Custom"
 
@@ -15811,233 +15778,228 @@ msgstr "Evolution Source Viewer"
 msgid "Display Name"
 msgstr "Display Name"
 
-#: ../src/e-util/evolution-source-viewer.c:677
-msgid "Flags"
-msgstr "Flags"
-
 #: ../src/e-util/evolution-source-viewer.c:729
-#: ../src/mail/e-mail-config-identity-page.c:1230
+#: ../src/mail/e-mail-config-identity-page.c:1231
 msgid "Identity"
 msgstr "Identity"
 
-#: ../src/e-util/e-webdav-browser.c:447
+#: ../src/e-util/e-webdav-browser.c:448
 msgid "Address book"
 msgstr "Address book"
 
-#: ../src/e-util/e-webdav-browser.c:458
+#: ../src/e-util/e-webdav-browser.c:459
 msgid "Events"
 msgstr "Events"
 
-#: ../src/e-util/e-webdav-browser.c:514 ../src/mail/em-folder-tree-model.c:1553
-#: ../src/mail/em-folder-tree-model.c:1930
+#: ../src/e-util/e-webdav-browser.c:515 ../src/mail/em-folder-tree-model.c:1555
+#: ../src/mail/em-folder-tree-model.c:1932
 msgid "Loading…"
 msgstr "Loading…"
 
-#: ../src/e-util/e-webdav-browser.c:1383
+#: ../src/e-util/e-webdav-browser.c:1387
 msgid "Searching collection children…"
 msgstr "Searching collection children…"
 
-#: ../src/e-util/e-webdav-browser.c:1385
+#: ../src/e-util/e-webdav-browser.c:1389
 msgid "Failed to search for collection children"
 msgstr "Failed to search for collection children"
 
-#: ../src/e-util/e-webdav-browser.c:1419
+#: ../src/e-util/e-webdav-browser.c:1423
 msgid "Searching for user home, please wait…"
 msgstr "Searching for user home, please wait…"
 
-#: ../src/e-util/e-webdav-browser.c:1421
+#: ../src/e-util/e-webdav-browser.c:1425
 msgid "Failed to search for user home"
 msgstr "Failed to search for user home"
 
-#: ../src/e-util/e-webdav-browser.c:1764
+#: ../src/e-util/e-webdav-browser.c:1768
 msgid "At least one component type should be set"
 msgstr "At least one component type should be set"
 
-#: ../src/e-util/e-webdav-browser.c:1783
+#: ../src/e-util/e-webdav-browser.c:1787
 msgid "Failed to get selected collection HREF"
 msgstr "Failed to get selected collection HREF"
 
-#: ../src/e-util/e-webdav-browser.c:1815
+#: ../src/e-util/e-webdav-browser.c:1819
 msgid "Failed to save changes"
 msgstr "Failed to save changes"
 
-#: ../src/e-util/e-webdav-browser.c:1817
+#: ../src/e-util/e-webdav-browser.c:1821
 msgid "Creating new book…"
 msgstr "Creating new book…"
 
-#: ../src/e-util/e-webdav-browser.c:1818
+#: ../src/e-util/e-webdav-browser.c:1822
 msgid "Failed to create new book"
 msgstr "Failed to create new book"
 
-#: ../src/e-util/e-webdav-browser.c:1820
+#: ../src/e-util/e-webdav-browser.c:1824
 msgid "Creating new calendar…"
 msgstr "Creating new calendar…"
 
-#: ../src/e-util/e-webdav-browser.c:1821
+#: ../src/e-util/e-webdav-browser.c:1825
 msgid "Failed to create new calendar"
 msgstr "Failed to create new calendar"
 
-#: ../src/e-util/e-webdav-browser.c:1823
+#: ../src/e-util/e-webdav-browser.c:1827
 msgid "Creating new collection…"
 msgstr "Creating new collection…"
 
-#: ../src/e-util/e-webdav-browser.c:1824
+#: ../src/e-util/e-webdav-browser.c:1828
 msgid "Failed to create new collection"
 msgstr "Failed to create new collection"
 
-#: ../src/e-util/e-webdav-browser.c:1963
+#: ../src/e-util/e-webdav-browser.c:1967
 msgid "It is not allowed to create book under another book or calendar"
 msgstr "It is not allowed to create book under another book or calendar"
 
 #. if (button == webdav_browser->priv->create_calendar_button)
-#: ../src/e-util/e-webdav-browser.c:1965
+#: ../src/e-util/e-webdav-browser.c:1969
 msgid "It is not allowed to create calendar under another book or calendar"
 msgstr "It is not allowed to create calendar under another book or calendar"
 
-#: ../src/e-util/e-webdav-browser.c:2194
+#: ../src/e-util/e-webdav-browser.c:2198
 msgid "Deleting book…"
 msgstr "Deleting book…"
 
-#: ../src/e-util/e-webdav-browser.c:2195
+#: ../src/e-util/e-webdav-browser.c:2199
 msgid "Failed to delete book"
 msgstr "Failed to delete book"
 
-#: ../src/e-util/e-webdav-browser.c:2198
+#: ../src/e-util/e-webdav-browser.c:2202
 msgid "Deleting calendar…"
 msgstr "Deleting calendar…"
 
-#: ../src/e-util/e-webdav-browser.c:2199
+#: ../src/e-util/e-webdav-browser.c:2203
 msgid "Failed to delete calendar"
 msgstr "Failed to delete calendar"
 
-#: ../src/e-util/e-webdav-browser.c:2202
+#: ../src/e-util/e-webdav-browser.c:2206
 msgid "Deleting collection…"
 msgstr "Deleting collection…"
 
-#: ../src/e-util/e-webdav-browser.c:2203
+#: ../src/e-util/e-webdav-browser.c:2207
 msgid "Failed to delete collection"
 msgstr "Failed to delete collection"
 
-#: ../src/e-util/e-webdav-browser.c:2434
+#: ../src/e-util/e-webdav-browser.c:2438
 msgid "For Components:"
 msgstr "For Components:"
 
-#: ../src/e-util/e-webdav-browser.c:2440
+#: ../src/e-util/e-webdav-browser.c:2444
 msgid "_Events"
 msgstr "_Events"
 
-#: ../src/e-util/e-webdav-browser.c:2630
+#: ../src/e-util/e-webdav-browser.c:2634
 msgid "WebDAV server:"
 msgstr "WebDAV server:"
 
-#: ../src/e-util/e-webdav-browser.c:2665
+#: ../src/e-util/e-webdav-browser.c:2669
 msgid "Create _Book"
 msgstr "Create _Book"
 
-#: ../src/e-util/e-webdav-browser.c:2672
+#: ../src/e-util/e-webdav-browser.c:2676
 msgid "Create _Calendar"
 msgstr "Create _Calendar"
 
-#: ../src/e-util/e-webdav-browser.c:2679
+#: ../src/e-util/e-webdav-browser.c:2683
 msgid "Create Collectio_n"
 msgstr "Create Collectio_n"
 
-#: ../src/e-util/e-web-view.c:406
+#: ../src/e-util/e-web-view.c:408
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: ../src/e-util/e-web-view.c:408
+#: ../src/e-util/e-web-view.c:410
 msgid "Copy the link to the clipboard"
 msgstr "Copy the link to the clipboard"
 
-#: ../src/e-util/e-web-view.c:416
+#: ../src/e-util/e-web-view.c:418
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: ../src/e-util/e-web-view.c:418
+#: ../src/e-util/e-web-view.c:420
 msgid "Open the link in a web browser"
 msgstr "Open the link in a web browser"
 
-#: ../src/e-util/e-web-view.c:426
+#: ../src/e-util/e-web-view.c:428
 msgid "_Copy Email Address"
 msgstr "_Copy E-mail Address"
 
-#: ../src/e-util/e-web-view.c:433
+#: ../src/e-util/e-web-view.c:435
 msgid "Copy _Raw Email Address"
 msgstr "Copy _Raw E-mail Address"
 
-#: ../src/e-util/e-web-view.c:435
+#: ../src/e-util/e-web-view.c:437
 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:450
+#: ../src/e-util/e-web-view.c:452
 msgid "_Copy Image"
 msgstr "_Copy Image"
 
-#: ../src/e-util/e-web-view.c:452
+#: ../src/e-util/e-web-view.c:454
 msgid "Copy the image to the clipboard"
 msgstr "Copy the image to the clipboard"
 
-#: ../src/e-util/e-web-view.c:457
-#| msgid "Save Image"
+#: ../src/e-util/e-web-view.c:459
 msgid "Save _Image…"
 msgstr "Save _Image…"
 
-#: ../src/e-util/e-web-view.c:459
+#: ../src/e-util/e-web-view.c:461
 msgid "Save the image to a file"
 msgstr "Save the image to a file"
 
-#: ../src/e-util/e-web-view.c:474 ../src/mail/e-mail-browser.c:179
-#: ../src/mail/e-mail-reader.c:2820
+#: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:201
+#: ../src/mail/e-mail-reader.c:2819
 msgid "Search _Web…"
 msgstr "Search _Web…"
 
-#: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:181
-#: ../src/mail/e-mail-reader.c:2822
+#: ../src/e-util/e-web-view.c:478 ../src/mail/e-mail-browser.c:203
+#: ../src/mail/e-mail-reader.c:2821
 msgid "Search the Web with the selected text"
 msgstr "Search the Web with the selected text"
 
-#: ../src/e-util/e-web-view.c:486 ../src/e-util/e-web-view.c:2102
+#: ../src/e-util/e-web-view.c:488 ../src/e-util/e-web-view.c:2066
 msgid "Select all text and images"
 msgstr "Select all text and images"
 
-#: ../src/e-util/e-web-view.c:1451
+#: ../src/e-util/e-web-view.c:1673
 #, c-format
 msgid "Click to call %s"
 msgstr "Click to call %s"
 
-#: ../src/e-util/e-web-view.c:1453
+#: ../src/e-util/e-web-view.c:1675
 msgid "Click to hide/unhide addresses"
 msgstr "Click to hide/unhide addresses"
 
-#: ../src/e-util/e-web-view.c:1464
+#: ../src/e-util/e-web-view.c:1686
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "Go to the section %s of the message"
 
-#: ../src/e-util/e-web-view.c:1466
+#: ../src/e-util/e-web-view.c:1688
 msgid "Go to the beginning of the message"
 msgstr "Go to the beginning of the message"
 
-#: ../src/e-util/e-web-view.c:1470
+#: ../src/e-util/e-web-view.c:1692
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
-#: ../src/e-util/e-web-view.c:4157
+#: ../src/e-util/e-web-view.c:3773
 msgid "Copying image to clipboard"
 msgstr "Copying image to clipboard"
 
-#: ../src/e-util/e-web-view.c:4345
+#: ../src/e-util/e-web-view.c:3961
 msgid "Save Image"
 msgstr "Save Image"
 
-#: ../src/e-util/e-web-view.c:4382
+#: ../src/e-util/e-web-view.c:3998
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "Saving image to “%s”"
 
-#: ../src/e-util/e-web-view.c:4529
+#: ../src/e-util/e-web-view.c:4145
 #, 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."
@@ -16253,7 +16215,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:204
+#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:202
 msgid "Do you wish to save your changes?"
 msgstr "Do you wish to save your changes?"
 
@@ -16261,7 +16223,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:206
+#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:204
 msgid "_Discard changes"
 msgstr "_Discard changes"
 
@@ -16347,43 +16309,43 @@ msgstr "Invalid folder URI “%s”"
 #. Some local folders
 #: ../src/libemail-engine/e-mail-session.c:120
 #: ../src/mail/em-folder-properties.c:1444
-#: ../src/mail/em-folder-tree-model.c:1501
+#: ../src/mail/em-folder-tree-model.c:1503
 #: ../src/mail/importers/kmail-libs.c:138
-#: ../src/modules/mail/e-mail-shell-view-private.c:1032
-#: ../src/modules/mail/e-mail-shell-view-private.c:1043
+#: ../src/modules/mail/e-mail-shell-view-private.c:1015
+#: ../src/modules/mail/e-mail-shell-view-private.c:1026
 msgid "Inbox"
 msgstr "Inbox"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
 #: ../src/libemail-engine/e-mail-session.c:121
-#: ../src/mail/em-folder-tree-model.c:1495
+#: ../src/mail/em-folder-tree-model.c:1497
 #: ../src/mail/importers/kmail-libs.c:144
-#: ../src/modules/mail/e-mail-shell-view-private.c:1030
+#: ../src/modules/mail/e-mail-shell-view-private.c:1013
 msgid "Drafts"
 msgstr "Drafts"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
 #: ../src/libemail-engine/e-mail-session.c:122
-#: ../src/mail/em-folder-tree-model.c:1505
+#: ../src/mail/em-folder-tree-model.c:1507
 #: ../src/mail/importers/kmail-libs.c:140
-#: ../src/modules/mail/e-mail-shell-view-private.c:1034
+#: ../src/modules/mail/e-mail-shell-view-private.c:1017
 msgid "Outbox"
 msgstr "Outbox"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
 #: ../src/libemail-engine/e-mail-session.c:123
-#: ../src/mail/em-folder-tree-model.c:1509
+#: ../src/mail/em-folder-tree-model.c:1511
 #: ../src/mail/importers/kmail-libs.c:142
-#: ../src/modules/mail/e-mail-shell-view-private.c:1036
+#: ../src/modules/mail/e-mail-shell-view-private.c:1019
 msgid "Sent"
 msgstr "Sent"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
 #: ../src/libemail-engine/e-mail-session.c:124
 #: ../src/mail/e-mail-templates-store.c:2211
-#: ../src/mail/em-folder-tree-model.c:1497
+#: ../src/mail/em-folder-tree-model.c:1499
 #: ../src/mail/importers/kmail-libs.c:146
-#: ../src/modules/mail/e-mail-shell-view-private.c:1038
+#: ../src/modules/mail/e-mail-shell-view-private.c:1021
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Templates"
@@ -16393,7 +16355,7 @@ msgstr "Templates"
 msgid "User cancelled operation"
 msgstr "User cancelled operation"
 
-#: ../src/libemail-engine/e-mail-session.c:1576
+#: ../src/libemail-engine/e-mail-session.c:1580
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
@@ -16402,26 +16364,26 @@ msgstr ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 
-#: ../src/libemail-engine/e-mail-session.c:1589
+#: ../src/libemail-engine/e-mail-session.c:1593
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr ""
 "No identity found to use, forwarding of the message has been cancelled."
 
-#: ../src/libemail-engine/e-mail-session.c:1741
+#: ../src/libemail-engine/e-mail-session.c:1794
 #, c-format
 msgid "Corresponding source for service with UID “%s” not found"
 msgstr "Corresponding source for service with UID “%s” not found"
 
-#: ../src/libemail-engine/e-mail-session.c:1861
+#: ../src/libemail-engine/e-mail-session.c:1914
 msgid "Looking up recipient S/MIME certificates in address books…"
 msgstr "Looking up recipient S/MIME certificates in address books…"
 
-#: ../src/libemail-engine/e-mail-session.c:1863
+#: ../src/libemail-engine/e-mail-session.c:1916
 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:2910
+#: ../src/libemail-engine/e-mail-session.c:2963
 #, c-format
 msgid "Waiting for “%s”"
 msgstr "Waiting for “%s”"
@@ -16483,7 +16445,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
+#: ../src/mail/mail-send-recv.c:1086
 #, c-format
 msgid "Preparing account “%s” for offline"
 msgstr "Preparing account “%s” for offline"
@@ -16594,7 +16556,6 @@ msgstr "Trying to movemail a non-mbox source “%s”"
 #. Translators: This is a subject attribution for forwarded messages. The %s is replaced with subject of the 
original message.
 #: ../src/libemail-engine/mail-tools.c:198
 #, c-format
-#| msgid "[Fwd: %s]"
 msgid "Fwd: %s"
 msgstr "Fwd: %s"
 
@@ -16646,24 +16607,24 @@ msgstr[1] ""
 "“%s”."
 
 #: ../src/mail/e-mail-account-manager.c:118
-#: ../src/mail/e-mail-account-manager.c:205
+#: ../src/mail/e-mail-account-manager.c:206
 msgid "Open _Online Accounts"
 msgstr "Open _Online Accounts"
 
 #: ../src/mail/e-mail-account-manager.c:144
-#: ../src/mail/e-mail-account-manager.c:231
+#: ../src/mail/e-mail-account-manager.c:232
 msgid "This account was created through the Online Accounts service."
 msgstr "This account was created through the Online Accounts service."
 
-#: ../src/mail/e-mail-account-manager.c:690
+#: ../src/mail/e-mail-account-manager.c:692
 msgid "_Reset Order"
 msgstr "_Reset Order"
 
-#: ../src/mail/e-mail-account-manager.c:703
+#: ../src/mail/e-mail-account-manager.c:705
 msgid "You can drag and drop account names to reorder them."
 msgstr "You can drag and drop account names to reorder them."
 
-#: ../src/mail/e-mail-account-manager.c:746
+#: ../src/mail/e-mail-account-manager.c:748
 msgid "De_fault"
 msgstr "De_fault"
 
@@ -16672,68 +16633,68 @@ msgstr "De_fault"
 msgid "Invalid URI: “%s”"
 msgstr "Invalid URI: “%s”"
 
-#: ../src/mail/e-mail-autoconfig.c:756
+#: ../src/mail/e-mail-autoconfig.c:768
 #, c-format
 msgid "Host: %s:%d"
 msgstr "Host: %s:%d"
 
-#: ../src/mail/e-mail-autoconfig.c:760
+#: ../src/mail/e-mail-autoconfig.c:772
 #, c-format
 msgid "User: %s"
 msgstr "User: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:764
+#: ../src/mail/e-mail-autoconfig.c:776
 #, c-format
 msgid "Security method: %s"
 msgstr "Security method: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:765
-#: ../src/mail/e-mail-config-summary-page.c:144
+#: ../src/mail/e-mail-autoconfig.c:777
+#: ../src/mail/e-mail-config-summary-page.c:146
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/mail/e-mail-autoconfig.c:766
-#: ../src/mail/e-mail-config-summary-page.c:147
+#: ../src/mail/e-mail-autoconfig.c:778
+#: ../src/mail/e-mail-config-summary-page.c:149
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../src/mail/e-mail-autoconfig.c:770
+#: ../src/mail/e-mail-autoconfig.c:782
 #, c-format
 msgid "Authentication mechanism: %s"
 msgstr "Authentication mechanism: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:950
+#: ../src/mail/e-mail-autoconfig.c:962
 msgid "No email address provided"
 msgstr "No e-mail address provided"
 
-#: ../src/mail/e-mail-autoconfig.c:959
+#: ../src/mail/e-mail-autoconfig.c:971
 msgid "Missing domain in email address"
 msgstr "Missing domain in e-mail address"
 
-#: ../src/mail/e-mail-autoconfig.c:1309
+#: ../src/mail/e-mail-autoconfig.c:1321
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:82
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:83
 msgid "IMAP server"
 msgstr "IMAP server"
 
-#: ../src/mail/e-mail-autoconfig.c:1316
+#: ../src/mail/e-mail-autoconfig.c:1328
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:84
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:85
 msgid "POP3 server"
 msgstr "POP3 server"
 
-#: ../src/mail/e-mail-autoconfig.c:1323
+#: ../src/mail/e-mail-autoconfig.c:1335
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:86
 msgid "SMTP server"
 msgstr "SMTP server"
 
-#: ../src/mail/e-mail-browser.c:146 ../src/shell/e-shell-window-actions.c:837
-#: ../src/shell/e-shell-window-actions.c:844
-#: ../src/shell/e-shell-window-actions.c:851
+#: ../src/mail/e-mail-browser.c:168 ../src/shell/e-shell-window-actions.c:871
+#: ../src/shell/e-shell-window-actions.c:878
+#: ../src/shell/e-shell-window-actions.c:885
 msgid "Close this window"
 msgstr "Close this window"
 
-#: ../src/mail/e-mail-browser.c:314
+#: ../src/mail/e-mail-browser.c:353
 msgid "(No Subject)"
 msgstr "(No Subject)"
 
@@ -16756,7 +16717,6 @@ msgid "_Revise Details"
 msgstr "_Revise Details"
 
 #: ../src/mail/e-mail-config-auth-check.c:217
-#| msgid "Querying authentication types..."
 msgid "Querying authentication types…"
 msgstr "Querying authentication types…"
 
@@ -16825,7 +16785,7 @@ 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:4145 ../src/mail/mail-config.ui.h:22
+#: ../src/mail/em-composer-utils.c:4142 ../src/mail/mail-config.ui.h:22
 msgid "Start _typing at the bottom"
 msgstr "Start _typing at the bottom"
 
@@ -16854,7 +16814,7 @@ msgstr "Always"
 msgid "Ask for each message"
 msgstr "Ask for each message"
 
-#: ../src/mail/e-mail-config-confirm-page.c:154
+#: ../src/mail/e-mail-config-confirm-page.c:155
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -16868,12 +16828,11 @@ msgstr ""
 "\n"
 "Click “Apply” to save your settings."
 
-#: ../src/mail/e-mail-config-confirm-page.c:166
+#: ../src/mail/e-mail-config-confirm-page.c:167
 msgid "Done"
 msgstr "Done"
 
 #: ../src/mail/e-mail-config-defaults-page.c:314
-#| msgid "Checking server settings..."
 msgid "Checking server settings…"
 msgstr "Checking server settings…"
 
@@ -16956,8 +16915,8 @@ msgstr ""
 "do not need to be filled in, unless you wish to include this information in "
 "e-mail you send."
 
-#: ../src/mail/e-mail-config-identity-page.c:579
-#: ../src/mail/e-mail-config-summary-page.c:353
+#: ../src/mail/e-mail-config-identity-page.c:580
+#: ../src/mail/e-mail-config-summary-page.c:355
 msgid ""
 "The above name will be used to identify this account.\n"
 "Use for example, “Work” or “Personal”."
@@ -16965,85 +16924,83 @@ msgstr ""
 "The above name will be used to identify this account.\n"
 "Use for example, “Work” or “Personal”."
 
-#: ../src/mail/e-mail-config-identity-page.c:596
+#: ../src/mail/e-mail-config-identity-page.c:597
 msgid "Required Information"
 msgstr "Required Information"
 
-#: ../src/mail/e-mail-config-identity-page.c:605
+#: ../src/mail/e-mail-config-identity-page.c:606
 msgid "Full Nam_e:"
 msgstr "Full Nam_e:"
 
-#: ../src/mail/e-mail-config-identity-page.c:634
+#: ../src/mail/e-mail-config-identity-page.c:635
 msgid "Email _Address:"
 msgstr "E-mail _Address:"
 
-#: ../src/mail/e-mail-config-identity-page.c:683
+#: ../src/mail/e-mail-config-identity-page.c:684
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "Optional Information"
 msgstr "Optional Information"
 
-#: ../src/mail/e-mail-config-identity-page.c:692
+#: ../src/mail/e-mail-config-identity-page.c:693
 msgid "Re_ply-To:"
 msgstr "Re_ply-To:"
 
-#: ../src/mail/e-mail-config-identity-page.c:721
+#: ../src/mail/e-mail-config-identity-page.c:722
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: ../src/mail/e-mail-config-identity-page.c:776
-#| msgid "Add Ne_w Signature..."
+#: ../src/mail/e-mail-config-identity-page.c:777
 msgid "Add Ne_w Signature…"
 msgstr "Add Ne_w Signature…"
 
-#: ../src/mail/e-mail-config-identity-page.c:790
+#: ../src/mail/e-mail-config-identity-page.c:791
 msgid "A_liases:"
 msgstr "A_liases:"
 
-#: ../src/mail/e-mail-config-identity-page.c:862
+#: ../src/mail/e-mail-config-identity-page.c:863
 msgid "Edi_t"
 msgstr "Edi_t"
 
-#: ../src/mail/e-mail-config-identity-page.c:885
+#: ../src/mail/e-mail-config-identity-page.c:886
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr "_Look up mail server details based on the entered e-mail address"
 
 #. This is only a warning, not a blocker
 #. complete = complete && correct;
-#: ../src/mail/e-mail-config-identity-page.c:934
+#: ../src/mail/e-mail-config-identity-page.c:935
 msgid "Full Name should not be empty"
 msgstr "Full Name should not be empty"
 
-#: ../src/mail/e-mail-config-identity-page.c:941
+#: ../src/mail/e-mail-config-identity-page.c:942
 msgid "Email Address cannot be empty"
 msgstr "E-mail Address cannot be empty"
 
-#: ../src/mail/e-mail-config-identity-page.c:946
+#: ../src/mail/e-mail-config-identity-page.c:947
 msgid "Email Address is not a valid email"
 msgstr "E-mail Address is not a valid email"
 
-#: ../src/mail/e-mail-config-identity-page.c:958
+#: ../src/mail/e-mail-config-identity-page.c:959
 msgid "Reply To is not a valid email"
 msgstr "Reply To is not a valid e-mail"
 
-#: ../src/mail/e-mail-config-identity-page.c:969
-#: ../src/mail/e-mail-config-summary-page.c:638
+#: ../src/mail/e-mail-config-identity-page.c:970
+#: ../src/mail/e-mail-config-summary-page.c:637
 msgid "Account Name cannot be empty"
 msgstr "Account Name cannot be empty"
 
 #: ../src/mail/e-mail-config-lookup-page.c:65
-#| msgid "Looking up account details..."
 msgid "Looking up account details…"
 msgstr "Looking up account details…"
 
-#: ../src/mail/e-mail-config-provider-page.c:538
+#: ../src/mail/e-mail-config-provider-page.c:541
 msgid "Checking for New Mail"
 msgstr "Checking for New Mail"
 
-#: ../src/mail/e-mail-config-provider-page.c:554
+#: ../src/mail/e-mail-config-provider-page.c:557
 msgid "Check for _new messages every"
 msgstr "Check for _new messages every"
 
-#: ../src/mail/e-mail-config-provider-page.c:764
+#: ../src/mail/e-mail-config-provider-page.c:767
 msgid "Receiving Options"
 msgstr "Receiving Options"
 
@@ -17144,7 +17101,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:933
+#: ../src/shell/e-shell-window-actions.c:967
 msgid "_Clear"
 msgstr "_Clear"
 
@@ -17176,59 +17133,59 @@ msgstr "Sending E-mail"
 msgid "Server _Type:"
 msgstr "Server _Type:"
 
-#: ../src/mail/e-mail-config-summary-page.c:306
+#: ../src/mail/e-mail-config-summary-page.c:308
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "This is a summary of the settings which will be used to access your mail."
 
-#: ../src/mail/e-mail-config-summary-page.c:370
+#: ../src/mail/e-mail-config-summary-page.c:372
 msgid "Personal Details"
 msgstr "Personal Details"
 
-#: ../src/mail/e-mail-config-summary-page.c:379
+#: ../src/mail/e-mail-config-summary-page.c:381
 msgid "Full Name:"
 msgstr "Full Name:"
 
-#: ../src/mail/e-mail-config-summary-page.c:393
+#: ../src/mail/e-mail-config-summary-page.c:395
 msgid "Email Address:"
 msgstr "E-mail Address:"
 
-#: ../src/mail/e-mail-config-summary-page.c:407
+#: ../src/mail/e-mail-config-summary-page.c:409
 msgid "Receiving"
 msgstr "Receiving"
 
-#: ../src/mail/e-mail-config-summary-page.c:419
+#: ../src/mail/e-mail-config-summary-page.c:421
 msgid "Sending"
 msgstr "Sending"
 
-#: ../src/mail/e-mail-config-summary-page.c:431
+#: ../src/mail/e-mail-config-summary-page.c:433
 msgid "Server Type:"
 msgstr "Server Type:"
 
-#: ../src/mail/e-mail-config-summary-page.c:452
+#: ../src/mail/e-mail-config-summary-page.c:454
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/mail/e-mail-config-summary-page.c:473
+#: ../src/mail/e-mail-config-summary-page.c:475
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
 msgid "Username:"
 msgstr "Username:"
 
-#: ../src/mail/e-mail-config-summary-page.c:494
+#: ../src/mail/e-mail-config-summary-page.c:496
 msgid "Security:"
 msgstr "Security:"
 
-#: ../src/mail/e-mail-config-summary-page.c:651
+#: ../src/mail/e-mail-config-summary-page.c:650
 msgid "Cannot have both receiving and sending parts set to None"
 msgstr "Cannot have both receiving and sending parts set to None"
 
-#: ../src/mail/e-mail-config-summary-page.c:807
+#: ../src/mail/e-mail-config-summary-page.c:806
 msgid "Account Summary"
 msgstr "Account Summary"
 
-#: ../src/mail/e-mail-config-welcome-page.c:161
+#: ../src/mail/e-mail-config-welcome-page.c:162
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -17238,7 +17195,7 @@ msgstr ""
 "\n"
 "Click “Next” to begin."
 
-#: ../src/mail/e-mail-config-welcome-page.c:171
+#: ../src/mail/e-mail-config-welcome-page.c:172
 #: ../src/modules/startup-wizard/e-startup-assistant.c:182
 msgid "Welcome"
 msgstr "Welcome"
@@ -17247,57 +17204,55 @@ msgstr "Welcome"
 msgid "Account Editor"
 msgstr "Account Editor"
 
-#: ../src/mail/e-mail-display.c:126
-#| msgid "_Add to Address Book..."
+#: ../src/mail/e-mail-display.c:138
 msgid "_Add to Address Book…"
 msgstr "_Add to Address Book…"
 
-#: ../src/mail/e-mail-display.c:133
+#: ../src/mail/e-mail-display.c:145
 msgid "_To This Address"
 msgstr "_To this Address"
 
-#: ../src/mail/e-mail-display.c:140
+#: ../src/mail/e-mail-display.c:152
 msgid "_From This Address"
 msgstr "_From This Address"
 
-#: ../src/mail/e-mail-display.c:147
-#| msgid "Send _Reply To..."
+#: ../src/mail/e-mail-display.c:159
 msgid "Send _Reply To…"
 msgstr "Send _Reply To…"
 
-#: ../src/mail/e-mail-display.c:149
+#: ../src/mail/e-mail-display.c:161
 msgid "Send a reply message to this address"
 msgstr "Send a reply message to this address"
 
-#: ../src/mail/e-mail-display.c:156
+#: ../src/mail/e-mail-display.c:168
 msgid "Create Search _Folder"
 msgstr "Create Search _Folder"
 
-#: ../src/mail/e-mail-display.c:812
+#: ../src/mail/e-mail-display.c:721
 msgid "Hid_e All"
 msgstr "Hid_e All"
 
-#: ../src/mail/e-mail-display.c:819
+#: ../src/mail/e-mail-display.c:728
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: ../src/mail/e-mail-display.c:826
+#: ../src/mail/e-mail-display.c:735
 msgid "Vie_w All Inline"
 msgstr "Vie_w All Inline"
 
-#: ../src/mail/e-mail-display.c:833
+#: ../src/mail/e-mail-display.c:742
 msgid "_Zoom to 100%"
 msgstr "_Zoom to 100%"
 
-#: ../src/mail/e-mail-display.c:835
+#: ../src/mail/e-mail-display.c:744
 msgid "Zoom the image to its natural size"
 msgstr "Zoom the image to its natural size"
 
-#: ../src/mail/e-mail-display.c:840
+#: ../src/mail/e-mail-display.c:749
 msgid "_Zoom to window"
 msgstr "_Zoom to window"
 
-#: ../src/mail/e-mail-display.c:842
+#: ../src/mail/e-mail-display.c:751
 msgid "Zoom large images to not be wider than the window width"
 msgstr "Zoom large images to not be wider than the window width"
 
@@ -17318,12 +17273,10 @@ msgid "Folder _name:"
 msgstr "Folder _name:"
 
 #: ../src/mail/e-mail-folder-sort-order-dialog.c:694
-#| msgid "Folder owner"
 msgid "Folder Sort Order"
 msgstr "Folder Sort Order"
 
 #: ../src/mail/e-mail-folder-sort-order-dialog.c:735
-#| msgid "Close the current file"
 msgid "Reset c_urrent level"
 msgstr "Reset c_urrent level"
 
@@ -17332,7 +17285,6 @@ msgid "Reset sort order in the current level to the defaults"
 msgstr "Reset sort order in the current level to the defaults"
 
 #: ../src/mail/e-mail-folder-sort-order-dialog.c:746
-#| msgid "Select all headers"
 msgid "Reset _all levels"
 msgstr "Reset _all levels"
 
@@ -17414,7 +17366,7 @@ msgstr "_To Do"
 msgid "_Later"
 msgstr "_Later"
 
-#: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:906
+#: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:905
 #: ../src/mail/em-folder-properties.c:1141
 msgid "Add Label"
 msgstr "Add Label"
@@ -17445,7 +17397,6 @@ msgid "Cannot find message in its folder summary"
 msgstr "Cannot find message in its folder summary"
 
 #: ../src/mail/e-mail-notes.c:863
-#| msgid "Saving changes…"
 msgid "Storing changes…"
 msgstr "Storing changes…"
 
@@ -17454,7 +17405,6 @@ msgid "Edit Message Note"
 msgstr "Edit Message Note"
 
 #: ../src/mail/e-mail-notes.c:1157
-#| msgid "Retrieving message"
 msgid "Retrieving message…"
 msgstr "Retrieving message…"
 
@@ -17495,696 +17445,677 @@ msgstr "Headers"
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: ../src/mail/e-mail-reader.c:358 ../src/mail/filtertypes.xml.in.h:65
+#: ../src/mail/e-mail-reader.c:357 ../src/mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "Move to Folder"
 
-#: ../src/mail/e-mail-reader.c:358 ../src/mail/filtertypes.xml.in.h:66
+#: ../src/mail/e-mail-reader.c:357 ../src/mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "Copy to Folder"
 
-#: ../src/mail/e-mail-reader.c:362 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:361 ../src/mail/em-folder-utils.c:568
 #: ../src/mail/mail.error.xml.h:153
 msgid "_Move"
 msgstr "_Move"
 
-#: ../src/mail/e-mail-reader.c:362 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:361 ../src/mail/em-folder-utils.c:568
 msgid "C_opy"
 msgstr "C_opy"
 
-#: ../src/mail/e-mail-reader.c:610
-#| msgid "Deleting message note..."
+#: ../src/mail/e-mail-reader.c:609
 msgid "Deleting message note…"
 msgstr "Deleting message note…"
 
-#: ../src/mail/e-mail-reader.c:1610 ../src/mail/e-mail-reader.c:1901
-#: ../src/mail/e-mail-reader.c:1941
+#: ../src/mail/e-mail-reader.c:1609 ../src/mail/e-mail-reader.c:1900
+#: ../src/mail/e-mail-reader.c:1940
 msgid "_Do not ask me again."
 msgstr "_Do not ask me again."
 
-#: ../src/mail/e-mail-reader.c:1947
+#: ../src/mail/e-mail-reader.c:1946
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Always ignore Reply-To: for mailing lists."
 
-#: ../src/mail/e-mail-reader.c:2151
+#: ../src/mail/e-mail-reader.c:2150
 msgid "Failed to retrieve message:"
 msgstr "Failed to retrieve message:"
 
-#: ../src/mail/e-mail-reader.c:2197 ../src/mail/e-mail-reader.c:3674
+#: ../src/mail/e-mail-reader.c:2196 ../src/mail/e-mail-reader.c:3686
 #, c-format
 msgid "Retrieving message “%s”"
 msgstr "Retrieving message “%s”"
 
-#: ../src/mail/e-mail-reader.c:2398
+#: ../src/mail/e-mail-reader.c:2397
 msgid "A_dd Sender to Address Book"
 msgstr "A_dd Sender to Address Book"
 
-#: ../src/mail/e-mail-reader.c:2400
+#: ../src/mail/e-mail-reader.c:2399
 msgid "Add sender to address book"
 msgstr "Add sender to address book"
 
-#: ../src/mail/e-mail-reader.c:2405
-#| msgid "Archive"
+#: ../src/mail/e-mail-reader.c:2404
 msgid "_Archive…"
 msgstr "_Archive…"
 
-#: ../src/mail/e-mail-reader.c:2407
+#: ../src/mail/e-mail-reader.c:2406
 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:2412
+#: ../src/mail/e-mail-reader.c:2411
 msgid "Check for _Junk"
 msgstr "Check for _Junk"
 
-#: ../src/mail/e-mail-reader.c:2414
+#: ../src/mail/e-mail-reader.c:2413
 msgid "Filter the selected messages for junk status"
 msgstr "Filter the selected messages for junk status"
 
-#: ../src/mail/e-mail-reader.c:2419
+#: ../src/mail/e-mail-reader.c:2418
 msgid "Assign C_olor…"
 msgstr "Assign C_olour…"
 
-#: ../src/mail/e-mail-reader.c:2421
+#: ../src/mail/e-mail-reader.c:2420
 msgid "Assign color for the selected messages"
 msgstr "Assign colour for the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2426
+#: ../src/mail/e-mail-reader.c:2425
 msgid "Unse_t Color"
 msgstr "Unse_t Colour"
 
-#: ../src/mail/e-mail-reader.c:2428
+#: ../src/mail/e-mail-reader.c:2427
 msgid "Unset color for the selected messages"
 msgstr "Unset colour for the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2433
-#| msgid "_Copy to Folder"
+#: ../src/mail/e-mail-reader.c:2432
 msgid "_Copy to Folder…"
 msgstr "_Copy to Folder…"
 
-#: ../src/mail/e-mail-reader.c:2435
+#: ../src/mail/e-mail-reader.c:2434
 msgid "Copy selected messages to another folder"
 msgstr "Copy selected messages to another folder"
 
-#: ../src/mail/e-mail-reader.c:2440
+#: ../src/mail/e-mail-reader.c:2439
 msgid "_Delete Message"
 msgstr "_Delete Message"
 
-#: ../src/mail/e-mail-reader.c:2442
+#: ../src/mail/e-mail-reader.c:2441
 msgid "Mark the selected messages for deletion"
 msgstr "Mark the selected messages for deletion"
 
-#: ../src/mail/e-mail-reader.c:2447
-#| msgid "_Add note..."
+#: ../src/mail/e-mail-reader.c:2446
 msgid "_Add note…"
 msgstr "_Add note…"
 
-#: ../src/mail/e-mail-reader.c:2449
+#: ../src/mail/e-mail-reader.c:2448
 msgid "Add a note for the selected message"
 msgstr "Add a note for the selected message"
 
-#: ../src/mail/e-mail-reader.c:2454
+#: ../src/mail/e-mail-reader.c:2453
 msgid "Delete no_te"
 msgstr "Delete no_te"
 
-#: ../src/mail/e-mail-reader.c:2456
+#: ../src/mail/e-mail-reader.c:2455
 msgid "Delete the note for the selected message"
 msgstr "Delete the note for the selected message"
 
-#: ../src/mail/e-mail-reader.c:2461
-#| msgid "_Edit note..."
+#: ../src/mail/e-mail-reader.c:2460
 msgid "_Edit note…"
 msgstr "_Edit note…"
 
-#: ../src/mail/e-mail-reader.c:2463
+#: ../src/mail/e-mail-reader.c:2462
 msgid "Edit a note for the selected message"
 msgstr "Edit a note for the selected message"
 
-#: ../src/mail/e-mail-reader.c:2468
-#| msgid "Create a Filter Rule for Mailing _List..."
+#: ../src/mail/e-mail-reader.c:2467
 msgid "Create a Filter Rule for Mailing _List…"
 msgstr "Create a Filter Rule for Mailing _List…"
 
-#: ../src/mail/e-mail-reader.c:2470
+#: ../src/mail/e-mail-reader.c:2469
 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:2475
-#| msgid "Create a Filter Rule for _Recipients..."
+#: ../src/mail/e-mail-reader.c:2474
 msgid "Create a Filter Rule for _Recipients…"
 msgstr "Create a Filter Rule for _Recipients…"
 
-#: ../src/mail/e-mail-reader.c:2477
+#: ../src/mail/e-mail-reader.c:2476
 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:2482
-#| msgid "Create a Filter Rule for Se_nder..."
+#: ../src/mail/e-mail-reader.c:2481
 msgid "Create a Filter Rule for Se_nder…"
 msgstr "Create a Filter Rule for Se_nder…"
 
-#: ../src/mail/e-mail-reader.c:2484
+#: ../src/mail/e-mail-reader.c:2483
 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:2489
-#| msgid "Create a Filter Rule for _Subject..."
+#: ../src/mail/e-mail-reader.c:2488
 msgid "Create a Filter Rule for _Subject…"
 msgstr "Create a Filter Rule for _Subject…"
 
-#: ../src/mail/e-mail-reader.c:2491
+#: ../src/mail/e-mail-reader.c:2490
 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:2496
+#: ../src/mail/e-mail-reader.c:2495
 msgid "A_pply Filters"
 msgstr "A_pply Filters"
 
-#: ../src/mail/e-mail-reader.c:2498
+#: ../src/mail/e-mail-reader.c:2497
 msgid "Apply filter rules to the selected messages"
 msgstr "Apply filter rules to the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2503
-#| msgid "Find in Message"
+#: ../src/mail/e-mail-reader.c:2502
 msgid "_Find in Message…"
 msgstr "_Find in Message…"
 
-#: ../src/mail/e-mail-reader.c:2505
+#: ../src/mail/e-mail-reader.c:2504
 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:2510
+#: ../src/mail/e-mail-reader.c:2509
 msgid "_Clear Flag"
 msgstr "_Clear Flag"
 
-#: ../src/mail/e-mail-reader.c:2512
+#: ../src/mail/e-mail-reader.c:2511
 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:2517
+#: ../src/mail/e-mail-reader.c:2516
 msgid "_Flag Completed"
 msgstr "_Flag Completed"
 
-#: ../src/mail/e-mail-reader.c:2519
+#: ../src/mail/e-mail-reader.c:2518
 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:2524
-#| msgid "Follow Up"
+#: ../src/mail/e-mail-reader.c:2523
 msgid "Follow _Up…"
 msgstr "Follow _Up…"
 
-#: ../src/mail/e-mail-reader.c:2526
+#: ../src/mail/e-mail-reader.c:2525
 msgid "Flag the selected messages for follow-up"
 msgstr "Flag the selected messages for follow-up"
 
-#: ../src/mail/e-mail-reader.c:2531
+#: ../src/mail/e-mail-reader.c:2530
 #: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "_Attached"
 
-#: ../src/mail/e-mail-reader.c:2533 ../src/mail/e-mail-reader.c:2540
+#: ../src/mail/e-mail-reader.c:2532 ../src/mail/e-mail-reader.c:2539
 #: ../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:2538
+#: ../src/mail/e-mail-reader.c:2537
 msgid "Forward As _Attached"
 msgstr "Forward As _Attached"
 
-#: ../src/mail/e-mail-reader.c:2545
+#: ../src/mail/e-mail-reader.c:2544
 #: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ../src/mail/e-mail-reader.c:2547 ../src/mail/e-mail-reader.c:2554
+#: ../src/mail/e-mail-reader.c:2546 ../src/mail/e-mail-reader.c:2553
 #: ../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:2552
+#: ../src/mail/e-mail-reader.c:2551
 msgid "Forward As _Inline"
 msgstr "Forward As _Inline"
 
-#: ../src/mail/e-mail-reader.c:2559
+#: ../src/mail/e-mail-reader.c:2558
 #: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ../src/mail/e-mail-reader.c:2561 ../src/mail/e-mail-reader.c:2568
+#: ../src/mail/e-mail-reader.c:2560 ../src/mail/e-mail-reader.c:2567
 #: ../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:2566
+#: ../src/mail/e-mail-reader.c:2565
 msgid "Forward As _Quoted"
 msgstr "Forward As _Quoted"
 
-#: ../src/mail/e-mail-reader.c:2573
+#: ../src/mail/e-mail-reader.c:2572
 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:2582
+#: ../src/mail/e-mail-reader.c:2581
 msgid "N_one"
 msgstr "N_one"
 
-#: ../src/mail/e-mail-reader.c:2589
+#: ../src/mail/e-mail-reader.c:2588
 msgid "_Load Images"
 msgstr "_Load Images"
 
-#: ../src/mail/e-mail-reader.c:2591
+#: ../src/mail/e-mail-reader.c:2590
 msgid "Force images in HTML mail to be loaded"
 msgstr "Force images in HTML mail to be loaded"
 
-#: ../src/mail/e-mail-reader.c:2596 ../src/mail/e-mail-reader.c:3015
+#: ../src/mail/e-mail-reader.c:2595 ../src/mail/e-mail-reader.c:3014
 msgid "_Ignore Subthread"
 msgstr "_Ignore Subthread"
 
-#: ../src/mail/e-mail-reader.c:2598
+#: ../src/mail/e-mail-reader.c:2597
 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:2603 ../src/mail/e-mail-reader.c:3019
+#: ../src/mail/e-mail-reader.c:2602 ../src/mail/e-mail-reader.c:3018
 msgid "_Ignore Thread"
 msgstr "_Ignore Thread"
 
-#: ../src/mail/e-mail-reader.c:2605
+#: ../src/mail/e-mail-reader.c:2604
 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:2610
+#: ../src/mail/e-mail-reader.c:2609
 msgid "_Important"
 msgstr "_Important"
 
-#: ../src/mail/e-mail-reader.c:2612
+#: ../src/mail/e-mail-reader.c:2611
 msgid "Mark the selected messages as important"
 msgstr "Mark the selected messages as important"
 
-#: ../src/mail/e-mail-reader.c:2617
+#: ../src/mail/e-mail-reader.c:2616
 msgid "_Junk"
 msgstr "_Junk"
 
-#: ../src/mail/e-mail-reader.c:2619
+#: ../src/mail/e-mail-reader.c:2618
 msgid "Mark the selected messages as junk"
 msgstr "Mark the selected messages as junk"
 
-#: ../src/mail/e-mail-reader.c:2624
+#: ../src/mail/e-mail-reader.c:2623
 msgid "_Not Junk"
 msgstr "_Not Junk"
 
-#: ../src/mail/e-mail-reader.c:2626
+#: ../src/mail/e-mail-reader.c:2625
 msgid "Mark the selected messages as not being junk"
 msgstr "Mark the selected messages as not being junk"
 
-#: ../src/mail/e-mail-reader.c:2631
+#: ../src/mail/e-mail-reader.c:2630
 msgid "_Read"
 msgstr "_Read"
 
-#: ../src/mail/e-mail-reader.c:2633
+#: ../src/mail/e-mail-reader.c:2632
 msgid "Mark the selected messages as having been read"
 msgstr "Mark the selected messages as having been read"
 
-#: ../src/mail/e-mail-reader.c:2638 ../src/mail/e-mail-reader.c:3039
+#: ../src/mail/e-mail-reader.c:2637 ../src/mail/e-mail-reader.c:3038
 msgid "Do not _Ignore Subthread"
 msgstr "Do not _Ignore Subthread"
 
-#: ../src/mail/e-mail-reader.c:2640
+#: ../src/mail/e-mail-reader.c:2639
 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:2645 ../src/mail/e-mail-reader.c:3043
+#: ../src/mail/e-mail-reader.c:2644 ../src/mail/e-mail-reader.c:3042
 msgid "Do not _Ignore Thread"
 msgstr "Do not _Ignore Thread"
 
-#: ../src/mail/e-mail-reader.c:2647
+#: ../src/mail/e-mail-reader.c:2646
 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:2652
+#: ../src/mail/e-mail-reader.c:2651
 msgid "Uni_mportant"
 msgstr "Uni_mportant"
 
-#: ../src/mail/e-mail-reader.c:2654
+#: ../src/mail/e-mail-reader.c:2653
 msgid "Mark the selected messages as unimportant"
 msgstr "Mark the selected messages as unimportant"
 
-#: ../src/mail/e-mail-reader.c:2659
+#: ../src/mail/e-mail-reader.c:2658
 msgid "_Unread"
 msgstr "_Unread"
 
-#: ../src/mail/e-mail-reader.c:2661
+#: ../src/mail/e-mail-reader.c:2660
 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:2666
+#: ../src/mail/e-mail-reader.c:2665
 #: ../src/modules/mail/e-mail-attachment-handler.c:417
-#| msgid "_Edit as New Message..."
 msgid "_Edit as New Message…"
 msgstr "_Edit as New Message…"
 
-#: ../src/mail/e-mail-reader.c:2668
+#: ../src/mail/e-mail-reader.c:2667
 #: ../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:2673
+#: ../src/mail/e-mail-reader.c:2672
 msgid "Compose _New Message"
 msgstr "Compose _New Message"
 
-#: ../src/mail/e-mail-reader.c:2675
+#: ../src/mail/e-mail-reader.c:2674
 msgid "Open a window for composing a mail message"
 msgstr "Open a window for composing a mail message"
 
-#: ../src/mail/e-mail-reader.c:2680
+#: ../src/mail/e-mail-reader.c:2679
 msgid "_Open in New Window"
 msgstr "_Open in New Window"
 
-#: ../src/mail/e-mail-reader.c:2682
+#: ../src/mail/e-mail-reader.c:2681
 msgid "Open the selected messages in a new window"
 msgstr "Open the selected messages in a new window"
 
-#: ../src/mail/e-mail-reader.c:2687
-#| msgid "_Move to Folder"
+#: ../src/mail/e-mail-reader.c:2686
 msgid "_Move to Folder…"
 msgstr "_Move to Folder…"
 
-#: ../src/mail/e-mail-reader.c:2689
+#: ../src/mail/e-mail-reader.c:2688
 msgid "Move selected messages to another folder"
 msgstr "Move selected messages to another folder"
 
-#: ../src/mail/e-mail-reader.c:2694
+#: ../src/mail/e-mail-reader.c:2693
 msgid "_Next Message"
 msgstr "_Next Message"
 
-#: ../src/mail/e-mail-reader.c:2696
+#: ../src/mail/e-mail-reader.c:2695
 msgid "Display the next message"
 msgstr "Display the next message"
 
-#: ../src/mail/e-mail-reader.c:2701
+#: ../src/mail/e-mail-reader.c:2700
 msgid "Next _Important Message"
 msgstr "Next _Important Message"
 
-#: ../src/mail/e-mail-reader.c:2703
+#: ../src/mail/e-mail-reader.c:2702
 msgid "Display the next important message"
 msgstr "Display the next important message"
 
-#: ../src/mail/e-mail-reader.c:2708
+#: ../src/mail/e-mail-reader.c:2707
 msgid "Next _Thread"
 msgstr "Next _Thread"
 
-#: ../src/mail/e-mail-reader.c:2710
+#: ../src/mail/e-mail-reader.c:2709
 msgid "Display the next thread"
 msgstr "Display the next thread"
 
-#: ../src/mail/e-mail-reader.c:2715
+#: ../src/mail/e-mail-reader.c:2714
 msgid "Next _Unread Message"
 msgstr "Next _Unread Message"
 
-#: ../src/mail/e-mail-reader.c:2717
+#: ../src/mail/e-mail-reader.c:2716
 msgid "Display the next unread message"
 msgstr "Display the next unread message"
 
-#: ../src/mail/e-mail-reader.c:2722
+#: ../src/mail/e-mail-reader.c:2721
 msgid "_Previous Message"
 msgstr "_Previous Message"
 
-#: ../src/mail/e-mail-reader.c:2724
+#: ../src/mail/e-mail-reader.c:2723
 msgid "Display the previous message"
 msgstr "Display the previous message"
 
-#: ../src/mail/e-mail-reader.c:2729
+#: ../src/mail/e-mail-reader.c:2728
 msgid "Pr_evious Important Message"
 msgstr "Pr_evious Important Message"
 
-#: ../src/mail/e-mail-reader.c:2731
+#: ../src/mail/e-mail-reader.c:2730
 msgid "Display the previous important message"
 msgstr "Display the previous important message"
 
-#: ../src/mail/e-mail-reader.c:2736
+#: ../src/mail/e-mail-reader.c:2735
 msgid "Previous T_hread"
 msgstr "Previous T_hread"
 
-#: ../src/mail/e-mail-reader.c:2738
+#: ../src/mail/e-mail-reader.c:2737
 msgid "Display the previous thread"
 msgstr "Display the previous thread"
 
-#: ../src/mail/e-mail-reader.c:2743
+#: ../src/mail/e-mail-reader.c:2742
 msgid "P_revious Unread Message"
 msgstr "P_revious Unread Message"
 
-#: ../src/mail/e-mail-reader.c:2745
+#: ../src/mail/e-mail-reader.c:2744
 msgid "Display the previous unread message"
 msgstr "Display the previous unread message"
 
-#: ../src/mail/e-mail-reader.c:2752
+#: ../src/mail/e-mail-reader.c:2751
 msgid "Print this message"
 msgstr "Print this message"
 
-#: ../src/mail/e-mail-reader.c:2759
+#: ../src/mail/e-mail-reader.c:2758
 msgid "Preview the message to be printed"
 msgstr "Preview the message to be printed"
 
-#: ../src/mail/e-mail-reader.c:2764
+#: ../src/mail/e-mail-reader.c:2763
 #: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "Re_direct"
 
-#: ../src/mail/e-mail-reader.c:2766
+#: ../src/mail/e-mail-reader.c:2765
 #: ../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:2771
+#: ../src/mail/e-mail-reader.c:2770
 msgid "Remo_ve Attachments"
 msgstr "Remo_ve Attachments"
 
-#: ../src/mail/e-mail-reader.c:2773
+#: ../src/mail/e-mail-reader.c:2772
 msgid "Remove attachments"
 msgstr "Remove attachments"
 
-#: ../src/mail/e-mail-reader.c:2778
+#: ../src/mail/e-mail-reader.c:2777
 msgid "Remove Du_plicate Messages"
 msgstr "Remove Du_plicate Messages"
 
-#: ../src/mail/e-mail-reader.c:2780
+#: ../src/mail/e-mail-reader.c:2779
 msgid "Checks selected messages for duplicates"
 msgstr "Checks selected messages for duplicates"
 
-#: ../src/mail/e-mail-reader.c:2785 ../src/mail/em-composer-utils.c:4099
+#: ../src/mail/e-mail-reader.c:2784 ../src/mail/em-composer-utils.c:4096
 #: ../src/mail/mail.error.xml.h:28
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1452
 #: ../src/modules/mail/e-mail-attachment-handler.c:396
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: ../src/mail/e-mail-reader.c:2787
+#: ../src/mail/e-mail-reader.c:2786
 #: ../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:2792
+#: ../src/mail/e-mail-reader.c:2791
 msgid "Al_ternative Reply…"
 msgstr "Al_ternative Reply…"
 
-#: ../src/mail/e-mail-reader.c:2794
+#: ../src/mail/e-mail-reader.c:2793
 msgid "Choose reply options for the selected message"
 msgstr "Choose reply options for the selected message"
 
-#: ../src/mail/e-mail-reader.c:2799 ../src/mail/em-composer-utils.c:4094
+#: ../src/mail/e-mail-reader.c:2798 ../src/mail/em-composer-utils.c:4091
 #: ../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:2801
+#: ../src/mail/e-mail-reader.c:2800
 #: ../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:2806
+#: ../src/mail/e-mail-reader.c:2805
 #: ../src/modules/mail/e-mail-attachment-handler.c:410
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: ../src/mail/e-mail-reader.c:2808
+#: ../src/mail/e-mail-reader.c:2807
 #: ../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:2813
-#| msgid "_Save as mbox..."
+#: ../src/mail/e-mail-reader.c:2812
 msgid "_Save as mbox…"
 msgstr "_Save as mbox…"
 
-#: ../src/mail/e-mail-reader.c:2815
+#: ../src/mail/e-mail-reader.c:2814
 msgid "Save selected messages as an mbox file"
 msgstr "Save selected messages as an mbox file"
 
-#: ../src/mail/e-mail-reader.c:2827
+#: ../src/mail/e-mail-reader.c:2826
 msgid "_Message Source"
 msgstr "_Message Source"
 
-#: ../src/mail/e-mail-reader.c:2829
+#: ../src/mail/e-mail-reader.c:2828
 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:2841
+#: ../src/mail/e-mail-reader.c:2840
 msgid "_Undelete Message"
 msgstr "_Undelete Message"
 
-#: ../src/mail/e-mail-reader.c:2843
+#: ../src/mail/e-mail-reader.c:2842
 msgid "Undelete the selected messages"
 msgstr "Undelete the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2848
+#: ../src/mail/e-mail-reader.c:2847
 msgid "_Normal Size"
 msgstr "_Normal Size"
 
-#: ../src/mail/e-mail-reader.c:2850
+#: ../src/mail/e-mail-reader.c:2849
 msgid "Reset the text to its original size"
 msgstr "Reset the text to its original size"
 
-#: ../src/mail/e-mail-reader.c:2855
+#: ../src/mail/e-mail-reader.c:2854
 msgid "_Zoom In"
 msgstr "_Zoom In"
 
-#: ../src/mail/e-mail-reader.c:2857
+#: ../src/mail/e-mail-reader.c:2856
 msgid "Increase the text size"
 msgstr "Increase the text size"
 
-#: ../src/mail/e-mail-reader.c:2864
+#: ../src/mail/e-mail-reader.c:2863
 msgid "Decrease the text size"
 msgstr "Decrease the text size"
 
-#: ../src/mail/e-mail-reader.c:2871
+#: ../src/mail/e-mail-reader.c:2870
 msgid "Cre_ate"
 msgstr "Cre_ate"
 
-#: ../src/mail/e-mail-reader.c:2878
+#: ../src/mail/e-mail-reader.c:2877
 msgid "Ch_aracter Encoding"
 msgstr "Ch_aracter Encoding"
 
-#: ../src/mail/e-mail-reader.c:2885
+#: ../src/mail/e-mail-reader.c:2884
 #: ../src/modules/mail/e-mail-attachment-handler.c:424
 msgid "F_orward As"
 msgstr "F_orward As"
 
-#: ../src/mail/e-mail-reader.c:2892
+#: ../src/mail/e-mail-reader.c:2891
 msgid "_Label"
 msgstr "_Label"
 
-#: ../src/mail/e-mail-reader.c:2899
+#: ../src/mail/e-mail-reader.c:2898
 msgid "_Group Reply"
 msgstr "_Group Reply"
 
-#: ../src/mail/e-mail-reader.c:2906
+#: ../src/mail/e-mail-reader.c:2905
 msgid "_Go To"
 msgstr "_Go To"
 
-#: ../src/mail/e-mail-reader.c:2913
+#: ../src/mail/e-mail-reader.c:2912
 msgid "Mar_k As"
 msgstr "Mar_k As"
 
-#: ../src/mail/e-mail-reader.c:2920
+#: ../src/mail/e-mail-reader.c:2919
 msgid "_Message"
 msgstr "_Message"
 
-#: ../src/mail/e-mail-reader.c:2927
+#: ../src/mail/e-mail-reader.c:2926
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../src/mail/e-mail-reader.c:2937
-#| msgid "Create a Search Folder from Mailing _List..."
+#: ../src/mail/e-mail-reader.c:2936
 msgid "Create a Search Folder from Mailing _List…"
 msgstr "Create a Search Folder from Mailing _List…"
 
-#: ../src/mail/e-mail-reader.c:2939
+#: ../src/mail/e-mail-reader.c:2938
 msgid "Create a search folder for this mailing list"
 msgstr "Create a search folder for this mailing list"
 
-#: ../src/mail/e-mail-reader.c:2944
-#| msgid "Create a Search Folder from Recipien_ts..."
+#: ../src/mail/e-mail-reader.c:2943
 msgid "Create a Search Folder from Recipien_ts…"
 msgstr "Create a Search Folder from Recipien_ts…"
 
-#: ../src/mail/e-mail-reader.c:2946
+#: ../src/mail/e-mail-reader.c:2945
 msgid "Create a search folder for these recipients"
 msgstr "Create a search folder for these recipients"
 
-#: ../src/mail/e-mail-reader.c:2951
-#| msgid "Create a Search Folder from Sen_der..."
+#: ../src/mail/e-mail-reader.c:2950
 msgid "Create a Search Folder from Sen_der…"
 msgstr "Create a Search Folder from Sen_der…"
 
-#: ../src/mail/e-mail-reader.c:2953
+#: ../src/mail/e-mail-reader.c:2952
 msgid "Create a search folder for this sender"
 msgstr "Create a search folder for this sender"
 
-#: ../src/mail/e-mail-reader.c:2958
-#| msgid "Create a Search Folder from S_ubject..."
+#: ../src/mail/e-mail-reader.c:2957
 msgid "Create a Search Folder from S_ubject…"
 msgstr "Create a Search Folder from S_ubject…"
 
-#: ../src/mail/e-mail-reader.c:2960
+#: ../src/mail/e-mail-reader.c:2959
 msgid "Create a search folder for this subject"
 msgstr "Create a search folder for this subject"
 
-#: ../src/mail/e-mail-reader.c:3007
-#| msgid "Mark for Follo_w Up..."
+#: ../src/mail/e-mail-reader.c:3006
 msgid "Mark for Follo_w Up…"
 msgstr "Mark for Follo_w Up…"
 
-#: ../src/mail/e-mail-reader.c:3023
+#: ../src/mail/e-mail-reader.c:3022
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: ../src/mail/e-mail-reader.c:3027
+#: ../src/mail/e-mail-reader.c:3026
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: ../src/mail/e-mail-reader.c:3031
+#: ../src/mail/e-mail-reader.c:3030
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: ../src/mail/e-mail-reader.c:3035
+#: ../src/mail/e-mail-reader.c:3034
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: ../src/mail/e-mail-reader.c:3047
+#: ../src/mail/e-mail-reader.c:3046
 msgid "Mark as Uni_mportant"
 msgstr "Mark as Uni_mportant"
 
-#: ../src/mail/e-mail-reader.c:3051
+#: ../src/mail/e-mail-reader.c:3050
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: ../src/mail/e-mail-reader.c:3099
+#: ../src/mail/e-mail-reader.c:3098
 msgid "_Caret Mode"
 msgstr "_Caret Mode"
 
-#: ../src/mail/e-mail-reader.c:3101
+#: ../src/mail/e-mail-reader.c:3100
 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:3107
+#: ../src/mail/e-mail-reader.c:3106
 msgid "All Message _Headers"
 msgstr "All Message _Headers"
 
-#: ../src/mail/e-mail-reader.c:3109
+#: ../src/mail/e-mail-reader.c:3108
 msgid "Show messages with all email headers"
 msgstr "Show messages with all e-mail headers"
 
-#: ../src/mail/e-mail-reader.c:3680
+#: ../src/mail/e-mail-reader.c:3692
 msgid "Retrieving message"
 msgstr "Retrieving message"
 
-#: ../src/mail/e-mail-reader.c:5041
+#: ../src/mail/e-mail-reader.c:5062
 #: ../src/modules/mail/e-mail-attachment-handler.c:389
 msgid "_Forward"
 msgstr "_Forward"
 
-#: ../src/mail/e-mail-reader.c:5042
+#: ../src/mail/e-mail-reader.c:5063
 #: ../src/modules/mail/e-mail-attachment-handler.c:391
 msgid "Forward the selected message to someone"
 msgstr "Forward the selected message to someone"
@@ -18193,55 +18124,32 @@ 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:5061
+#: ../src/mail/e-mail-reader.c:5082
 msgid "Group Reply"
 msgstr "Group Reply"
 
-#: ../src/mail/e-mail-reader.c:5062
+#: ../src/mail/e-mail-reader.c:5083
 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:5128 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:5149 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Delete"
 
-#: ../src/mail/e-mail-reader.c:5140
+#: ../src/mail/e-mail-reader.c:5161
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Next"
 msgstr "Next"
 
-#: ../src/mail/e-mail-reader.c:5144
+#: ../src/mail/e-mail-reader.c:5165
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1242
 msgid "Previous"
 msgstr "Previous"
 
-#: ../src/mail/e-mail-reader.c:5153 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:5174 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Reply"
 
-#: ../src/mail/e-mail-reader.c:6308
-#, c-format
-msgid "Allow remote content for anyone from %s"
-msgstr "Allow remote content for anyone from %s"
-
-#: ../src/mail/e-mail-reader.c:6310
-#, c-format
-msgid "Allow remote content for %s"
-msgstr "Allow remote content for %s"
-
-#: ../src/mail/e-mail-reader.c:6327
-#, c-format
-msgid "Allow remote content from %s"
-msgstr "Allow remote content from %s"
-
-#: ../src/mail/e-mail-reader.c:6344
-msgid "Do not show this message again"
-msgstr "Do not show this message again"
-
-#: ../src/mail/e-mail-reader.c:6396
-msgid "Load remote content"
-msgstr "Load remote content"
-
 #: ../src/mail/e-mail-reader-utils.c:144
 msgid "Do not warn me again"
 msgstr "Do not warn me again"
@@ -18293,7 +18201,7 @@ msgstr[1] ""
 "Folder “%s” contains %u duplicate messages. Are you sure you want to delete "
 "them?"
 
-#: ../src/mail/e-mail-reader-utils.c:2925
+#: ../src/mail/e-mail-reader-utils.c:3023
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Save Message"
@@ -18304,16 +18212,47 @@ 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:2946
+#: ../src/mail/e-mail-reader-utils.c:3044
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Message"
 msgstr[1] "Messages"
 
-#: ../src/mail/e-mail-reader-utils.c:3360
+#: ../src/mail/e-mail-reader-utils.c:3458
 msgid "Parsing message"
 msgstr "Parsing message"
 
+#: ../src/mail/e-mail-remote-content-popover.c:232
+#, c-format
+msgid "Allow remote content for anyone from %s"
+msgstr "Allow remote content for anyone from %s"
+
+#: ../src/mail/e-mail-remote-content-popover.c:234
+#, c-format
+msgid "Allow remote content for %s"
+msgstr "Allow remote content for %s"
+
+#: ../src/mail/e-mail-remote-content-popover.c:251
+#, c-format
+msgid "Allow remote content from %s"
+msgstr "Allow remote content from %s"
+
+#: ../src/mail/e-mail-remote-content-popover.c:268
+msgid "Do not show this message again"
+msgstr "Do not show this message again"
+
+#: ../src/mail/e-mail-remote-content-popover.c:320
+msgid "Load remote content"
+msgstr "Load remote content"
+
+#: ../src/mail/e-mail-remote-content-popover.c:395
+msgid ""
+"You can download remote content manually, or set to remember to download "
+"remote content for this sender or used sites."
+msgstr ""
+"You can download remote content manually, or set to remember to download "
+"remote content for this sender or used sites."
+
 #: ../src/mail/e-mail-request.c:288
 msgid "The message has no text content."
 msgstr "The message has no text content."
@@ -18382,7 +18321,6 @@ msgstr[1] ""
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
 #: ../src/mail/em-composer-utils.c:829
-#| msgid "Waiting for attachments to load..."
 msgid "Waiting for attachments to load…"
 msgstr "Waiting for attachments to load…"
 
@@ -18417,60 +18355,60 @@ msgstr "Re: %s"
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
-#: ../src/mail/em-composer-utils.c:4045
+#: ../src/mail/em-composer-utils.c:4042
 msgid "Alternative Reply"
 msgstr "Alternative Reply"
 
-#: ../src/mail/em-composer-utils.c:4048
+#: ../src/mail/em-composer-utils.c:4045
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Reply"
 msgstr "_Reply"
 
-#: ../src/mail/em-composer-utils.c:4061
+#: ../src/mail/em-composer-utils.c:4058
 msgid "Recipients:"
 msgstr "Recipients:"
 
-#: ../src/mail/em-composer-utils.c:4089
+#: ../src/mail/em-composer-utils.c:4086
 msgid "Reply to _Sender"
 msgstr "Reply to _Sender"
 
-#: ../src/mail/em-composer-utils.c:4111
+#: ../src/mail/em-composer-utils.c:4108
 msgid "Reply style:"
 msgstr "Reply style:"
 
-#: ../src/mail/em-composer-utils.c:4119
+#: ../src/mail/em-composer-utils.c:4116
 msgid "_Default"
 msgstr "_Default"
 
-#: ../src/mail/em-composer-utils.c:4123
+#: ../src/mail/em-composer-utils.c:4120
 msgid "Attach_ment"
 msgstr "Attach_ment"
 
-#: ../src/mail/em-composer-utils.c:4127
+#: ../src/mail/em-composer-utils.c:4124
 msgid "Inline (_Outlook style)"
 msgstr "Inline (_Outlook style)"
 
-#: ../src/mail/em-composer-utils.c:4131
+#: ../src/mail/em-composer-utils.c:4128
 msgid "_Quote"
 msgstr "_Quote"
 
-#: ../src/mail/em-composer-utils.c:4135
+#: ../src/mail/em-composer-utils.c:4132
 msgid "Do _Not Quote"
 msgstr "Do _Not Quote"
 
-#: ../src/mail/em-composer-utils.c:4142
+#: ../src/mail/em-composer-utils.c:4139
 msgid "_Format message in HTML"
 msgstr "_Format message in HTML"
 
-#: ../src/mail/em-composer-utils.c:4152
+#: ../src/mail/em-composer-utils.c:4149
 msgid "Apply t_emplate"
 msgstr "Apply t_emplate"
 
-#: ../src/mail/em-composer-utils.c:4164
+#: ../src/mail/em-composer-utils.c:4161
 msgid "Preserve original message S_ubject"
 msgstr "Preserve original message S_ubject"
 
-#: ../src/mail/em-composer-utils.c:4230
+#: ../src/mail/em-composer-utils.c:4227
 #, c-format
 msgid "one recipient"
 msgid_plural "%d recipients"
@@ -18478,11 +18416,11 @@ msgstr[0] "one recipient"
 msgstr[1] "%d recipients"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:4639
+#: ../src/mail/em-composer-utils.c:4636
 msgid "Posting destination"
 msgstr "Posting destination"
 
-#: ../src/mail/em-composer-utils.c:4644
+#: ../src/mail/em-composer-utils.c:4641
 msgid "Choose folders to post the message to."
 msgstr "Choose folders to post the message to."
 
@@ -18522,7 +18460,7 @@ msgid "If any of the following conditions are met"
 msgstr "If any of the following conditions are met"
 
 #. and now for the action area
-#: ../src/mail/em-filter-editor.c:203 ../src/mail/em-filter-rule.c:1068
+#: ../src/mail/em-filter-editor.c:203 ../src/mail/em-filter-rule.c:1067
 msgid "Then"
 msgstr "Then"
 
@@ -18535,35 +18473,32 @@ msgid "Select Folder"
 msgstr "Select Folder"
 
 #. Translators: This is in a Mail filter rule editor, part of "For account: [ Any   ]" section
-#: ../src/mail/em-filter-rule.c:941
+#: ../src/mail/em-filter-rule.c:940
 msgctxt "mail-filter-rule"
 msgid "Any"
 msgstr "Any"
 
-#: ../src/mail/em-filter-rule.c:1038
+#: ../src/mail/em-filter-rule.c:1037
 msgid "Rul_e type:"
 msgstr "Rul_e type:"
 
-#: ../src/mail/em-filter-rule.c:1056
+#: ../src/mail/em-filter-rule.c:1055
 msgid "_For Account:"
 msgstr "_For Account:"
 
-#: ../src/mail/em-filter-rule.c:1141
+#: ../src/mail/em-filter-rule.c:1140
 msgid "Add Ac_tion"
 msgstr "Add Ac_tion"
 
 #: ../src/mail/em-folder-properties.c:170
-#| msgid "Selected Column"
 msgid "Select Custom Icon"
 msgstr "Select Custom Icon"
 
 #: ../src/mail/em-folder-properties.c:219
-#| msgid "Use custom fonts"
 msgid "_Use custom icon"
 msgstr "_Use custom icon"
 
 #: ../src/mail/em-folder-properties.c:312
-#| msgid "Unse_t Color"
 msgid "Use te_xt color"
 msgstr "Use te_xt colour"
 
@@ -18653,7 +18588,6 @@ msgid "Label"
 msgstr "Label"
 
 #: ../src/mail/em-folder-properties.c:1370
-#| msgid "_Switcher Appearance"
 msgid "Appearance"
 msgstr "Appearance"
 
@@ -18725,12 +18659,12 @@ msgstr "Moving folder %s"
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2629
+#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2632
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2631
+#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2634
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
@@ -18801,9 +18735,9 @@ msgid "Unsubscribe From _All"
 msgstr "Unsubscribe From _All"
 
 #: ../src/mail/em-subscription-editor.c:1315
-#: ../src/modules/mail/e-mail-shell-view-private.c:933
-#: ../src/modules/mail/e-mail-shell-view-private.c:965
-#: ../src/modules/mail/e-mail-shell-view-private.c:1009
+#: ../src/modules/mail/e-mail-shell-view-private.c:916
+#: ../src/modules/mail/e-mail-shell-view-private.c:948
+#: ../src/modules/mail/e-mail-shell-view-private.c:992
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -18811,7 +18745,7 @@ msgstr[0] "%d unread, "
 msgstr[1] "%d unread, "
 
 #: ../src/mail/em-subscription-editor.c:1319
-#: ../src/modules/mail/e-mail-shell-view-private.c:1019
+#: ../src/modules/mail/e-mail-shell-view-private.c:1002
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -19311,7 +19245,7 @@ msgid "Import mail and contacts from KMail."
 msgstr "Import mail and contacts from KMail."
 
 #: ../src/mail/importers/kmail-libs.c:149
-#: ../src/modules/mail/e-mail-shell-view-private.c:1040
+#: ../src/modules/mail/e-mail-shell-view-private.c:1023
 msgid "Trash"
 msgstr "Wastebasket"
 
@@ -19572,7 +19506,7 @@ msgstr "Sending a message with _recipients not entered as mail addresses"
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Sending a message using _key accelerator (Ctrl+Enter)"
 
-#. Translators:
+#. Translators: 'changes' is a verb. This is whether to show a warning or not in that situation
 #: ../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"
@@ -19673,7 +19607,7 @@ msgid "Highlight _quotations with"
 msgstr "Highlight _quotations with"
 
 #: ../src/mail/mail-config.ui.h:97
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Pick a color"
 msgstr "Pick a colour"
 
@@ -19915,18 +19849,6 @@ msgstr "_Accept Licence"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Tick this to accept the licence agreement"
 
-#: ../src/mail/mail-dialogs.ui.h:22
-msgid "Security Information"
-msgstr "Security Information"
-
-#: ../src/mail/mail-dialogs.ui.h:24
-msgid "Digital Signature"
-msgstr "Digital Signature"
-
-#: ../src/mail/mail-dialogs.ui.h:25
-msgid "Encryption"
-msgstr "Encryption"
-
 #: ../src/mail/mail.error.xml.h:1
 msgid "Invalid authentication"
 msgstr "Invalid authentication"
@@ -20778,52 +20700,40 @@ msgstr "Failed to mark subthread to be ignored in folder “{0}”"
 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: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:197
-msgid ""
-"You can download remote content manually, or set to remember to download "
-"remote content for this sender or used sites."
-msgstr ""
-"You can download remote content manually, or set to remember to download "
-"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:199
+#: ../src/mail/mail.error.xml.h:197
 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:201
+#: ../src/mail/mail.error.xml.h:199
 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:203
+#: ../src/mail/mail.error.xml.h:201
 msgid "Overdue: {0} by {1}"
 msgstr "Overdue: {0} by {1}"
 
-#: ../src/mail/mail.error.xml.h:205
+#: ../src/mail/mail.error.xml.h:203
 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:208
+#: ../src/mail/mail.error.xml.h:206
 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:210
+#: ../src/mail/mail.error.xml.h:208
 msgid "Failed to store message note in folder “{0}”"
 msgstr "Failed to store message note in folder “{0}”"
 
-#: ../src/mail/mail.error.xml.h:211
+#: ../src/mail/mail.error.xml.h:209
 msgid "Something has gone wrong when displaying the message"
 msgstr "Something has gone wrong when displaying the message"
 
-#: ../src/mail/mail.error.xml.h:212
+#: ../src/mail/mail.error.xml.h:210
 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 "
@@ -20833,11 +20743,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:213
+#: ../src/mail/mail.error.xml.h:211
 msgid "Something has gone wrong when displaying the signature"
 msgstr "Something has gone wrong when displaying the signature"
 
-#: ../src/mail/mail.error.xml.h:214
+#: ../src/mail/mail.error.xml.h:212
 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 "
@@ -20847,11 +20757,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:215
+#: ../src/mail/mail.error.xml.h:213
 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:216
+#: ../src/mail/mail.error.xml.h:214
 msgid ""
 "These messages will be shown in the Trash folder, where they can be "
 "permanently deleted later."
@@ -20859,16 +20769,15 @@ msgstr ""
 "These messages will be shown in the Wastebasket folder, where they can be "
 "permanently deleted later."
 
-#: ../src/mail/mail.error.xml.h:217
+#: ../src/mail/mail.error.xml.h:215
 msgid "_Empty Junk"
 msgstr "_Empty Junk"
 
-#: ../src/mail/mail.error.xml.h:218
+#: ../src/mail/mail.error.xml.h:216
 msgid "Failed to empty Junk folder “{0}”"
 msgstr "Failed to empty Junk folder “{0}”"
 
 #: ../src/mail/mail-send-recv.c:193
-#| msgid "Canceling..."
 msgid "Canceling…"
 msgstr "Cancelling…"
 
@@ -20888,32 +20797,30 @@ msgstr "Send & Receive Mail"
 msgid "Cancel _All"
 msgstr "Cancel _All"
 
-#: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:1470
-#| msgid "Updating..."
+#: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:1467
 msgid "Updating…"
 msgstr "Updating…"
 
 #: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:952
-#| msgid "Waiting..."
 msgid "Waiting…"
 msgstr "Waiting…"
 
-#: ../src/mail/mail-send-recv.c:1436
+#: ../src/mail/mail-send-recv.c:1433
 #, c-format
 msgid "Checking for new mail at “%s”"
 msgstr "Checking for new mail at “%s”"
 
-#: ../src/mail/mail-send-recv.c:1663
+#: ../src/mail/mail-send-recv.c:1660
 #, c-format
 msgid "Deleting junk and expunging trash at “%s”"
 msgstr "Deleting junk and expunging wastebasket at “%s”"
 
-#: ../src/mail/mail-send-recv.c:1665
+#: ../src/mail/mail-send-recv.c:1662
 #, c-format
 msgid "Deleting junk at “%s”"
 msgstr "Deleting junk at “%s”"
 
-#: ../src/mail/mail-send-recv.c:1667
+#: ../src/mail/mail-send-recv.c:1664
 #, c-format
 msgid "Expunging trash at “%s”"
 msgstr "Expunging wastebasket at “%s”"
@@ -20930,87 +20837,87 @@ msgstr "Edit Search Folder"
 msgid "New Search Folder"
 msgstr "New Search Folder"
 
-#: ../src/mail/message-list.c:309
+#: ../src/mail/message-list.c:312
 msgid "Unseen"
 msgstr "Unseen"
 
-#: ../src/mail/message-list.c:310
+#: ../src/mail/message-list.c:313
 msgid "Seen"
 msgstr "Seen"
 
-#: ../src/mail/message-list.c:311
+#: ../src/mail/message-list.c:314
 msgid "Answered"
 msgstr "Answered"
 
-#: ../src/mail/message-list.c:312
+#: ../src/mail/message-list.c:315
 msgid "Forwarded"
 msgstr "Forwarded"
 
-#: ../src/mail/message-list.c:313
+#: ../src/mail/message-list.c:316
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: ../src/mail/message-list.c:314
+#: ../src/mail/message-list.c:317
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: ../src/mail/message-list.c:327
+#: ../src/mail/message-list.c:330
 msgid "Lowest"
 msgstr "Lowest"
 
-#: ../src/mail/message-list.c:328
+#: ../src/mail/message-list.c:331
 msgid "Lower"
 msgstr "Lower"
 
-#: ../src/mail/message-list.c:332
+#: ../src/mail/message-list.c:335
 msgid "Higher"
 msgstr "Higher"
 
-#: ../src/mail/message-list.c:333
+#: ../src/mail/message-list.c:336
 msgid "Highest"
 msgstr "Highest"
 
-#: ../src/mail/message-list.c:482
+#: ../src/mail/message-list.c:485
 msgid "Generating message list"
 msgstr "Generating message list"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2151
-#: ../src/modules/itip-formatter/itip-view.c:268
+#: ../src/mail/message-list.c:2154
+#: ../src/modules/itip-formatter/itip-view.c:270
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: ../src/mail/message-list.c:2160
+#: ../src/mail/message-list.c:2163
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: ../src/mail/message-list.c:2172
+#: ../src/mail/message-list.c:2175
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../src/mail/message-list.c:2180
+#: ../src/mail/message-list.c:2183
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../src/mail/message-list.c:2182
+#: ../src/mail/message-list.c:2185
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../src/mail/message-list.c:3267
+#: ../src/mail/message-list.c:3311
 msgid "Select all visible messages"
 msgstr "Select all visible messages"
 
-#: ../src/mail/message-list.c:4022 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4076 ../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:5591
+#: ../src/mail/message-list.c:5645
 msgid "Follow-up"
 msgstr "Follow-up"
 
-#: ../src/mail/message-list.c:6654
+#: ../src/mail/message-list.c:6708
 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 "
@@ -21022,12 +20929,11 @@ msgstr ""
 "running a new search either by clearing it with Search→Clear menu item or by "
 "changing the query above."
 
-#: ../src/mail/message-list.c:6662
+#: ../src/mail/message-list.c:6716
 msgid "There are no messages in this folder."
 msgstr "There are no messages in this folder."
 
-#: ../src/mail/message-list.c:6738
-#| msgid "Generating message list"
+#: ../src/mail/message-list.c:6792
 msgid "Generating message list…"
 msgstr "Generating message list…"
 
@@ -21134,7 +21040,7 @@ msgid "New Address Book"
 msgstr "New Address Book"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:484
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:271
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:284
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:180
 msgid "New Memo List"
 msgstr "New Memo List"
@@ -21270,7 +21176,6 @@ msgid "Save as vCard"
 msgstr "Save as vCard…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1015
-#| msgid "Co_py All Contacts To..."
 msgid "Co_py All Contacts To…"
 msgstr "Co_py All Contacts To…"
 
@@ -21287,7 +21192,6 @@ msgid "Delete the selected address book"
 msgstr "Delete the selected address book"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1029
-#| msgid "_Manage Address Book groups..."
 msgid "_Manage Address Book groups…"
 msgstr "_Manage Address Book groups…"
 
@@ -21297,7 +21201,6 @@ msgid "Manage task list groups order and visibility"
 msgstr "Manage task list groups order and visibility"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1036
-#| msgid "Mo_ve All Contacts To..."
 msgid "Mo_ve All Contacts To…"
 msgstr "Mo_ve All Contacts To…"
 
@@ -21345,7 +21248,6 @@ msgstr "Show map with all contacts from selected address book"
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:640
 #: ../src/modules/calendar/e-task-shell-view-actions.c:766
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1685
-#| msgid "_Rename"
 msgid "_Rename…"
 msgstr "_Rename…"
 
@@ -21358,7 +21260,6 @@ msgid "Stop loading"
 msgstr "Stop loading"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1092
-#| msgid "_Copy Contact To..."
 msgid "_Copy Contact To…"
 msgstr "_Copy Contact To…"
 
@@ -21371,7 +21272,6 @@ msgid "_Delete Contact"
 msgstr "_Delete Contact"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1106
-#| msgid "_Find in Contact..."
 msgid "_Find in Contact…"
 msgstr "_Find in Contact…"
 
@@ -21380,7 +21280,6 @@ msgid "Search for text in the displayed contact"
 msgstr "Search for text in the displayed contact"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1113
-#| msgid "_Forward Contact"
 msgid "_Forward Contact…"
 msgstr "_Forward Contact…"
 
@@ -21389,7 +21288,6 @@ msgid "Send selected contacts to another person"
 msgstr "Send selected contacts to another person"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1120
-#| msgid "_Move Contact To..."
 msgid "_Move Contact To…"
 msgstr "_Move Contact To…"
 
@@ -21398,12 +21296,10 @@ msgid "Move selected contacts to another address book"
 msgstr "Move selected contacts to another address book"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1127
-#| msgid "New Contact"
 msgid "_New Contact…"
 msgstr "_New Contact…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1134
-#| msgid "New Contact List"
 msgid "New Contact _List…"
 msgstr "New Contact _List…"
 
@@ -21416,7 +21312,6 @@ msgid "View the current contact"
 msgstr "View the current contact"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1148
-#| msgid "_Send Message to Contact"
 msgid "_Send Message to Contact…"
 msgstr "_Send Message to Contact…"
 
@@ -21441,7 +21336,6 @@ msgstr "_Preview"
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1511
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:701
 #: ../src/modules/calendar/e-task-shell-view-actions.c:855
-#| msgid "_Manage groups..."
 msgid "_Manage groups…"
 msgstr "_Manage groups…"
 
@@ -21526,7 +21420,6 @@ msgstr "Save the contacts of the selected address book as a vCard"
 #. Translators: This is an action label
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1358
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1368
-#| msgid "Save as vCard"
 msgid "_Save as vCard…"
 msgstr "_Save as vCard…"
 
@@ -21534,23 +21427,23 @@ msgstr "_Save as vCard…"
 msgid "Save selected contacts as a vCard"
 msgstr "Save selected contacts as a vCard"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:351
+#: ../src/modules/addressbook/e-book-shell-view.c:355
 msgid "_Forward Contacts"
 msgstr "_Forward Contacts"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:353
+#: ../src/modules/addressbook/e-book-shell-view.c:357
 msgid "_Forward Contact"
 msgstr "_Forward Contact"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:384
+#: ../src/modules/addressbook/e-book-shell-view.c:388
 msgid "_Send Message to Contacts"
 msgstr "_Send Message to Contacts"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:386
+#: ../src/modules/addressbook/e-book-shell-view.c:390
 msgid "_Send Message to List"
 msgstr "_Send Message to List"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:388
+#: ../src/modules/addressbook/e-book-shell-view.c:392
 msgid "_Send Message to Contact"
 msgstr "_Send Message to Contact"
 
@@ -21569,17 +21462,17 @@ msgstr ""
 "\n"
 "This will restore all your personal data, settings mail filters, etc."
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:177
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:178
 msgid "_Restore from a backup file:"
 msgstr "_Restore from a backup file:"
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:188
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:189
 msgid "Choose a backup file to restore"
 msgstr "Choose a backup file to restore"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:291
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:292
 #: ../src/modules/backup-restore/e-mail-config-restore-ready-page.c:57
 msgid "Restore from Backup"
 msgstr "Restore from Backup"
@@ -21602,12 +21495,10 @@ msgstr "Select name of the Evolution backup file to restore"
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:437
 #, c-format
-#| msgid "Checking content of backup file “%s”, please wait..."
 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:458
-#| msgid "_Back up Evolution Data..."
 msgid "_Back up Evolution Data…"
 msgstr "_Back up Evolution Data…"
 
@@ -21616,7 +21507,6 @@ 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:465
-#| msgid "R_estore Evolution Data..."
 msgid "R_estore Evolution Data…"
 msgstr "R_estore Evolution Data…"
 
@@ -22207,7 +22097,6 @@ msgid "_Delete message after acting"
 msgstr "_Delete message after acting"
 
 #: ../src/modules/calendar/e-calendar-preferences.c:645
-#| msgid "_Preserve my reminder"
 msgid "_Preserve existing reminder by default"
 msgstr "_Preserve existing reminder by default"
 
@@ -22221,11 +22110,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:1113
+#: ../src/modules/calendar/e-calendar-preferences.c:1116
 msgid "Ti_me and date:"
 msgstr "Ti_me and date:"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1114
+#: ../src/modules/calendar/e-calendar-preferences.c:1117
 msgid "_Date only:"
 msgstr "_Date only:"
 
@@ -22411,104 +22300,108 @@ msgid "Sc_roll Month View by a week"
 msgstr "Sc_roll Month View by a week"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:57
+#| msgid "Scroll Month View by a week"
+msgid "Start Month View with the c_urrent week"
+msgstr "Start Month View with the c_urrent week"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Order days in Week View from _left to right"
 msgstr "Order days in Week View from _left to right"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
 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
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Hi_de cancelled events"
 msgstr "Hi_de cancelled events"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
 msgid "Alerts"
 msgstr "Alerts"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Ask for confirmation when deleting items"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Display"
 msgstr "Display"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
 msgid "Highlight t_asks due today"
 msgstr "Highlight t_asks due today"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
 msgid "Highlight _overdue tasks"
 msgstr "Highlight _overdue tasks"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
 msgid "_Hide completed tasks after"
 msgstr "_Hide completed tasks after"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
 msgid "Hid_e cancelled tasks"
 msgstr "Hid_e cancelled tasks"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
 msgid "To Do bar"
 msgstr "To Do bar"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
 msgid "Show Tasks without _Due date"
 msgstr "Show Tasks without _Due date"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
-#| msgid "Display reminders in _notification area only"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Display Reminders window with _notifications"
 msgstr "Display Reminders window with _notifications"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Keep reminder notification _window always on top"
 msgstr "Keep reminder notification _window always on top"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
 msgid "Display reminders for completed _tasks"
 msgstr "Display reminders for completed _tasks"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:77
 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:78
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
 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:80
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
 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:82
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
 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:84
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
 msgid "before every anniversary/birthday"
 msgstr "before every anniversary/birthday"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
 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/"
@@ -22516,7 +22409,7 @@ 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:93
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:94
 msgid "Publishing Information"
 msgstr "Publishing Information"
 
@@ -22603,7 +22496,6 @@ msgstr "Save as iCalendar"
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1228
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:591
 #: ../src/modules/calendar/e-task-shell-view-actions.c:717
-#| msgid "_Copy"
 msgid "_Copy…"
 msgstr "_Copy…"
 
@@ -22636,7 +22528,6 @@ msgid "Select a specific date"
 msgstr "Select a specific date"
 
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1270
-#| msgid "_Manage Calendar groups..."
 msgid "_Manage Calendar groups…"
 msgstr "_Manage Calendar groups…"
 
@@ -22702,12 +22593,10 @@ msgid "Show _Only This Calendar"
 msgstr "Show _Only This Calendar"
 
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1354
-#| msgid "Cop_y to Calendar..."
 msgid "Cop_y to Calendar…"
 msgstr "Cop_y to Calendar…"
 
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1361
-#| msgid "_Delegate Meeting..."
 msgid "_Delegate Meeting…"
 msgstr "_Delegate Meeting…"
 
@@ -22736,7 +22625,6 @@ msgid "Delete all occurrences"
 msgstr "Delete all occurrences"
 
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1389
-#| msgid "Edit as Ne_w..."
 msgid "Edit as Ne_w…"
 msgstr "Edit as Ne_w…"
 
@@ -22745,7 +22633,6 @@ msgid "Edit the current appointment as new"
 msgstr "Edit the current appointment as new"
 
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1396
-#| msgid "New All Day Event"
 msgid "New All Day _Event…"
 msgstr "New All Day _Event…"
 
@@ -22758,7 +22645,6 @@ msgstr "Create a new all-day event"
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:318
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:584
 #: ../src/modules/calendar/e-task-shell-view-actions.c:710
-#| msgid "_Forward as iCalendar"
 msgid "_Forward as iCalendar…"
 msgstr "_Forward as iCalendar…"
 
@@ -22767,7 +22653,6 @@ msgid "Create a new meeting"
 msgstr "Create a new meeting"
 
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1417
-#| msgid "Mo_ve to Calendar..."
 msgid "Mo_ve to Calendar…"
 msgstr "Mo_ve to Calendar…"
 
@@ -22784,7 +22669,6 @@ msgid "View the current appointment"
 msgstr "View the current appointment"
 
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1459
-#| msgid "_Schedule Meeting..."
 msgid "_Schedule Meeting…"
 msgstr "_Schedule Meeting…"
 
@@ -22793,7 +22677,6 @@ msgid "Converts an appointment to a meeting"
 msgstr "Converts an appointment to a meeting"
 
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1466
-#| msgid "Conv_ert to Appointment..."
 msgid "Conv_ert to Appointment…"
 msgstr "Conv_ert to Appointment…"
 
@@ -22873,7 +22756,6 @@ msgstr "Summary contains"
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:845
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1039
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1053
-#| msgid "Print"
 msgid "Print…"
 msgstr "Print…"
 
@@ -22890,7 +22772,6 @@ msgstr "Preview the calendar to be printed"
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:373
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:862
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1070
-#| msgid "Save as iCalendar"
 msgid "_Save as iCalendar…"
 msgstr "_Save as iCalendar…"
 
@@ -22938,29 +22819,29 @@ msgstr "Open _Web Page"
 msgid "Print the selected memo"
 msgstr "Print the selected memo"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:911
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1019
 msgid "Searching next matching event"
 msgstr "Searching next matching event"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:912
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1020
 msgid "Searching previous matching event"
 msgstr "Searching previous matching event"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:933
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1041
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "Cannot find matching event in the next %d year"
 msgstr[1] "Cannot find matching event in the next %d years"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:937
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1045
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "Cannot find matching event in the previous %d year"
 msgstr[1] "Cannot find matching event in the previous %d years"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:960
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1068
 msgid "Cannot search with no active calendar"
 msgstr "Cannot search with no active calendar"
 
@@ -23057,7 +22938,6 @@ msgid "_Delete Memo"
 msgstr "_Delete Memo"
 
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:577
-#| msgid "_Find in Memo..."
 msgid "_Find in Memo…"
 msgstr "_Find in Memo…"
 
@@ -23074,7 +22954,6 @@ msgid "Delete the selected memo list"
 msgstr "Delete the selected memo list"
 
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:605
-#| msgid "_Manage Memo List groups..."
 msgid "_Manage Memo List groups…"
 msgstr "_Manage Memo List groups…"
 
@@ -23201,7 +23080,6 @@ msgid "_Delete Task"
 msgstr "_Delete Task"
 
 #: ../src/modules/calendar/e-task-shell-view-actions.c:703
-#| msgid "_Find in Task..."
 msgid "_Find in Task…"
 msgstr "_Find in Task…"
 
@@ -23218,7 +23096,6 @@ msgid "Delete the selected task list"
 msgstr "Delete the selected task list"
 
 #: ../src/modules/calendar/e-task-shell-view-actions.c:731
-#| msgid "_Manage Task List groups..."
 msgid "_Manage Task List groups…"
 msgstr "_Manage Task List groups…"
 
@@ -23401,7 +23278,7 @@ msgstr "CardDAV: %s"
 msgid "CalDAV and CardDAV server"
 msgstr "CalDAV and CardDAV server"
 
-#: ../src/modules/config-lookup/e-webdav-config-lookup.c:209
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:213
 msgid "Look up for a CalDAV/CardDAV server"
 msgstr "Look up for a CalDAV/CardDAV server"
 
@@ -23415,194 +23292,194 @@ msgstr "Display part as an invitation"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:259
+#: ../src/modules/itip-formatter/itip-view.c:261
 msgid "Today %H:%M"
 msgstr "Today %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:263
+#: ../src/modules/itip-formatter/itip-view.c:265
 msgid "Today %H:%M:%S"
 msgstr "Today %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:272
+#: ../src/modules/itip-formatter/itip-view.c:274
 msgid "Today %l:%M:%S %p"
 msgstr "Today %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:287
+#: ../src/modules/itip-formatter/itip-view.c:289
 msgid "Tomorrow %H:%M"
 msgstr "Tomorrow %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:291
+#: ../src/modules/itip-formatter/itip-view.c:293
 msgid "Tomorrow %H:%M:%S"
 msgstr "Tomorrow %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:296
+#: ../src/modules/itip-formatter/itip-view.c:298
 msgid "Tomorrow %l:%M %p"
 msgstr "Tomorrow %l:%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:300
+#: ../src/modules/itip-formatter/itip-view.c:302
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Tomorrow %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../src/modules/itip-formatter/itip-view.c:319
+#: ../src/modules/itip-formatter/itip-view.c:321
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:324
+#: ../src/modules/itip-formatter/itip-view.c:326
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:328
+#: ../src/modules/itip-formatter/itip-view.c:330
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:333
+#: ../src/modules/itip-formatter/itip-view.c:335
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:337
+#: ../src/modules/itip-formatter/itip-view.c:339
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../src/modules/itip-formatter/itip-view.c:346
+#: ../src/modules/itip-formatter/itip-view.c:348
 msgid "%A, %B %e"
 msgstr "%A %e %B"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:352
+#: ../src/modules/itip-formatter/itip-view.c:354
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:356
+#: ../src/modules/itip-formatter/itip-view.c:358
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:361
+#: ../src/modules/itip-formatter/itip-view.c:363
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:365
+#: ../src/modules/itip-formatter/itip-view.c:367
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../src/modules/itip-formatter/itip-view.c:371
+#: ../src/modules/itip-formatter/itip-view.c:373
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B, %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:376
+#: ../src/modules/itip-formatter/itip-view.c:378
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:380
+#: ../src/modules/itip-formatter/itip-view.c:382
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:385
+#: ../src/modules/itip-formatter/itip-view.c:387
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:389
+#: ../src/modules/itip-formatter/itip-view.c:391
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l:%M:%S %p"
 
-#: ../src/modules/itip-formatter/itip-view.c:427
-#: ../src/modules/itip-formatter/itip-view.c:428
-#: ../src/modules/itip-formatter/itip-view.c:517
-#: ../src/modules/itip-formatter/itip-view.c:518
-#: ../src/modules/itip-formatter/itip-view.c:607
+#: ../src/modules/itip-formatter/itip-view.c:429
+#: ../src/modules/itip-formatter/itip-view.c:430
+#: ../src/modules/itip-formatter/itip-view.c:519
+#: ../src/modules/itip-formatter/itip-view.c:520
+#: ../src/modules/itip-formatter/itip-view.c:609
 msgid "An unknown person"
 msgstr "An unknown person"
 
-#: ../src/modules/itip-formatter/itip-view.c:432
-#: ../src/modules/itip-formatter/itip-view.c:522
-#: ../src/modules/itip-formatter/itip-view.c:611
+#: ../src/modules/itip-formatter/itip-view.c:434
+#: ../src/modules/itip-formatter/itip-view.c:524
+#: ../src/modules/itip-formatter/itip-view.c:613
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Please respond on behalf of %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:434
-#: ../src/modules/itip-formatter/itip-view.c:524
-#: ../src/modules/itip-formatter/itip-view.c:613
+#: ../src/modules/itip-formatter/itip-view.c:436
+#: ../src/modules/itip-formatter/itip-view.c:526
+#: ../src/modules/itip-formatter/itip-view.c:615
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Received on behalf of %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:439
+#: ../src/modules/itip-formatter/itip-view.c:441
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s through %s has published the following meeting information:"
 
-#: ../src/modules/itip-formatter/itip-view.c:441
+#: ../src/modules/itip-formatter/itip-view.c:443
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s has published the following meeting information:"
 
-#: ../src/modules/itip-formatter/itip-view.c:446
+#: ../src/modules/itip-formatter/itip-view.c:448
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s has delegated the following meeting to you:"
 
-#: ../src/modules/itip-formatter/itip-view.c:449
+#: ../src/modules/itip-formatter/itip-view.c:451
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s through %s requests your presence at the following meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:451
+#: ../src/modules/itip-formatter/itip-view.c:453
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s requests your presence at the following meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:457
+#: ../src/modules/itip-formatter/itip-view.c:459
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s through %s wishes to add to an existing meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:459
+#: ../src/modules/itip-formatter/itip-view.c:461
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s wishes to add to an existing meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:463
+#: ../src/modules/itip-formatter/itip-view.c:465
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -23611,87 +23488,87 @@ msgstr ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:465
+#: ../src/modules/itip-formatter/itip-view.c:467
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s wishes to receive the latest information for the following meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:469
+#: ../src/modules/itip-formatter/itip-view.c:471
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s through %s has sent back the following meeting response:"
 
-#: ../src/modules/itip-formatter/itip-view.c:471
+#: ../src/modules/itip-formatter/itip-view.c:473
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s has sent back the following meeting response:"
 
-#: ../src/modules/itip-formatter/itip-view.c:475
+#: ../src/modules/itip-formatter/itip-view.c:477
 #, c-format
 msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s through %s has cancelled the following meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:477
+#: ../src/modules/itip-formatter/itip-view.c:479
 #, c-format
 msgid "%s has cancelled the following meeting:"
 msgstr "%s has cancelled the following meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:481
+#: ../src/modules/itip-formatter/itip-view.c:483
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s through %s has proposed the following meeting changes."
 
-#: ../src/modules/itip-formatter/itip-view.c:483
+#: ../src/modules/itip-formatter/itip-view.c:485
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s has proposed the following meeting changes:"
 
-#: ../src/modules/itip-formatter/itip-view.c:487
+#: ../src/modules/itip-formatter/itip-view.c:489
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s through %s has declined the following meeting changes:"
 
-#: ../src/modules/itip-formatter/itip-view.c:489
+#: ../src/modules/itip-formatter/itip-view.c:491
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s has declined the following meeting changes:"
 
-#: ../src/modules/itip-formatter/itip-view.c:529
+#: ../src/modules/itip-formatter/itip-view.c:531
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s through %s has published the following task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:531
+#: ../src/modules/itip-formatter/itip-view.c:533
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s has published the following task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:536
+#: ../src/modules/itip-formatter/itip-view.c:538
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s requests the assignment of %s to the following task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:539
+#: ../src/modules/itip-formatter/itip-view.c:541
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s through %s has assigned you a task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:541
+#: ../src/modules/itip-formatter/itip-view.c:543
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s has assigned you a task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:547
+#: ../src/modules/itip-formatter/itip-view.c:549
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s through %s wishes to add to an existing task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:549
+#: ../src/modules/itip-formatter/itip-view.c:551
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s wishes to add to an existing task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:553
+#: ../src/modules/itip-formatter/itip-view.c:555
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -23700,214 +23577,212 @@ msgstr ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:555
+#: ../src/modules/itip-formatter/itip-view.c:557
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr ""
 "%s wishes to receive the latest information for the following assigned task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:559
+#: ../src/modules/itip-formatter/itip-view.c:561
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s through %s has sent back the following assigned task response:"
 
-#: ../src/modules/itip-formatter/itip-view.c:561
+#: ../src/modules/itip-formatter/itip-view.c:563
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s has sent back the following assigned task response:"
 
-#: ../src/modules/itip-formatter/itip-view.c:565
+#: ../src/modules/itip-formatter/itip-view.c:567
 #, c-format
 msgid "%s through %s has cancelled the following assigned task:"
 msgstr "%s through %s has cancelled the following assigned task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:567
+#: ../src/modules/itip-formatter/itip-view.c:569
 #, c-format
 msgid "%s has cancelled the following assigned task:"
 msgstr "%s has cancelled the following assigned task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:571
+#: ../src/modules/itip-formatter/itip-view.c:573
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s through %s has proposed the following task assignment changes:"
 
-#: ../src/modules/itip-formatter/itip-view.c:573
+#: ../src/modules/itip-formatter/itip-view.c:575
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s has proposed the following task assignment changes:"
 
-#: ../src/modules/itip-formatter/itip-view.c:577
+#: ../src/modules/itip-formatter/itip-view.c:579
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s through %s has declined the following assigned task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:579
+#: ../src/modules/itip-formatter/itip-view.c:581
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s has declined the following assigned task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:618
+#: ../src/modules/itip-formatter/itip-view.c:620
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s through %s has published the following memo:"
 
-#: ../src/modules/itip-formatter/itip-view.c:620
+#: ../src/modules/itip-formatter/itip-view.c:622
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s has published the following memo:"
 
-#: ../src/modules/itip-formatter/itip-view.c:625
+#: ../src/modules/itip-formatter/itip-view.c:627
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s through %s wishes to add to an existing memo:"
 
-#: ../src/modules/itip-formatter/itip-view.c:627
+#: ../src/modules/itip-formatter/itip-view.c:629
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s wishes to add to an existing memo:"
 
-#: ../src/modules/itip-formatter/itip-view.c:631
+#: ../src/modules/itip-formatter/itip-view.c:633
 #, c-format
 msgid "%s through %s has cancelled the following shared memo:"
 msgstr "%s through %s has cancelled the following shared memo:"
 
-#: ../src/modules/itip-formatter/itip-view.c:633
+#: ../src/modules/itip-formatter/itip-view.c:635
 #, c-format
 msgid "%s has cancelled the following shared memo:"
 msgstr "%s has cancelled the following shared memo:"
 
-#: ../src/modules/itip-formatter/itip-view.c:858
+#: ../src/modules/itip-formatter/itip-view.c:798
 msgid "All day:"
 msgstr "All day:"
 
-#: ../src/modules/itip-formatter/itip-view.c:864
+#: ../src/modules/itip-formatter/itip-view.c:804
 msgid "Start day:"
 msgstr "Start day:"
 
-#: ../src/modules/itip-formatter/itip-view.c:864
-#: ../src/modules/itip-formatter/itip-view.c:1678
+#: ../src/modules/itip-formatter/itip-view.c:804
+#: ../src/modules/itip-formatter/itip-view.c:1636
 msgid "Start time:"
 msgstr "Start time:"
 
-#: ../src/modules/itip-formatter/itip-view.c:873
+#: ../src/modules/itip-formatter/itip-view.c:813
 msgid "End day:"
 msgstr "End day:"
 
-#: ../src/modules/itip-formatter/itip-view.c:873
-#: ../src/modules/itip-formatter/itip-view.c:1679
+#: ../src/modules/itip-formatter/itip-view.c:813
+#: ../src/modules/itip-formatter/itip-view.c:1637
 msgid "End time:"
 msgstr "End time:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1213
+#: ../src/modules/itip-formatter/itip-view.c:1183
 msgid "Ope_n Calendar"
 msgstr "Ope_n Calendar"
 
-#: ../src/modules/itip-formatter/itip-view.c:1216
+#: ../src/modules/itip-formatter/itip-view.c:1186
 msgid "_Decline all"
 msgstr "_Decline all"
 
-#: ../src/modules/itip-formatter/itip-view.c:1219
+#: ../src/modules/itip-formatter/itip-view.c:1189
 msgid "_Decline"
 msgstr "_Decline"
 
-#: ../src/modules/itip-formatter/itip-view.c:1222
+#: ../src/modules/itip-formatter/itip-view.c:1192
 msgid "_Tentative all"
 msgstr "_Tentative all"
 
-#: ../src/modules/itip-formatter/itip-view.c:1225
+#: ../src/modules/itip-formatter/itip-view.c:1195
 msgid "_Tentative"
 msgstr "_Tentative"
 
-#: ../src/modules/itip-formatter/itip-view.c:1228
+#: ../src/modules/itip-formatter/itip-view.c:1198
 msgid "Acce_pt all"
 msgstr "Acce_pt all"
 
-#: ../src/modules/itip-formatter/itip-view.c:1231
+#: ../src/modules/itip-formatter/itip-view.c:1201
 msgid "Acce_pt"
 msgstr "Acce_pt"
 
-#: ../src/modules/itip-formatter/itip-view.c:1234
+#: ../src/modules/itip-formatter/itip-view.c:1204
 msgid "Send _Information"
 msgstr "Send _Information"
 
-#: ../src/modules/itip-formatter/itip-view.c:1237
+#: ../src/modules/itip-formatter/itip-view.c:1207
 msgid "_Update Attendee Status"
 msgstr "_Update Attendee Status"
 
-#: ../src/modules/itip-formatter/itip-view.c:1240
+#: ../src/modules/itip-formatter/itip-view.c:1210
 #: ../src/smime/gui/certificate-manager.c:1661
 msgid "_Update"
 msgstr "_Update"
 
-#: ../src/modules/itip-formatter/itip-view.c:1681
-#: ../src/modules/itip-formatter/itip-view.c:1729
-#: ../src/modules/itip-formatter/itip-view.c:1800
+#: ../src/modules/itip-formatter/itip-view.c:1639
+#: ../src/modules/itip-formatter/itip-view.c:1687
+#: ../src/modules/itip-formatter/itip-view.c:1758
 msgid "Comment:"
 msgstr "Comment:"
 
 #. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1717
+#: ../src/modules/itip-formatter/itip-view.c:1675
 msgid "Send reply to sender"
 msgstr "Send reply to sender"
 
 #. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1732
+#: ../src/modules/itip-formatter/itip-view.c:1690
 msgid "Send _updates to attendees"
 msgstr "Send _updates to attendees"
 
 #. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1735
+#: ../src/modules/itip-formatter/itip-view.c:1693
 msgid "_Apply to all instances"
 msgstr "_Apply to all instances"
 
-#: ../src/modules/itip-formatter/itip-view.c:1736
+#: ../src/modules/itip-formatter/itip-view.c:1694
 msgid "Show time as _free"
 msgstr "Show time as _free"
 
-#: ../src/modules/itip-formatter/itip-view.c:1737
+#: ../src/modules/itip-formatter/itip-view.c:1695
 msgid "_Preserve my reminder"
 msgstr "_Preserve my reminder"
 
-#: ../src/modules/itip-formatter/itip-view.c:1738
+#: ../src/modules/itip-formatter/itip-view.c:1696
 msgid "_Inherit reminder"
 msgstr "_Inherit reminder"
 
-#: ../src/modules/itip-formatter/itip-view.c:2074
+#: ../src/modules/itip-formatter/itip-view.c:1910
 msgid "_Tasks:"
 msgstr "_Tasks:"
 
-#: ../src/modules/itip-formatter/itip-view.c:2077
+#: ../src/modules/itip-formatter/itip-view.c:1913
 msgid "_Memos:"
 msgstr "_Memos:"
 
-#: ../src/modules/itip-formatter/itip-view.c:3151
+#: ../src/modules/itip-formatter/itip-view.c:2909
 msgid "Sa_ve"
 msgstr "Sa_ve"
 
-#: ../src/modules/itip-formatter/itip-view.c:3695
-#: ../src/modules/itip-formatter/itip-view.c:5448
+#: ../src/modules/itip-formatter/itip-view.c:3470
+#: ../src/modules/itip-formatter/itip-view.c:5222
 msgid "Attendee status updated"
 msgstr "Attendee status updated"
 
-#: ../src/modules/itip-formatter/itip-view.c:3905
+#: ../src/modules/itip-formatter/itip-view.c:3680
 #, 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:3912
+#: ../src/modules/itip-formatter/itip-view.c:3687
 #, c-format
-#| msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 msgid "A task “%s” in the task list “%s” conflicts with this task"
 msgstr "A task “%s” in the task list “%s” conflicts with this task"
 
-#: ../src/modules/itip-formatter/itip-view.c:3919
+#: ../src/modules/itip-formatter/itip-view.c:3694
 #, c-format
-#| msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 msgid "A memo “%s” in the memo list “%s” conflicts with this memo"
 msgstr "A memo “%s” in the memo list “%s” conflicts with this memo"
 
-#: ../src/modules/itip-formatter/itip-view.c:3930
+#: ../src/modules/itip-formatter/itip-view.c:3705
 #, c-format
 msgid ""
 "The calendar “%s” contains an appointment which conflicts with this meeting"
@@ -23918,266 +23793,235 @@ msgstr[0] ""
 msgstr[1] ""
 "The calendar “%s” contains %d appointments which conflict with this meeting"
 
-#: ../src/modules/itip-formatter/itip-view.c:3939
+#: ../src/modules/itip-formatter/itip-view.c:3714
 #, c-format
-#| msgid ""
-#| "The calendar “%s” contains an appointment which conflicts with this "
-#| "meeting"
-#| msgid_plural ""
-#| "The calendar “%s” contains %d appointments which conflict with this "
-#| "meeting"
 msgid "The task list “%s” contains a task which conflicts with this task"
 msgid_plural ""
 "The task list “%s” contains %d tasks which conflict with this task"
 msgstr[0] "The task list “%s” contains a task which conflicts with this task"
 msgstr[1] "The task list “%s” contains %d tasks which conflict with this task"
 
-#: ../src/modules/itip-formatter/itip-view.c:3948
+#: ../src/modules/itip-formatter/itip-view.c:3723
 #, c-format
-#| msgid ""
-#| "The calendar “%s” contains an appointment which conflicts with this "
-#| "meeting"
-#| msgid_plural ""
-#| "The calendar “%s” contains %d appointments which conflict with this "
-#| "meeting"
 msgid "The memo list “%s” contains a memo which conflicts with this memo"
 msgid_plural ""
 "The memo list “%s” contains %d memos which conflict with this memo"
 msgstr[0] "The memo list “%s” contains a memo which conflicts with this memo"
 msgstr[1] "The memo list “%s” contains %d memos which conflict with this memo"
 
-#: ../src/modules/itip-formatter/itip-view.c:3986
+#: ../src/modules/itip-formatter/itip-view.c:3761
 #, 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:3991
+#: ../src/modules/itip-formatter/itip-view.c:3766
 #, c-format
-#| msgid "Moving a task into the task list “%s”"
 msgid "Found the task in the task list “%s”"
 msgstr "Found the task in the task list “%s”"
 
-#: ../src/modules/itip-formatter/itip-view.c:3996
+#: ../src/modules/itip-formatter/itip-view.c:3771
 #, c-format
-#| msgid "Moving a memo into the memo list “%s”"
 msgid "Found the memo in the memo list “%s”"
 msgstr "Found the memo in the memo list “%s”"
 
-#: ../src/modules/itip-formatter/itip-view.c:4007
+#: ../src/modules/itip-formatter/itip-view.c:3782
 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:4149
+#: ../src/modules/itip-formatter/itip-view.c:3924
 msgid "Unable to find any calendars"
 msgstr "Unable to find any calendars"
 
-#: ../src/modules/itip-formatter/itip-view.c:4157
+#: ../src/modules/itip-formatter/itip-view.c:3932
 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:4162
+#: ../src/modules/itip-formatter/itip-view.c:3937
 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:4167
+#: ../src/modules/itip-formatter/itip-view.c:3942
 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:4461
+#: ../src/modules/itip-formatter/itip-view.c:4236
 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:4465
-#| msgid "Searching for an existing version of this appointment"
+#: ../src/modules/itip-formatter/itip-view.c:4240
 msgid "Searching for an existing version of this task"
 msgstr "Searching for an existing version of this task"
 
-#: ../src/modules/itip-formatter/itip-view.c:4469
-#| msgid "Searching for an existing version of this appointment"
+#: ../src/modules/itip-formatter/itip-view.c:4244
 msgid "Searching for an existing version of this memo"
 msgstr "Searching for an existing version of this memo"
 
-#: ../src/modules/itip-formatter/itip-view.c:4527
-#| msgid "Opening the calendar. Please wait..."
+#: ../src/modules/itip-formatter/itip-view.c:4302
 msgid "Opening the calendar. Please wait…"
 msgstr "Opening the calendar. Please wait…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4944
+#: ../src/modules/itip-formatter/itip-view.c:4718
 #, c-format
-#| msgid "Unable to send item to calendar “%s”.  %s"
 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:4952
+#: ../src/modules/itip-formatter/itip-view.c:4726
 #, c-format
-#| msgid "Unable to send item to calendar “%s”.  %s"
 msgid "Unable to send item to task list “%s”. %s"
 msgstr "Unable to send item to task list “%s”. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4960
+#: ../src/modules/itip-formatter/itip-view.c:4734
 #, c-format
-#| msgid "Unable to send item to calendar “%s”.  %s"
 msgid "Unable to send item to memo list “%s”. %s"
 msgstr "Unable to send item to memo list “%s”. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4980
+#: ../src/modules/itip-formatter/itip-view.c:4754
 #, c-format
 msgid "Sent to calendar “%s” as accepted"
 msgstr "Sent to calendar “%s” as accepted"
 
-#: ../src/modules/itip-formatter/itip-view.c:4985
+#: ../src/modules/itip-formatter/itip-view.c:4759
 #, c-format
-#| msgid "Sent to calendar “%s” as accepted"
 msgid "Sent to task list “%s” as accepted"
 msgstr "Sent to task list “%s” as accepted"
 
-#: ../src/modules/itip-formatter/itip-view.c:4990
+#: ../src/modules/itip-formatter/itip-view.c:4764
 #, c-format
-#| msgid "Sent to calendar “%s” as accepted"
 msgid "Sent to memo list “%s” as accepted"
 msgstr "Sent to memo list “%s” as accepted"
 
-#: ../src/modules/itip-formatter/itip-view.c:5000
+#: ../src/modules/itip-formatter/itip-view.c:4774
 #, c-format
 msgid "Sent to calendar “%s” as tentative"
 msgstr "Sent to calendar “%s” as tentative"
 
-#: ../src/modules/itip-formatter/itip-view.c:5005
+#: ../src/modules/itip-formatter/itip-view.c:4779
 #, c-format
-#| msgid "Sent to calendar “%s” as tentative"
 msgid "Sent to task list “%s” as tentative"
 msgstr "Sent to task list “%s” as tentative"
 
-#: ../src/modules/itip-formatter/itip-view.c:5010
+#: ../src/modules/itip-formatter/itip-view.c:4784
 #, c-format
-#| msgid "Sent to calendar “%s” as tentative"
 msgid "Sent to memo list “%s” as tentative"
 msgstr "Sent to memo list “%s” as tentative"
 
-#: ../src/modules/itip-formatter/itip-view.c:5020
+#: ../src/modules/itip-formatter/itip-view.c:4794
 #, c-format
 msgid "Sent to calendar “%s” as declined"
 msgstr "Sent to calendar “%s” as declined"
 
-#: ../src/modules/itip-formatter/itip-view.c:5025
+#: ../src/modules/itip-formatter/itip-view.c:4799
 #, c-format
-#| msgid "Sent to calendar “%s” as declined"
 msgid "Sent to task list “%s” as declined"
 msgstr "Sent to task list “%s” as declined"
 
-#: ../src/modules/itip-formatter/itip-view.c:5030
+#: ../src/modules/itip-formatter/itip-view.c:4804
 #, c-format
-#| msgid "Sent to calendar “%s” as declined"
 msgid "Sent to memo list “%s” as declined"
 msgstr "Sent to memo list “%s” as declined"
 
-#: ../src/modules/itip-formatter/itip-view.c:5040
+#: ../src/modules/itip-formatter/itip-view.c:4814
 #, c-format
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "Sent to calendar “%s” as cancelled"
 
-#: ../src/modules/itip-formatter/itip-view.c:5045
+#: ../src/modules/itip-formatter/itip-view.c:4819
 #, c-format
-#| msgid "Sent to calendar “%s” as cancelled"
 msgid "Sent to task list “%s” as cancelled"
 msgstr "Sent to task list “%s” as cancelled"
 
-#: ../src/modules/itip-formatter/itip-view.c:5050
+#: ../src/modules/itip-formatter/itip-view.c:4824
 #, c-format
-#| msgid "Sent to calendar “%s” as cancelled"
 msgid "Sent to memo list “%s” as cancelled"
 msgstr "Sent to memo list “%s” as cancelled"
 
-#: ../src/modules/itip-formatter/itip-view.c:5068
-#| msgid "Saving changes to the calendar. Please wait..."
+#: ../src/modules/itip-formatter/itip-view.c:4842
 msgid "Saving changes to the calendar. Please wait…"
 msgstr "Saving changes to the calendar. Please wait…"
 
-#: ../src/modules/itip-formatter/itip-view.c:5071
-#| msgid "Saving changes to the calendar. Please wait..."
+#: ../src/modules/itip-formatter/itip-view.c:4845
 msgid "Saving changes to the task list. Please wait…"
 msgstr "Saving changes to the task list. Please wait…"
 
-#: ../src/modules/itip-formatter/itip-view.c:5074
-#| msgid "Saving changes to the calendar. Please wait..."
+#: ../src/modules/itip-formatter/itip-view.c:4848
 msgid "Saving changes to the memo list. Please wait…"
 msgstr "Saving changes to the memo list. Please wait…"
 
-#: ../src/modules/itip-formatter/itip-view.c:5165
+#: ../src/modules/itip-formatter/itip-view.c:4939
 msgid "Unable to parse item"
 msgstr "Unable to parse item"
 
-#: ../src/modules/itip-formatter/itip-view.c:5373
+#: ../src/modules/itip-formatter/itip-view.c:5147
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organiser has removed the delegate %s "
 
-#: ../src/modules/itip-formatter/itip-view.c:5390
+#: ../src/modules/itip-formatter/itip-view.c:5164
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Sent a cancellation notice to the delegate"
 
-#: ../src/modules/itip-formatter/itip-view.c:5394
+#: ../src/modules/itip-formatter/itip-view.c:5168
 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:5440
+#: ../src/modules/itip-formatter/itip-view.c:5214
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Unable to update attendee. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5473
+#: ../src/modules/itip-formatter/itip-view.c:5247
 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:5558
+#: ../src/modules/itip-formatter/itip-view.c:5332
 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:5633
-#: ../src/modules/itip-formatter/itip-view.c:5671
+#: ../src/modules/itip-formatter/itip-view.c:5407
+#: ../src/modules/itip-formatter/itip-view.c:5445
 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:5732
+#: ../src/modules/itip-formatter/itip-view.c:5506
 msgid "Meeting information sent"
 msgstr "Meeting information sent"
 
-#: ../src/modules/itip-formatter/itip-view.c:5737
+#: ../src/modules/itip-formatter/itip-view.c:5511
 msgid "Task information sent"
 msgstr "Task information sent"
 
-#: ../src/modules/itip-formatter/itip-view.c:5742
+#: ../src/modules/itip-formatter/itip-view.c:5516
 msgid "Memo information sent"
 msgstr "Memo information sent"
 
-#: ../src/modules/itip-formatter/itip-view.c:5753
+#: ../src/modules/itip-formatter/itip-view.c:5527
 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:5758
+#: ../src/modules/itip-formatter/itip-view.c:5532
 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:5763
+#: ../src/modules/itip-formatter/itip-view.c:5537
 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:5808
+#: ../src/modules/itip-formatter/itip-view.c:5582
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5813
+#: ../src/modules/itip-formatter/itip-view.c:5587
 msgid "Save Calendar"
 msgstr "Save Calendar"
 
-#: ../src/modules/itip-formatter/itip-view.c:5861
-#: ../src/modules/itip-formatter/itip-view.c:5874
+#: ../src/modules/itip-formatter/itip-view.c:5635
+#: ../src/modules/itip-formatter/itip-view.c:5648
 msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
-#: ../src/modules/itip-formatter/itip-view.c:5862
-#: ../src/modules/itip-formatter/itip-view.c:5875
+#: ../src/modules/itip-formatter/itip-view.c:5636
+#: ../src/modules/itip-formatter/itip-view.c:5649
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -24185,15 +24029,15 @@ msgstr ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 
-#: ../src/modules/itip-formatter/itip-view.c:5957
-#: ../src/modules/itip-formatter/itip-view.c:6041
-#: ../src/modules/itip-formatter/itip-view.c:6145
+#: ../src/modules/itip-formatter/itip-view.c:5731
+#: ../src/modules/itip-formatter/itip-view.c:5815
+#: ../src/modules/itip-formatter/itip-view.c:5919
 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:5958
-#: ../src/modules/itip-formatter/itip-view.c:6042
-#: ../src/modules/itip-formatter/itip-view.c:6146
+#: ../src/modules/itip-formatter/itip-view.c:5732
+#: ../src/modules/itip-formatter/itip-view.c:5816
+#: ../src/modules/itip-formatter/itip-view.c:5920
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -24201,11 +24045,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:6051
+#: ../src/modules/itip-formatter/itip-view.c:5825
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
-#: ../src/modules/itip-formatter/itip-view.c:6052
+#: ../src/modules/itip-formatter/itip-view.c:5826
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -24213,12 +24057,12 @@ msgstr ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 
-#: ../src/modules/itip-formatter/itip-view.c:6639
+#: ../src/modules/itip-formatter/itip-view.c:6413
 msgctxt "cal-itip"
 msgid "None"
 msgstr "None"
 
-#: ../src/modules/itip-formatter/itip-view.c:6657
+#: ../src/modules/itip-formatter/itip-view.c:6431
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
@@ -24481,7 +24325,6 @@ msgstr "Method to detect _online state:"
 #. Translators: The '%s' is replaced with the actual name of the GNetworkMonitor implementation
 #: ../src/modules/mail/e-mail-shell-backend.c:829
 #, c-format
-#| msgid "Defaults"
 msgctxt "NetworkMonitor"
 msgid "Default (%s)"
 msgstr "Default (%s)"
@@ -24518,7 +24361,6 @@ msgid "None"
 msgstr "None"
 
 #: ../src/modules/mail/e-mail-shell-view-actions.c:853
-#| msgid "Marking messages as read..."
 msgid "Marking messages as read…"
 msgstr "Marking messages as read…"
 
@@ -24571,7 +24413,6 @@ msgid "Fl_ush Outbox"
 msgstr "Fl_ush Outbox"
 
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1621
-#| msgid "Copy Folder To"
 msgid "_Copy Folder To…"
 msgstr "_Copy Folder To…"
 
@@ -24588,7 +24429,6 @@ msgid "Edit Sort _Order…"
 msgstr "Edit Sort _Order…"
 
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1637
-#| msgid "Move folder in folder tree."
 msgid "Change sort order of the folders in the folder tree"
 msgstr "Change sort order of the folders in the folder tree"
 
@@ -24611,7 +24451,6 @@ msgid "Mark all messages in the folder as read"
 msgstr "Mark all messages in the folder as read"
 
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1656
-#| msgid "Move Folder To"
 msgid "_Move Folder To…"
 msgstr "_Move Folder To…"
 
@@ -24621,7 +24460,6 @@ msgstr "Move the selected folder into another folder"
 
 #. Translators: An action caption to create a new mail folder
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1664
-#| msgid "_New"
 msgid "_New…"
 msgstr "_New…"
 
@@ -24736,7 +24574,6 @@ msgid "Create or edit rules for filtering new mail"
 msgstr "Create or edit rules for filtering new mail"
 
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1818
-#| msgid "_Subscriptions..."
 msgid "_Subscriptions…"
 msgstr "_Subscriptions…"
 
@@ -24745,7 +24582,6 @@ msgid "F_older"
 msgstr "F_older"
 
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1844
-#| msgid "C_reate Search Folder From Search..."
 msgid "C_reate Search Folder From Search…"
 msgstr "C_reate Search Folder From Search…"
 
@@ -24758,7 +24594,6 @@ msgid "Create or edit search folder definitions"
 msgstr "Create or edit search folder definitions"
 
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1896
-#| msgid "_New Folder..."
 msgid "_New Folder…"
 msgstr "_New Folder…"
 
@@ -24902,58 +24737,58 @@ msgstr "All Account Search"
 msgid "Account Search"
 msgstr "Account Search"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:926
+#: ../src/modules/mail/e-mail-shell-view-private.c:909
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d selected, "
 msgstr[1] "%d selected, "
 
+#: ../src/modules/mail/e-mail-shell-view-private.c:924
 #: ../src/modules/mail/e-mail-shell-view-private.c:941
-#: ../src/modules/mail/e-mail-shell-view-private.c: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:972
-#: ../src/modules/mail/e-mail-shell-view-private.c:978
+#: ../src/modules/mail/e-mail-shell-view-private.c:955
+#: ../src/modules/mail/e-mail-shell-view-private.c:961
 #, 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:985
+#: ../src/modules/mail/e-mail-shell-view-private.c:968
 #, 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:991
+#: ../src/modules/mail/e-mail-shell-view-private.c:974
 #, 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:997
+#: ../src/modules/mail/e-mail-shell-view-private.c:980
 #, 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:1014
+#: ../src/modules/mail/e-mail-shell-view-private.c:997
 #, 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:1532
+#: ../src/modules/mail/e-mail-shell-view-private.c:1515
 msgid "Send / Receive"
 msgstr "Send / Receive"
 
@@ -25042,22 +24877,31 @@ msgstr "Do you want to make Evolution your default e-mail client?"
 #. * is the subject of the email, third %s is the date.
 #: ../src/modules/mdn/evolution-mdn.c:308
 #, c-format
-msgid "Your message to %s about “%s” on %s has been read."
-msgstr "Your message to %s about “%s” on %s has been read."
+#| msgid "Your message to %s about “%s” on %s has been read."
+msgid ""
+"Your message to %s about “%s” on %s has been displayed. This is no guarantee "
+"that the message has been read or understood."
+msgstr ""
+"Your message to %s about “%s” on %s has been displayed. This is no guarantee "
+"that the message has been read or understood."
 
-#. Translators: %s is the subject of the email message.
-#: ../src/modules/mdn/evolution-mdn.c:374
+#. Translators: %s is the subject of the email message This text is used as
+#. a subject of a delivery notification email (basically a notification, that
+#. the user did read (or better displayed) the message).
+#: ../src/modules/mdn/evolution-mdn.c:376
 #, c-format
-msgid "Delivery Notification for “%s”"
-msgstr "Delivery Notification for “%s”"
+#| msgctxt "reply-attribution"
+#| msgid "Re: %s"
+msgid "Read: %s"
+msgstr "Read: %s"
 
-#: ../src/modules/mdn/evolution-mdn.c:540
+#: ../src/modules/mdn/evolution-mdn.c:542
 #, c-format
 msgid "Send a read receipt to “%s”"
 msgstr "Send a read receipt to “%s”"
 
 #. name doesn't matter
-#: ../src/modules/mdn/evolution-mdn.c:545
+#: ../src/modules/mdn/evolution-mdn.c:547
 msgid "_Notify Sender"
 msgstr "_Notify Sender"
 
@@ -25118,19 +24962,19 @@ msgstr "_Plugins"
 msgid "Enable and disable plugins"
 msgstr "Enable and disable plugins"
 
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:137
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:138
 msgid "Display plain text version"
 msgstr "Display plain text version"
 
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
 msgid "Display plain text version of multipart/alternative message"
 msgstr "Display plain text version of multipart/alternative message"
 
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:145
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:146
 msgid "Display HTML version"
 msgstr "Display HTML version"
 
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Display HTML version of multipart/alternative message"
 
@@ -25291,16 +25135,14 @@ 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..."
 msgid "Loading accounts…"
 msgstr "Loading accounts…"
 
-#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:93
-#| msgid "_Format as..."
+#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:94
 msgid "_Format as…"
 msgstr "_Format as…"
 
-#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:101
+#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:102
 msgid "_Other languages"
 msgstr "_Other languages"
 
@@ -25520,37 +25362,35 @@ msgstr "_TCSH"
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:129
-#: ../src/modules/vcard-inline/e-mail-part-vcard.c:188
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:153
 msgid "Show F_ull vCard"
 msgstr "Show F_ull vCard"
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:132
-#: ../src/modules/vcard-inline/e-mail-part-vcard.c:193
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:183
 msgid "Show Com_pact vCard"
 msgstr "Show Com_pact vCard"
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:163
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:205
 msgid "Save _To Addressbook"
 msgstr "Save _To Addressbook"
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:187
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:228
 msgid "There is one other contact."
 msgstr "There is one other contact."
 
 #. Translators: This will always be two or more.
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:192
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:233
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "There is %d other contact."
 msgstr[1] "There are %d other contacts."
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:218
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:259
 msgid "Addressbook Contact"
 msgstr "Addressbook Contact"
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:219
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:260
 msgid "Display the part as an addressbook contact"
 msgstr "Display the part as an addressbook contact"
 
@@ -25717,11 +25557,11 @@ 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:861
+#: ../src/plugins/email-custom-header/email-custom-header.c:862
 msgid "Key"
 msgstr "Key"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:878
+#: ../src/plugins/email-custom-header/email-custom-header.c:879
 #: ../src/plugins/templates/templates.c:498
 msgid "Values"
 msgstr "Values"
@@ -25755,8 +25595,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "_Automatically launch when a new mail is edited"
 
-#: ../src/plugins/external-editor/external-editor.c:453
 #: ../src/plugins/external-editor/external-editor.c:455
+#: ../src/plugins/external-editor/external-editor.c:457
 msgid "Compose in External Editor"
 msgstr "Compose in External Editor"
 
@@ -25808,10 +25648,6 @@ msgstr ""
 msgid "Select a Face Picture"
 msgstr "Select a Face Picture"
 
-#: ../src/plugins/face/face.c:301
-msgid "Image files"
-msgstr "Image files"
-
 #: ../src/plugins/face/face.c:389
 msgid "_Insert Face picture by default"
 msgstr "_Insert Face picture by default"
@@ -26225,12 +26061,12 @@ msgstr "Invalid object returned from a server"
 msgid "An error occurred during processing: %s"
 msgstr "An error occurred during processing: %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:864
+#: ../src/plugins/mail-to-task/mail-to-task.c:877
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Cannot open calendar. %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:868
+#: ../src/plugins/mail-to-task/mail-to-task.c:881
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -26238,7 +26074,7 @@ msgstr ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:871
+#: ../src/plugins/mail-to-task/mail-to-task.c:884
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -26246,7 +26082,7 @@ msgstr ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:874
+#: ../src/plugins/mail-to-task/mail-to-task.c:887
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -26254,35 +26090,35 @@ msgstr ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1299
+#: ../src/plugins/mail-to-task/mail-to-task.c:1328
 msgid "Create an _Appointment"
 msgstr "Create an _Appointment"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1301
+#: ../src/plugins/mail-to-task/mail-to-task.c:1330
 msgid "Create a new event from the selected message"
 msgstr "Create a new event from the selected message"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1306
+#: ../src/plugins/mail-to-task/mail-to-task.c:1335
 msgid "Create a Mem_o"
 msgstr "Create a Mem_o"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1308
+#: ../src/plugins/mail-to-task/mail-to-task.c:1337
 msgid "Create a new memo from the selected message"
 msgstr "Create a new memo from the selected message"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1313
+#: ../src/plugins/mail-to-task/mail-to-task.c:1342
 msgid "Create a _Task"
 msgstr "Create a _Task"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1315
+#: ../src/plugins/mail-to-task/mail-to-task.c:1344
 msgid "Create a new task from the selected message"
 msgstr "Create a new task from the selected message"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1323
+#: ../src/plugins/mail-to-task/mail-to-task.c:1352
 msgid "Create a _Meeting"
 msgstr "Create a _Meeting"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1325
+#: ../src/plugins/mail-to-task/mail-to-task.c:1354
 msgid "Create a new meeting from the selected message"
 msgstr "Create a new meeting from the selected message"
 
@@ -26624,12 +26460,10 @@ msgid "Save as Template"
 msgstr "Save as Template"
 
 #: ../src/shell/e-shell.c:379
-#| msgid "Preparing to go offline..."
 msgid "Preparing to go offline…"
 msgstr "Preparing to go offline…"
 
 #: ../src/shell/e-shell.c:408
-#| msgid "Preparing to go online..."
 msgid "Preparing to go online…"
 msgstr "Preparing to go online…"
 
@@ -26638,7 +26472,6 @@ msgid "Preparing to quit"
 msgstr "Preparing to quit"
 
 #: ../src/shell/e-shell.c:525
-#| msgid "Preparing to quit"
 msgid "Preparing to quit…"
 msgstr "Preparing to quit…"
 
@@ -26650,18 +26483,6 @@ msgstr "Open _Settings"
 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:1464 ../src/shell/e-shell-window-actions.c:891
-msgid "New _Window"
-msgstr "New _Window"
-
-#: ../src/shell/e-shell.c:1475 ../src/shell/e-shell-window-actions.c:821
-msgid "_About"
-msgstr "_About"
-
-#: ../src/shell/e-shell.c:1476 ../src/shell/e-shell-window-actions.c:919
-msgid "_Quit"
-msgstr "_Quit"
-
 #: ../src/shell/e-shell-content.c:702 ../src/shell/e-shell-content.c:703
 msgid "Searches"
 msgstr "Searches"
@@ -26719,296 +26540,300 @@ msgstr "Website"
 msgid "Saving user interface state"
 msgstr "Saving user interface state"
 
-#: ../src/shell/e-shell-window-actions.c:311
+#: ../src/shell/e-shell-window-actions.c:345
 msgid "Categories Editor"
 msgstr "Categories Editor"
 
-#: ../src/shell/e-shell-window-actions.c:614
+#: ../src/shell/e-shell-window-actions.c:648
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy is not installed."
 
-#: ../src/shell/e-shell-window-actions.c:615
+#: ../src/shell/e-shell-window-actions.c:649
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy could not be run."
 
-#: ../src/shell/e-shell-window-actions.c:811
+#: ../src/shell/e-shell-window-actions.c:845
 msgid "Collect_ion Account"
 msgstr "Collect_ion Account"
 
-#: ../src/shell/e-shell-window-actions.c:813
+#: ../src/shell/e-shell-window-actions.c:847
 msgid "Create a new collection account"
 msgstr "Create a new collection account"
 
-#: ../src/shell/e-shell-window-actions.c:823
+#: ../src/shell/e-shell-window-actions.c:855
+msgid "_About"
+msgstr "_About"
+
+#: ../src/shell/e-shell-window-actions.c:857
 msgid "Show information about Evolution"
 msgstr "Show information about Evolution"
 
-#: ../src/shell/e-shell-window-actions.c:828
+#: ../src/shell/e-shell-window-actions.c:862
 msgid "_Accounts"
 msgstr "_Accounts"
 
-#: ../src/shell/e-shell-window-actions.c:830
+#: ../src/shell/e-shell-window-actions.c:864
 msgid "Configure Evolution Accounts"
 msgstr "Configure Evolution Accounts"
 
-#: ../src/shell/e-shell-window-actions.c:835
-#: ../src/shell/e-shell-window-actions.c:849
+#: ../src/shell/e-shell-window-actions.c:869
+#: ../src/shell/e-shell-window-actions.c:883
 msgid "_Close Window"
 msgstr "_Close Window"
 
-#: ../src/shell/e-shell-window-actions.c:856
+#: ../src/shell/e-shell-window-actions.c:890
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../src/shell/e-shell-window-actions.c:858
+#: ../src/shell/e-shell-window-actions.c:892
 msgid "Open the Evolution User Guide"
 msgstr "Open the Evolution User Guide"
 
-#: ../src/shell/e-shell-window-actions.c:884
-#| msgid "I_mport"
+#: ../src/shell/e-shell-window-actions.c:918
 msgid "I_mport…"
 msgstr "I_mport…"
 
-#: ../src/shell/e-shell-window-actions.c:886
+#: ../src/shell/e-shell-window-actions.c:920
 msgid "Import data from other programs"
 msgstr "Import data from other programs"
 
-#: ../src/shell/e-shell-window-actions.c:893
+#: ../src/shell/e-shell-window-actions.c:925
+msgid "New _Window"
+msgstr "New _Window"
+
+#: ../src/shell/e-shell-window-actions.c:927
 msgid "Create a new window displaying this view"
 msgstr "Create a new window displaying this view"
 
-#: ../src/shell/e-shell-window-actions.c:905
+#: ../src/shell/e-shell-window-actions.c:939
 msgid "Available Cate_gories"
 msgstr "Available Cate_gories"
 
-#: ../src/shell/e-shell-window-actions.c:907
+#: ../src/shell/e-shell-window-actions.c:941
 msgid "Manage available categories"
 msgstr "Manage available categories"
 
-#: ../src/shell/e-shell-window-actions.c:921
+#: ../src/shell/e-shell-window-actions.c:953
+msgid "_Quit"
+msgstr "_Quit"
+
+#: ../src/shell/e-shell-window-actions.c:955
 msgid "Exit the program"
 msgstr "Exit the program"
 
-#: ../src/shell/e-shell-window-actions.c:926
-#| msgid "Advanced Search"
+#: ../src/shell/e-shell-window-actions.c:960
 msgid "_Advanced Search…"
 msgstr "_Advanced Search…"
 
-#: ../src/shell/e-shell-window-actions.c:928
+#: ../src/shell/e-shell-window-actions.c:962
 msgid "Construct a more advanced search"
 msgstr "Construct a more advanced search"
 
-#: ../src/shell/e-shell-window-actions.c:935
+#: ../src/shell/e-shell-window-actions.c:969
 msgid "Clear the current search parameters"
 msgstr "Clear the current search parameters"
 
-#: ../src/shell/e-shell-window-actions.c:940
-#| msgid "_Edit Saved Searches..."
+#: ../src/shell/e-shell-window-actions.c:974
 msgid "_Edit Saved Searches…"
 msgstr "_Edit Saved Searches…"
 
-#: ../src/shell/e-shell-window-actions.c:942
+#: ../src/shell/e-shell-window-actions.c:976
 msgid "Manage your saved searches"
 msgstr "Manage your saved searches"
 
-#: ../src/shell/e-shell-window-actions.c:949
+#: ../src/shell/e-shell-window-actions.c:983
 msgid "Click here to change the search type"
 msgstr "Click here to change the search type"
 
-#: ../src/shell/e-shell-window-actions.c:954
+#: ../src/shell/e-shell-window-actions.c:988
 msgid "_Find Now"
 msgstr "_Find Now"
 
-#: ../src/shell/e-shell-window-actions.c:956
+#: ../src/shell/e-shell-window-actions.c:990
 msgid "Execute the current search parameters"
 msgstr "Execute the current search parameters"
 
-#: ../src/shell/e-shell-window-actions.c:961
-#| msgid "Save Search"
+#: ../src/shell/e-shell-window-actions.c:995
 msgid "_Save Search…"
 msgstr "_Save Search…"
 
-#: ../src/shell/e-shell-window-actions.c:963
+#: ../src/shell/e-shell-window-actions.c:997
 msgid "Save the current search parameters"
 msgstr "Save the current search parameters"
 
-#: ../src/shell/e-shell-window-actions.c:975
-#| msgid "_Forward Contacts"
+#: ../src/shell/e-shell-window-actions.c:1009
 msgid "_Keyboard Shortcuts"
 msgstr "_Keyboard Shortcuts"
 
-#: ../src/shell/e-shell-window-actions.c:977
+#: ../src/shell/e-shell-window-actions.c:1011
 msgid "Show keyboard shortcuts"
 msgstr "Show keyboard shortcuts"
 
-#: ../src/shell/e-shell-window-actions.c:982
-#| msgid "Submit Bug Report"
+#: ../src/shell/e-shell-window-actions.c:1016
 msgid "Submit _Bug Report…"
 msgstr "Submit _Bug Report…"
 
-#: ../src/shell/e-shell-window-actions.c:984
+#: ../src/shell/e-shell-window-actions.c:1018
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Submit a bug report using Bug Buddy"
 
-#: ../src/shell/e-shell-window-actions.c:989
+#: ../src/shell/e-shell-window-actions.c:1023
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: ../src/shell/e-shell-window-actions.c:991
+#: ../src/shell/e-shell-window-actions.c:1025
 msgid "Put Evolution into offline mode"
 msgstr "Put Evolution into offline mode"
 
-#: ../src/shell/e-shell-window-actions.c:996
+#: ../src/shell/e-shell-window-actions.c:1030
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: ../src/shell/e-shell-window-actions.c:998
+#: ../src/shell/e-shell-window-actions.c:1032
 msgid "Put Evolution into online mode"
 msgstr "Put Evolution into online mode"
 
-#: ../src/shell/e-shell-window-actions.c:1026
+#: ../src/shell/e-shell-window-actions.c:1060
 msgid "Lay_out"
 msgstr "Lay_out"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:1034
+#: ../src/shell/e-shell-window-actions.c:1068
 msgid "_New"
 msgstr "_New"
 
-#: ../src/shell/e-shell-window-actions.c:1041
+#: ../src/shell/e-shell-window-actions.c:1075
 msgid "_Search"
 msgstr "_Search"
 
-#: ../src/shell/e-shell-window-actions.c:1048
+#: ../src/shell/e-shell-window-actions.c:1082
 msgid "_Switcher Appearance"
 msgstr "_Switcher Appearance"
 
-#: ../src/shell/e-shell-window-actions.c:1062
+#: ../src/shell/e-shell-window-actions.c:1096
 msgid "_Window"
 msgstr "_Window"
 
-#: ../src/shell/e-shell-window-actions.c:1091
+#: ../src/shell/e-shell-window-actions.c:1125
 msgid "Show _Menu Bar"
 msgstr "Show _Menu Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1093
+#: ../src/shell/e-shell-window-actions.c:1127
 msgid "Show the menu bar"
 msgstr "Show the menu bar"
 
-#: ../src/shell/e-shell-window-actions.c:1099
+#: ../src/shell/e-shell-window-actions.c:1133
 msgid "Show Side _Bar"
 msgstr "Show Side _Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1101
+#: ../src/shell/e-shell-window-actions.c:1135
 msgid "Show the side bar"
 msgstr "Show the side bar"
 
-#: ../src/shell/e-shell-window-actions.c:1107
+#: ../src/shell/e-shell-window-actions.c:1141
 msgid "Show _Buttons"
 msgstr "Show _Buttons"
 
-#: ../src/shell/e-shell-window-actions.c:1109
+#: ../src/shell/e-shell-window-actions.c:1143
 msgid "Show the switcher buttons"
 msgstr "Show the switcher buttons"
 
-#: ../src/shell/e-shell-window-actions.c:1115
+#: ../src/shell/e-shell-window-actions.c:1149
 msgid "Show _Status Bar"
 msgstr "Show _Status Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1117
+#: ../src/shell/e-shell-window-actions.c:1151
 msgid "Show the status bar"
 msgstr "Show the status bar"
 
-#: ../src/shell/e-shell-window-actions.c:1123
+#: ../src/shell/e-shell-window-actions.c:1157
 msgid "Show _Tool Bar"
 msgstr "Show _Tool Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1125
+#: ../src/shell/e-shell-window-actions.c:1159
 msgid "Show the tool bar"
 msgstr "Show the tool bar"
 
-#: ../src/shell/e-shell-window-actions.c:1147
+#: ../src/shell/e-shell-window-actions.c:1181
 msgid "_Icons Only"
 msgstr "_Icons Only"
 
-#: ../src/shell/e-shell-window-actions.c:1149
+#: ../src/shell/e-shell-window-actions.c:1183
 msgid "Display window buttons with icons only"
 msgstr "Display window buttons with icons only"
 
-#: ../src/shell/e-shell-window-actions.c:1154
+#: ../src/shell/e-shell-window-actions.c:1188
 msgid "_Text Only"
 msgstr "_Text Only"
 
-#: ../src/shell/e-shell-window-actions.c:1156
+#: ../src/shell/e-shell-window-actions.c:1190
 msgid "Display window buttons with text only"
 msgstr "Display window buttons with text only"
 
-#: ../src/shell/e-shell-window-actions.c:1161
+#: ../src/shell/e-shell-window-actions.c:1195
 msgid "Icons _and Text"
 msgstr "Icons _and Text"
 
-#: ../src/shell/e-shell-window-actions.c:1163
+#: ../src/shell/e-shell-window-actions.c:1197
 msgid "Display window buttons with icons and text"
 msgstr "Display window buttons with icons and text"
 
-#: ../src/shell/e-shell-window-actions.c:1168
+#: ../src/shell/e-shell-window-actions.c:1202
 msgid "Tool_bar Style"
 msgstr "Tool_bar Style"
 
-#: ../src/shell/e-shell-window-actions.c:1170
+#: ../src/shell/e-shell-window-actions.c:1204
 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:1178
+#: ../src/shell/e-shell-window-actions.c:1212
 msgid "Delete Current View"
 msgstr "Delete Current View"
 
-#: ../src/shell/e-shell-window-actions.c:1185
-#| msgid "Save Custom View"
+#: ../src/shell/e-shell-window-actions.c:1219
 msgid "Save Custom View…"
 msgstr "Save Custom View…"
 
-#: ../src/shell/e-shell-window-actions.c:1187
+#: ../src/shell/e-shell-window-actions.c:1221
 msgid "Save current custom view"
 msgstr "Save current custom view"
 
-#: ../src/shell/e-shell-window-actions.c:1194
+#: ../src/shell/e-shell-window-actions.c:1235
 msgid "C_urrent View"
 msgstr "C_urrent View"
 
-#: ../src/shell/e-shell-window-actions.c:1204
+#: ../src/shell/e-shell-window-actions.c:1245
 msgid "Custom View"
 msgstr "Custom View"
 
-#: ../src/shell/e-shell-window-actions.c:1206
+#: ../src/shell/e-shell-window-actions.c:1247
 msgid "Current view is a customized view"
 msgstr "Current view is a customised view"
 
-#: ../src/shell/e-shell-window-actions.c:1214
-#| msgid "Page Setup:"
+#: ../src/shell/e-shell-window-actions.c:1255
 msgid "Page Set_up…"
 msgstr "Page Set_up…"
 
-#: ../src/shell/e-shell-window-actions.c:1216
+#: ../src/shell/e-shell-window-actions.c:1257
 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:1586
+#: ../src/shell/e-shell-window-actions.c:1627
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: ../src/shell/e-shell-window-actions.c:1709
+#: ../src/shell/e-shell-window-actions.c:1751
 #, c-format
 msgid "Select view: %s"
 msgstr "Select view: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1726
+#: ../src/shell/e-shell-window-actions.c:1768
 #, c-format
 msgid "Delete view: %s"
 msgstr "Delete view: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1830
+#: ../src/shell/e-shell-window-actions.c:1878
 msgid "Execute these search parameters"
 msgstr "Execute these search parameters"
 
@@ -27020,7 +26845,7 @@ msgid "New"
 msgstr "New"
 
 #. Translators: This is used for the main window title.
-#: ../src/shell/e-shell-window-private.c:787
+#: ../src/shell/e-shell-window-private.c:786
 #, c-format
 msgid "%s — Evolution"
 msgstr "%s — Evolution"
@@ -27126,11 +26951,11 @@ msgstr ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
 "System error: %s"
 
-#: ../src/shell/main.c:490 ../src/shell/main.c:495
+#: ../src/shell/main.c:493 ../src/shell/main.c:498
 msgid "— The Evolution PIM and Email Client"
 msgstr "— The Evolution PIM and Email Client"
 
-#: ../src/shell/main.c:551
+#: ../src/shell/main.c:554
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -27139,7 +26964,7 @@ msgstr ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run “%s --help” for more information.\n"
 
-#: ../src/shell/main.c:557
+#: ../src/shell/main.c:560
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -27266,6 +27091,10 @@ msgstr "SSL certificate for “{0}” is not trusted."
 msgid "Reason: {1}"
 msgstr "Reason: {1}"
 
+#: ../src/shell/shell.error.xml.h:28 ../src/smime/gui/smime-ui.ui.h:16
+msgid "_View Certificate"
+msgstr "_View Certificate"
+
 #: ../src/shell/shell.error.xml.h:29
 msgid "SSL certificate for address book “{0}” is not trusted."
 msgstr "SSL certificate for address book “{0}” is not trusted."
@@ -27385,7 +27214,6 @@ msgid "Email Address"
 msgstr "E-mail Address"
 
 #: ../src/smime/gui/certificate-manager.c:648
-#| msgid "Select a file to backup your key and certificate..."
 msgid "Select a file to backup your key and certificate…"
 msgstr "Select a file to backup your key and certificate…"
 
@@ -27410,7 +27238,6 @@ msgstr "_File name:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
 #: ../src/smime/gui/certificate-manager.c:741
-#| msgid "Please select a file..."
 msgid "Please select a file…"
 msgstr "Please select a file…"
 
@@ -27459,7 +27286,6 @@ msgid "Failed to backup key and certificate"
 msgstr "Failed to backup key and certificate"
 
 #: ../src/smime/gui/certificate-manager.c:948
-#| msgid "Select a certificate to import..."
 msgid "Select a certificate to import…"
 msgstr "Select a certificate to import…"
 
@@ -27760,6 +27586,29 @@ msgstr "Unable to write store to disk, err_code: %i"
 msgid "Imported Certificate"
 msgstr "Imported Certificate"
 
+#~ msgid "Image file"
+#~ msgstr "Image file"
+
+#~ msgid "Delivery Notification for “%s”"
+#~ msgstr "Delivery Notification for “%s”"
+
+#~| msgid "_Preserve my reminder"
+#~ msgid "Preserve exiting reminder by default"
+#~ msgstr "Preserve exiting reminder by default"
+
+#~ msgid "Attendee                          "
+#~ msgstr "Attendee                          "
+
+#~ msgid "This certificate is not viewable"
+#~ msgstr "This certificate is not viewable"
+
+#~ msgctxt "collection-account-wizard"
+#~ msgid "%s %s."
+#~ msgstr "%s %s."
+
+#~ msgid "Security Information"
+#~ msgstr "Security Information"
+
 #~ msgid "%d week"
 #~ msgid_plural "%d weeks"
 #~ msgstr[0] "%d week"
@@ -29113,9 +28962,6 @@ msgstr "Imported Certificate"
 #~ msgid "Field Value"
 #~ msgstr "Field Value"
 
-#~ msgid "Details"
-#~ msgstr "Details"
-
 #~ msgid ""
 #~ "Issued to:\n"
 #~ "  Subject: %s\n"
@@ -30586,9 +30432,6 @@ msgstr "Imported Certificate"
 #~ msgid "Whether to show week numbers in various places in the Calendar."
 #~ msgstr "Whether to show week numbers in various places in the Calendar."
 
-#~ msgid "Scroll Month View by a week"
-#~ msgstr "Scroll Month View by a week"
-
 #~ 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."
 
@@ -34380,9 +34223,6 @@ msgstr "Imported Certificate"
 #~ "\n"
 #~ "Or you might have just typed your password wrong."
 
-#~ msgid "Try again with a different password."
-#~ msgstr "Try again with a different password."
-
 #~ msgid "Unable to add user to access control list:"
 #~ msgstr "Unable to add user to access control list:"
 



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