[evolution] Update British English translation



commit 8a8a91a2724f54f4c8038b303993138e278f74cf
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Wed Aug 14 21:21:00 2019 +0000

    Update British English translation

 po/en_GB.po | 6023 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 3430 insertions(+), 2593 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 193c1d2c62..02cc5538aa 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n";
-"POT-Creation-Date: 2019-03-11 09:00+0000\n"
-"PO-Revision-Date: 2019-03-16 10:42+0000\n"
+"POT-Creation-Date: 2019-08-02 11:50+0000\n"
+"PO-Revision-Date: 2019-08-13 20:39+0100\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 3.30.1\n"
+"X-Generator: Gtranslator 3.32.1\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
@@ -511,12 +511,10 @@ msgid "Number of units for determining when to hide tasks"
 msgstr "Number of units for determining when to hide tasks"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
-#| msgid "Hide cancelled tasks"
 msgid "Hide cancelled events"
 msgstr "Hide cancelled events"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
-#| msgid "Whether to hide cancelled tasks in the tasks view"
 msgid "Whether to hide cancelled events in the calendar view"
 msgstr "Whether to hide cancelled events in the calendar view"
 
@@ -929,10 +927,15 @@ msgstr ""
 "Week, Week or Month view."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+#| msgid "Default reminder snooze interval, in minutes"
+msgid "User-defined reminder times, in minutes"
+msgstr "User-defined reminder times, in minutes"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 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:156
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“week-start-day-name” instead."
@@ -940,11 +943,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:157
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
 msgid "(Deprecated) Work days"
 msgstr "(Deprecated) Work days"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
 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-"
@@ -1182,12 +1185,10 @@ msgid "List of dictionary language codes used for spell checking."
 msgstr "List of dictionary language codes used for spell checking."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-#| msgid "Spell checking languages"
 msgid "List of recently used spell checking languages"
 msgstr "List of recently used spell checking languages"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-#| msgid "List of dictionary language codes used for spell checking."
 msgid ""
 "List of dictionary language codes used for spell checking, which had been "
 "used recently."
@@ -1480,7 +1481,6 @@ msgstr ""
 "it’s in UTC in the message."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
-#| msgid "Failed to mark messages as read."
 msgid "Mark replied to messages as read"
 msgstr "Mark replied to messages as read"
 
@@ -2642,7 +2642,6 @@ msgstr ""
 "marked for auto-completion."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
-#| msgid "Failed to download messages for offline viewing."
 msgid "Whether Send/Receive should also download of messages for offline."
 msgstr "Whether Send/Receive should also download of messages for offline."
 
@@ -2655,10 +2654,23 @@ 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."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
+msgid ""
+"If enabled, the message/delivery-status and message/disposition-notification "
+"parts are shown automatically inline."
+msgstr ""
+"If enabled, the message/delivery-status and message/disposition-notification "
+"parts are shown automatically inline."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
 msgid "(Deprecated) Default forward style"
 msgstr "(Deprecated) Default forward style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“forward-style-name” instead."
@@ -2666,11 +2678,11 @@ msgstr ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“forward-style-name” instead."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
 msgid "(Deprecated) Default reply style"
 msgstr "(Deprecated) Default reply style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“reply-style-name” instead."
@@ -2678,11 +2690,11 @@ msgstr ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“reply-style-name” instead."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(Deprecated) List of custom headers and whether they are enabled."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“show-headers” instead."
@@ -2690,11 +2702,11 @@ msgstr ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“show-headers” instead."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(Deprecated) Load images for HTML messages over HTTP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“image-loading-policy” instead."
@@ -2702,7 +2714,7 @@ msgstr ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“image-loading-policy” instead."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -2710,7 +2722,7 @@ msgstr ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:304
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“browser-close-on-reply-policy” instead."
@@ -2859,6 +2871,15 @@ msgstr "Delete processed"
 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"
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:4
+msgid "Whether to preset option to preserve existing reminder by default"
+msgstr "Whether to preset option to preserve existing reminder by default"
+
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
 msgid "Notify new messages for Inbox only."
 msgstr "Notify new messages for Inbox only."
@@ -3044,7 +3065,7 @@ msgstr ""
 "Compression filter used when compressing attached directories with autoar."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../src/shell/main.c:318
+#: ../src/shell/main.c:331
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
@@ -3271,9 +3292,6 @@ msgstr ""
 "Microsoft Exchange by way of the “Exchange Web Services” (EWS) extension."
 
 #: ../data/org.gnome.Evolution.appdata.xml.in.in.h:5
-#| msgid ""
-#| "Thanks\n"
-#| "The Evolution Team\n"
 msgid "The Evolution Team"
 msgstr "The Evolution Team"
 
@@ -3306,11 +3324,11 @@ msgid "Contacts"
 msgstr "Contacts"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:845
-#: ../src/e-util/e-collection-account-wizard.c:784
+#: ../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/modules/calendar/e-cal-shell-view-actions.c:199
-#: ../src/modules/calendar/e-cal-shell-view.c:604
+#: ../src/modules/calendar/e-cal-shell-view.c:599
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
 msgid "Calendar"
 msgstr "Calendar"
@@ -3319,14 +3337,14 @@ msgstr "Calendar"
 #: ../src/e-util/e-send-options.c:536 ../src/mail/importers/elm-importer.c:330
 #: ../src/mail/importers/kmail-importer.c:251
 #: ../src/mail/importers/pine-importer.c:423
-#: ../src/modules/mail/e-mail-shell-view.c:1489
+#: ../src/modules/mail/e-mail-shell-view.c:1493
 #: ../src/smime/gui/certificate-manager.c:1666
 msgid "Mail"
 msgstr "Mail"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:11
-#: ../src/calendar/gui/e-memo-table.c:374 ../src/e-util/e-webdav-browser.c:459
-#: ../src/modules/calendar/e-cal-shell-content.c:1736
+#: ../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/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
@@ -3334,18 +3352,302 @@ msgid "Memos"
 msgstr "Memos"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:12
-#: ../src/calendar/gui/e-task-table.c:697 ../src/calendar/gui/print.c:2417
+#: ../src/calendar/gui/e-task-table.c:624 ../src/calendar/gui/print.c:2426
 #: ../src/calendar/importers/icalendar-importer.c:77
-#: ../src/calendar/importers/icalendar-importer.c:1109
+#: ../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:1696
+#: ../src/modules/calendar/e-cal-shell-content.c:1723
 #: ../src/modules/calendar/e-task-shell-view-actions.c:220
 #: ../src/modules/calendar/e-task-shell-view-actions.c:235
-#: ../src/modules/calendar/e-task-shell-view.c:507
+#: ../src/modules/calendar/e-task-shell-view.c:508
 msgid "Tasks"
 msgstr "Tasks"
 
+#: ../data/ui/evolution-shortcuts.ui.h:1
+msgctxt "shortcut window"
+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"
+
+#: ../data/ui/evolution-shortcuts.ui.h:9
+msgctxt "shortcut window"
+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"
+
+#: ../data/ui/evolution-shortcuts.ui.h:32
+msgctxt "shortcut window"
+msgid "Scroll up"
+msgstr "Scroll up"
+
+#: ../data/ui/evolution-shortcuts.ui.h:33
+msgctxt "shortcut window"
+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"
+
 #: ../data/views/addressbook/galview.xml.h:1
 msgid "_Address Cards"
 msgstr "_Address Cards"
@@ -3407,11 +3709,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:2439
+#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2444
 msgid "_Memos"
 msgstr "_Memos"
 
-#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2443
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2448
 #: ../src/plugins/pst-import/pst-importer.c:571
 msgid "_Tasks"
 msgstr "_Tasks"
@@ -3535,30 +3837,34 @@ msgstr ""
 "The image you have selected is large. Do you want to resize and store it?"
 
 #: ../src/addressbook/addressbook.error.xml.h:24
+msgid "An expected image size is up to 96 x 96 pixels."
+msgstr "An expected image size is up to 96 x 96 pixels."
+
+#: ../src/addressbook/addressbook.error.xml.h:25
 msgid "_Resize"
 msgstr "_Resize"
 
-#: ../src/addressbook/addressbook.error.xml.h:25
+#: ../src/addressbook/addressbook.error.xml.h:26
 msgid "_Use as it is"
 msgstr "_Use as it is"
 
-#: ../src/addressbook/addressbook.error.xml.h:26
+#: ../src/addressbook/addressbook.error.xml.h:27
 msgid "_Do not save"
 msgstr "_Do not save"
 
-#: ../src/addressbook/addressbook.error.xml.h:27
+#: ../src/addressbook/addressbook.error.xml.h:28
 msgid "Unable to save {0}."
 msgstr "Unable to save {0}."
 
-#: ../src/addressbook/addressbook.error.xml.h:28
+#: ../src/addressbook/addressbook.error.xml.h:29
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Error saving {0} to {1}: {2}"
 
-#: ../src/addressbook/addressbook.error.xml.h:29
+#: ../src/addressbook/addressbook.error.xml.h:30
 msgid "Address “{0}” already exists."
 msgstr "Address “{0}” already exists."
 
-#: ../src/addressbook/addressbook.error.xml.h:30
+#: ../src/addressbook/addressbook.error.xml.h:31
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -3566,16 +3872,16 @@ msgstr ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
 
-#: ../src/addressbook/addressbook.error.xml.h:31
+#: ../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:721
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1505
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:751
+#: ../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:1033 ../src/e-util/filter.ui.h:25
+#: ../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-label-manager.c:371
-#: ../src/mail/em-folder-properties.c:1044
+#: ../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
@@ -3586,11 +3892,11 @@ msgstr ""
 msgid "_Add"
 msgstr "_Add"
 
-#: ../src/addressbook/addressbook.error.xml.h:32
+#: ../src/addressbook/addressbook.error.xml.h:33
 msgid "Some addresses already exist in this contact list."
 msgstr "Some addresses already exist in this contact list."
 
-#: ../src/addressbook/addressbook.error.xml.h:33
+#: ../src/addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
@@ -3598,19 +3904,19 @@ msgstr ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
 
-#: ../src/addressbook/addressbook.error.xml.h:34
+#: ../src/addressbook/addressbook.error.xml.h:35
 msgid "Skip duplicates"
 msgstr "Skip duplicates"
 
-#: ../src/addressbook/addressbook.error.xml.h:35
+#: ../src/addressbook/addressbook.error.xml.h:36
 msgid "Add with duplicates"
 msgstr "Add with duplicates"
 
-#: ../src/addressbook/addressbook.error.xml.h:36
+#: ../src/addressbook/addressbook.error.xml.h:37
 msgid "List “{0}” is already in this contact list."
 msgstr "List “{0}” is already in this contact list."
 
-#: ../src/addressbook/addressbook.error.xml.h:37
+#: ../src/addressbook/addressbook.error.xml.h:38
 msgid ""
 "A contact list named “{0}” is already in this contact list. Would you like "
 "to add it anyway?"
@@ -3618,21 +3924,21 @@ msgstr ""
 "A contact list named “{0}” is already in this contact list. Would you like "
 "to add it anyway?"
 
-#: ../src/addressbook/addressbook.error.xml.h:38
+#: ../src/addressbook/addressbook.error.xml.h:39
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:1280
 msgid "Failed to delete contact"
 msgstr "Failed to delete contact"
 
-#: ../src/addressbook/addressbook.error.xml.h:39
+#: ../src/addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "You do not have permission to delete contacts in this address book."
 
-#: ../src/addressbook/addressbook.error.xml.h:40
+#: ../src/addressbook/addressbook.error.xml.h:41
 msgid "Cannot add new contact"
 msgstr "Cannot add new contact"
 
 #. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:42
+#: ../src/addressbook/addressbook.error.xml.h:43
 msgid ""
 "“{0}” is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
@@ -3640,12 +3946,12 @@ msgstr ""
 "“{0}” is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
 
-#: ../src/addressbook/addressbook.error.xml.h:43
+#: ../src/addressbook/addressbook.error.xml.h:44
 msgid "Cannot save a contact, address book is still opening"
 msgstr "Cannot save a contact, address book is still opening"
 
 #. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:45
+#: ../src/addressbook/addressbook.error.xml.h:46
 msgid ""
 "Cannot save a contact to the address book “{0}”, because it is still "
 "opening. Either wait till it’s opened, or select a different address book."
@@ -3653,11 +3959,11 @@ msgstr ""
 "Cannot save a contact to the address book “{0}”, because it is still "
 "opening. Either wait till it’s opened, or select a different address book."
 
-#: ../src/addressbook/addressbook.error.xml.h:46
+#: ../src/addressbook/addressbook.error.xml.h:47
 msgid "Something has gone wrong when displaying the contact"
 msgstr "Something has gone wrong when displaying the contact"
 
-#: ../src/addressbook/addressbook.error.xml.h:47
+#: ../src/addressbook/addressbook.error.xml.h:48
 msgid ""
 "A WebKitWebProcess crashed when displaying the contact. You can try again by "
 "moving to another contact and back. If the issue persists, please file a bug "
@@ -3667,22 +3973,19 @@ msgstr ""
 "moving to another contact and back. If the issue persists, please file a bug "
 "report in GNOME Gitlab."
 
-#: ../src/addressbook/addressbook.error.xml.h:48
+#: ../src/addressbook/addressbook.error.xml.h:49
 msgid "Failed to refresh list of account address books"
 msgstr "Failed to refresh list of account address books"
 
-#: ../src/addressbook/addressbook.error.xml.h:49
-#| msgid "Do you want to resend the meeting?"
+#: ../src/addressbook/addressbook.error.xml.h:50
 msgid "Do you want to unset contact image?"
 msgstr "Do you want to unset contact image?"
 
-#: ../src/addressbook/addressbook.error.xml.h:50
-#| msgid "Do _Not Unsubscribe"
+#: ../src/addressbook/addressbook.error.xml.h:51
 msgid "Do _Not Unset"
 msgstr "Do _Not Unset"
 
-#: ../src/addressbook/addressbook.error.xml.h:51
-#| msgid "_Unsort"
+#: ../src/addressbook/addressbook.error.xml.h:52
 msgid "_Unset"
 msgstr "_Unset"
 
@@ -3731,14 +4034,14 @@ msgid "Show Certificates"
 msgstr "Show Certificates"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:726
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:748
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3109
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:724
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:746
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3115
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1985
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2353
 #: ../src/mail/mail-config.ui.h:40
 msgid "Options"
 msgstr "Options"
@@ -3746,31 +4049,31 @@ msgstr "Options"
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4334
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4346
 #: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:220
 #: ../src/addressbook/gui/contact-editor/e-contact-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:472
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:716
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:510
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:746
 #: ../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:694
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:301
+#: ../src/calendar/gui/e-cal-dialogs.c:689
+#: ../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
 #: ../src/e-util/e-attachment-store.c:658
 #: ../src/e-util/e-attachment-store.c:668
 #: ../src/e-util/e-attachment-store.c:848
 #: ../src/e-util/e-attachment-store.c:854 ../src/e-util/e-attachment-view.c:301
-#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:171
-#: ../src/e-util/e-category-editor.c:259 ../src/e-util/e-charset-combo-box.c:99
-#: ../src/e-util/e-collection-account-wizard.c:231
-#: ../src/e-util/e-collection-account-wizard.c:1801
-#: ../src/e-util/e-collection-account-wizard.c:2037
+#: ../src/e-util/e-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-color-chooser-widget.c:125
 #: ../src/e-util/e-filter-datespec.c:300
 #: ../src/e-util/e-html-editor-actions.c:304
@@ -3785,10 +4088,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:4318
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4347
 #: ../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:4175
+#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4047
 #: ../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
@@ -3796,7 +4099,7 @@ msgstr "Options"
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:277
 #: ../src/modules/backup-restore/evolution-backup-tool.c:936
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:409
-#: ../src/modules/calendar/e-cal-attachment-handler.c:283
+#: ../src/modules/calendar/e-cal-attachment-handler.c:281
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
 #: ../src/plugins/face/face.c:298
 #: ../src/plugins/publish-calendar/publish-calendar.c:789
@@ -3813,17 +4116,17 @@ msgid "_Cancel"
 msgstr "_Cancel"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+#: ../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:719
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:749
 #: ../src/calendar/calendar.error.xml.h:47
-#: ../src/calendar/gui/e-comp-editor.c:2115
+#: ../src/calendar/gui/e-comp-editor.c:2123
 #: ../src/composer/e-composer-actions.c:228
 #: ../src/composer/e-composer-actions.c:340
 #: ../src/e-util/e-attachment-store.c:848
 #: ../src/e-util/e-attachment-store.c:855
 #: ../src/e-util/e-mail-signature-script-dialog.c:370
-#: ../src/e-util/e-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4318
+#: ../src/e-util/e-webdav-browser.c:2472 ../src/e-util/e-web-view.c:4347
 #: ../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
@@ -3832,17 +4135,17 @@ msgid "_Save"
 msgstr "_Save"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../src/calendar/gui/e-comp-editor.c:2012
-#: ../src/calendar/gui/e-comp-editor.c:2084
+#: ../src/calendar/gui/e-comp-editor.c:2020
+#: ../src/calendar/gui/e-comp-editor.c:2092
 #: ../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:994
+#: ../src/shell/e-shell.c:1474 ../src/shell/e-shell-window-actions.c:1019
 msgid "_Help"
 msgstr "_Help"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
-#: ../src/e-util/e-misc-utils.c:3575
+#: ../src/e-util/e-misc-utils.c:3573
 msgid "Image"
 msgstr "Image"
 
@@ -3868,8 +4171,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:762
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1181
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:835
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1291
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "E-mail"
@@ -3900,8 +4203,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:835
-#: ../src/modules/itip-formatter/itip-view.c:2076
+#: ../src/calendar/gui/e-comp-editor-event.c:863
+#: ../src/modules/itip-formatter/itip-view.c:2071
 msgid "_Calendar:"
 msgstr "_Calendar:"
 
@@ -3989,16 +4292,16 @@ msgid "_Anniversary:"
 msgstr "_Anniversary:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:893
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:2079
+#: ../src/calendar/gui/e-calendar-view.c:2121
 msgid "Anniversary"
 msgstr "Anniversary"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1000
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:2078
+#: ../src/calendar/gui/e-calendar-view.c:2120
 msgid "Birthday"
 msgstr "Birthday"
 
@@ -4047,15 +4350,15 @@ 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:860
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:969
 #: ../src/addressbook/gui/widgets/e-contact-map.c:380
 msgid "Work"
 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:525
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:927
+#: ../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
 msgid "Other"
 msgstr "Other"
@@ -4080,14 +4383,14 @@ msgstr "Add _X.509"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:69
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1521
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1541
 #: ../src/e-util/e-attachment-view.c:355 ../src/e-util/e-filter-rule.c:409
 #: ../src/e-util/e-mail-signature-manager.c:368
-#: ../src/e-util/e-name-selector-dialog.c:1037
+#: ../src/e-util/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-label-manager.c:389 ../src/mail/em-filter-rule.c:678
-#: ../src/mail/em-folder-properties.c:1050
+#: ../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
@@ -4111,24 +4414,24 @@ msgid "Certificates"
 msgstr "Certificates"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../src/calendar/gui/e-comp-editor.c:2047
+#: ../src/calendar/gui/e-comp-editor.c:2055
 #: ../src/e-util/e-html-editor-actions.c:945
 msgid "_Undo"
 msgstr "_Undo"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:263
-#: ../src/calendar/gui/e-comp-editor.c:2049 ../src/e-util/e-focus-tracker.c:120
+#: ../src/calendar/gui/e-comp-editor.c:2057 ../src/e-util/e-focus-tracker.c:120
 msgid "Undo"
 msgstr "Undo"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:268
-#: ../src/calendar/gui/e-comp-editor.c:2054
+#: ../src/calendar/gui/e-comp-editor.c:2062
 #: ../src/e-util/e-html-editor-actions.c:931
 msgid "_Redo"
 msgstr "_Redo"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:270
-#: ../src/calendar/gui/e-comp-editor.c:2056 ../src/e-util/e-focus-tracker.c:136
+#: ../src/calendar/gui/e-comp-editor.c:2064 ../src/e-util/e-focus-tracker.c:136
 msgid "Redo"
 msgstr "Redo"
 
@@ -4145,38 +4448,38 @@ msgstr "Error modifying contact"
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:742
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3103
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:740
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3109
 #, c-format
 msgid "Contact Editor — %s"
 msgstr "Contact Editor — %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3239
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3245
 msgid "X.509 certificates"
 msgstr "X.509 certificates"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3244
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3250
 msgid "PGP keys"
 msgstr "PGP keys"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3250
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3256
 #: ../src/smime/gui/certificate-manager.c:672
 #: ../src/smime/gui/certificate-manager.c:961
 msgid "All files"
 msgstr "All files"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3270
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
 msgid "Open PGP key"
 msgstr "Open PGP key"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3270
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
 msgid "Open X.509 certificate"
 msgstr "Open X.509 certificate"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4334
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4341
-#: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:179
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4347
+#: ../src/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
@@ -4185,49 +4488,49 @@ msgstr "Open X.509 certificate"
 msgid "_Open"
 msgstr "_Open"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3287
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3515
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3293
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3521
 msgid "Chosen file is not a local file."
 msgstr "Chosen file is not a local file."
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3300
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3306
 #, c-format
 msgid "Failed to load certificate: %s"
 msgstr "Failed to load certificate: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3329
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
 msgctxt "cert-kind"
 msgid "X.509"
 msgstr "X.509"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3329
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
 msgctxt "cert-kind"
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3500
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
 msgid "Save PGP key"
 msgstr "Save PGP key"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3500
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
 msgid "Save X.509 certificate"
 msgstr "Save X.509 certificate"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3527
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3533
 #, c-format
 msgid "Failed to save certificate: %s"
 msgstr "Failed to save certificate: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4331
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4337
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4343
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4342
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4348
 msgid "_No image"
 msgstr "_No image"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4702
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4708
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -4235,28 +4538,28 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4708
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4714
 #, c-format
 msgid "“%s” has an invalid format"
 msgstr "“%s” has an invalid format"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4716
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4722
 #, 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:4724
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4730
 #, 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:4737
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4751
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4743
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4757
 #, c-format
 msgid "%s“%s” is empty"
 msgstr "%s“%s” is empty"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4766
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4772
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
@@ -4264,13 +4567,13 @@ msgstr "Invalid contact."
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:454
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:317
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:302
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:305
 #: ../src/e-util/e-attachment-dialog.c:311
-#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:260
+#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:258
 #: ../src/e-util/e-charset-combo-box.c:100
 #: ../src/e-util/e-color-chooser-widget.c:126
 #: ../src/e-util/e-filter-datespec.c:301
-#: ../src/e-util/e-html-editor-link-dialog.c:255
+#: ../src/e-util/e-html-editor-link-dialog.c:243
 #: ../src/e-util/e-passwords.c:469 ../src/e-util/e-rule-context.c:817
 #: ../src/e-util/e-rule-editor.c:188 ../src/e-util/e-rule-editor.c:299
 #: ../src/e-util/e-rule-editor.c:934 ../src/e-util/e-send-options.ui.h:17
@@ -4424,12 +4727,12 @@ msgid "_Top"
 msgstr "_Top"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../src/e-util/e-source-selector.c:3474 ../src/e-util/filter.ui.h:29
+#: ../src/e-util/e-source-selector.c:3473 ../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:3475 ../src/e-util/filter.ui.h:30
+#: ../src/e-util/e-source-selector.c:3474 ../src/e-util/filter.ui.h:30
 msgid "_Down"
 msgstr "_Down"
 
@@ -4473,9 +4776,9 @@ msgstr "E-mail begins with"
 #: ../src/calendar/gui/memotypes.xml.in.h:19
 #: ../src/calendar/gui/tasktypes.xml.in.h:30
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1295
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1740
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:809
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1017
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:807
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1015
 msgid "Any field contains"
 msgstr "Any field contains"
 
@@ -4496,7 +4799,8 @@ 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..."
+#| msgid "_Send New Message To..."
+msgid "_Send New Message To…"
 msgstr "_Send New Message To…"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:194
@@ -4505,7 +4809,7 @@ 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:1441
+#: ../src/e-util/e-web-view.c:1446
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
@@ -4519,179 +4823,169 @@ msgstr "Click to open map for %s"
 msgid "Open map"
 msgstr "Open map"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:450
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:451
 msgid "SIP"
 msgstr "SIP"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:694
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:690
 msgid "List Members:"
 msgstr "List Members:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:766
+#: ../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
+msgid "Phone"
+msgstr "Phone"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:875
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Nickname"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:767
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:876
 msgid "AIM"
 msgstr "AIM"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:768
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:877
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:769
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:878
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:770
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:879
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:771
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:880
 msgid "MSN"
 msgstr "MSN"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:772
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:881
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:773
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:882
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:774
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:883
 msgid "Skype"
 msgstr "Skype"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:775
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:884
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:837
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:946
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Company"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:838
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:947
 msgid "Department"
 msgstr "Department"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:839
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:948
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "Office"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:840
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
 msgid "Profession"
 msgstr "Profession"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:841
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:950
 msgid "Position"
 msgstr "Position"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:951
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Manager"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:843
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:952
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Assistant"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:844
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:953
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:846
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:955
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Free/Busy"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:847
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:888
-msgid "Phone"
-msgstr "Phone"
-
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:848
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:957
 msgid "Fax"
 msgstr "Fax"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:850
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:891
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:917
+#: ../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
 msgid "Address"
 msgstr "Address"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:886
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:995
 msgid "Home Page"
 msgstr "Home Page"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:887
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:996
 msgid "Web Log"
 msgstr "Web Log"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:889
-#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
-
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:894
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Spouse"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:904
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1012
 msgid "Personal"
 msgstr "Personal"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1057
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Note"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1145
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1253
 msgid "List Members"
 msgstr "List Members"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1166
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1276
 msgid "Job Title"
 msgstr "Job Title"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1207
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1317
 msgid "Home page"
 msgstr "Home page"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1217
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1327
 msgid "Blog"
 msgstr "Blog"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:259
-#: ../src/calendar/gui/e-cal-component-preview.c:322
-#: ../src/calendar/gui/e-cal-model-tasks.c:272
-#: ../src/calendar/gui/e-cal-model-tasks.c:526
-#: ../src/calendar/gui/e-task-table.c:210
-#: ../src/calendar/gui/e-task-table.c:225
-#: ../src/calendar/gui/e-task-table.c:635 ../src/calendar/gui/print.c:3600
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:299
 #: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1146
 msgid "Cancelled"
 msgstr "Cancelled"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:455
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:489
 msgid "Merge Contact"
 msgstr "Merge Contact"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:473
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:722
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:511
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:752
 msgid "_Merge"
 msgstr "_Merge"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:711
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:741
 msgid "Duplicate Contact Detected"
 msgstr "Duplicate Contact Detected"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:769
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:799
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
@@ -4699,7 +4993,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:772
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:802
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
@@ -4707,19 +5001,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:787
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:817
 msgid "Changed Contact:"
 msgstr "Changed Contact:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:789
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:819
 msgid "New Contact:"
 msgstr "New Contact:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:828
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:858
 msgid "Conflicting Contact:"
 msgstr "Conflicting Contact:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:830
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:860
 msgid "Old Contact:"
 msgstr "Old Contact:"
 
@@ -4905,23 +5199,23 @@ 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:2005
+#: ../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/e-util/evolution-source-viewer.c:806
-#: ../src/e-util/e-webdav-browser.c:2688
+#: ../src/e-util/e-webdav-browser.c:2693
 #: ../src/mail/e-mail-account-manager.c:737
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1173
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1547
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:699
-#: ../src/modules/calendar/e-task-shell-view-actions.c:853
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1589
-#: ../src/shell/e-shell-window-actions.c:859
+#: ../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/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:1508
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1509
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -4936,11 +5230,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:1516
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1517
 msgid "_Don’t Display"
 msgstr "_Don’t Display"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1518
 msgid "Display _All Contacts"
 msgstr "Display _All Contacts"
 
@@ -5008,6 +5302,10 @@ msgstr "Home Fax"
 msgid "ISDN Phone"
 msgstr "ISDN Phone"
 
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Other Phone"
@@ -5051,7 +5349,7 @@ msgid "Title"
 msgstr "Title"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../src/calendar/gui/e-meeting-list-view.c:671
+#: ../src/calendar/gui/e-meeting-list-view.c:664
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Role"
@@ -5114,23 +5412,27 @@ msgstr "Zoom _In"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2829
+#: ../src/mail/e-mail-reader.c:2862
 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-find-dialog.c:250
-#: ../src/shell/e-shell-window-actions.c:929
+#: ../src/e-util/e-html-editor-find-dialog.c:244
+#: ../src/shell/e-shell-window-actions.c:947
 msgid "_Find"
 msgstr "_Find"
 
 #: ../src/addressbook/gui/widgets/e-minicard-view.c:186
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Searching for the Contacts..."
 msgid ""
 "\n"
 "\n"
-"Searching for the Contacts..."
+"Searching for the Contacts…"
 msgstr ""
 "\n"
 "\n"
@@ -5184,41 +5486,41 @@ msgstr ""
 "\n"
 "There are no items to show in this view."
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:749
+#: ../src/addressbook/importers/evolution-csv-importer.c:789
 #: ../src/addressbook/importers/evolution-ldif-importer.c:547
 #: ../src/addressbook/importers/evolution-vcard-importer.c:247
-#: ../src/calendar/importers/icalendar-importer.c:478
-#: ../src/calendar/importers/icalendar-importer.c:971
-#: ../src/calendar/importers/icalendar-importer.c:1011
-#: ../src/shell/shell.error.xml.h:1
-msgid "Importing..."
+#: ../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:931
+#: ../src/addressbook/importers/evolution-csv-importer.c:971
 msgid "Can’t open .csv file"
 msgstr "Can’t open .csv file"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1100
+#: ../src/addressbook/importers/evolution-csv-importer.c:1140
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlook Contacts CSV or Tab (.csv, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1101
+#: ../src/addressbook/importers/evolution-csv-importer.c:1141
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlook Contacts CSV and Tab Importer"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1109
+#: ../src/addressbook/importers/evolution-csv-importer.c:1149
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozilla Contacts CSV or Tab (.csv, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1110
+#: ../src/addressbook/importers/evolution-csv-importer.c:1150
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilla Contacts CSV and Tab Importer"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1118
+#: ../src/addressbook/importers/evolution-csv-importer.c:1158
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolution Contacts CSV or Tab (.csv, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1119
+#: ../src/addressbook/importers/evolution-csv-importer.c:1159
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolution Contacts CSV and Tab Importer"
 
@@ -5388,7 +5690,7 @@ msgid "_Send Notice"
 msgstr "_Send Notice"
 
 #: ../src/calendar/calendar.error.xml.h:5
-#: ../src/calendar/gui/e-cal-dialogs.c:507
+#: ../src/calendar/gui/e-cal-dialogs.c:504
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Are you sure you want to delete this meeting?"
@@ -5408,7 +5710,7 @@ msgstr ""
 "know the task has been deleted."
 
 #: ../src/calendar/calendar.error.xml.h:9
-#: ../src/calendar/gui/e-cal-dialogs.c:510
+#: ../src/calendar/gui/e-cal-dialogs.c:507
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Are you sure you want to delete this task?"
@@ -5430,7 +5732,7 @@ msgstr ""
 "know the memo has been deleted."
 
 #: ../src/calendar/calendar.error.xml.h:13
-#: ../src/calendar/gui/e-cal-dialogs.c:513
+#: ../src/calendar/gui/e-cal-dialogs.c:510
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Are you sure you want to delete this memo?"
@@ -6046,7 +6348,7 @@ msgstr ""
 #: ../src/calendar/gui/e-task-table.etspec.h:4
 #: ../src/calendar/gui/memotypes.xml.in.h:1
 #: ../src/calendar/gui/tasktypes.xml.in.h:1
-#: ../src/plugins/save-calendar/csv-format.c:373
+#: ../src/plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "Summary"
 
@@ -6069,7 +6371,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:1893
+#: ../src/e-util/e-collection-account-wizard.c:1930
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -6101,23 +6403,23 @@ msgid "is not"
 msgstr "is not"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:9
-#: ../src/calendar/gui/e-cal-list-view.c:243
-#: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-cal-model.c:310
-#: ../src/calendar/gui/e-task-table.c:523
+#: ../src/calendar/gui/e-cal-list-view.c:263
+#: ../src/calendar/gui/e-cal-model.c:296 ../src/calendar/gui/e-cal-model.c:304
+#: ../src/calendar/gui/e-task-table.c:445
 #: ../src/calendar/gui/memotypes.xml.in.h:10
 msgid "Public"
 msgstr "Public"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:10
-#: ../src/calendar/gui/e-cal-list-view.c:244
-#: ../src/calendar/gui/e-cal-model.c:312 ../src/calendar/gui/e-task-table.c:524
+#: ../src/calendar/gui/e-cal-list-view.c:264
+#: ../src/calendar/gui/e-cal-model.c:306 ../src/calendar/gui/e-task-table.c:446
 #: ../src/calendar/gui/memotypes.xml.in.h:11
 msgid "Private"
 msgstr "Private"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:11
-#: ../src/calendar/gui/e-cal-list-view.c:245
-#: ../src/calendar/gui/e-cal-model.c:314 ../src/calendar/gui/e-task-table.c:525
+#: ../src/calendar/gui/e-cal-list-view.c:265
+#: ../src/calendar/gui/e-cal-model.c:308 ../src/calendar/gui/e-task-table.c:447
 #: ../src/calendar/gui/memotypes.xml.in.h:12
 #: ../src/e-util/e-html-editor-page-dialog.c:113
 #: ../src/e-util/e-send-options.ui.h:7
@@ -6142,7 +6444,7 @@ msgstr "Attendee"
 #: ../src/mail/message-list.etspec.h:14
 #: ../src/plugins/publish-calendar/publish-calendar.c:861
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../src/plugins/save-calendar/csv-format.c:387
+#: ../src/plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Location"
 
@@ -6157,7 +6459,7 @@ msgstr "Category"
 #: ../src/calendar/gui/memotypes.xml.in.h:14
 #: ../src/calendar/gui/tasktypes.xml.in.h:15
 #: ../src/em-format/e-mail-formatter-print.c:51
-#: ../src/em-format/e-mail-formatter-print-headers.c:156
+#: ../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
 msgid "Attachments"
@@ -6180,7 +6482,7 @@ msgid "Do Not Exist"
 msgstr "Do Not Exist"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:19
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2011
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2065
 msgid "Recurrence"
 msgstr "Recurrence"
 
@@ -6212,19 +6514,78 @@ msgstr "Summary Contains"
 msgid "Description Contains"
 msgstr "Description Contains"
 
-#: ../src/calendar/gui/comp-util.c:1490
-#: ../src/modules/itip-formatter/itip-view.c:2393
+#: ../src/calendar/gui/comp-util.c:1539
+#: ../src/modules/itip-formatter/itip-view.c:2391
 #, 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:1546
+#: ../src/calendar/gui/comp-util.c:1598
 #, c-format
 msgid "Comments: %s"
 msgstr "Comments: %s"
 
+#: ../src/calendar/gui/comp-util.c:1612 ../src/calendar/gui/comp-util.c:1615
+#| msgid "None"
+msgctxt "iCalendarStatus"
+msgid "None"
+msgstr "None"
+
+#: ../src/calendar/gui/comp-util.c:1613
+#| msgid "Tentative"
+msgctxt "iCalendarStatus"
+msgid "Tentative"
+msgstr "Tentative"
+
+#: ../src/calendar/gui/comp-util.c:1614
+#| msgid "Confirm expunge"
+msgctxt "iCalendarStatus"
+msgid "Confirmed"
+msgstr "Confirmed"
+
+#: ../src/calendar/gui/comp-util.c:1616
+#| msgid "Draft"
+msgctxt "iCalendarStatus"
+msgid "Draft"
+msgstr "Draft"
+
+#: ../src/calendar/gui/comp-util.c:1617
+msgctxt "iCalendarStatus"
+msgid "Final"
+msgstr "Final"
+
+#: ../src/calendar/gui/comp-util.c:1618
+#| msgid "Not Started"
+msgctxt "iCalendarStatus"
+msgid "Not Started"
+msgstr "Not Started"
+
+#: ../src/calendar/gui/comp-util.c:1619
+#| msgid "Needs Action"
+msgctxt "iCalendarStatus"
+msgid "Needs Action"
+msgstr "Needs Action"
+
+#: ../src/calendar/gui/comp-util.c:1620
+#| msgid "In Progress"
+msgctxt "iCalendarStatus"
+msgid "In Progress"
+msgstr "In Progress"
+
+#: ../src/calendar/gui/comp-util.c:1621
+#| msgid "Completed"
+msgctxt "iCalendarStatus"
+msgid "Completed"
+msgstr "Completed"
+
+#: ../src/calendar/gui/comp-util.c:1622
+#| msgid "Cancelled"
+msgctxt "iCalendarStatus"
+msgid "Cancelled"
+msgstr "Cancelled"
+
 #: ../src/calendar/gui/ea-cal-view.c:281
 msgid "New Appointment"
 msgstr "New Appointment"
@@ -6326,83 +6687,42 @@ msgstr "Jump button"
 msgid "Click here, you can find more events."
 msgstr "Click here, you can find more events."
 
-#. Translator: Entire string is like "Pop up an alert %d days before start"
-#: ../src/calendar/gui/e-alarm-list.c:368 ../src/calendar/gui/misc.c:95
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d day"
-msgstr[1] "%d days"
-
-#. Translator: Entire string is like "Pop up an alert %d weeks before start"
-#: ../src/calendar/gui/e-alarm-list.c:374
-#, c-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] "%d week"
-msgstr[1] "%d weeks"
-
-#. Translator: Entire string is like "Pop up an alert %d hours before start"
-#: ../src/calendar/gui/e-alarm-list.c:380 ../src/calendar/gui/misc.c:101
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hour"
-msgstr[1] "%d hours"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start"
-#: ../src/calendar/gui/e-alarm-list.c:386 ../src/calendar/gui/misc.c:107
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minute"
-msgstr[1] "%d minutes"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../src/calendar/gui/e-alarm-list.c:392 ../src/calendar/gui/misc.c:111
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d second"
-msgstr[1] "%d seconds"
-
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:419
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1820
+#: ../src/calendar/gui/e-alarm-list.c:387
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2188
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "Play a sound"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:423
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1818
+#: ../src/calendar/gui/e-alarm-list.c:391
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2186
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "Pop up an alert"
 
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:427
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1824
+#: ../src/calendar/gui/e-alarm-list.c:395
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2192
 msgctxt "cal-reminders"
 msgid "Send an email"
 msgstr "Send an e-mail"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:431
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1822
+#: ../src/calendar/gui/e-alarm-list.c:399
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2190
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Run a program"
 
-#: ../src/calendar/gui/e-alarm-list.c:437
+#: ../src/calendar/gui/e-alarm-list.c:405
 msgctxt "cal-reminders"
 msgid "Unknown action to be performed"
 msgstr "Unknown action to be performed"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:452
+#: ../src/calendar/gui/e-alarm-list.c:421
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s before the start"
@@ -6410,7 +6730,7 @@ msgstr "%s %s before the start"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:458
+#: ../src/calendar/gui/e-alarm-list.c:427
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s after the start"
@@ -6418,7 +6738,7 @@ msgstr "%s %s after the start"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../src/calendar/gui/e-alarm-list.c:465
+#: ../src/calendar/gui/e-alarm-list.c:434
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s at the start"
@@ -6426,7 +6746,7 @@ msgstr "%s at the start"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:477
+#: ../src/calendar/gui/e-alarm-list.c:447
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s before the end"
@@ -6434,7 +6754,7 @@ msgstr "%s %s before the end"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:483
+#: ../src/calendar/gui/e-alarm-list.c:453
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s after the end"
@@ -6442,7 +6762,7 @@ msgstr "%s %s after the end"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../src/calendar/gui/e-alarm-list.c:490
+#: ../src/calendar/gui/e-alarm-list.c:460
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s at the end"
@@ -6450,7 +6770,7 @@ msgstr "%s at the end"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../src/calendar/gui/e-alarm-list.c:514
+#: ../src/calendar/gui/e-alarm-list.c:484
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s at %s"
@@ -6458,7 +6778,7 @@ msgstr "%s at %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../src/calendar/gui/e-alarm-list.c:522
+#: ../src/calendar/gui/e-alarm-list.c:492
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s for an unknown trigger type"
@@ -6482,297 +6802,273 @@ msgstr "calendar view for a month"
 msgid "calendar view for one or more weeks"
 msgstr "calendar view for one or more weeks"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:216
+#: ../src/calendar/gui/e-cal-component-preview.c:237
 #: ../src/e-util/e-filter-rule.c:986 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "Untitled"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:224
+#: ../src/calendar/gui/e-cal-component-preview.c:251
 msgid "Categories:"
 msgstr "Categories:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:258
+#: ../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:1682
-#: ../src/modules/itip-formatter/itip-view.c:1793
+#: ../src/modules/itip-formatter/itip-view.c:1677
+#: ../src/modules/itip-formatter/itip-view.c:1788
 msgid "Location:"
 msgstr "Location:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:266
+#: ../src/calendar/gui/e-cal-component-preview.c:295
 msgid "Start Date:"
 msgstr "Start Date:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:277
+#: ../src/calendar/gui/e-cal-component-preview.c:304
 msgid "End Date:"
 msgstr "End Date:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:288
+#: ../src/calendar/gui/e-cal-component-preview.c:313
 msgid "Due Date:"
 msgstr "Due Date:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:300
+#: ../src/calendar/gui/e-cal-component-preview.c:326
 msgid "Recurs:"
 msgstr "Recurs:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:312
-#: ../src/modules/itip-formatter/itip-view.c:1685
-#: ../src/modules/itip-formatter/itip-view.c:1802
+#: ../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
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:316
-#: ../src/calendar/gui/e-cal-model-tasks.c:268
-#: ../src/calendar/gui/e-cal-model-tasks.c:522
-#: ../src/calendar/gui/e-cal-model-tasks.c:603
-#: ../src/calendar/gui/e-task-table.c:206
-#: ../src/calendar/gui/e-task-table.c:221
-#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3594
-msgid "In Progress"
-msgstr "In Progress"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:319
-#: ../src/calendar/gui/e-cal-model-tasks.c:270
-#: ../src/calendar/gui/e-cal-model-tasks.c:524
-#: ../src/calendar/gui/e-meeting-store.c:205
-#: ../src/calendar/gui/e-meeting-store.c:228
-#: ../src/calendar/gui/e-task-table.c:208
-#: ../src/calendar/gui/e-task-table.c:223
-#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3597
-#: ../src/calendar/gui/tasktypes.xml.in.h:13
-#: ../src/plugins/save-calendar/csv-format.c:377
-msgid "Completed"
-msgstr "Completed"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:326
-#: ../src/calendar/gui/e-cal-model-tasks.c:266
-#: ../src/calendar/gui/e-cal-model-tasks.c:520
-#: ../src/calendar/gui/e-task-table.c:204
-#: ../src/calendar/gui/e-task-table.c:219
-#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3591
-#: ../src/calendar/gui/tasktypes.xml.in.h:11
-msgid "Not Started"
-msgstr "Not Started"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:339
-msgid "Priority:"
-msgstr "Priority:"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:341
-#: ../src/calendar/gui/e-task-table.c:549
+#: ../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:328
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:331
 msgid "High"
 msgstr "High"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:343
-#: ../src/calendar/gui/e-cal-model.c:1911
-#: ../src/calendar/gui/e-task-table.c:550
+#: ../src/calendar/gui/e-cal-component-preview.c:349
+#: ../src/calendar/gui/e-cal-model.c:1907
+#: ../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:327
+#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:330
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:345
-#: ../src/calendar/gui/e-task-table.c:551
+#: ../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:326
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:329
 msgid "Low"
 msgstr "Low"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:364
+#: ../src/calendar/gui/e-cal-component-preview.c:353
+msgid "Priority:"
+msgstr "Priority:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:365
+msgid "Organizer:"
+msgstr "Organiser:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:406
+#| msgid "Attendees: "
+msgid "Attendees:"
+msgstr "Attendees:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:453
 #: ../src/mail/e-mail-config-service-page.c:533
 msgid "Description:"
 msgstr "Description:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:408
+#: ../src/calendar/gui/e-cal-component-preview.c:507
 msgid "Web Page:"
 msgstr "Web Page:"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1709
+#: ../src/calendar/gui/e-cal-data-model.c:1753
 #, c-format
 msgid "Creating view for calendar “%s”"
 msgstr "Creating view for calendar “%s”"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1713
+#: ../src/calendar/gui/e-cal-data-model.c:1757
 #, c-format
 msgid "Creating view for task list “%s”"
 msgstr "Creating view for task list “%s”"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1717
+#: ../src/calendar/gui/e-cal-data-model.c:1761
 #, c-format
 msgid "Creating view for memo list “%s”"
 msgstr "Creating view for memo list “%s”"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:219 ../src/calendar/gui/e-cal-ops.c:1966
+#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1964
 msgid "Destination is read only"
 msgstr "Destination is read only"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:299
+#: ../src/calendar/gui/e-cal-dialogs.c:297
 #, c-format
 msgid "Copying events to the calendar “%s”"
 msgstr "Copying events to the calendar “%s”"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:305
+#: ../src/calendar/gui/e-cal-dialogs.c:303
 #, c-format
 msgid "Copying memos to the memo list “%s”"
 msgstr "Copying memos to the memo list “%s”"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:311
+#: ../src/calendar/gui/e-cal-dialogs.c:309
 #, c-format
 msgid "Copying tasks to the task list “%s”"
 msgstr "Copying tasks to the task list “%s”"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:530
+#: ../src/calendar/gui/e-cal-dialogs.c:527
 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:533
+#: ../src/calendar/gui/e-cal-dialogs.c:530
 msgid "_Retract comment"
 msgstr "_Retract comment"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:692
+#: ../src/calendar/gui/e-cal-dialogs.c:687
 msgid "Select Date"
 msgstr "Select Date"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:693
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1304
+#: ../src/calendar/gui/e-cal-dialogs.c:688
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Select _Today"
 msgstr "Select _Today"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:712
+#: ../src/calendar/gui/e-cal-dialogs.c:707
 msgid "January"
 msgstr "January"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:713
+#: ../src/calendar/gui/e-cal-dialogs.c:708
 msgid "February"
 msgstr "February"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:714
+#: ../src/calendar/gui/e-cal-dialogs.c:709
 msgid "March"
 msgstr "March"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:715
+#: ../src/calendar/gui/e-cal-dialogs.c:710
 msgid "April"
 msgstr "April"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:716
+#: ../src/calendar/gui/e-cal-dialogs.c:711
 msgid "May"
 msgstr "May"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:717
+#: ../src/calendar/gui/e-cal-dialogs.c:712
 msgid "June"
 msgstr "June"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:718
+#: ../src/calendar/gui/e-cal-dialogs.c:713
 msgid "July"
 msgstr "July"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:719
+#: ../src/calendar/gui/e-cal-dialogs.c:714
 msgid "August"
 msgstr "August"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:720
+#: ../src/calendar/gui/e-cal-dialogs.c:715
 msgid "September"
 msgstr "September"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:721
+#: ../src/calendar/gui/e-cal-dialogs.c:716
 msgid "October"
 msgstr "October"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:722
+#: ../src/calendar/gui/e-cal-dialogs.c:717
 msgid "November"
 msgstr "November"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:723
+#: ../src/calendar/gui/e-cal-dialogs.c:718
 msgid "December"
 msgstr "December"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:873
+#: ../src/calendar/gui/e-cal-dialogs.c:870
 #, 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:875
+#: ../src/calendar/gui/e-cal-dialogs.c:872
 #, 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:879
+#: ../src/calendar/gui/e-cal-dialogs.c:876
 #, 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:883
+#: ../src/calendar/gui/e-cal-dialogs.c:880
 #, 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:909
+#: ../src/calendar/gui/e-cal-dialogs.c:906
 msgid "This Instance Only"
 msgstr "This Instance Only"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:913
+#: ../src/calendar/gui/e-cal-dialogs.c:910
 msgid "This and Prior Instances"
 msgstr "This and Prior Instances"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:919
+#: ../src/calendar/gui/e-cal-dialogs.c:916
 msgid "This and Future Instances"
 msgstr "This and Future Instances"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:924
+#: ../src/calendar/gui/e-cal-dialogs.c:921
 msgid "All Instances"
 msgstr "All Instances"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1174
-#: ../src/calendar/gui/e-cal-dialogs.c:1256
+#: ../src/calendar/gui/e-cal-dialogs.c:1171
+#: ../src/calendar/gui/e-cal-dialogs.c:1253
 msgid "Send my reminders with this event"
 msgstr "Send my reminders with this event"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1176
-#: ../src/calendar/gui/e-cal-dialogs.c:1258
+#: ../src/calendar/gui/e-cal-dialogs.c:1173
+#: ../src/calendar/gui/e-cal-dialogs.c:1255
 msgid "Notify new attendees _only"
 msgstr "Notify new attendees _only"
 
-#: ../src/calendar/gui/e-calendar-view.c:464
+#: ../src/calendar/gui/e-calendar-view.c:476
 msgid "Cut selected events to the clipboard"
 msgstr "Cut selected events to the clipboard"
 
-#: ../src/calendar/gui/e-calendar-view.c:470
+#: ../src/calendar/gui/e-calendar-view.c:482
 msgid "Copy selected events to the clipboard"
 msgstr "Copy selected events to the clipboard"
 
-#: ../src/calendar/gui/e-calendar-view.c:476
+#: ../src/calendar/gui/e-calendar-view.c:488
 msgid "Paste events from the clipboard"
 msgstr "Paste events from the clipboard"
 
-#: ../src/calendar/gui/e-calendar-view.c:482
+#: ../src/calendar/gui/e-calendar-view.c:494
 msgid "Delete selected events"
 msgstr "Delete selected events"
 
-#: ../src/calendar/gui/e-calendar-view.c:866
+#: ../src/calendar/gui/e-calendar-view.c:904
 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:877
-#: ../src/calendar/gui/e-cal-ops.c:1556
+#: ../src/calendar/gui/e-calendar-view.c:915
+#: ../src/calendar/gui/e-cal-ops.c:1555
 msgid "Default calendar not found"
 msgstr "Default calendar not found"
 
-#: ../src/calendar/gui/e-calendar-view.c:882
-#: ../src/calendar/gui/e-cal-ops.c:1559
+#: ../src/calendar/gui/e-calendar-view.c:920
+#: ../src/calendar/gui/e-cal-ops.c:1558
 msgid "Default memo list not found"
 msgstr "Default memo list not found"
 
-#: ../src/calendar/gui/e-calendar-view.c:887
-#: ../src/calendar/gui/e-cal-ops.c:1562
+#: ../src/calendar/gui/e-calendar-view.c:925
+#: ../src/calendar/gui/e-cal-ops.c:1561
 msgid "Default task list not found"
 msgstr "Default task list not found"
 
-#: ../src/calendar/gui/e-calendar-view.c:976
+#: ../src/calendar/gui/e-calendar-view.c:1017
 msgid "No suitable component found"
 msgstr "No suitable component found"
 
-#: ../src/calendar/gui/e-calendar-view.c:1046
+#: ../src/calendar/gui/e-calendar-view.c:1087
 msgid "Pasting iCalendar data"
 msgstr "Pasting iCalendar data"
 
@@ -6781,9 +7077,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:1854
-#: ../src/calendar/gui/e-memo-table.c:499
-#: ../src/calendar/gui/e-task-table.c:819
+#: ../src/calendar/gui/e-calendar-view.c:1896
+#: ../src/calendar/gui/e-memo-table.c:571
+#: ../src/calendar/gui/e-task-table.c:735
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organiser: %s <%s>"
@@ -6791,35 +7087,47 @@ 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:1858
-#: ../src/calendar/gui/e-memo-table.c:504
-#: ../src/calendar/gui/e-task-table.c:823
+#: ../src/calendar/gui/e-calendar-view.c:1899
+#: ../src/calendar/gui/e-memo-table.c:576
+#: ../src/calendar/gui/e-task-table.c:739
 #, 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:1874
+#: ../src/calendar/gui/e-calendar-view.c:1918
 #: ../src/calendar/gui/e-meeting-time-sel.c:2580
-#: ../src/calendar/gui/e-task-table.c:839
-#: ../src/calendar/gui/e-to-do-pane.c:363 ../src/calendar/gui/print.c:3545
+#: ../src/calendar/gui/e-task-table.c:757
+#: ../src/calendar/gui/e-to-do-pane.c:375 ../src/calendar/gui/print.c:3565
 #, 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:1914
-#: ../src/calendar/gui/e-to-do-pane.c:460
+#: ../src/calendar/gui/e-calendar-view.c:1963
+#: ../src/calendar/gui/e-to-do-pane.c:478
 #, c-format
 msgid "Time: %s %s"
 msgstr "Time: %s %s"
 
-#: ../src/calendar/gui/e-calendar-view.c:2309
-#: ../src/calendar/gui/e-calendar-view.c:2312
-#: ../src/calendar/gui/e-calendar-view.c:2315
-#: ../src/calendar/gui/e-calendar-view.c:2316
+#. Translators: the '%s' stands for a component summary, the '%d' for the years.
+#. The string is used for Birthday & Anniversary events where the first year is
+#. know, constructing a summary which also shows how many years the birthday or
+#. anniversary is for. Example: "Birthday: John Doe (13)"
+#: ../src/calendar/gui/e-calendar-view.c:2141
+#, 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
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -6828,14 +7136,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:2311
-#: ../src/calendar/gui/e-day-view.c:3095
-#: ../src/calendar/gui/e-day-view-top-item.c:865
+#: ../src/calendar/gui/e-calendar-view.c:2341
+#: ../src/calendar/gui/e-day-view.c:3078
+#: ../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:2322
+#: ../src/calendar/gui/e-calendar-view.c:2352
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -6845,16 +7153,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:2324
-#: ../src/calendar/gui/e-day-view.c:3079
-#: ../src/calendar/gui/e-day-view-top-item.c:861
+#: ../src/calendar/gui/e-calendar-view.c:2354
+#: ../src/calendar/gui/e-day-view.c:3062
+#: ../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:2325
-#: ../src/calendar/gui/e-calendar-view.c:2327
-#: ../src/calendar/gui/e-calendar-view.c:2328
+#: ../src/calendar/gui/e-calendar-view.c:2355
+#: ../src/calendar/gui/e-calendar-view.c:2357
+#: ../src/calendar/gui/e-calendar-view.c:2358
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -6870,7 +7178,7 @@ msgstr "End Date"
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:7
 #: ../src/calendar/gui/e-memo-table.etspec.h:6
 #: ../src/calendar/gui/e-task-table.etspec.h:14
-#: ../src/plugins/save-calendar/csv-format.c:378
+#: ../src/plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "Created"
 
@@ -6887,94 +7195,115 @@ msgstr "Last modified"
 msgid "Source"
 msgstr "Source"
 
-#: ../src/calendar/gui/e-cal-model.c:316
+#. 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-meeting-time-sel.etspec.h:9
+#: ../src/calendar/gui/e-memo-table.etspec.h:9
+#: ../src/calendar/gui/e-task-table.etspec.h:11
+#: ../src/calendar/gui/tasktypes.xml.in.h:8 ../src/mail/filtertypes.xml.in.h:36
+#: ../src/mail/message-list.etspec.h:1 ../src/mail/searchtypes.xml.in.h:38
+#: ../src/mail/vfoldertypes.xml.in.h:38
+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-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/mail/e-mail-account-tree-view.c:158
+msgid "Type"
+msgstr "Type"
+
+#: ../src/calendar/gui/e-cal-model.c:310
 #: ../src/calendar/gui/e-meeting-list-view.c:183
 #: ../src/calendar/gui/e-meeting-list-view.c:197
 #: ../src/calendar/gui/e-meeting-store.c:135
 #: ../src/calendar/gui/e-meeting-store.c:170
-#: ../src/calendar/gui/e-meeting-store.c:233 ../src/calendar/gui/print.c:1256
-#: ../src/calendar/gui/print.c:1273 ../src/e-util/e-charset.c:49
-#: ../src/modules/itip-formatter/itip-view.c:3587
-#: ../src/modules/itip-formatter/itip-view.c:6409
+#: ../src/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/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../src/calendar/gui/e-cal-model.c:1417 ../src/calendar/gui/e-cal-ops.c:614
-#: ../src/calendar/gui/e-cal-ops.c:1250
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:435
+#: ../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
 #, c-format
 msgid "Source with UID “%s” not found"
 msgstr "Source with UID “%s” not found"
 
-#: ../src/calendar/gui/e-cal-model.c:1522 ../src/calendar/gui/e-cal-ops.c:186
-#: ../src/calendar/gui/e-cal-ops.c:1367
+#: ../src/calendar/gui/e-cal-model.c:1515 ../src/calendar/gui/e-cal-ops.c:185
+#: ../src/calendar/gui/e-cal-ops.c:1363
 msgid "Creating an event"
 msgstr "Creating an event"
 
-#: ../src/calendar/gui/e-cal-model.c:1526 ../src/calendar/gui/e-cal-ops.c:190
-#: ../src/calendar/gui/e-cal-ops.c:1371
+#: ../src/calendar/gui/e-cal-model.c:1519 ../src/calendar/gui/e-cal-ops.c:189
+#: ../src/calendar/gui/e-cal-ops.c:1367
 msgid "Creating a memo"
 msgstr "Creating a memo"
 
-#: ../src/calendar/gui/e-cal-model.c:1530 ../src/calendar/gui/e-cal-ops.c:194
-#: ../src/calendar/gui/e-cal-ops.c:1375
+#: ../src/calendar/gui/e-cal-model.c:1523 ../src/calendar/gui/e-cal-ops.c:193
+#: ../src/calendar/gui/e-cal-ops.c:1371
 msgid "Creating a task"
 msgstr "Creating a task"
 
-#: ../src/calendar/gui/e-cal-model.c:1913
+#: ../src/calendar/gui/e-cal-model.c:1909
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../src/calendar/gui/e-cal-model.c:1915
+#: ../src/calendar/gui/e-cal-model.c:1911
 msgid "Assigned"
 msgstr "Assigned"
 
-#: ../src/calendar/gui/e-cal-model.c:1918
-#: ../src/calendar/gui/e-cal-model-tasks.c:1144
-#: ../src/calendar/gui/e-meeting-list-view.c:207
-#: ../src/calendar/gui/e-meeting-store.c:177
-#: ../src/calendar/gui/e-meeting-store.c:187
-#: ../src/calendar/gui/e-meeting-store.c:1098
+#: ../src/calendar/gui/e-cal-model.c:1914
+#: ../src/calendar/gui/e-cal-model-tasks.c:1133
 msgid "Yes"
 msgstr "Yes"
 
-#: ../src/calendar/gui/e-cal-model.c:1918
-#: ../src/calendar/gui/e-cal-model-tasks.c:1144
-#: ../src/calendar/gui/e-meeting-list-view.c:208
-#: ../src/calendar/gui/e-meeting-store.c:189
+#: ../src/calendar/gui/e-cal-model.c:1914
+#: ../src/calendar/gui/e-cal-model-tasks.c:1133
 msgid "No"
 msgstr "No"
 
 #: ../src/calendar/gui/e-cal-model.c:3822
-#: ../src/calendar/gui/e-meeting-list-view.c:219
-#: ../src/calendar/gui/e-meeting-store.c:197
-#: ../src/calendar/gui/e-meeting-store.c:220
-#: ../src/modules/itip-formatter/itip-view.c:6397
+#: ../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
 msgid "Accepted"
 msgstr "Accepted"
 
 #: ../src/calendar/gui/e-cal-model.c:3823
-#: ../src/calendar/gui/e-meeting-list-view.c:220
-#: ../src/calendar/gui/e-meeting-store.c:199
-#: ../src/calendar/gui/e-meeting-store.c:222
-#: ../src/modules/itip-formatter/itip-view.c:6403
+#: ../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
 msgid "Declined"
 msgstr "Declined"
 
 #: ../src/calendar/gui/e-cal-model.c:3824
-#: ../src/calendar/gui/e-meeting-list-view.c:221
-#: ../src/calendar/gui/e-meeting-store.c:201
-#: ../src/calendar/gui/e-meeting-store.c:224
+#: ../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
 #: ../src/calendar/gui/e-meeting-time-sel.c:523
 msgid "Tentative"
 msgstr "Tentative"
 
 #: ../src/calendar/gui/e-cal-model.c:3825
-#: ../src/calendar/gui/e-meeting-list-view.c:222
-#: ../src/calendar/gui/e-meeting-store.c:203
-#: ../src/calendar/gui/e-meeting-store.c:226
-#: ../src/modules/itip-formatter/itip-view.c:6406
+#: ../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
 msgid "Delegated"
 msgstr "Delegated"
 
@@ -6982,30 +7311,18 @@ msgstr "Delegated"
 msgid "Needs action"
 msgstr "Needs action"
 
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. * Status: Accepted: X   Declined: Y   ...
-#: ../src/calendar/gui/e-cal-model.c:3881
-#: ../src/calendar/gui/e-meeting-list-view.c:700
-#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../src/calendar/gui/e-task-table.etspec.h:11
-#: ../src/calendar/gui/tasktypes.xml.in.h:8 ../src/mail/filtertypes.xml.in.h:36
-#: ../src/mail/message-list.etspec.h:1 ../src/mail/searchtypes.xml.in.h:38
-#: ../src/mail/vfoldertypes.xml.in.h:38
-msgid "Status"
-msgstr "Status"
-
-#: ../src/calendar/gui/e-cal-model-calendar.c:144
-#: ../src/calendar/gui/e-task-table.c:607
+#: ../src/calendar/gui/e-cal-model-calendar.c:157
+#: ../src/calendar/gui/e-task-table.c:529
 msgid "Free"
 msgstr "Free"
 
-#: ../src/calendar/gui/e-cal-model-calendar.c:147
+#: ../src/calendar/gui/e-cal-model-calendar.c:160
 #: ../src/calendar/gui/e-meeting-time-sel.c:524
-#: ../src/calendar/gui/e-task-table.c:608
+#: ../src/calendar/gui/e-task-table.c:530
 msgid "Busy"
 msgstr "Busy"
 
-#: ../src/calendar/gui/e-cal-model-tasks.c:466
+#: ../src/calendar/gui/e-cal-model-tasks.c:493
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7015,11 +7332,9 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#. Translators: "None" for task's status
-#: ../src/calendar/gui/e-cal-model-tasks.c:518
-msgctxt "cal-task-status"
-msgid "None"
-msgstr "None"
+#: ../src/calendar/gui/e-cal-model-tasks.c:590
+msgid "In Progress"
+msgstr "In Progress"
 
 #: ../src/calendar/gui/e-cal-ops.c:305
 msgid "Modifying an event"
@@ -7033,154 +7348,154 @@ msgstr "Modifying a memo"
 msgid "Modifying a task"
 msgstr "Modifying a task"
 
-#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1954
+#: ../src/calendar/gui/e-cal-ops.c:411 ../src/calendar/gui/e-to-do-pane.c:2042
 msgid "Removing an event"
 msgstr "Removing an event"
 
-#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1958
+#: ../src/calendar/gui/e-cal-ops.c:415 ../src/calendar/gui/e-to-do-pane.c:2046
 msgid "Removing a memo"
 msgstr "Removing a memo"
 
-#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1962
+#: ../src/calendar/gui/e-cal-ops.c:419 ../src/calendar/gui/e-to-do-pane.c:2050
 msgid "Removing a task"
 msgstr "Removing a task"
 
-#: ../src/calendar/gui/e-cal-ops.c:511
+#: ../src/calendar/gui/e-cal-ops.c:507
 #, 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:515
+#: ../src/calendar/gui/e-cal-ops.c:511
 #, 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:519
+#: ../src/calendar/gui/e-cal-ops.c:515
 #, 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:722
+#: ../src/calendar/gui/e-cal-ops.c:721
 #, 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:737
+#: ../src/calendar/gui/e-cal-ops.c:736
 #, 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:752
+#: ../src/calendar/gui/e-cal-ops.c:751
 #, 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:851
+#: ../src/calendar/gui/e-cal-ops.c:847
 msgid "Updating an event"
 msgstr "Updating an event"
 
-#: ../src/calendar/gui/e-cal-ops.c:855
+#: ../src/calendar/gui/e-cal-ops.c:851
 msgid "Updating a memo"
 msgstr "Updating a memo"
 
-#: ../src/calendar/gui/e-cal-ops.c:859
+#: ../src/calendar/gui/e-cal-ops.c:855
 msgid "Updating a task"
 msgstr "Updating a task"
 
-#: ../src/calendar/gui/e-cal-ops.c:967
+#: ../src/calendar/gui/e-cal-ops.c:968
 #, 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:971
+#: ../src/calendar/gui/e-cal-ops.c:972
 #, 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:975
+#: ../src/calendar/gui/e-cal-ops.c:976
 #, 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:1001
+#: ../src/calendar/gui/e-cal-ops.c:1002
 #, c-format
 msgid "Purging events in the calendar “%s”"
 msgstr "Purging events in the calendar “%s”"
 
-#: ../src/calendar/gui/e-cal-ops.c:1005
+#: ../src/calendar/gui/e-cal-ops.c:1006
 #, 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:1009
+#: ../src/calendar/gui/e-cal-ops.c:1010
 #, 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:1109
+#: ../src/calendar/gui/e-cal-ops.c:1105
 msgid "Purging events"
 msgstr "Purging events"
 
-#: ../src/calendar/gui/e-cal-ops.c:1113
+#: ../src/calendar/gui/e-cal-ops.c:1109
 msgid "Purging memos"
 msgstr "Purging memos"
 
-#: ../src/calendar/gui/e-cal-ops.c:1117
+#: ../src/calendar/gui/e-cal-ops.c:1113
 msgid "Purging tasks"
 msgstr "Purging tasks"
 
-#: ../src/calendar/gui/e-cal-ops.c:1219
+#: ../src/calendar/gui/e-cal-ops.c:1215
 msgid "Expunging completed tasks"
 msgstr "Expunging completed tasks"
 
-#: ../src/calendar/gui/e-cal-ops.c:2060
+#: ../src/calendar/gui/e-cal-ops.c:2057
 #, 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:2061
+#: ../src/calendar/gui/e-cal-ops.c:2058
 #, 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:2067
+#: ../src/calendar/gui/e-cal-ops.c:2064
 #, 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:2068
+#: ../src/calendar/gui/e-cal-ops.c:2065
 #, 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:2074
+#: ../src/calendar/gui/e-cal-ops.c:2071
 #, 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:2075
+#: ../src/calendar/gui/e-cal-ops.c:2072
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -7188,16 +7503,16 @@ msgstr[0] "Copying a task"
 msgstr[1] "Copying %d tasks"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../src/calendar/gui/e-cell-date-edit-text.c:163
+#: ../src/calendar/gui/e-cell-date-edit-text.c:177
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../src/calendar/gui/e-cell-date-edit-text.c:166
+#: ../src/calendar/gui/e-cell-date-edit-text.c:180
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../src/calendar/gui/e-cell-date-edit-text.c:174
+#: ../src/calendar/gui/e-cell-date-edit-text.c:188
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7210,38 +7525,38 @@ 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:206
+#: ../src/calendar/gui/e-comp-editor-event.c:208
 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:208
+#: ../src/calendar/gui/e-comp-editor-event.c:210
 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:210
+#: ../src/calendar/gui/e-comp-editor-event.c:212
 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:460
-#: ../src/calendar/gui/e-comp-editor-task.c:546
+#: ../src/calendar/gui/e-comp-editor-event.c:485
+#: ../src/calendar/gui/e-comp-editor-task.c:566
 msgid "Start date is not a valid date"
 msgstr "Start date is not a valid date"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:462
+#: ../src/calendar/gui/e-comp-editor-event.c:487
 msgid "Start time is not a valid time"
 msgstr "Start time is not a valid time"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:466
-#: ../src/calendar/gui/e-comp-editor-event.c:482
+#: ../src/calendar/gui/e-comp-editor-event.c:491
+#: ../src/calendar/gui/e-comp-editor-event.c:507
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
-#: ../src/calendar/gui/e-comp-editor.c:337
+#: ../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:4218 ../src/e-util/e-misc-utils.c:4230
-#: ../src/e-util/e-misc-utils.c:4244 ../src/mail/e-mail-autoconfig.c:1029
-#: ../src/mail/e-mail-display.c:2292 ../src/mail/e-mail-reader-utils.c:805
-#: ../src/mail/em-composer-utils.c:3969 ../src/mail/em-composer-utils.c:4000
+#: ../src/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/modules/accounts-window/e-accounts-window-editors.c:172
 #: ../src/plugins/face/face.c:175 ../src/shell/e-shell.c:1235
@@ -7250,128 +7565,128 @@ msgstr "Start time is not a valid time"
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:476
+#: ../src/calendar/gui/e-comp-editor-event.c:501
 msgid "End date is not a valid date"
 msgstr "End date is not a valid date"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:478
+#: ../src/calendar/gui/e-comp-editor-event.c:503
 msgid "End time is not a valid time"
 msgstr "End time is not a valid time"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:677
+#: ../src/calendar/gui/e-comp-editor-event.c:705
 #: ../src/calendar/gui/e-comp-editor-memo.c:134
-#: ../src/calendar/gui/e-comp-editor-task.c:651
+#: ../src/calendar/gui/e-comp-editor-task.c:679
 msgid "_Categories"
 msgstr "_Categories"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:679
+#: ../src/calendar/gui/e-comp-editor-event.c:707
 #: ../src/calendar/gui/e-comp-editor-memo.c:136
-#: ../src/calendar/gui/e-comp-editor-task.c:653
+#: ../src/calendar/gui/e-comp-editor-task.c:681
 msgid "Toggles whether to display categories"
 msgstr "Toggles whether to display categories"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:685
-#: ../src/calendar/gui/e-comp-editor-task.c:659
+#: ../src/calendar/gui/e-comp-editor-event.c:713
+#: ../src/calendar/gui/e-comp-editor-task.c:687
 msgid "Time _Zone"
 msgstr "Time _Zone"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:687
-#: ../src/calendar/gui/e-comp-editor-task.c:661
+#: ../src/calendar/gui/e-comp-editor-event.c:715
+#: ../src/calendar/gui/e-comp-editor-task.c:689
 msgid "Toggles whether the time zone is displayed"
 msgstr "Toggles whether the time zone is displayed"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:693
+#: ../src/calendar/gui/e-comp-editor-event.c:721
 msgid "All _Day Event"
 msgstr "All _Day Event"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:695
+#: ../src/calendar/gui/e-comp-editor-event.c:723
 msgid "Toggles whether to have All Day Event"
 msgstr "Toggles whether to have All Day Event"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:701
+#: ../src/calendar/gui/e-comp-editor-event.c:729
 msgid "Show Time as _Busy"
 msgstr "Show Time as _Busy"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:703
+#: ../src/calendar/gui/e-comp-editor-event.c:731
 msgid "Toggles whether to show time as busy"
 msgstr "Toggles whether to show time as busy"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:712
+#: ../src/calendar/gui/e-comp-editor-event.c:740
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:714
+#: ../src/calendar/gui/e-comp-editor-event.c:742
 msgid "Classify as public"
 msgstr "Classify as public"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:719
+#: ../src/calendar/gui/e-comp-editor-event.c:747
 msgid "_Private"
 msgstr "_Private"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:721
+#: ../src/calendar/gui/e-comp-editor-event.c:749
 msgid "Classify as private"
 msgstr "Classify as private"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:726
+#: ../src/calendar/gui/e-comp-editor-event.c:754
 msgid "_Confidential"
 msgstr "_Confidential"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:728
+#: ../src/calendar/gui/e-comp-editor-event.c:756
 msgid "Classify as confidential"
 msgstr "Classify as confidential"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:846
+#: ../src/calendar/gui/e-comp-editor-event.c:874
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Start time:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:851
+#: ../src/calendar/gui/e-comp-editor-event.c:879
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "_End time:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:861
+#: ../src/calendar/gui/e-comp-editor-event.c:889
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "All da_y event"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:919
-#: ../src/calendar/gui/e-comp-editor-memo.c:222
-#: ../src/calendar/gui/e-comp-editor-task.c:829
+#: ../src/calendar/gui/e-comp-editor-event.c:957
+#: ../src/calendar/gui/e-comp-editor-memo.c:232
+#: ../src/calendar/gui/e-comp-editor-task.c:857
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "General"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:922
-#: ../src/calendar/gui/e-comp-editor-task.c:852
+#: ../src/calendar/gui/e-comp-editor-event.c:960
+#: ../src/calendar/gui/e-comp-editor-task.c:880
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Reminders"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:925
-#: ../src/calendar/gui/e-comp-editor-task.c:856
+#: ../src/calendar/gui/e-comp-editor-event.c:963
+#: ../src/calendar/gui/e-comp-editor-task.c:884
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Recurrence"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:928
-#: ../src/calendar/gui/e-comp-editor-memo.c:225
-#: ../src/calendar/gui/e-comp-editor-task.c:860
+#: ../src/calendar/gui/e-comp-editor-event.c:966
+#: ../src/calendar/gui/e-comp-editor-memo.c:235
+#: ../src/calendar/gui/e-comp-editor-task.c:888
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Attachments"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:938
+#: ../src/calendar/gui/e-comp-editor-event.c:976
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "Schedule"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:973
+#: ../src/calendar/gui/e-comp-editor-event.c:1011
 #, c-format
 msgid "Meeting — %s"
 msgstr "Meeting — %s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:974
+#: ../src/calendar/gui/e-comp-editor-event.c:1012
 #, c-format
 msgid "Appointment — %s"
 msgstr "Appointment — %s"
@@ -7391,22 +7706,22 @@ 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:760
+#: ../src/calendar/gui/e-comp-editor-task.c:788
 msgid "_List:"
 msgstr "_List:"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:203
-#: ../src/calendar/gui/e-comp-editor-task.c:770
+#: ../src/calendar/gui/e-comp-editor-task.c:798
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "Sta_rt date:"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:256
+#: ../src/calendar/gui/e-comp-editor-memo.c:266
 #, c-format
 msgid "Assigned Memo — %s"
 msgstr "Assigned Memo — %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:257
+#: ../src/calendar/gui/e-comp-editor-memo.c:267
 #, c-format
 msgid "Memo — %s"
 msgstr "Memo — %s"
@@ -7442,127 +7757,128 @@ msgstr ""
 "Some attachments are still being downloaded. Please wait until the download "
 "is finished."
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:452
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:449
 #, 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:469
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:466
 #, 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:647
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:639
 #: ../src/composer/e-composer-actions.c:312
-msgid "_Attachment..."
+#| msgid "_Attachments"
+msgid "_Attachment…"
 msgstr "_Attachment…"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:649
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:641
 #: ../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:656
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:648
 msgid "_Attachments"
 msgstr "_Attachments"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:658
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:650
 msgid "Show attachments"
 msgstr "Show attachments"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:811
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:803
 #: ../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:813
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:805
 #: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
 msgid "List View"
 msgstr "List View"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:387
+#: ../src/calendar/gui/e-comp-editor-page-general.c:392
 #, c-format
 msgid "Cannot find attendee “%s” in the list of attendees"
 msgstr "Cannot find attendee “%s” in the list of attendees"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:394
+#: ../src/calendar/gui/e-comp-editor-page-general.c:399
 #, c-format
 msgid "Not enough rights to delete attendee “%s”"
 msgstr "Not enough rights to delete attendee “%s”"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:424
+#: ../src/calendar/gui/e-comp-editor-page-general.c:429
 msgid "Failed to delete selected attendee"
 msgid_plural "Failed to delete selected attendees"
 msgstr[0] "Failed to delete selected attendee"
 msgstr[1] "Failed to delete selected attendees"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:510
+#: ../src/calendar/gui/e-comp-editor-page-general.c:543
 msgid "Organizer address is not a valid user mail address"
 msgstr "Organiser address is not a valid user mail address"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:675
+#: ../src/calendar/gui/e-comp-editor-page-general.c:712
 msgid "A_ttendees"
 msgstr "A_ttendees"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:677
+#: ../src/calendar/gui/e-comp-editor-page-general.c:714
 msgid "Toggles whether the Attendees are displayed"
 msgstr "Toggles whether the Attendees are displayed"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:686
+#: ../src/calendar/gui/e-comp-editor-page-general.c:723
 msgid "R_ole Field"
 msgstr "R_ole Field"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:688
+#: ../src/calendar/gui/e-comp-editor-page-general.c:725
 msgid "Toggles whether the Role field is displayed"
 msgstr "Toggles whether the Role field is displayed"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:694
+#: ../src/calendar/gui/e-comp-editor-page-general.c:731
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:696
+#: ../src/calendar/gui/e-comp-editor-page-general.c:733
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Toggles whether the RSVP field is displayed"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:702
+#: ../src/calendar/gui/e-comp-editor-page-general.c:739
 msgid "_Status Field"
 msgstr "_Status Field"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:704
+#: ../src/calendar/gui/e-comp-editor-page-general.c:741
 msgid "Toggles whether the Status field is displayed"
 msgstr "Toggles whether the Status field is displayed"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:710
+#: ../src/calendar/gui/e-comp-editor-page-general.c:747
 msgid "_Type Field"
 msgstr "_Type Field"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:712
+#: ../src/calendar/gui/e-comp-editor-page-general.c:749
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Toggles whether the Attendee Type is displayed"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1058
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1064
 msgid "An organizer is required."
 msgstr "An organiser is required."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1068
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1199
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1074
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1216
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1323
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1340
 msgid "Or_ganizer:"
 msgstr "Or_ganiser:"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1420
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1435
 msgid ""
 "Override color of the event. If not set, then color of the calendar is used."
 msgstr ""
 "Override colour of the event. If not set, then colour of the calendar is "
 "used."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1422
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1437
 msgid ""
 "Override color of the memo. If not set, then color of the memo list is used."
 msgstr ""
@@ -7570,47 +7886,48 @@ msgstr ""
 "used."
 
 #. E_SOURCE_EXTENSION_TASK_LIST
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1424
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1439
 msgid ""
 "Override color of the task. If not set, then color of the task list is used."
 msgstr ""
 "Override colour of the task. If not set, then colour of the task list is "
 "used."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1436
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1450
+#| msgid "Atte_ndees"
 msgctxt "ECompEditor"
-msgid "Atte_ndees..."
-msgstr "Atte_ndees..."
+msgid "Atte_ndees…"
+msgstr "Atte_ndees…"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1513
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
-#: ../src/calendar/gui/e-comp-editor.c:2070
+#: ../src/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/e-util/e-accounts-window.c:1745
 #: ../src/e-util/e-html-editor-actions.c:954
 #: ../src/e-util/e-mail-signature-manager.c:358
-#: ../src/e-util/e-webdav-browser.c:2681 ../src/e-util/filter.ui.h:26
+#: ../src/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/mail/e-mail-label-manager.c:380
-#: ../src/mail/em-folder-properties.c:1047 ../src/mail/mail-config.ui.h:68
+#: ../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/publish-calendar/publish-calendar.ui.h:34
 #: ../src/plugins/templates/templates.c:469
-#: ../src/shell/e-shell-window-actions.c:980 ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/shell/e-shell-window-actions.c:1005 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:325
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:328
 msgid "Add exception"
 msgstr "Add exception"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:363
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:369
 msgid "Modify exception"
 msgstr "Modify exception"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:488
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:502
 msgid "on"
 msgstr "on"
 
@@ -7618,7 +7935,7 @@ msgstr "on"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:569
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:583
 msgctxt "ECompEditorPageRecur"
 msgid "first"
 msgstr "first"
@@ -7628,7 +7945,7 @@ msgstr "first"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:575
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:589
 msgctxt "ECompEditorPageRecur"
 msgid "second"
 msgstr "second"
@@ -7637,7 +7954,7 @@ msgstr "second"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:580
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:594
 msgctxt "ECompEditorPageRecur"
 msgid "third"
 msgstr "third"
@@ -7646,7 +7963,7 @@ msgstr "third"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:585
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:599
 msgctxt "ECompEditorPageRecur"
 msgid "fourth"
 msgstr "fourth"
@@ -7655,7 +7972,7 @@ msgstr "fourth"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:590
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:604
 msgctxt "ECompEditorPageRecur"
 msgid "fifth"
 msgstr "fifth"
@@ -7664,14 +7981,14 @@ msgstr "fifth"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:595
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:609
 msgctxt "ECompEditorPageRecur"
 msgid "last"
 msgstr "last"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:622
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:636
 msgctxt "ECompEditorPageRecur"
 msgid "Other Date"
 msgstr "Other Date"
@@ -7680,7 +7997,7 @@ msgstr "Other Date"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:628
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:642
 msgctxt "ECompEditorPageRecur"
 msgid "1st to 10th"
 msgstr "1st to 10th"
@@ -7689,7 +8006,7 @@ msgstr "1st to 10th"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:634
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:648
 msgctxt "ECompEditorPageRecur"
 msgid "11th to 20th"
 msgstr "11th to 20th"
@@ -7698,7 +8015,7 @@ msgstr "11th to 20th"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:640
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:654
 msgctxt "ECompEditorPageRecur"
 msgid "21st to 31st"
 msgstr "21st to 31st"
@@ -7706,42 +8023,42 @@ msgstr "21st to 31st"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:666
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:680
 msgctxt "ECompEditorPageRecur"
 msgid "day"
 msgstr "day"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:667
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:681
 msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "Monday"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:668
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:682
 msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:669
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:683
 msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:670
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:684
 msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "Thursday"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:671
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:685
 msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "Friday"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:672
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:686
 msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "Saturday"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:673
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:687
 msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
 msgstr "Sunday"
@@ -7749,127 +8066,127 @@ msgstr "Sunday"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:802
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:816
 msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "on the"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:992
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1011
 msgctxt "ECompEditorPageRecur"
 msgid "occurrences"
 msgstr "occurrences"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1484
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2023
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1520
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2077
 msgctxt "ECompEditorPageRecur"
 msgid "This appointment rec_urs"
 msgstr "This appointment rec_urs"
 
 #. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1489
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1525
 msgctxt "ECompEditorPageRecur"
 msgid "This task rec_urs"
 msgstr "This task rec_urs"
 
 #. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1494
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1530
 msgctxt "ECompEditorPageRecur"
 msgid "This memo rec_urs"
 msgstr "This memo rec_urs"
 
 #. Translators: Entire string is for example:     'This component 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1499
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1535
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "This component rec_urs"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1860
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1906
 msgid "Recurrence exception date is invalid"
 msgstr "Recurrence exception date is invalid"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1908
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1962
 msgid "End time of the recurrence is before the start"
 msgstr "End time of the recurrence is before the start"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1951
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2005
 msgid "R_ecurrence"
 msgstr "R_ecurrence"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1953
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2007
 msgid "Set or unset recurrence"
 msgstr "Set or unset recurrence"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2055
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2109
 msgctxt "ECompEditorPageRecur"
 msgid "Every"
 msgstr "Every"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2090
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2144
 msgctxt "ECompEditorPageRecur"
 msgid "day(s)"
 msgstr "day(s)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2092
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2146
 msgctxt "ECompEditorPageRecur"
 msgid "week(s)"
 msgstr "week(s)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2094
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2148
 msgctxt "ECompEditorPageRecur"
 msgid "month(s)"
 msgstr "month(s)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2096
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2150
 msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
 msgstr "year(s)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2125
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2179
 msgctxt "ECompEditorPageRecur"
 msgid "for"
 msgstr "for"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2127
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2181
 msgctxt "ECompEditorPageRecur"
 msgid "until"
 msgstr "until"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2129
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2183
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "forever"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2145
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2199
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2158
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2212
 msgid "Exceptions"
 msgstr "Exceptions"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2223
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1774
+#: ../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/mail-config.ui.h:67
 msgid "A_dd"
 msgstr "A_dd"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1782
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2293
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2150
 #: ../src/mail/mail-config.ui.h:69
 msgid "Re_move"
 msgstr "Re_move"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2247
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2301
 msgid "Preview"
 msgstr "Preview"
 
@@ -7877,359 +8194,357 @@ msgstr "Preview"
 msgid "Send To"
 msgstr "Send To"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1550
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1566
 msgid "_Reminders"
 msgstr "_Reminders"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1552
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1568
 msgid "Set or unset reminders"
 msgstr "Set or unset reminders"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1614
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
-msgid "Reminders"
-msgstr "Reminders"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1639
-msgid "_Reminder"
-msgstr "_Reminder"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1672
-#, c-format
-msgid "%d day before"
-msgid_plural "%d days before"
-msgstr[0] "%d day before"
-msgstr[1] "%d days before"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1679
-#, c-format
-msgid "%d hour before"
-msgid_plural "%d hours before"
-msgstr[0] "%d hour before"
-msgstr[1] "%d hours before"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1686
-#, c-format
-msgid "%d minute before"
-msgid_plural "%d minutes before"
-msgstr[0] "%d minute before"
-msgstr[1] "%d minutes before"
-
 #. Translators: "None" for "No reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1694
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1680
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "None"
 
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1696
-msgctxt "cal-reminders"
-msgid "15 minutes before"
-msgstr "15 minutes before"
-
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1698
+#. Translators: This constructs predefined reminder's description, for example "15 minutes before",
+#. "1 hour before", "1 day before", but, if user has set, also more complicated strings like
+#. "2 days 13 hours 1 minute before".
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1690
+#, c-format
+#| msgid "is before"
 msgctxt "cal-reminders"
-msgid "1 hour before"
-msgstr "1 hour before"
+msgid "%s before"
+msgstr "%s before"
 
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1700
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
+#| msgctxt "cal-reminders"
+#| msgid "%s at the start"
 msgctxt "cal-reminders"
-msgid "1 day before"
-msgstr "1 day before"
+msgid "at the start"
+msgstr "at the start"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1712
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1703
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "Custom"
 
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1849
+msgid "Set a custom predefined time to"
+msgstr "Set a custom predefined time to"
+
+#. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1862
+msgctxt "cal-reminders"
+msgid "da_ys"
+msgstr "da_ys"
+
+#. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1878
+#| 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
+msgid "Reminders"
+msgstr "Reminders"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2005
+msgid "_Reminder"
+msgstr "_Reminder"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2030
+msgid "Add custom predefined time"
+msgstr "Add custom predefined time"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2038
+msgid "Remove custom predefined times"
+msgstr "Remove custom predefined times"
+
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1855
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2223
 msgctxt "cal-reminders"
 msgid "minute(s)"
 msgstr "minute(s)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1857
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2225
 msgctxt "cal-reminders"
 msgid "hour(s)"
 msgstr "hour(s)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1859
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2227
 msgctxt "cal-reminders"
 msgid "day(s)"
 msgstr "day(s)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1876
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2244
 msgctxt "cal-reminders"
 msgid "before"
 msgstr "before"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1878
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2246
 msgctxt "cal-reminders"
 msgid "after"
 msgstr "after"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1894
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2262
 msgctxt "cal-reminders"
 msgid "start"
 msgstr "start"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1896
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2264
 msgctxt "cal-reminders"
 msgid "end"
 msgstr "end"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1915
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2283
 msgid "Re_peat the reminder"
 msgstr "Re_peat the reminder"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1940
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2308
 msgctxt "cal-reminders"
 msgid "extra times every"
 msgstr "extra times every"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1977
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2345
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "minutes"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1979
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2347
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "hours"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1981
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2349
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "days"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2018
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2175
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2386
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2543
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "Custom _message"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2062
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2430
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "Custom reminder _sound"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2073
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2441
 msgid "Select a sound file"
 msgstr "Select a sound file"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2101
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2469
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2126
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2494
 msgid "_Arguments:"
 msgstr "_Arguments:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2158
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2526
 msgid "_Send To:"
 msgstr "_Send To:"
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:443
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:471
 msgid "_Schedule"
 msgstr "_Schedule"
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:445
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:473
 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:79
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:80
 msgctxt "ECompEditor"
 msgid "_Summary:"
 msgstr "_Summary:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:323
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:324
 msgctxt "ECompEditor"
 msgid "_Location:"
 msgstr "_Location:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:456
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:457
+#| msgid "_Categories"
 msgctxt "ECompEditor"
-msgid "_Categories..."
-msgstr "_Categories..."
+msgid "_Categories…"
+msgstr "_Categories…"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:555
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:556
 msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "_Description:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:687
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:688
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "_Web page:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1058
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1059
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "D_ue date:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1154
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1153
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "Date _completed:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1170
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1169
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "Public"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1170
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "Private"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1172
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "Confidential"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1188
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1187
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "C_lassification:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1207
-msgctxt "ECompEditor"
-msgid "Not Started"
-msgstr "Not Started"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1208
-msgctxt "ECompEditor"
-msgid "In Progress"
-msgstr "In Progress"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1209
-msgctxt "ECompEditor"
-msgid "Completed"
-msgstr "Completed"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1210
-msgctxt "ECompEditor"
-msgid "Cancelled"
-msgstr "Cancelled"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1219
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1250
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1249
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1280
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "Undefined"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1250
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1281
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "High"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1251
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1282
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1252
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1283
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "Low"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1261
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1292
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "Priorit_y:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1315
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1346
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "Percent complete:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1396
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1427
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "Time _zone:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1521
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1557
 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:1648
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1979
 msgctxt "ECompEditor"
 msgid "None"
 msgstr "None"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:241
+#: ../src/calendar/gui/e-comp-editor-task.c:256
 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:249
+#: ../src/calendar/gui/e-comp-editor-task.c:264
 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:485
+#: ../src/calendar/gui/e-comp-editor-task.c:505
 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:487
+#: ../src/calendar/gui/e-comp-editor-task.c:507
 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:489
+#: ../src/calendar/gui/e-comp-editor-task.c:509
 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:560
+#: ../src/calendar/gui/e-comp-editor-task.c:580
 msgid "Start date is required for recurring tasks"
 msgstr "Start date is required for recurring tasks"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:572
+#: ../src/calendar/gui/e-comp-editor-task.c:596
 msgid "Due date is not a valid date"
 msgstr "Due date is not a valid date"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:583
+#: ../src/calendar/gui/e-comp-editor-task.c:607
 msgid "Completed date is not a valid date"
 msgstr "Completed date is not a valid date"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:594
+#: ../src/calendar/gui/e-comp-editor-task.c:618
 msgid "Completed date cannot be in the future"
 msgstr "Completed date cannot be in the future"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:667
+#: ../src/calendar/gui/e-comp-editor-task.c:695
 msgid "All _Day Task"
 msgstr "All _Day Task"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:669
+#: ../src/calendar/gui/e-comp-editor-task.c:697
 msgid "Toggles whether to have All Day Task"
 msgstr "Toggles whether to have All Day Task"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:893
+#: ../src/calendar/gui/e-comp-editor-task.c:921
 #, c-format
 msgid "Assigned Task — %s"
 msgstr "Assigned Task — %s"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:894
+#: ../src/calendar/gui/e-comp-editor-task.c:922
 #, c-format
 msgid "Task — %s"
 msgstr "Task — %s"
@@ -8239,20 +8554,22 @@ msgstr "Task — %s"
 msgid "attachment"
 msgstr "attachment"
 
-#: ../src/calendar/gui/e-comp-editor.c:607
-msgid "Sending notifications to attendees..."
-msgstr "Sending notifications to attendees..."
+#: ../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:996
-msgid "Saving changes..."
-msgstr "Saving changes..."
+#: ../src/calendar/gui/e-comp-editor.c:985
+#: ../src/e-util/e-webdav-browser.c:1814
+msgid "Saving changes…"
+msgstr "Saving changes…"
 
-#: ../src/calendar/gui/e-comp-editor.c:1256
+#: ../src/calendar/gui/e-comp-editor.c:1245
 msgid "No Summary"
 msgstr "No Summary"
 
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:1984
+#: ../src/calendar/gui/e-comp-editor.c:1992
 #: ../src/composer/e-composer-actions.c:319
 #: ../src/e-util/e-accounts-window.c:1778
 #: ../src/e-util/e-html-editor-dialog.c:194
@@ -8260,155 +8577,159 @@ 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-notes.c:964
-#: ../src/mail/em-filter-editor.c:45 ../src/mail/em-folder-properties.c:1172
-#: ../src/mail/em-subscription-editor.c:1739
+#: ../src/mail/e-mail-browser.c:144
+#: ../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:296
-#: ../src/shell/e-shell-window-actions.c:824
+#: ../src/shell/e-shell-window-actions.c:314
+#: ../src/shell/e-shell-window-actions.c:842
 #: ../src/smime/gui/certificate-manager.c:2196
 msgid "_Close"
 msgstr "_Close"
 
-#: ../src/calendar/gui/e-comp-editor.c:1986
+#: ../src/calendar/gui/e-comp-editor.c:1994
 msgid "Close the current window"
 msgstr "Close the current window"
 
 #. copy menu item
-#: ../src/calendar/gui/e-comp-editor.c:1991 ../src/e-util/e-focus-tracker.c:773
+#: ../src/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:845
+#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:863
 msgid "_Copy"
 msgstr "_Copy"
 
-#: ../src/calendar/gui/e-comp-editor.c:1993 ../src/e-util/e-focus-tracker.c:173
+#: ../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:2075 ../src/mail/e-mail-browser.c:153
-#: ../src/shell/e-shell-window-actions.c:847
+#: ../src/e-util/e-web-view.c:2080 ../src/mail/e-mail-browser.c:153
+#: ../src/shell/e-shell-window-actions.c:865
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
 #. cut menu item
-#: ../src/calendar/gui/e-comp-editor.c:1998 ../src/e-util/e-focus-tracker.c:768
+#: ../src/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:852
+#: ../src/mail/e-mail-browser.c:158 ../src/shell/e-shell-window-actions.c:870
 msgid "Cu_t"
 msgstr "Cu_t"
 
-#: ../src/calendar/gui/e-comp-editor.c:2000 ../src/e-util/e-focus-tracker.c:166
+#: ../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:2084
-#: ../src/mail/e-mail-browser.c:160 ../src/shell/e-shell-window-actions.c:854
+#: ../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
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
-#: ../src/calendar/gui/e-comp-editor.c:2007 ../src/e-util/e-focus-tracker.c:187
+#: ../src/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:861
+#: ../src/shell/e-shell-window-actions.c:879
 msgid "Delete the selection"
 msgstr "Delete the selection"
 
-#: ../src/calendar/gui/e-comp-editor.c:2014
+#: ../src/calendar/gui/e-comp-editor.c:2022
 msgid "View help"
 msgstr "View help"
 
 #. paste menu item
-#: ../src/calendar/gui/e-comp-editor.c:2019 ../src/e-util/e-focus-tracker.c:778
+#: ../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:880
+#: ../src/mail/e-mail-browser.c:165 ../src/shell/e-shell-window-actions.c:898
 msgid "_Paste"
 msgstr "_Paste"
 
-#: ../src/calendar/gui/e-comp-editor.c:2021 ../src/e-util/e-focus-tracker.c:180
+#: ../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:2093
-#: ../src/mail/e-mail-browser.c:167 ../src/shell/e-shell-window-actions.c:882
+#: ../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
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
-#: ../src/calendar/gui/e-comp-editor.c:2026
-#: ../src/composer/e-composer-actions.c:373 ../src/mail/e-mail-reader.c:2717
+#: ../src/calendar/gui/e-comp-editor.c:2034
+#: ../src/composer/e-composer-actions.c:373 ../src/mail/e-mail-reader.c:2750
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1319
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1333
-msgid "_Print..."
+#| msgid "_Print"
+msgid "_Print…"
 msgstr "_Print…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2724
+#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/mail/e-mail-reader.c:2757
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1771
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:840
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
-msgid "Pre_view..."
-msgstr "Pre_view..."
+#: ../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:2040 ../src/e-util/e-focus-tracker.c:788
+#: ../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:950
+#: ../src/mail/e-mail-browser.c:172 ../src/shell/e-shell-window-actions.c:968
 msgid "Select _All"
 msgstr "Select _All"
 
-#: ../src/calendar/gui/e-comp-editor.c:2042 ../src/e-util/e-focus-tracker.c:194
+#: ../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:952
+#: ../src/mail/e-mail-browser.c:174 ../src/shell/e-shell-window-actions.c:970
 msgid "Select all text"
 msgstr "Select all text"
 
-#: ../src/calendar/gui/e-comp-editor.c:2063
+#: ../src/calendar/gui/e-comp-editor.c:2071
 msgid "_Classification"
 msgstr "_Classification"
 
-#: ../src/calendar/gui/e-comp-editor.c:2077
+#: ../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:987
+#: ../src/mail/e-mail-notes.c:978 ../src/shell/e-shell-window-actions.c:1012
 msgid "_File"
 msgstr "_File"
 
-#: ../src/calendar/gui/e-comp-editor.c:2091
+#: ../src/calendar/gui/e-comp-editor.c:2099
 #: ../src/e-util/e-html-editor-actions.c:982
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../src/calendar/gui/e-comp-editor.c:2098
+#: ../src/calendar/gui/e-comp-editor.c:2106
 #: ../src/composer/e-composer-actions.c:363
 msgid "_Options"
 msgstr "_Options"
 
-#: ../src/calendar/gui/e-comp-editor.c:2105
+#: ../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:1030
+#: ../src/shell/e-shell-window-actions.c:1055
 #: ../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:2117
+#: ../src/calendar/gui/e-comp-editor.c:2125
 msgid "Save current changes"
 msgstr "Save current changes"
 
-#: ../src/calendar/gui/e-comp-editor.c:2122
+#: ../src/calendar/gui/e-comp-editor.c:2130
 #: ../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:2124
+#: ../src/calendar/gui/e-comp-editor.c:2132
 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:2147 ../src/calendar/gui/e-to-do-pane.c:241
-#: ../src/calendar/gui/e-week-view.c:1772 ../src/calendar/gui/print.c:1079
-#: ../src/calendar/gui/print.c:1098 ../src/calendar/gui/print.c:2635
-#: ../src/calendar/gui/print.c:2655
+#: ../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
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2150 ../src/calendar/gui/e-to-do-pane.c:245
-#: ../src/calendar/gui/e-week-view.c:1775 ../src/calendar/gui/print.c:1084
-#: ../src/calendar/gui/print.c:1100 ../src/calendar/gui/print.c:2640
-#: ../src/calendar/gui/print.c:2657
+#: ../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
 msgid "pm"
 msgstr "pm"
 
@@ -8418,15 +8739,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:3062
-#: ../src/calendar/gui/e-day-view-top-item.c:857
+#: ../src/calendar/gui/e-day-view.c:3045
+#: ../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:2102
+#: ../src/calendar/gui/print.c:2109
 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:3790
+#: ../src/calendar/gui/e-day-view.c:3786
 #, c-format
 msgid "Week %d"
 msgstr "Week %d"
@@ -8437,28 +8758,29 @@ msgstr "Week %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../src/calendar/gui/e-day-view-time-item.c:804
+#: ../src/calendar/gui/e-day-view-time-item.c:811
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minute divisions"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:829
+#: ../src/calendar/gui/e-day-view-time-item.c:836
 msgid "Show the second time zone"
 msgstr "Show the second time zone"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../src/calendar/gui/e-day-view-time-item.c:846
-#: ../src/modules/calendar/e-calendar-preferences.c:313
-#: ../src/modules/calendar/e-calendar-preferences.c:365
+#: ../src/calendar/gui/e-day-view-time-item.c:853
+#: ../src/modules/calendar/e-calendar-preferences.c:310
+#: ../src/modules/calendar/e-calendar-preferences.c:362
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "None"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:880
-#: ../src/calendar/gui/e-timezone-entry.c:333
-#: ../src/modules/calendar/e-calendar-preferences.c:396
-msgid "Select..."
+#: ../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…"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:62
@@ -8484,100 +8806,95 @@ 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:1092 ../src/calendar/gui/print.c:1252
+#: ../src/calendar/gui/e-meeting-store.c:1072 ../src/calendar/gui/print.c:1253
 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:1253
+#: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1254
 #: ../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:1254
+#: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1255
 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:1255
+#: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1256
 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:1269
+#: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1270
 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:1095 ../src/calendar/gui/print.c:1270
+#: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1271
 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:1271
+#: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1272
 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:1272
+#: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1273
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:218
-#: ../src/calendar/gui/e-meeting-store.c:195
-#: ../src/calendar/gui/e-meeting-store.c:218
-#: ../src/calendar/gui/e-meeting-store.c:1105
+#: ../src/calendar/gui/e-meeting-list-view.c:207
+#: ../src/calendar/gui/e-meeting-store.c:177
+#: ../src/calendar/gui/e-meeting-store.c:200
+#: ../src/calendar/gui/e-meeting-store.c:1079
 msgid "Needs Action"
 msgstr "Needs Action"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:631
+#: ../src/calendar/gui/e-meeting-list-view.c:624
 msgid "Attendee                          "
 msgstr "Attendee                          "
 
-#: ../src/calendar/gui/e-meeting-list-view.c:657
-#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
-#: ../src/calendar/gui/e-memo-table.etspec.h:3
-#: ../src/calendar/gui/e-task-table.etspec.h:3
-#: ../src/e-util/e-accounts-window.c:1443
-#: ../src/e-util/e-attachment-tree-view.c:205
-#: ../src/e-util/e-collection-account-wizard.c:1934
-#: ../src/e-util/e-webdav-browser.c:2381
-#: ../src/mail/e-mail-account-tree-view.c:158
-msgid "Type"
-msgstr "Type"
-
 #. To translators: RSVP means "please reply"
-#: ../src/calendar/gui/e-meeting-list-view.c:686
+#: ../src/calendar/gui/e-meeting-list-view.c:679
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../src/calendar/gui/e-meeting-store.c:207
-#: ../src/calendar/gui/e-meeting-store.c:230
+#: ../src/calendar/gui/e-meeting-store.c:187
+#: ../src/calendar/gui/e-meeting-store.c:210
+#: ../src/calendar/gui/tasktypes.xml.in.h:13
+#: ../src/plugins/save-calendar/csv-format.c:366
+msgid "Completed"
+msgstr "Completed"
+
+#: ../src/calendar/gui/e-meeting-store.c:189
+#: ../src/calendar/gui/e-meeting-store.c:212
 msgid "In Process"
 msgstr "In Process"
 
-#: ../src/calendar/gui/e-meeting-store.c:1976
+#: ../src/calendar/gui/e-meeting-store.c:2003
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "Enter password to access free/busy information on server %s as user %s"
 
-#: ../src/calendar/gui/e-meeting-store.c:1986
+#: ../src/calendar/gui/e-meeting-store.c:2013
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Failure reason: %s"
 
-#: ../src/calendar/gui/e-meeting-store.c:1991
-#: ../src/e-util/e-collection-account-wizard.c:470
+#: ../src/calendar/gui/e-meeting-store.c:2018
+#: ../src/e-util/e-collection-account-wizard.c:493
 #: ../src/plugins/publish-calendar/publish-calendar.c:350
 #: ../src/smime/gui/component.c:61
 msgid "Enter password"
@@ -8592,7 +8909,8 @@ msgid "No Information"
 msgstr "No Information"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:543
-msgid "Atte_ndees..."
+#| msgid "Atte_ndees"
+msgid "Atte_ndees…"
 msgstr "Atte_ndees…"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:562
@@ -8657,7 +8975,7 @@ msgstr ""
 "Location: %s"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:2578
-#: ../src/calendar/gui/print.c:3534
+#: ../src/calendar/gui/print.c:3554
 #, c-format
 msgid "Summary: %s"
 msgstr "Summary: %s"
@@ -8686,41 +9004,41 @@ msgstr "Common Name"
 msgid "Language"
 msgstr "Language"
 
-#: ../src/calendar/gui/e-memo-table.c:461
-#: ../src/calendar/gui/e-task-table.c:782
+#: ../src/calendar/gui/e-memo-table.c:535
+#: ../src/calendar/gui/e-task-table.c:700
 msgid "* No Summary *"
 msgstr "* No Summary *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../src/calendar/gui/e-memo-table.c:546
-#: ../src/calendar/gui/e-task-table.c:879
+#: ../src/calendar/gui/e-memo-table.c:621
+#: ../src/calendar/gui/e-task-table.c:799
 msgid "Start: "
 msgstr "Start: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../src/calendar/gui/e-memo-table.c:566
-#: ../src/calendar/gui/e-task-table.c:898
+#: ../src/calendar/gui/e-memo-table.c:641
+#: ../src/calendar/gui/e-task-table.c:832
 msgid "Due: "
 msgstr "Due: "
 
-#: ../src/calendar/gui/e-memo-table.c:775
+#: ../src/calendar/gui/e-memo-table.c:849
 msgid "Cut selected memos to the clipboard"
 msgstr "Cut selected memos to the clipboard"
 
-#: ../src/calendar/gui/e-memo-table.c:781
+#: ../src/calendar/gui/e-memo-table.c:855
 msgid "Copy selected memos to the clipboard"
 msgstr "Copy selected memos to the clipboard"
 
-#: ../src/calendar/gui/e-memo-table.c:787
+#: ../src/calendar/gui/e-memo-table.c:861
 msgid "Paste memos from the clipboard"
 msgstr "Paste memos from the clipboard"
 
-#: ../src/calendar/gui/e-memo-table.c:793
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:574
+#: ../src/calendar/gui/e-memo-table.c:867
+#: ../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:799
+#: ../src/calendar/gui/e-memo-table.c:873
 msgid "Select all visible memos"
 msgstr "Select all visible memos"
 
@@ -8728,7 +9046,7 @@ msgstr "Select all visible memos"
 msgid "Click to add a memo"
 msgstr "Click to add a memo"
 
-#: ../src/calendar/gui/e-task-table.c:552
+#: ../src/calendar/gui/e-task-table.c:474
 #: ../src/calendar/gui/tasktypes.xml.in.h:22
 #: ../src/e-util/e-send-options.ui.h:1
 msgid "Undefined"
@@ -8738,29 +9056,29 @@ msgstr "Undefined"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../src/calendar/gui/e-task-table.c:580
+#: ../src/calendar/gui/e-task-table.c:502
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/calendar/gui/e-task-table.c:1135
+#: ../src/calendar/gui/e-task-table.c:1069
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cut selected tasks to the clipboard"
 
-#: ../src/calendar/gui/e-task-table.c:1141
+#: ../src/calendar/gui/e-task-table.c:1075
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copy selected tasks to the clipboard"
 
-#: ../src/calendar/gui/e-task-table.c:1147
+#: ../src/calendar/gui/e-task-table.c:1081
 msgid "Paste tasks from the clipboard"
 msgstr "Paste tasks from the clipboard"
 
-#: ../src/calendar/gui/e-task-table.c:1153
-#: ../src/modules/calendar/e-task-shell-view-actions.c:700
+#: ../src/calendar/gui/e-task-table.c:1087
+#: ../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:1159
+#: ../src/calendar/gui/e-task-table.c:1093
 msgid "Select all visible tasks"
 msgstr "Select all visible tasks"
 
@@ -8792,127 +9110,154 @@ msgstr "% Complete"
 
 #: ../src/calendar/gui/e-task-table.etspec.h:10
 #: ../src/calendar/gui/tasktypes.xml.in.h:18
-#: ../src/plugins/save-calendar/csv-format.c:384
+#: ../src/plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "Priority"
 
-#: ../src/calendar/gui/e-timezone-entry.c:344
+#. 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"
+
+#: ../src/calendar/gui/e-timezone-entry.c:357
 msgid "Select Timezone"
 msgstr "Select Timezone"
 
 #. Translators: It will display "Start: StartDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:390
+#: ../src/calendar/gui/e-to-do-pane.c:404
 #, c-format
 msgid "Start: %s"
 msgstr "Start: %s"
 
 #. Translators: It will display "Due: DueDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:410
+#: ../src/calendar/gui/e-to-do-pane.c:426
 #, c-format
 msgid "Due: %s"
 msgstr "Due: %s"
 
 #. Translators: It will display "Completed: DateAndTimeWhenCompleted"
-#: ../src/calendar/gui/e-to-do-pane.c:424
+#: ../src/calendar/gui/e-to-do-pane.c:440
 #, c-format
 msgid "Completed: %s"
 msgstr "Completed: %s"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1460 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/calendar/gui/e-to-do-pane.c:1544 ../src/e-util/e-cell-date-edit.c:328
 #: ../src/e-util/e-datetime-format.c:207
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1869
-#: ../src/modules/itip-formatter/itip-view.c:255
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1821
+#: ../src/modules/itip-formatter/itip-view.c:254
 msgid "Today"
 msgstr "Today"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1462
+#: ../src/calendar/gui/e-to-do-pane.c:1546
 #: ../src/e-util/e-datetime-format.c:218
-#: ../src/modules/itip-formatter/itip-view.c:283
+#: ../src/modules/itip-formatter/itip-view.c:282
 msgid "Tomorrow"
 msgstr "Tomorrow"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1472
+#: ../src/calendar/gui/e-to-do-pane.c:1556
 msgid "Tasks without Due date"
 msgstr "Tasks without Due date"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2045
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1472
-msgid "New _Appointment..."
+#: ../src/calendar/gui/e-to-do-pane.c:2133
+#: ../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:2053
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1458
-msgid "New _Meeting..."
+#: ../src/calendar/gui/e-to-do-pane.c:2141
+#: ../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:2061
-msgid "New _Task..."
-msgstr "New _Task..."
-
-#: ../src/calendar/gui/e-to-do-pane.c:2069
-msgid "_New Assigned Task..."
-msgstr "_New Assigned Task..."
-
-#: ../src/calendar/gui/e-to-do-pane.c:2082
-msgid "_Open..."
-msgstr "_Open..."
-
-#: ../src/calendar/gui/e-to-do-pane.c:2096
-msgid "_Delete This Instance..."
-msgstr "_Delete This Instance..."
-
-#: ../src/calendar/gui/e-to-do-pane.c:2104
-msgid "D_elete All Instances..."
-msgstr "D_elete All Instances..."
-
-#: ../src/calendar/gui/e-to-do-pane.c:2112
-msgid "_Delete..."
-msgstr "_Delete..."
-
-#: ../src/calendar/gui/e-to-do-pane.c:2129
+#: ../src/calendar/gui/e-to-do-pane.c:2149
+#| msgid "New _Task"
+msgid "New _Task…"
+msgstr "New _Task…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2157
+#| msgid "_New Assigned Task..."
+msgid "_New Assigned Task…"
+msgstr "_New Assigned Task…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2170
+#| msgid "_Open"
+msgid "_Open…"
+msgstr "_Open…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2184
+#| msgid "_Delete This Instance..."
+msgid "_Delete This Instance…"
+msgstr "_Delete This Instance…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2192
+#| msgid "D_elete All Instances..."
+msgid "D_elete All Instances…"
+msgstr "D_elete All Instances…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2200
+#| msgid "_Delete"
+msgid "_Delete…"
+msgstr "_Delete…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2217
 msgid "_Show Tasks without Due date"
 msgstr "_Show Tasks without Due date"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2395
+#: ../src/calendar/gui/e-to-do-pane.c:2483
 msgid "To Do"
 msgstr "To Do"
 
+#. Translators: the first '%s' is replaced with a component summary;
+#. the second '%s' is replaced with an event location.
+#. Example: "Meet John Doe (Central Park)"
+#: ../src/calendar/gui/e-week-view.c:3705
+#, c-format
+#| msgctxt "language"
+#| msgid "%s (%s)"
+msgctxt "SummaryWithLocation"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
 #: ../src/calendar/gui/e-week-view-main-item.c:222
-#: ../src/calendar/gui/print.c:2081
+#: ../src/calendar/gui/print.c:2088
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../src/calendar/gui/itip-utils.c:786 ../src/calendar/gui/itip-utils.c:848
-#: ../src/calendar/gui/itip-utils.c:982
+#: ../src/calendar/gui/itip-utils.c:795 ../src/calendar/gui/itip-utils.c:861
+#: ../src/calendar/gui/itip-utils.c:1010
 msgid "An organizer must be set."
 msgstr "An organiser must be set."
 
-#: ../src/calendar/gui/itip-utils.c:839
+#: ../src/calendar/gui/itip-utils.c:851
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: ../src/calendar/gui/itip-utils.c:1070 ../src/calendar/gui/itip-utils.c:1231
+#: ../src/calendar/gui/itip-utils.c:1108 ../src/calendar/gui/itip-utils.c:1274
 msgid "Event information"
 msgstr "Event information"
 
-#: ../src/calendar/gui/itip-utils.c:1073 ../src/calendar/gui/itip-utils.c:1234
+#: ../src/calendar/gui/itip-utils.c:1111 ../src/calendar/gui/itip-utils.c:1277
 msgid "Task information"
 msgstr "Task information"
 
-#: ../src/calendar/gui/itip-utils.c:1076 ../src/calendar/gui/itip-utils.c:1237
+#: ../src/calendar/gui/itip-utils.c:1114 ../src/calendar/gui/itip-utils.c:1280
 msgid "Memo information"
 msgstr "Memo information"
 
-#: ../src/calendar/gui/itip-utils.c:1079 ../src/calendar/gui/itip-utils.c:1255
+#: ../src/calendar/gui/itip-utils.c:1117 ../src/calendar/gui/itip-utils.c:1298
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
-#: ../src/calendar/gui/itip-utils.c:1082
+#: ../src/calendar/gui/itip-utils.c:1120
 msgid "Calendar information"
 msgstr "Calendar information"
 
@@ -8920,7 +9265,7 @@ msgstr "Calendar information"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1119
+#: ../src/calendar/gui/itip-utils.c:1160
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Accepted"
@@ -8929,7 +9274,7 @@ msgstr "Accepted"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1126
+#: ../src/calendar/gui/itip-utils.c:1167
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
@@ -8941,7 +9286,7 @@ msgstr "Tentatively Accepted"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1133 ../src/calendar/gui/itip-utils.c:1181
+#: ../src/calendar/gui/itip-utils.c:1174 ../src/calendar/gui/itip-utils.c:1222
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Declined"
@@ -8950,7 +9295,7 @@ msgstr "Declined"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1140
+#: ../src/calendar/gui/itip-utils.c:1181
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegated"
@@ -8958,7 +9303,7 @@ msgstr "Delegated"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1153
+#: ../src/calendar/gui/itip-utils.c:1194
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Updated"
@@ -8966,7 +9311,7 @@ msgstr "Updated"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1160
+#: ../src/calendar/gui/itip-utils.c:1201
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancel"
@@ -8974,7 +9319,7 @@ msgstr "Cancel"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1167
+#: ../src/calendar/gui/itip-utils.c:1208
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Refresh"
@@ -8982,160 +9327,201 @@ msgstr "Refresh"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1174
+#: ../src/calendar/gui/itip-utils.c:1215
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
 
-#: ../src/calendar/gui/itip-utils.c:1252
+#: ../src/calendar/gui/itip-utils.c:1295
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy information (%s to %s)"
 
-#: ../src/calendar/gui/itip-utils.c:1260
+#: ../src/calendar/gui/itip-utils.c:1303
 msgid "iCalendar information"
 msgstr "iCalendar information"
 
-#: ../src/calendar/gui/itip-utils.c:1289
+#: ../src/calendar/gui/itip-utils.c:1332
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Unable to book a resource, the new event collides with some other."
 
-#: ../src/calendar/gui/itip-utils.c:1294
+#: ../src/calendar/gui/itip-utils.c:1337
 msgid "Unable to book a resource, error: "
 msgstr "Unable to book a resource, error: "
 
-#: ../src/calendar/gui/itip-utils.c:1465
+#: ../src/calendar/gui/itip-utils.c:1530
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
-#: ../src/calendar/gui/itip-utils.c:2210
+#: ../src/calendar/gui/itip-utils.c:2311
 msgid "Sending an event"
 msgstr "Sending an event"
 
-#: ../src/calendar/gui/itip-utils.c:2214
+#: ../src/calendar/gui/itip-utils.c:2315
 msgid "Sending a memo"
 msgstr "Sending a memo"
 
-#: ../src/calendar/gui/itip-utils.c:2218
+#: ../src/calendar/gui/itip-utils.c:2319
 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"
+msgctxt "Location"
+msgid "Unspecified"
+msgstr "Unspecified"
+
+#: ../src/calendar/gui/misc.c:95
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d day"
+msgstr[1] "%d days"
+
+#: ../src/calendar/gui/misc.c:101
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hour"
+msgstr[1] "%d hours"
+
+#: ../src/calendar/gui/misc.c:107
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minute"
+msgstr[1] "%d minutes"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../src/calendar/gui/misc.c:111
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d second"
+msgstr[1] "%d seconds"
+
 #. G_DATE_BAD_WEEKDAY
 #. Translators: These are workday abbreviations,
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_MONDAY
-#: ../src/calendar/gui/print.c:733
+#: ../src/calendar/gui/print.c:730
 msgid "Mo"
 msgstr "Mo"
 
 #. G_DATE_TUESDAY
-#: ../src/calendar/gui/print.c:734
+#: ../src/calendar/gui/print.c:731
 msgid "Tu"
 msgstr "Tu"
 
 #. G_DATE_WEDNESDAY
-#: ../src/calendar/gui/print.c:735
+#: ../src/calendar/gui/print.c:732
 msgid "We"
 msgstr "We"
 
 #. G_DATE_THURSDAY
-#: ../src/calendar/gui/print.c:736
+#: ../src/calendar/gui/print.c:733
 msgid "Th"
 msgstr "Th"
 
 #. G_DATE_FRIDAY
-#: ../src/calendar/gui/print.c:737
+#: ../src/calendar/gui/print.c:734
 msgid "Fr"
 msgstr "Fr"
 
 #. G_DATE_SATURDAY
-#: ../src/calendar/gui/print.c:738
+#: ../src/calendar/gui/print.c:735
 msgid "Sa"
 msgstr "Sa"
 
 #. G_DATE_SUNDAY
-#: ../src/calendar/gui/print.c:739
+#: ../src/calendar/gui/print.c:736
 msgid "Su"
 msgstr "Su"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../src/calendar/gui/print.c:3327
+#: ../src/calendar/gui/print.c:3346
 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:3337
+#: ../src/calendar/gui/print.c:3356
 msgid " (Completed "
 msgstr " (Completed "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../src/calendar/gui/print.c:3343
+#: ../src/calendar/gui/print.c:3362
 msgid "Completed "
 msgstr "Completed "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../src/calendar/gui/print.c:3353
+#: ../src/calendar/gui/print.c:3372
 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:3360
+#: ../src/calendar/gui/print.c:3379
 msgid "Due "
 msgstr "Due "
 
-#: ../src/calendar/gui/print.c:3504
+#: ../src/calendar/gui/print.c:3524
 msgid "Appointment"
 msgstr "Appointment"
 
-#: ../src/calendar/gui/print.c:3506 ../src/e-util/e-send-options.c:551
+#: ../src/calendar/gui/print.c:3526 ../src/e-util/e-send-options.c:551
 msgid "Task"
 msgstr "Task"
 
-#: ../src/calendar/gui/print.c:3508
+#: ../src/calendar/gui/print.c:3528
 msgid "Memo"
 msgstr "Memo"
 
-#: ../src/calendar/gui/print.c:3564
+#: ../src/calendar/gui/print.c:3585
 msgid "Attendees: "
 msgstr "Attendees: "
 
-#: ../src/calendar/gui/print.c:3608
+#: ../src/calendar/gui/print.c:3614
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../src/calendar/gui/print.c:3624
+#: ../src/calendar/gui/print.c:3630
 #, c-format
 msgid "Priority: %s"
 msgstr "Priority: %s"
 
-#: ../src/calendar/gui/print.c:3642
+#: ../src/calendar/gui/print.c:3645
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percent Complete: %i"
 
-#: ../src/calendar/gui/print.c:3656
+#: ../src/calendar/gui/print.c:3660
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../src/calendar/gui/print.c:3670
+#: ../src/calendar/gui/print.c:3676
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: ../src/calendar/gui/print.c:3681
+#: ../src/calendar/gui/print.c:3688
 msgid "Contacts: "
 msgstr "Contacts: "
 
+#: ../src/calendar/gui/tasktypes.xml.in.h:11
+msgid "Not Started"
+msgstr "Not Started"
+
 #: ../src/calendar/gui/tasktypes.xml.in.h:12
 msgid "In progress"
 msgstr "In progress"
@@ -9161,208 +9547,208 @@ msgstr "is less than"
 msgid "Appointments and Meetings"
 msgstr "Appointments and Meetings"
 
-#: ../src/calendar/importers/icalendar-importer.c:306
+#: ../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:108
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:322
+#: ../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-shell-view-actions.c:180
 msgid "New Calendar"
 msgstr "New Calendar"
 
-#: ../src/calendar/importers/icalendar-importer.c:309
+#: ../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:330
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:275
 #: ../src/modules/calendar/e-task-shell-view-actions.c:204
 msgid "New Task List"
 msgstr "New Task List"
 
-#: ../src/calendar/importers/icalendar-importer.c:351
+#: ../src/calendar/importers/icalendar-importer.c:372
 msgid "Cre_ate new calendar"
 msgstr "Cre_ate new calendar"
 
-#: ../src/calendar/importers/icalendar-importer.c:355
+#: ../src/calendar/importers/icalendar-importer.c:376
 msgid "Cre_ate new task list"
 msgstr "Cre_ate new task list"
 
-#: ../src/calendar/importers/icalendar-importer.c:500
-#: ../src/calendar/importers/icalendar-importer.c:939
+#: ../src/calendar/importers/icalendar-importer.c:521
+#: ../src/calendar/importers/icalendar-importer.c:971
 msgid "Opening calendar"
 msgstr "Opening calendar"
 
-#: ../src/calendar/importers/icalendar-importer.c:647
+#: ../src/calendar/importers/icalendar-importer.c:668
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar files (.ics)"
 
-#: ../src/calendar/importers/icalendar-importer.c:648
+#: ../src/calendar/importers/icalendar-importer.c:669
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar importer"
 
-#: ../src/calendar/importers/icalendar-importer.c:740
+#: ../src/calendar/importers/icalendar-importer.c:764
 msgid "Reminder!"
 msgstr "Reminder!"
 
-#: ../src/calendar/importers/icalendar-importer.c:825
+#: ../src/calendar/importers/icalendar-importer.c:859
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar files (.vcs)"
 
-#: ../src/calendar/importers/icalendar-importer.c:826
+#: ../src/calendar/importers/icalendar-importer.c:860
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar importer"
 
-#: ../src/calendar/importers/icalendar-importer.c:1102
+#: ../src/calendar/importers/icalendar-importer.c:1134
 msgid "Calendar Events"
 msgstr "Calendar Events"
 
-#: ../src/calendar/importers/icalendar-importer.c:1145
+#: ../src/calendar/importers/icalendar-importer.c:1177
 msgid "GNOME Calendar"
 msgstr "GNOME Calendar"
 
-#: ../src/calendar/importers/icalendar-importer.c:1146
+#: ../src/calendar/importers/icalendar-importer.c:1178
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution Calendar intelligent importer"
 
-#: ../src/calendar/importers/icalendar-importer.c:1217
-#: ../src/calendar/importers/icalendar-importer.c:1531
+#: ../src/calendar/importers/icalendar-importer.c:1254
+#: ../src/calendar/importers/icalendar-importer.c:1582
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Meeting"
 
-#: ../src/calendar/importers/icalendar-importer.c:1217
-#: ../src/calendar/importers/icalendar-importer.c:1531
+#: ../src/calendar/importers/icalendar-importer.c:1254
+#: ../src/calendar/importers/icalendar-importer.c:1582
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Event"
 
-#: ../src/calendar/importers/icalendar-importer.c:1220
-#: ../src/calendar/importers/icalendar-importer.c:1532
+#: ../src/calendar/importers/icalendar-importer.c:1257
+#: ../src/calendar/importers/icalendar-importer.c:1583
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Task"
 
-#: ../src/calendar/importers/icalendar-importer.c:1223
-#: ../src/calendar/importers/icalendar-importer.c:1533
+#: ../src/calendar/importers/icalendar-importer.c:1260
+#: ../src/calendar/importers/icalendar-importer.c:1584
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Memo"
 
 #. have ? NULL :
-#: ../src/calendar/importers/icalendar-importer.c:1232
+#: ../src/calendar/importers/icalendar-importer.c:1269
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "has recurrences"
 
-#: ../src/calendar/importers/icalendar-importer.c:1237
+#: ../src/calendar/importers/icalendar-importer.c:1274
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "is an instance"
 
-#: ../src/calendar/importers/icalendar-importer.c:1242
+#: ../src/calendar/importers/icalendar-importer.c:1279
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "has reminders"
 
-#: ../src/calendar/importers/icalendar-importer.c:1247
+#: ../src/calendar/importers/icalendar-importer.c:1284
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "has attachments"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1260
+#: ../src/calendar/importers/icalendar-importer.c:1296
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Public"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1263
+#: ../src/calendar/importers/icalendar-importer.c:1299
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Private"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1266
+#: ../src/calendar/importers/icalendar-importer.c:1302
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Confidential"
 
 #. Translators: Appointment's classification section name
-#: ../src/calendar/importers/icalendar-importer.c:1270
+#: ../src/calendar/importers/icalendar-importer.c:1306
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Classification"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../src/calendar/importers/icalendar-importer.c:1275
-#: ../src/calendar/importers/icalendar-importer.c:1575
+#: ../src/calendar/importers/icalendar-importer.c:1311
+#: ../src/calendar/importers/icalendar-importer.c:1627
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Summary"
 
 #. Translators: Appointment's location
-#: ../src/calendar/importers/icalendar-importer.c:1281
+#: ../src/calendar/importers/icalendar-importer.c:1318
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Location"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../src/calendar/importers/icalendar-importer.c:1289
-#: ../src/calendar/importers/icalendar-importer.c:1570
+#: ../src/calendar/importers/icalendar-importer.c:1326
+#: ../src/calendar/importers/icalendar-importer.c:1622
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Start"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../src/calendar/importers/icalendar-importer.c:1300
+#: ../src/calendar/importers/icalendar-importer.c:1336
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Due"
 
 #. Translators: Appointment's end time
-#: ../src/calendar/importers/icalendar-importer.c:1312
+#: ../src/calendar/importers/icalendar-importer.c:1347
 msgctxt "iCalImp"
 msgid "End"
 msgstr "End"
 
 #. Translators: Appointment's categories
-#: ../src/calendar/importers/icalendar-importer.c:1322
+#: ../src/calendar/importers/icalendar-importer.c:1356
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Categories"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../src/calendar/importers/icalendar-importer.c:1346
+#: ../src/calendar/importers/icalendar-importer.c:1381
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Completed"
 
 #. Translators: Appointment's URL
-#: ../src/calendar/importers/icalendar-importer.c:1354
+#: ../src/calendar/importers/icalendar-importer.c:1388
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../src/calendar/importers/icalendar-importer.c:1365
-#: ../src/calendar/importers/icalendar-importer.c:1368
+#: ../src/calendar/importers/icalendar-importer.c:1405
+#: ../src/calendar/importers/icalendar-importer.c:1408
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organiser"
 
 #. Translators: Appointment's attendees
-#: ../src/calendar/importers/icalendar-importer.c:1388
-#: ../src/calendar/importers/icalendar-importer.c:1391
+#: ../src/calendar/importers/icalendar-importer.c:1437
+#: ../src/calendar/importers/icalendar-importer.c:1440
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Attendees"
 
-#: ../src/calendar/importers/icalendar-importer.c:1405
+#: ../src/calendar/importers/icalendar-importer.c:1456
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Description"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../src/calendar/importers/icalendar-importer.c:1565
+#: ../src/calendar/importers/icalendar-importer.c:1617
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Type"
@@ -10915,7 +11301,8 @@ msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
 #: ../src/composer/e-composer-actions.c:226
-msgid "Save as..."
+#| msgid "Save Task"
+msgid "Save as…"
 msgstr "Save as…"
 
 #: ../src/composer/e-composer-actions.c:321
@@ -10931,12 +11318,12 @@ 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:894
+#: ../src/shell/e-shell-window-actions.c:912
 msgid "_Preferences"
 msgstr "_Preferences"
 
 #: ../src/composer/e-composer-actions.c:335
-#: ../src/shell/e-shell-window-actions.c:896
+#: ../src/shell/e-shell-window-actions.c:914
 msgid "Configure Evolution"
 msgstr "Configure Evolution"
 
@@ -10945,7 +11332,8 @@ msgid "Save the current file"
 msgstr "Save the current file"
 
 #: ../src/composer/e-composer-actions.c:347
-msgid "Save _As..."
+#| msgid "Save _As"
+msgid "Save _As…"
 msgstr "Save _As…"
 
 #: ../src/composer/e-composer-actions.c:349
@@ -11081,9 +11469,9 @@ msgid "Save Draft"
 msgstr "Save Draft"
 
 #: ../src/composer/e-composer-from-header.c:108
-#: ../src/e-util/e-collection-account-wizard.c:1966
+#: ../src/e-util/e-collection-account-wizard.c:2003
 #: ../src/e-util/e-mail-signature-script-dialog.c:416
-#: ../src/e-util/e-webdav-browser.c:2408
+#: ../src/e-util/e-webdav-browser.c:2413
 #: ../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
@@ -11164,11 +11552,11 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
-#: ../src/composer/e-msg-composer.c:1792 ../src/composer/e-msg-composer.c:2466
+#: ../src/composer/e-msg-composer.c:1802 ../src/composer/e-msg-composer.c:2476
 msgid "Compose Message"
 msgstr "Compose Message"
 
-#: ../src/composer/e-msg-composer.c:4987
+#: ../src/composer/e-msg-composer.c:5006
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "The composer contains a non-text message body, which cannot be edited."
 
@@ -11318,7 +11706,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:643
+#: ../src/e-util/e-collection-account-wizard.c:675
 msgid "_Try Again"
 msgstr "_Try Again"
 
@@ -11462,21 +11850,21 @@ 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:107
+#: ../src/em-format/e-mail-formatter-headers.c:108
 #: ../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:132
+#: ../src/em-format/e-mail-formatter-headers.c:133
 msgid "(no subject)"
 msgstr "(no subject)"
 
 #. 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:339
+#: ../src/em-format/e-mail-formatter-headers.c:344
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "This message was sent by %s on behalf of %s"
@@ -11489,16 +11877,16 @@ msgstr "Regular Image"
 msgid "Display part as an image"
 msgstr "Display part as an image"
 
-#: ../src/em-format/e-mail-formatter-message-rfc822.c:249
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:253
 msgid "RFC822 message"
 msgstr "RFC822 message"
 
-#: ../src/em-format/e-mail-formatter-message-rfc822.c:250
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:254
 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:2352
+#: ../src/e-util/e-webdav-browser.c:2357
 #: ../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
@@ -11511,7 +11899,7 @@ msgstr "Name"
 msgid "Size"
 msgstr "Size"
 
-#: ../src/em-format/e-mail-formatter-quote-headers.c:178
+#: ../src/em-format/e-mail-formatter-quote-headers.c:181
 #: ../src/em-format/e-mail-part-headers.c:51
 #: ../src/mail/e-mail-tag-editor.c:201 ../src/mail/filtertypes.xml.in.h:16
 #: ../src/mail/message-list.etspec.h:6 ../src/mail/searchtypes.xml.in.h:17
@@ -11522,8 +11910,8 @@ msgid "Subject"
 msgstr "Subject"
 
 #. pseudo-header
-#: ../src/em-format/e-mail-formatter-quote-headers.c:197
-#: ../src/em-format/e-mail-formatter-utils.c:346
+#: ../src/em-format/e-mail-formatter-quote-headers.c:200
+#: ../src/em-format/e-mail-formatter-utils.c:360
 #: ../src/modules/mail/em-mailer-prefs.c:686
 #: ../src/modules/mail/em-mailer-prefs.c:1619
 #: ../src/modules/mail/em-mailer-prefs.c:1668
@@ -11541,12 +11929,12 @@ msgid "Display part as enriched text"
 msgstr "Display part as enriched text"
 
 #: ../src/em-format/e-mail-formatter-quote-text-html.c:93
-#: ../src/em-format/e-mail-formatter-text-html.c:386
+#: ../src/em-format/e-mail-formatter-text-html.c:385
 msgid "HTML"
 msgstr "HTML"
 
 #: ../src/em-format/e-mail-formatter-quote-text-html.c:94
-#: ../src/em-format/e-mail-formatter-text-html.c:387
+#: ../src/em-format/e-mail-formatter-text-html.c:386
 msgid "Format part as HTML"
 msgstr "Format part as HTML"
 
@@ -11687,8 +12075,8 @@ msgstr ""
 msgid "Display source of a MIME part"
 msgstr "Display source of a MIME part"
 
-#: ../src/em-format/e-mail-formatter-utils.c:205
-#: ../src/em-format/e-mail-formatter-utils.c:222
+#: ../src/em-format/e-mail-formatter-utils.c:212
+#: ../src/em-format/e-mail-formatter-utils.c:237
 #: ../src/em-format/e-mail-part-headers.c:48
 #: ../src/mail/message-list.etspec.h:9 ../src/mail/searchtypes.xml.in.h:11
 #: ../src/mail/vfoldertypes.xml.in.h:11
@@ -11696,53 +12084,53 @@ msgstr "Display source of a MIME part"
 msgid "To"
 msgstr "To"
 
-#: ../src/em-format/e-mail-formatter-utils.c:206
-#: ../src/em-format/e-mail-formatter-utils.c:223
+#: ../src/em-format/e-mail-formatter-utils.c:213
+#: ../src/em-format/e-mail-formatter-utils.c:238
 #: ../src/em-format/e-mail-part-headers.c:49
 #: ../src/modules/mail/em-mailer-prefs.c:63
 msgid "Cc"
 msgstr "Cc"
 
-#: ../src/em-format/e-mail-formatter-utils.c:207
-#: ../src/em-format/e-mail-formatter-utils.c:224
+#: ../src/em-format/e-mail-formatter-utils.c:214
+#: ../src/em-format/e-mail-formatter-utils.c:239
 #: ../src/em-format/e-mail-part-headers.c:50
 #: ../src/modules/mail/em-mailer-prefs.c:64
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../src/em-format/e-mail-formatter-utils.c:564
+#: ../src/em-format/e-mail-formatter-utils.c:577
 msgid "GPG signed"
 msgstr "GPG signed"
 
-#: ../src/em-format/e-mail-formatter-utils.c:564
+#: ../src/em-format/e-mail-formatter-utils.c:577
 msgid "partially GPG signed"
 msgstr "partially GPG signed"
 
-#: ../src/em-format/e-mail-formatter-utils.c:565
+#: ../src/em-format/e-mail-formatter-utils.c:578
 msgid "GPG encrypted"
 msgstr "GPG encrypted"
 
-#: ../src/em-format/e-mail-formatter-utils.c:565
+#: ../src/em-format/e-mail-formatter-utils.c:578
 msgid "partially GPG encrypted"
 msgstr "partially GPG encrypted"
 
-#: ../src/em-format/e-mail-formatter-utils.c:566
+#: ../src/em-format/e-mail-formatter-utils.c:579
 msgid "S/MIME signed"
 msgstr "S/MIME signed"
 
-#: ../src/em-format/e-mail-formatter-utils.c:566
+#: ../src/em-format/e-mail-formatter-utils.c:579
 msgid "partially S/MIME signed"
 msgstr "partially S/MIME signed"
 
-#: ../src/em-format/e-mail-formatter-utils.c:567
+#: ../src/em-format/e-mail-formatter-utils.c:580
 msgid "S/MIME encrypted"
 msgstr "S/MIME encrypted"
 
-#: ../src/em-format/e-mail-formatter-utils.c:567
+#: ../src/em-format/e-mail-formatter-utils.c:580
 msgid "partially S/MIME encrypted"
 msgstr "partially S/MIME encrypted"
 
-#: ../src/em-format/e-mail-formatter-utils.c:680
+#: ../src/em-format/e-mail-formatter-utils.c:693
 #: ../src/mail/e-mail-config-security-page.c:856
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:273
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:216
@@ -11754,7 +12142,7 @@ msgstr "Security"
 msgid "Error parsing MBOX part: %s"
 msgstr "Error parsing MBOX part: %s"
 
-#: ../src/em-format/e-mail-parser-application-smime.c:101
+#: ../src/em-format/e-mail-parser-application-smime.c:113
 #, c-format
 msgid "Could not parse S/MIME message: %s"
 msgstr "Could not parse S/MIME message: %s"
@@ -11765,7 +12153,7 @@ msgid "Could not parse PGP message: %s"
 msgstr "Could not parse PGP message: %s"
 
 #: ../src/em-format/e-mail-parser-inlinepgp-signed.c:79
-#: ../src/em-format/e-mail-parser-multipart-signed.c:152
+#: ../src/em-format/e-mail-parser-multipart-signed.c:163
 #, c-format
 msgid "Error verifying signature: %s"
 msgstr "Error verifying signature: %s"
@@ -11799,21 +12187,21 @@ msgstr "Pointer to remote data (%s)"
 msgid "Pointer to unknown external data (“%s” type)"
 msgstr "Pointer to unknown external data (“%s” type)"
 
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:65
-#: ../src/em-format/e-mail-parser-multipart-signed.c:100
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:74
+#: ../src/em-format/e-mail-parser-multipart-signed.c:109
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Could not parse MIME message. Displaying as source."
 
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:80
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:89
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:99
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:108
 #, c-format
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "Could not parse PGP/MIME message: %s"
 
-#: ../src/em-format/e-mail-parser-multipart-signed.c:138
+#: ../src/em-format/e-mail-parser-multipart-signed.c:149
 msgid "Unsupported signature format"
 msgstr "Unsupported signature format"
 
@@ -11857,7 +12245,7 @@ msgstr "_Import Certificate"
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: ../src/em-format/e-mail-part-utils.c:630
+#: ../src/em-format/e-mail-part-utils.c:634
 #, c-format
 msgid "%s attachment"
 msgstr "%s attachment"
@@ -11877,7 +12265,7 @@ msgstr "evolution calendar item"
 
 #: ../src/e-util/e-accounts-window.c:557 ../src/e-util/e-accounts-window.c:674
 #: ../src/e-util/e-accounts-window.c:894
-#: ../src/modules/mail/e-mail-shell-backend.c:870
+#: ../src/modules/mail/e-mail-shell-backend.c:910
 msgid "Mail Accounts"
 msgstr "Mail Accounts"
 
@@ -11894,13 +12282,12 @@ msgstr "Calendars"
 
 #: ../src/e-util/e-accounts-window.c:576 ../src/e-util/e-accounts-window.c:705
 #: ../src/e-util/e-accounts-window.c:910
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 msgid "Memo Lists"
 msgstr "Memo Lists"
 
 #: ../src/e-util/e-accounts-window.c:582 ../src/e-util/e-accounts-window.c:706
 #: ../src/e-util/e-accounts-window.c:911
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 msgid "Task Lists"
 msgstr "Task Lists"
 
@@ -11950,10 +12337,10 @@ msgstr "Evolution Accounts"
 #. widget = gtk_button_new_with_mnemonic (_("_Permissions"));
 #. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 #. webdav_browser->priv->permissions_button = widget;
-#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2699
-#: ../src/mail/em-subscription-editor.c:1950
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1561
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1632
+#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2704
+#: ../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
 msgid "_Refresh"
 msgstr "_Refresh"
 
@@ -12001,7 +12388,7 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
 #: ../src/e-util/e-activity-proxy.c:350
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1790
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -12079,8 +12466,8 @@ msgstr "F_ilename:"
 
 #: ../src/e-util/e-attachment-dialog.c:354
 #: ../src/e-util/e-html-editor-image-dialog.c:513
-#: ../src/e-util/e-html-editor-link-dialog.c:241
-#: ../src/e-util/e-webdav-browser.c:2447
+#: ../src/e-util/e-html-editor-link-dialog.c:229
+#: ../src/e-util/e-webdav-browser.c:2452
 msgid "_Description:"
 msgstr "_Description:"
 
@@ -12154,7 +12541,8 @@ 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..."
+msgid "Open With Other Application…"
 msgstr "Open With Other Application…"
 
 #: ../src/e-util/e-attachment-view.c:315
@@ -12173,16 +12561,17 @@ msgid "Save _As"
 msgstr "Save _As"
 
 #: ../src/e-util/e-attachment-view.c:341
-msgid "A_dd Attachment..."
+#| msgid "Add Attachment"
+msgid "A_dd Attachment…"
 msgstr "A_dd Attachment…"
 
 #: ../src/e-util/e-attachment-view.c:348
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1181
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:621
-#: ../src/modules/calendar/e-task-shell-view-actions.c:747
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1554
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1625
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:619
+#: ../src/modules/calendar/e-task-shell-view-actions.c:745
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1593
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
 msgid "_Properties"
 msgstr "_Properties"
 
@@ -12197,12 +12586,10 @@ msgid "Open this attachment in %s"
 msgstr "Open this attachment in %s"
 
 #: ../src/e-util/e-attachment-view.c:789
-#| msgid "Open With Other Application..."
 msgid "Open With Default Application"
 msgstr "Open With Default Application"
 
 #: ../src/e-util/e-attachment-view.c:790
-#| msgid "Open this attachment in %s"
 msgid "Open this attachment in default application"
 msgstr "Open this attachment in default application"
 
@@ -12289,25 +12676,25 @@ msgstr "Copy task list contents locally for offline operation"
 msgid "Copy memo list contents locally for offline operation"
 msgstr "Copy memo list contents locally for offline operation"
 
-#: ../src/e-util/e-categories-editor.c:246
+#: ../src/e-util/e-categories-editor.c:251
 msgid "Currently _used categories:"
 msgstr "Currently _used categories:"
 
-#: ../src/e-util/e-categories-editor.c:257
+#: ../src/e-util/e-categories-editor.c:262
 msgid "_Available Categories:"
 msgstr "_Available Categories:"
 
-#: ../src/e-util/e-categories-editor.c:297
+#: ../src/e-util/e-categories-editor.c:302
 msgctxt "category"
 msgid "_New"
 msgstr "_New"
 
-#: ../src/e-util/e-categories-editor.c:301
+#: ../src/e-util/e-categories-editor.c:306
 msgctxt "category"
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../src/e-util/e-categories-editor.c:305
+#: ../src/e-util/e-categories-editor.c:310
 msgctxt "category"
 msgid "_Delete"
 msgstr "_Delete"
@@ -12321,32 +12708,31 @@ msgstr "Icon"
 msgid "Create category “%s”"
 msgstr "Create category “%s”"
 
-#: ../src/e-util/e-category-editor.c:169 ../src/e-util/e-category-editor.c:234
+#: ../src/e-util/e-category-editor.c:167 ../src/e-util/e-category-editor.c:232
 msgid "Category Icon"
 msgstr "Category Icon"
 
-#: ../src/e-util/e-category-editor.c:173
+#: ../src/e-util/e-category-editor.c:171
 msgid "_No Image"
 msgstr "_No Image"
 
-#: ../src/e-util/e-category-editor.c:207
+#: ../src/e-util/e-category-editor.c:205
 msgid "Category _Name"
 msgstr "Category _Name"
 
-#: ../src/e-util/e-category-editor.c:220
+#: ../src/e-util/e-category-editor.c:218
 msgid "Category _Icon"
 msgstr "Category _Icon"
 
-#: ../src/e-util/e-category-editor.c:236
-#| msgid "Insert Emoticon"
+#: ../src/e-util/e-category-editor.c:234
 msgid "_Unset icon"
 msgstr "_Unset icon"
 
-#: ../src/e-util/e-category-editor.c:262
+#: ../src/e-util/e-category-editor.c:260
 msgid "Category Properties"
 msgstr "Category Properties"
 
-#: ../src/e-util/e-category-editor.c:323
+#: ../src/e-util/e-category-editor.c:321
 #, c-format
 msgid ""
 "There is already a category “%s” in the configuration. Please use another "
@@ -12360,7 +12746,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:2146
+#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2143
 msgid "?"
 msgstr "?"
 
@@ -12475,7 +12861,8 @@ 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..."
+#| msgid "Other"
+msgid "Other…"
 msgstr "Other…"
 
 #: ../src/e-util/e-client-cache.c:1149 ../src/e-util/e-client-cache.c:1280
@@ -12483,53 +12870,57 @@ msgstr "Other…"
 msgid "Cannot create a client object from extension name “%s”"
 msgstr "Cannot create a client object from extension name “%s”"
 
-#: ../src/e-util/e-collection-account-wizard.c:106
+#: ../src/e-util/e-collection-account-wizard.c:107
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:83
 msgid "_Finish"
 msgstr "_Finish"
 
-#: ../src/e-util/e-collection-account-wizard.c:108
-#: ../src/e-util/e-collection-account-wizard.c:266
+#: ../src/e-util/e-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/modules/accounts-window/e-collection-wizard-page.c:85
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:244
 msgid "_Next"
 msgstr "_Next"
 
-#: ../src/e-util/e-collection-account-wizard.c:180
-#| msgid "Collection _Account"
+#: ../src/e-util/e-collection-account-wizard.c:184
 msgid "New Collection Account"
 msgstr "New Collection Account"
 
-#: ../src/e-util/e-collection-account-wizard.c:251
+#: ../src/e-util/e-collection-account-wizard.c:258
 #: ../src/e-util/e-search-bar.c:665
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:78
 msgid "_Previous"
 msgstr "_Previous"
 
-#: ../src/e-util/e-collection-account-wizard.c:416
+#: ../src/e-util/e-collection-account-wizard.c:439
 msgid "Looking up details, please wait…"
 msgstr "Looking up details, please wait…"
 
 #. Translators: The %s is replaced with a clickable text "Enter password", thus it'll be "Requires password 
to continue. Enter password." at the end.
-#: ../src/e-util/e-collection-account-wizard.c:473
+#: ../src/e-util/e-collection-account-wizard.c:496
 #, c-format
 msgid "Requires password to continue. %s."
 msgstr "Requires password to continue. %s."
 
-#: ../src/e-util/e-collection-account-wizard.c:486
+#: ../src/e-util/e-collection-account-wizard.c:509
 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:490
+#: ../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:528
+#: ../src/e-util/e-collection-account-wizard.c:551
 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 "
@@ -12539,80 +12930,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:530
+#: ../src/e-util/e-collection-account-wizard.c:553
 #, 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:625
+#: ../src/e-util/e-collection-account-wizard.c:657
 #: ../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:637
+#: ../src/e-util/e-collection-account-wizard.c:669
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "_Remember password"
 msgstr "_Remember password"
 
-#: ../src/e-util/e-collection-account-wizard.c:780
+#: ../src/e-util/e-collection-account-wizard.c:812
 #: ../src/e-util/e-webdav-browser.c:473
 msgid "Collection"
 msgstr "Collection"
 
-#: ../src/e-util/e-collection-account-wizard.c:781
+#: ../src/e-util/e-collection-account-wizard.c:813
 msgid "Mail Receive"
 msgstr "Mail Receive"
 
-#: ../src/e-util/e-collection-account-wizard.c:782
+#: ../src/e-util/e-collection-account-wizard.c:814
 msgid "Mail Send"
 msgstr "Mail Send"
 
-#: ../src/e-util/e-collection-account-wizard.c:783
+#: ../src/e-util/e-collection-account-wizard.c:815
 #: ../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:785
+#: ../src/e-util/e-collection-account-wizard.c:817
 msgid "Memo List"
 msgstr "Memo List"
 
-#: ../src/e-util/e-collection-account-wizard.c:786
+#: ../src/e-util/e-collection-account-wizard.c:818
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Task List"
 msgstr "Task List"
 
-#: ../src/e-util/e-collection-account-wizard.c:1122
+#: ../src/e-util/e-collection-account-wizard.c:1154
 msgid "Looking up LDAP server’s search base…"
 msgstr "Looking up LDAP server’s search base…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1429
+#: ../src/e-util/e-collection-account-wizard.c:1461
 msgid "Saving account settings, please wait…"
 msgstr "Saving account settings, please wait…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1573
+#: ../src/e-util/e-collection-account-wizard.c:1612
 msgid "User details"
 msgstr "User details"
 
-#: ../src/e-util/e-collection-account-wizard.c:1586
+#: ../src/e-util/e-collection-account-wizard.c:1625
 msgid "_Email Address or User name:"
 msgstr "_E-mail Address or User name:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1617
+#: ../src/e-util/e-collection-account-wizard.c:1656
 msgid "_Advanced Options"
 msgstr "_Advanced Options"
 
-#: ../src/e-util/e-collection-account-wizard.c:1622
+#: ../src/e-util/e-collection-account-wizard.c:1661
 #: ../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:1641
+#: ../src/e-util/e-collection-account-wizard.c:1680
 msgid ""
 "Semicolon (“;”) separated list of servers to look up information for, in "
 "addition to the domain of the e-mail address."
@@ -12620,11 +13011,11 @@ msgstr ""
 "Semicolon (“;”) separated list of servers to look up information for, in "
 "addition to the domain of the e-mail address."
 
-#: ../src/e-util/e-collection-account-wizard.c:1833
+#: ../src/e-util/e-collection-account-wizard.c:1870
 msgid "Select which parts should be configured:"
 msgstr "Select which parts should be configured:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1957
+#: ../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
 msgid "Account Information"
@@ -12634,170 +13025,170 @@ msgstr "Account Information"
 msgid "Choose custom color"
 msgstr "Choose custom colour"
 
-#: ../src/e-util/e-color-combo.c:79
+#: ../src/e-util/e-color-combo.c:76
 msgid "black"
 msgstr "black"
 
-#: ../src/e-util/e-color-combo.c:80
+#: ../src/e-util/e-color-combo.c:77
 msgid "light brown"
 msgstr "light brown"
 
-#: ../src/e-util/e-color-combo.c:81
+#: ../src/e-util/e-color-combo.c:78
 msgid "brown gold"
 msgstr "brown gold"
 
-#: ../src/e-util/e-color-combo.c:82
+#: ../src/e-util/e-color-combo.c:79
 msgid "dark green #2"
 msgstr "dark green #2"
 
-#: ../src/e-util/e-color-combo.c:83
+#: ../src/e-util/e-color-combo.c:80
 msgid "navy"
 msgstr "navy"
 
-#: ../src/e-util/e-color-combo.c:84
+#: ../src/e-util/e-color-combo.c:81
 msgid "dark blue"
 msgstr "dark blue"
 
-#: ../src/e-util/e-color-combo.c:85
+#: ../src/e-util/e-color-combo.c:82
 msgid "purple #2"
 msgstr "purple #2"
 
-#: ../src/e-util/e-color-combo.c:86
+#: ../src/e-util/e-color-combo.c:83
 msgid "very dark gray"
 msgstr "very dark grey"
 
-#: ../src/e-util/e-color-combo.c:88
+#: ../src/e-util/e-color-combo.c:85
 msgid "dark red"
 msgstr "dark red"
 
-#: ../src/e-util/e-color-combo.c:89
+#: ../src/e-util/e-color-combo.c:86
 msgid "red-orange"
 msgstr "red-orange"
 
-#: ../src/e-util/e-color-combo.c:90
+#: ../src/e-util/e-color-combo.c:87
 msgid "gold"
 msgstr "gold"
 
-#: ../src/e-util/e-color-combo.c:91
+#: ../src/e-util/e-color-combo.c:88
 msgid "dark green"
 msgstr "dark green"
 
-#: ../src/e-util/e-color-combo.c:92
+#: ../src/e-util/e-color-combo.c:89
 msgid "dull blue"
 msgstr "dull blue"
 
-#: ../src/e-util/e-color-combo.c:93
+#: ../src/e-util/e-color-combo.c:90
 msgid "blue"
 msgstr "blue"
 
-#: ../src/e-util/e-color-combo.c:94
+#: ../src/e-util/e-color-combo.c:91
 msgid "dull purple"
 msgstr "dull purple"
 
-#: ../src/e-util/e-color-combo.c:95
+#: ../src/e-util/e-color-combo.c:92
 msgid "dark grey"
 msgstr "dark grey"
 
-#: ../src/e-util/e-color-combo.c:97
+#: ../src/e-util/e-color-combo.c:94
 msgid "red"
 msgstr "red"
 
-#: ../src/e-util/e-color-combo.c:98
+#: ../src/e-util/e-color-combo.c:95
 msgid "orange"
 msgstr "orange"
 
-#: ../src/e-util/e-color-combo.c:99
+#: ../src/e-util/e-color-combo.c:96
 msgid "lime"
 msgstr "lime"
 
-#: ../src/e-util/e-color-combo.c:100
+#: ../src/e-util/e-color-combo.c:97
 msgid "dull green"
 msgstr "dull green"
 
-#: ../src/e-util/e-color-combo.c:101
+#: ../src/e-util/e-color-combo.c:98
 msgid "dull blue #2"
 msgstr "dull blue #2"
 
-#: ../src/e-util/e-color-combo.c:102
+#: ../src/e-util/e-color-combo.c:99
 msgid "sky blue #2"
 msgstr "sky blue #2"
 
-#: ../src/e-util/e-color-combo.c:103
+#: ../src/e-util/e-color-combo.c:100
 msgid "purple"
 msgstr "purple"
 
-#: ../src/e-util/e-color-combo.c:104
+#: ../src/e-util/e-color-combo.c:101
 msgid "gray"
 msgstr "grey"
 
-#: ../src/e-util/e-color-combo.c:106
+#: ../src/e-util/e-color-combo.c:103
 msgid "magenta"
 msgstr "magenta"
 
-#: ../src/e-util/e-color-combo.c:107
+#: ../src/e-util/e-color-combo.c:104
 msgid "bright orange"
 msgstr "bright orange"
 
-#: ../src/e-util/e-color-combo.c:108
+#: ../src/e-util/e-color-combo.c:105
 msgid "yellow"
 msgstr "yellow"
 
-#: ../src/e-util/e-color-combo.c:109
+#: ../src/e-util/e-color-combo.c:106
 msgid "green"
 msgstr "green"
 
-#: ../src/e-util/e-color-combo.c:110
+#: ../src/e-util/e-color-combo.c:107
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/e-util/e-color-combo.c:111
+#: ../src/e-util/e-color-combo.c:108
 msgid "bright blue"
 msgstr "bright blue"
 
-#: ../src/e-util/e-color-combo.c:112
+#: ../src/e-util/e-color-combo.c:109
 msgid "red purple"
 msgstr "red purple"
 
-#: ../src/e-util/e-color-combo.c:113
+#: ../src/e-util/e-color-combo.c:110
 msgid "light grey"
 msgstr "light grey"
 
-#: ../src/e-util/e-color-combo.c:115
+#: ../src/e-util/e-color-combo.c:112
 msgid "pink"
 msgstr "pink"
 
-#: ../src/e-util/e-color-combo.c:116
+#: ../src/e-util/e-color-combo.c:113
 msgid "light orange"
 msgstr "light orange"
 
-#: ../src/e-util/e-color-combo.c:117
+#: ../src/e-util/e-color-combo.c:114
 msgid "light yellow"
 msgstr "light yellow"
 
-#: ../src/e-util/e-color-combo.c:118
+#: ../src/e-util/e-color-combo.c:115
 msgid "light green"
 msgstr "light green"
 
-#: ../src/e-util/e-color-combo.c:119
+#: ../src/e-util/e-color-combo.c:116
 msgid "light cyan"
 msgstr "light cyan"
 
-#: ../src/e-util/e-color-combo.c:120
+#: ../src/e-util/e-color-combo.c:117
 msgid "light blue"
 msgstr "light blue"
 
-#: ../src/e-util/e-color-combo.c:121
+#: ../src/e-util/e-color-combo.c:118
 msgid "light purple"
 msgstr "light purple"
 
-#: ../src/e-util/e-color-combo.c:122
+#: ../src/e-util/e-color-combo.c:119
 msgid "white"
 msgstr "white"
 
-#: ../src/e-util/e-color-combo.c:641 ../src/mail/e-mail-account-tree-view.c:135
+#: ../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:4816 ../src/mail/mail-config.ui.h:78
+#: ../src/mail/e-mail-reader.c:4849 ../src/mail/mail-config.ui.h:78
 msgid "Default"
 msgstr "Default"
 
@@ -12956,7 +13347,6 @@ msgstr "Do not synchronise locally mails older than"
 #. Translators: The %s is replaced with a spin button; always keep it in the string at the right position
 #: ../src/e-util/e-dialog-widgets.c:437
 #, c-format
-#| msgid "_Mark messages as read after"
 msgid "Mark messages as read after %s seconds"
 msgstr "Mark messages as read after %s seconds"
 
@@ -13298,7 +13688,6 @@ msgid "Insert Image"
 msgstr "Insert Image"
 
 #: ../src/e-util/e-html-editor-actions.c:352
-#| msgid "Image files"
 msgid "Image file"
 msgstr "Image file"
 
@@ -13357,20 +13746,23 @@ msgid "Increase Indent"
 msgstr "Increase Indent"
 
 #: ../src/e-util/e-html-editor-actions.c:1020
-msgid "_HTML File..."
-msgstr "_HTML File..."
+#| msgid "_HTML File..."
+msgid "_HTML File…"
+msgstr "_HTML File…"
 
 #: ../src/e-util/e-html-editor-actions.c:1027
-msgid "Te_xt File..."
-msgstr "Te_xt File..."
+#| msgid "Te_xt File..."
+msgid "Te_xt File…"
+msgstr "Te_xt File…"
 
 #: ../src/e-util/e-html-editor-actions.c:1034
 msgid "Paste _Quotation"
 msgstr "Paste _Quotation"
 
 #: ../src/e-util/e-html-editor-actions.c:1041
-msgid "_Find..."
-msgstr "_Find..."
+#| msgid "_Find"
+msgid "_Find…"
+msgstr "_Find…"
 
 #: ../src/e-util/e-html-editor-actions.c:1043
 msgid "Search for text"
@@ -13381,16 +13773,18 @@ msgid "Find A_gain"
 msgstr "Find A_gain"
 
 #: ../src/e-util/e-html-editor-actions.c:1055
-msgid "Re_place..."
-msgstr "Re_place..."
+#| msgid "Re_place"
+msgid "Re_place…"
+msgstr "Re_place…"
 
 #: ../src/e-util/e-html-editor-actions.c:1057
 msgid "Search for and replace text"
 msgstr "Search for and replace text"
 
 #: ../src/e-util/e-html-editor-actions.c:1062
-msgid "Check _Spelling..."
-msgstr "Check _Spelling..."
+#| msgid "Check _Spelling..."
+msgid "Check _Spelling…"
+msgstr "Check _Spelling…"
 
 #: ../src/e-util/e-html-editor-actions.c:1069
 msgid "_Decrease Indent"
@@ -13505,8 +13899,9 @@ msgstr "_Alphabetical List"
 
 #: ../src/e-util/e-html-editor-actions.c:1227
 #: ../src/e-util/e-html-editor-actions.c:1265
-msgid "_Image..."
-msgstr "_Image..."
+#| msgid "_Image"
+msgid "_Image…"
+msgstr "_Image…"
 
 #. Translators: This is an action tooltip
 #: ../src/e-util/e-html-editor-actions.c:1230
@@ -13515,8 +13910,9 @@ msgstr "Insert Image"
 
 #: ../src/e-util/e-html-editor-actions.c:1235
 #: ../src/e-util/e-html-editor-actions.c:1272
-msgid "_Link..."
-msgstr "_Link..."
+#| msgid "_Link"
+msgid "_Link…"
+msgstr "_Link…"
 
 #: ../src/e-util/e-html-editor-actions.c:1237
 msgid "Insert Link"
@@ -13525,8 +13921,9 @@ 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..."
-msgstr "_Rule..."
+#| msgid "_Rule"
+msgid "_Rule…"
+msgstr "_Rule…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
 #: ../src/e-util/e-html-editor-actions.c:1246
@@ -13535,20 +13932,23 @@ msgstr "Insert Rule"
 
 #: ../src/e-util/e-html-editor-actions.c:1251
 #: ../src/e-util/e-html-editor-actions.c:1294
-msgid "_Table..."
-msgstr "_Table..."
+#| msgid "_Table"
+msgid "_Table…"
+msgstr "_Table…"
 
 #: ../src/e-util/e-html-editor-actions.c:1253
 msgid "Insert Table"
 msgstr "Insert Table"
 
 #: ../src/e-util/e-html-editor-actions.c:1258
-msgid "_Cell..."
-msgstr "_Cell..."
+#| msgid "_Cell..."
+msgid "_Cell…"
+msgstr "_Cell…"
 
 #: ../src/e-util/e-html-editor-actions.c:1279
-msgid "Pa_ge..."
-msgstr "Pa_ge..."
+#| msgid "Pa_ge..."
+msgid "Pa_ge…"
+msgstr "Pa_ge…"
 
 #: ../src/e-util/e-html-editor-actions.c:1303
 msgid "Font _Size"
@@ -13688,37 +14088,44 @@ msgid "Row Below"
 msgstr "Row Below"
 
 #: ../src/e-util/e-html-editor-actions.c:1538
-msgid "Cell..."
-msgstr "Cell..."
+msgid "Cell…"
+msgstr "Cell…"
 
 #: ../src/e-util/e-html-editor-actions.c:1545
-msgid "Image..."
-msgstr "Image..."
+#| msgid "Image"
+msgid "Image…"
+msgstr "Image…"
 
 #: ../src/e-util/e-html-editor-actions.c:1552
-msgid "Link..."
-msgstr "Link..."
+#| msgid "_Link"
+msgid "Link…"
+msgstr "Link…"
 
 #: ../src/e-util/e-html-editor-actions.c:1559
-msgid "Page..."
-msgstr "Page..."
+#| msgid "Pager"
+msgid "Page…"
+msgstr "Page…"
 
 #: ../src/e-util/e-html-editor-actions.c:1566
-msgid "Paragraph..."
-msgstr "Paragraph..."
+#| msgid "Paragraph..."
+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..."
-msgstr "Rule..."
+#| msgid "_Rule"
+msgid "Rule…"
+msgstr "Rule…"
 
 #: ../src/e-util/e-html-editor-actions.c:1581
-msgid "Table..."
-msgstr "Table..."
+#| msgid "Table"
+msgid "Table…"
+msgstr "Table…"
 
 #: ../src/e-util/e-html-editor-actions.c:1588
-msgid "Text..."
-msgstr "Text..."
+#| msgid "_Text:"
+msgid "Text…"
+msgstr "Text…"
 
 #: ../src/e-util/e-html-editor-actions.c:1595
 msgid "Remove Link"
@@ -13945,7 +14352,7 @@ msgstr "Case _Sensitive"
 msgid "_Wrap Search"
 msgstr "_Wrap Search"
 
-#: ../src/e-util/e-html-editor-find-dialog.c:268
+#: ../src/e-util/e-html-editor-find-dialog.c:262
 msgid "Find"
 msgstr "Find"
 
@@ -14014,24 +14421,24 @@ msgid "<b>Link</b>"
 msgstr "<b>Link</b>"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:663
-#: ../src/e-util/e-html-editor-link-dialog.c:219
+#: ../src/e-util/e-html-editor-link-dialog.c:213
 msgid "_URL:"
 msgstr "_URL:"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:668
-#: ../src/e-util/e-html-editor-link-dialog.c:224
-msgid "_Test URL..."
-msgstr "_Test URL..."
+#| msgid "_Test URL..."
+msgid "_Test URL…"
+msgstr "_Test URL…"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:685
 msgid "Image Properties"
 msgstr "Image Properties"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:248
+#: ../src/e-util/e-html-editor-link-dialog.c:236
 msgid "_Remove Link"
 msgstr "_Remove Link"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:273
+#: ../src/e-util/e-html-editor-link-dialog.c:261
 msgid "Link Properties"
 msgstr "Link Properties"
 
@@ -14090,7 +14497,7 @@ msgid "<b>Background Image</b>"
 msgstr "<b>Background Image</b>"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:473
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:90
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
 msgid "_Template:"
 msgstr "_Template:"
 
@@ -14227,7 +14634,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:2418
+#: ../src/e-util/e-webdav-browser.c:2423
 msgid "_Color:"
 msgstr "_Colour:"
 
@@ -14446,32 +14853,32 @@ msgstr "Could not open the link."
 msgid "Could not display help for Evolution."
 msgstr "Could not display help for Evolution."
 
-#: ../src/e-util/e-misc-utils.c:2563
+#: ../src/e-util/e-misc-utils.c:2561
 #, c-format
 msgid "Opening calendar “%s”"
 msgstr "Opening calendar “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2566
+#: ../src/e-util/e-misc-utils.c:2564
 #, c-format
 msgid "Opening memo list “%s”"
 msgstr "Opening memo list “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2569
+#: ../src/e-util/e-misc-utils.c:2567
 #, c-format
 msgid "Opening task list “%s”"
 msgstr "Opening task list “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2572
+#: ../src/e-util/e-misc-utils.c:2570
 #, c-format
 msgid "Opening address book “%s”"
 msgstr "Opening address book “%s”"
 
-#: ../src/e-util/e-misc-utils.c:3352
+#: ../src/e-util/e-misc-utils.c:3350
 #: ../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:4205
+#: ../src/e-util/e-misc-utils.c:4244
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -14479,18 +14886,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:4217
+#: ../src/e-util/e-misc-utils.c:4256
 #, 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:4229
+#: ../src/e-util/e-misc-utils.c:4268
 #, 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:4243
+#: ../src/e-util/e-misc-utils.c:4282
 #, c-format
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
@@ -14506,7 +14913,7 @@ msgstr ""
 "Detailed error (%d): %s"
 
 #  addressbook:ldap-search-base secondary
-#: ../src/e-util/e-misc-utils.c:4254
+#: ../src/e-util/e-misc-utils.c:4293
 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 "
@@ -14516,12 +14923,12 @@ msgstr ""
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 
-#: ../src/e-util/e-misc-utils.c:4287
+#: ../src/e-util/e-misc-utils.c:4326
 msgid "Evolution had not been compiled with LDAP support"
 msgstr "Evolution had not been compiled with LDAP support"
 
 #. Translators: %s is the language ISO code.
-#: ../src/e-util/e-misc-utils.c:4601
+#: ../src/e-util/e-misc-utils.c:4640
 #, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
@@ -14529,7 +14936,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:4610
+#: ../src/e-util/e-misc-utils.c:4649
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -14552,11 +14959,11 @@ msgid "_Search:"
 msgstr "_Search:"
 
 #: ../src/e-util/e-name-selector-dialog.c:363
-#: ../src/e-util/e-name-selector-dialog.c:1330
+#: ../src/e-util/e-name-selector-dialog.c:1325
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1271
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1702
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:785
-#: ../src/modules/calendar/e-task-shell-view-actions.c:958
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1654
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:783
+#: ../src/modules/calendar/e-task-shell-view-actions.c:956
 msgid "Any Category"
 msgstr "Any Category"
 
@@ -14574,25 +14981,25 @@ msgid "Select Contacts from Address Book"
 msgstr "Select Contacts from Address Book"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../src/e-util/e-name-selector-entry.c:3252
+#: ../src/e-util/e-name-selector-entry.c:3234
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "E_xpand %s Inline"
 
 #. Copy Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3268
+#: ../src/e-util/e-name-selector-entry.c:3250
 #, c-format
 msgid "Cop_y %s"
 msgstr "Cop_y %s"
 
 #. Cut Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3279
+#: ../src/e-util/e-name-selector-entry.c:3261
 #, c-format
 msgid "C_ut %s"
 msgstr "C_ut %s"
 
 #. Edit Contact item
-#: ../src/e-util/e-name-selector-entry.c:3297
+#: ../src/e-util/e-name-selector-entry.c:3279
 #, c-format
 msgid "_Edit %s"
 msgstr "_Edit %s"
@@ -14964,24 +15371,24 @@ msgstr "User:"
 msgid "Show"
 msgstr "Show"
 
-#: ../src/e-util/e-source-selector.c:3224
+#: ../src/e-util/e-source-selector.c:3223
 msgid "Group name"
 msgstr "Group name"
 
-#: ../src/e-util/e-source-selector.c:3379 ../src/mail/e-mail-display.c:805
+#: ../src/e-util/e-source-selector.c:3378 ../src/mail/e-mail-display.c:805
 msgid "_Hide"
 msgstr "_Hide"
 
-#: ../src/e-util/e-source-selector.c:3379
-#: ../src/e-util/e-source-selector.c:3478
+#: ../src/e-util/e-source-selector.c:3378
+#: ../src/e-util/e-source-selector.c:3476
 msgid "_Show"
 msgstr "_Show"
 
-#: ../src/e-util/e-source-selector.c:3431
+#: ../src/e-util/e-source-selector.c:3430
 msgid "Manage Groups"
 msgstr "Manage Groups"
 
-#: ../src/e-util/e-source-selector.c:3443
+#: ../src/e-util/e-source-selector.c:3442
 msgid "Available Groups:"
 msgstr "Available Groups:"
 
@@ -14999,7 +15406,7 @@ msgid "(no suggestions)"
 msgstr "(no suggestions)"
 
 #: ../src/e-util/e-spell-entry.c:503
-msgid "More..."
+msgid "More…"
 msgstr "More…"
 
 #. + Add to Dictionary
@@ -15191,11 +15598,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:1780
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1782
 msgid "Ascending"
 msgstr "Ascending"
 
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1780
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1782
 msgid "Descending"
 msgstr "Descending"
 
@@ -15286,60 +15693,63 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d item)"
 msgstr[1] "%s (%d items)"
 
-#: ../src/e-util/e-table-header-item.c:1607
+#: ../src/e-util/e-table-header-item.c:1609
 msgid "Customize Current View"
 msgstr "Customise Current View"
 
-#: ../src/e-util/e-table-header-item.c:1630
+#: ../src/e-util/e-table-header-item.c:1632
 msgid "Sort _Ascending"
 msgstr "Sort _Ascending"
 
-#: ../src/e-util/e-table-header-item.c:1633
+#: ../src/e-util/e-table-header-item.c:1635
 msgid "Sort _Descending"
 msgstr "Sort _Descending"
 
-#: ../src/e-util/e-table-header-item.c:1636
+#: ../src/e-util/e-table-header-item.c:1638
 msgid "_Reset sort"
 msgstr "_Reset sort"
 
-#: ../src/e-util/e-table-header-item.c:1639
+#: ../src/e-util/e-table-header-item.c:1641
 msgid "Group By This _Field"
 msgstr "Group By This _Field"
 
-#: ../src/e-util/e-table-header-item.c:1642
+#: ../src/e-util/e-table-header-item.c:1644
 msgid "Group By _Box"
 msgstr "Group By _Box"
 
-#: ../src/e-util/e-table-header-item.c:1646
+#: ../src/e-util/e-table-header-item.c:1648
 msgid "Remove This _Column"
 msgstr "Remove This _Column"
 
-#: ../src/e-util/e-table-header-item.c:1649
-msgid "Add a C_olumn..."
+#: ../src/e-util/e-table-header-item.c:1651
+#| msgid "Add a Column"
+msgid "Add a C_olumn…"
 msgstr "Add a C_olumn…"
 
-#: ../src/e-util/e-table-header-item.c:1653
+#: ../src/e-util/e-table-header-item.c:1655
 msgid "A_lignment"
 msgstr "A_lignment"
 
-#: ../src/e-util/e-table-header-item.c:1656
+#: ../src/e-util/e-table-header-item.c:1658
 msgid "B_est Fit"
 msgstr "B_est Fit"
 
-#: ../src/e-util/e-table-header-item.c:1659
-msgid "Format Column_s..."
+#: ../src/e-util/e-table-header-item.c:1661
+#| msgid "Format Column_s..."
+msgid "Format Column_s…"
 msgstr "Format Column_s…"
 
-#: ../src/e-util/e-table-header-item.c:1663
-msgid "Custo_mize Current View..."
+#: ../src/e-util/e-table-header-item.c:1665
+#| msgid "Customize Current View"
+msgid "Custo_mize Current View…"
 msgstr "Custo_mise Current View…"
 
-#: ../src/e-util/e-table-header-item.c:1730
+#: ../src/e-util/e-table-header-item.c:1732
 msgid "_Sort By"
 msgstr "_Sort By"
 
 #. Custom
-#: ../src/e-util/e-table-header-item.c:1753
+#: ../src/e-util/e-table-header-item.c:1755
 msgid "_Custom"
 msgstr "_Custom"
 
@@ -15352,9 +15762,9 @@ msgid "Input Methods"
 msgstr "Input Methods"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../src/e-util/e-timezone-dialog.c:268 ../src/e-util/e-timezone-dialog.c:508
-#: ../src/e-util/e-timezone-dialog.c:512 ../src/e-util/e-timezone-dialog.c:516
-#: ../src/e-util/e-timezone-dialog.c:899
+#: ../src/e-util/e-timezone-dialog.c:280 ../src/e-util/e-timezone-dialog.c:520
+#: ../src/e-util/e-timezone-dialog.c:524 ../src/e-util/e-timezone-dialog.c:528
+#: ../src/e-util/e-timezone-dialog.c:1015
 msgid "UTC"
 msgstr "UTC"
 
@@ -15418,7 +15828,8 @@ msgstr "Address book"
 msgid "Events"
 msgstr "Events"
 
-#: ../src/e-util/e-webdav-browser.c:514
+#: ../src/e-util/e-webdav-browser.c:514 ../src/mail/em-folder-tree-model.c:1553
+#: ../src/mail/em-folder-tree-model.c:1930
 msgid "Loading…"
 msgstr "Loading…"
 
@@ -15438,100 +15849,96 @@ msgstr "Searching for user home, please wait…"
 msgid "Failed to search for user home"
 msgstr "Failed to search for user home"
 
-#: ../src/e-util/e-webdav-browser.c:1763
+#: ../src/e-util/e-webdav-browser.c:1764
 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:1781
+#: ../src/e-util/e-webdav-browser.c:1783
 msgid "Failed to get selected collection HREF"
 msgstr "Failed to get selected collection HREF"
 
-#: ../src/e-util/e-webdav-browser.c:1812
-msgid "Saving changes…"
-msgstr "Saving changes…"
-
-#: ../src/e-util/e-webdav-browser.c:1813
+#: ../src/e-util/e-webdav-browser.c:1815
 msgid "Failed to save changes"
 msgstr "Failed to save changes"
 
-#: ../src/e-util/e-webdav-browser.c:1815
+#: ../src/e-util/e-webdav-browser.c:1817
 msgid "Creating new book…"
 msgstr "Creating new book…"
 
-#: ../src/e-util/e-webdav-browser.c:1816
+#: ../src/e-util/e-webdav-browser.c:1818
 msgid "Failed to create new book"
 msgstr "Failed to create new book"
 
-#: ../src/e-util/e-webdav-browser.c:1818
+#: ../src/e-util/e-webdav-browser.c:1820
 msgid "Creating new calendar…"
 msgstr "Creating new calendar…"
 
-#: ../src/e-util/e-webdav-browser.c:1819
+#: ../src/e-util/e-webdav-browser.c:1821
 msgid "Failed to create new calendar"
 msgstr "Failed to create new calendar"
 
-#: ../src/e-util/e-webdav-browser.c:1821
+#: ../src/e-util/e-webdav-browser.c:1823
 msgid "Creating new collection…"
 msgstr "Creating new collection…"
 
-#: ../src/e-util/e-webdav-browser.c:1822
+#: ../src/e-util/e-webdav-browser.c:1824
 msgid "Failed to create new collection"
 msgstr "Failed to create new collection"
 
-#: ../src/e-util/e-webdav-browser.c:1961
+#: ../src/e-util/e-webdav-browser.c:1963
 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:1963
+#: ../src/e-util/e-webdav-browser.c:1965
 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:2189
+#: ../src/e-util/e-webdav-browser.c:2194
 msgid "Deleting book…"
 msgstr "Deleting book…"
 
-#: ../src/e-util/e-webdav-browser.c:2190
+#: ../src/e-util/e-webdav-browser.c:2195
 msgid "Failed to delete book"
 msgstr "Failed to delete book"
 
-#: ../src/e-util/e-webdav-browser.c:2193
+#: ../src/e-util/e-webdav-browser.c:2198
 msgid "Deleting calendar…"
 msgstr "Deleting calendar…"
 
-#: ../src/e-util/e-webdav-browser.c:2194
+#: ../src/e-util/e-webdav-browser.c:2199
 msgid "Failed to delete calendar"
 msgstr "Failed to delete calendar"
 
-#: ../src/e-util/e-webdav-browser.c:2197
+#: ../src/e-util/e-webdav-browser.c:2202
 msgid "Deleting collection…"
 msgstr "Deleting collection…"
 
-#: ../src/e-util/e-webdav-browser.c:2198
+#: ../src/e-util/e-webdav-browser.c:2203
 msgid "Failed to delete collection"
 msgstr "Failed to delete collection"
 
-#: ../src/e-util/e-webdav-browser.c:2429
+#: ../src/e-util/e-webdav-browser.c:2434
 msgid "For Components:"
 msgstr "For Components:"
 
-#: ../src/e-util/e-webdav-browser.c:2435
+#: ../src/e-util/e-webdav-browser.c:2440
 msgid "_Events"
 msgstr "_Events"
 
-#: ../src/e-util/e-webdav-browser.c:2625
+#: ../src/e-util/e-webdav-browser.c:2630
 msgid "WebDAV server:"
 msgstr "WebDAV server:"
 
-#: ../src/e-util/e-webdav-browser.c:2660
+#: ../src/e-util/e-webdav-browser.c:2665
 msgid "Create _Book"
 msgstr "Create _Book"
 
-#: ../src/e-util/e-webdav-browser.c:2667
+#: ../src/e-util/e-webdav-browser.c:2672
 msgid "Create _Calendar"
 msgstr "Create _Calendar"
 
-#: ../src/e-util/e-webdav-browser.c:2674
+#: ../src/e-util/e-webdav-browser.c:2679
 msgid "Create Collectio_n"
 msgstr "Create Collectio_n"
 
@@ -15572,7 +15979,8 @@ 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..."
+#| msgid "Save Image"
+msgid "Save _Image…"
 msgstr "Save _Image…"
 
 #: ../src/e-util/e-web-view.c:459
@@ -15580,58 +15988,56 @@ 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:2787
-#| msgid "Search Rule"
+#: ../src/mail/e-mail-reader.c:2820
 msgid "Search _Web…"
 msgstr "Search _Web…"
 
 #: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:181
-#: ../src/mail/e-mail-reader.c:2789
-#| msgid "Send a message to the selected contacts"
+#: ../src/mail/e-mail-reader.c:2822
 msgid "Search the Web with the selected text"
 msgstr "Search the Web with the selected text"
 
-#: ../src/e-util/e-web-view.c:486 ../src/e-util/e-web-view.c:2097
+#: ../src/e-util/e-web-view.c:486 ../src/e-util/e-web-view.c:2102
 msgid "Select all text and images"
 msgstr "Select all text and images"
 
-#: ../src/e-util/e-web-view.c:1446
+#: ../src/e-util/e-web-view.c:1451
 #, c-format
 msgid "Click to call %s"
 msgstr "Click to call %s"
 
-#: ../src/e-util/e-web-view.c:1448
+#: ../src/e-util/e-web-view.c:1453
 msgid "Click to hide/unhide addresses"
 msgstr "Click to hide/unhide addresses"
 
-#: ../src/e-util/e-web-view.c:1459
+#: ../src/e-util/e-web-view.c:1464
 #, 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:1461
+#: ../src/e-util/e-web-view.c:1466
 msgid "Go to the beginning of the message"
 msgstr "Go to the beginning of the message"
 
-#: ../src/e-util/e-web-view.c:1465
+#: ../src/e-util/e-web-view.c:1470
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
-#: ../src/e-util/e-web-view.c:4128
+#: ../src/e-util/e-web-view.c:4157
 msgid "Copying image to clipboard"
 msgstr "Copying image to clipboard"
 
-#: ../src/e-util/e-web-view.c:4316
+#: ../src/e-util/e-web-view.c:4345
 msgid "Save Image"
 msgstr "Save Image"
 
-#: ../src/e-util/e-web-view.c:4353
+#: ../src/e-util/e-web-view.c:4382
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "Saving image to “%s”"
 
-#: ../src/e-util/e-web-view.c:4500
+#: ../src/e-util/e-web-view.c:4529
 #, 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."
@@ -15884,7 +16290,6 @@ msgid "Could not save signature."
 msgstr "Could not save signature."
 
 #: ../src/e-util/widgets.error.xml.h:10
-#| msgid "Could not get a selection to delete."
 msgid "Could not get selected text."
 msgstr "Could not get selected text."
 
@@ -15940,55 +16345,55 @@ msgid "Invalid folder URI “%s”"
 msgstr "Invalid folder URI “%s”"
 
 #. Some local folders
-#: ../src/libemail-engine/e-mail-session.c:117
-#: ../src/mail/em-folder-properties.c:1164
-#: ../src/mail/em-folder-tree-model.c:1237
-#: ../src/mail/importers/kmail-libs.c:139
+#: ../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/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
 msgid "Inbox"
 msgstr "Inbox"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../src/libemail-engine/e-mail-session.c:118
-#: ../src/mail/em-folder-tree-model.c:1230
-#: ../src/mail/importers/kmail-libs.c:145
+#: ../src/libemail-engine/e-mail-session.c:121
+#: ../src/mail/em-folder-tree-model.c:1495
+#: ../src/mail/importers/kmail-libs.c:144
 #: ../src/modules/mail/e-mail-shell-view-private.c:1030
 msgid "Drafts"
 msgstr "Drafts"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../src/libemail-engine/e-mail-session.c:119
-#: ../src/mail/em-folder-tree-model.c:1241
-#: ../src/mail/importers/kmail-libs.c:141
+#: ../src/libemail-engine/e-mail-session.c:122
+#: ../src/mail/em-folder-tree-model.c:1505
+#: ../src/mail/importers/kmail-libs.c:140
 #: ../src/modules/mail/e-mail-shell-view-private.c:1034
 msgid "Outbox"
 msgstr "Outbox"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../src/libemail-engine/e-mail-session.c:120
-#: ../src/mail/em-folder-tree-model.c:1245
-#: ../src/mail/importers/kmail-libs.c:143
+#: ../src/libemail-engine/e-mail-session.c:123
+#: ../src/mail/em-folder-tree-model.c:1509
+#: ../src/mail/importers/kmail-libs.c:142
 #: ../src/modules/mail/e-mail-shell-view-private.c:1036
 msgid "Sent"
 msgstr "Sent"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../src/libemail-engine/e-mail-session.c:121
+#: ../src/libemail-engine/e-mail-session.c:124
 #: ../src/mail/e-mail-templates-store.c:2211
-#: ../src/mail/em-folder-tree-model.c:1233
-#: ../src/mail/importers/kmail-libs.c:147
+#: ../src/mail/em-folder-tree-model.c:1497
+#: ../src/mail/importers/kmail-libs.c:146
 #: ../src/modules/mail/e-mail-shell-view-private.c:1038
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Templates"
 
-#: ../src/libemail-engine/e-mail-session.c:1294
+#: ../src/libemail-engine/e-mail-session.c:1519
 #, c-format
 msgid "User cancelled operation"
 msgstr "User cancelled operation"
 
-#: ../src/libemail-engine/e-mail-session.c:1351
+#: ../src/libemail-engine/e-mail-session.c:1576
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
@@ -15997,26 +16402,26 @@ msgstr ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 
-#: ../src/libemail-engine/e-mail-session.c:1364
+#: ../src/libemail-engine/e-mail-session.c:1589
 #, 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:1516
+#: ../src/libemail-engine/e-mail-session.c:1741
 #, 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:1636
+#: ../src/libemail-engine/e-mail-session.c:1861
 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:1638
+#: ../src/libemail-engine/e-mail-session.c:1863
 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:2639
+#: ../src/libemail-engine/e-mail-session.c:2910
 #, c-format
 msgid "Waiting for “%s”"
 msgstr "Waiting for “%s”"
@@ -16072,6 +16477,7 @@ msgid "Disconnecting from “%s”"
 msgstr "Disconnecting from “%s”"
 
 #: ../src/libemail-engine/e-mail-store-utils.c:264
+#: ../src/mail/e-mail-backend.c:1048
 #, c-format
 msgid "Reconnecting to “%s”"
 msgstr "Reconnecting to “%s”"
@@ -16188,8 +16594,9 @@ 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]"
-msgstr "[Fwd: %s]"
+#| msgid "[Fwd: %s]"
+msgid "Fwd: %s"
+msgstr "Fwd: %s"
 
 #. Translators: This is a subject attribution for forwarded messages, used when there could not be used any 
subject.
 #. It results in "[Fwd: No Subject]" being used as a subject of the forwarded message.
@@ -16320,9 +16727,9 @@ msgstr "POP3 server"
 msgid "SMTP server"
 msgstr "SMTP server"
 
-#: ../src/mail/e-mail-browser.c:146 ../src/shell/e-shell-window-actions.c:819
-#: ../src/shell/e-shell-window-actions.c:826
-#: ../src/shell/e-shell-window-actions.c:833
+#: ../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
 msgid "Close this window"
 msgstr "Close this window"
 
@@ -16349,8 +16756,9 @@ msgid "_Revise Details"
 msgstr "_Revise Details"
 
 #: ../src/mail/e-mail-config-auth-check.c:217
-msgid "Querying authentication types..."
-msgstr "Querying authentication types..."
+#| msgid "Querying authentication types..."
+msgid "Querying authentication types…"
+msgstr "Querying authentication types…"
 
 #: ../src/mail/e-mail-config-auth-check.c:430
 msgid "Check for Supported Types"
@@ -16386,8 +16794,6 @@ msgid "Do Not Quote"
 msgstr "Do Not Quote"
 
 #: ../src/mail/e-mail-config-composing-page.c:157
-#| msgctxt "ReplyForward"
-#| msgid "Use global setting"
 msgid "Use global setting"
 msgstr "Use global setting"
 
@@ -16409,7 +16815,6 @@ msgid "Re_ply style:"
 msgstr "Re_ply style:"
 
 #: ../src/mail/e-mail-config-composing-page.c:495
-#| msgid "Language"
 msgid "Lang_uage:"
 msgstr "Lang_uage:"
 
@@ -16420,7 +16825,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:4273 ../src/mail/mail-config.ui.h:22
+#: ../src/mail/em-composer-utils.c:4145 ../src/mail/mail-config.ui.h:22
 msgid "Start _typing at the bottom"
 msgstr "Start _typing at the bottom"
 
@@ -16468,8 +16873,9 @@ msgid "Done"
 msgstr "Done"
 
 #: ../src/mail/e-mail-config-defaults-page.c:314
-msgid "Checking server settings..."
-msgstr "Checking server settings..."
+#| msgid "Checking server settings..."
+msgid "Checking server settings…"
+msgstr "Checking server settings…"
 
 #: ../src/mail/e-mail-config-defaults-page.c:663
 msgid "Special Folders"
@@ -16585,7 +16991,8 @@ msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
 #: ../src/mail/e-mail-config-identity-page.c:776
-msgid "Add Ne_w Signature..."
+#| msgid "Add Ne_w Signature..."
+msgid "Add Ne_w Signature…"
 msgstr "Add Ne_w Signature…"
 
 #: ../src/mail/e-mail-config-identity-page.c:790
@@ -16624,7 +17031,8 @@ 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..."
+msgid "Looking up account details…"
 msgstr "Looking up account details…"
 
 #: ../src/mail/e-mail-config-provider-page.c:538
@@ -16652,11 +17060,11 @@ msgid "%s — %s"
 msgstr "%s — %s"
 
 #: ../src/mail/e-mail-config-security-page.c:460
-#: ../src/mail/em-folder-properties.c:1083 ../src/mail/mail-config.ui.h:34
+#: ../src/mail/em-folder-properties.c:1367 ../src/mail/mail-config.ui.h:34
 #: ../src/modules/addressbook/autocompletion-config.c:115
-#: ../src/modules/calendar/e-calendar-preferences.c:643
+#: ../src/modules/calendar/e-calendar-preferences.c:621
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:771
+#: ../src/modules/mail/e-mail-shell-backend.c:802
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "General"
@@ -16736,7 +17144,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:915
+#: ../src/shell/e-shell-window-actions.c:933
 msgid "_Clear"
 msgstr "_Clear"
 
@@ -16840,7 +17248,8 @@ msgid "Account Editor"
 msgstr "Account Editor"
 
 #: ../src/mail/e-mail-display.c:126
-msgid "_Add to Address Book..."
+#| msgid "_Add to Address Book..."
+msgid "_Add to Address Book…"
 msgstr "_Add to Address Book…"
 
 #: ../src/mail/e-mail-display.c:133
@@ -16852,7 +17261,8 @@ msgid "_From This Address"
 msgstr "_From This Address"
 
 #: ../src/mail/e-mail-display.c:147
-msgid "Send _Reply To..."
+#| msgid "Send _Reply To..."
+msgid "Send _Reply To…"
 msgstr "Send _Reply To…"
 
 #: ../src/mail/e-mail-display.c:149
@@ -16907,6 +17317,29 @@ msgstr "C_reate"
 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"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:736
+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"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:747
+msgid "Reset sort order in all levels to their defaults"
+msgstr "Reset sort order in all levels to their defaults"
+
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
 #: ../src/mail/e-mail-free-form-exp.c:231
@@ -16939,12 +17372,12 @@ msgctxt "ffe"
 msgid "Attachment"
 msgstr "Attachment"
 
-#: ../src/mail/e-mail-free-form-exp.c:484
+#: ../src/mail/e-mail-free-form-exp.c:489
 msgctxt "ffe"
 msgid "no"
 msgstr "no"
 
-#: ../src/mail/e-mail-free-form-exp.c:485
+#: ../src/mail/e-mail-free-form-exp.c:490
 msgctxt "ffe"
 msgid "false"
 msgstr "false"
@@ -16982,12 +17415,12 @@ msgid "_Later"
 msgstr "_Later"
 
 #: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:906
-#: ../src/mail/em-folder-properties.c:855
+#: ../src/mail/em-folder-properties.c:1141
 msgid "Add Label"
 msgstr "Add Label"
 
 #: ../src/mail/e-mail-label-manager.c:220
-#: ../src/mail/em-folder-properties.c:882
+#: ../src/mail/em-folder-properties.c:1168
 msgid "Edit Label"
 msgstr "Edit Label"
 
@@ -17012,16 +17445,18 @@ msgid "Cannot find message in its folder summary"
 msgstr "Cannot find message in its folder summary"
 
 #: ../src/mail/e-mail-notes.c:863
-msgid "Storing changes..."
-msgstr "Storing changes..."
+#| msgid "Saving changes…"
+msgid "Storing changes…"
+msgstr "Storing changes…"
 
 #: ../src/mail/e-mail-notes.c:1001
 msgid "Edit Message Note"
 msgstr "Edit Message Note"
 
-#: ../src/mail/e-mail-notes.c:1159
-msgid "Retrieving message..."
-msgstr "Retrieving message..."
+#: ../src/mail/e-mail-notes.c:1157
+#| msgid "Retrieving message"
+msgid "Retrieving message…"
+msgstr "Retrieving message…"
 
 #: ../src/mail/e-mail-print-config-headers.c:166
 msgid "Move selected headers to top"
@@ -17078,659 +17513,678 @@ msgid "C_opy"
 msgstr "C_opy"
 
 #: ../src/mail/e-mail-reader.c:610
-msgid "Deleting message note..."
-msgstr "Deleting message note..."
+#| msgid "Deleting message note..."
+msgid "Deleting message note…"
+msgstr "Deleting message note…"
 
-#: ../src/mail/e-mail-reader.c:1577 ../src/mail/e-mail-reader.c:1868
-#: ../src/mail/e-mail-reader.c:1908
+#: ../src/mail/e-mail-reader.c:1610 ../src/mail/e-mail-reader.c:1901
+#: ../src/mail/e-mail-reader.c:1941
 msgid "_Do not ask me again."
 msgstr "_Do not ask me again."
 
-#: ../src/mail/e-mail-reader.c:1914
+#: ../src/mail/e-mail-reader.c:1947
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Always ignore Reply-To: for mailing lists."
 
-#: ../src/mail/e-mail-reader.c:2118
+#: ../src/mail/e-mail-reader.c:2151
 msgid "Failed to retrieve message:"
 msgstr "Failed to retrieve message:"
 
-#: ../src/mail/e-mail-reader.c:2164 ../src/mail/e-mail-reader.c:3641
+#: ../src/mail/e-mail-reader.c:2197 ../src/mail/e-mail-reader.c:3674
 #, c-format
 msgid "Retrieving message “%s”"
 msgstr "Retrieving message “%s”"
 
-#: ../src/mail/e-mail-reader.c:2365
+#: ../src/mail/e-mail-reader.c:2398
 msgid "A_dd Sender to Address Book"
 msgstr "A_dd Sender to Address Book"
 
-#: ../src/mail/e-mail-reader.c:2367
+#: ../src/mail/e-mail-reader.c:2400
 msgid "Add sender to address book"
 msgstr "Add sender to address book"
 
-#: ../src/mail/e-mail-reader.c:2372
-msgid "_Archive..."
-msgstr "_Archive..."
+#: ../src/mail/e-mail-reader.c:2405
+#| msgid "Archive"
+msgid "_Archive…"
+msgstr "_Archive…"
 
-#: ../src/mail/e-mail-reader.c:2374
+#: ../src/mail/e-mail-reader.c:2407
 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:2379
+#: ../src/mail/e-mail-reader.c:2412
 msgid "Check for _Junk"
 msgstr "Check for _Junk"
 
-#: ../src/mail/e-mail-reader.c:2381
+#: ../src/mail/e-mail-reader.c:2414
 msgid "Filter the selected messages for junk status"
 msgstr "Filter the selected messages for junk status"
 
-#: ../src/mail/e-mail-reader.c:2386
+#: ../src/mail/e-mail-reader.c:2419
 msgid "Assign C_olor…"
 msgstr "Assign C_olour…"
 
-#: ../src/mail/e-mail-reader.c:2388
+#: ../src/mail/e-mail-reader.c:2421
 msgid "Assign color for the selected messages"
 msgstr "Assign colour for the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2393
+#: ../src/mail/e-mail-reader.c:2426
 msgid "Unse_t Color"
 msgstr "Unse_t Colour"
 
-#: ../src/mail/e-mail-reader.c:2395
+#: ../src/mail/e-mail-reader.c:2428
 msgid "Unset color for the selected messages"
 msgstr "Unset colour for the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2400
-msgid "_Copy to Folder..."
+#: ../src/mail/e-mail-reader.c:2433
+#| msgid "_Copy to Folder"
+msgid "_Copy to Folder…"
 msgstr "_Copy to Folder…"
 
-#: ../src/mail/e-mail-reader.c:2402
+#: ../src/mail/e-mail-reader.c:2435
 msgid "Copy selected messages to another folder"
 msgstr "Copy selected messages to another folder"
 
-#: ../src/mail/e-mail-reader.c:2407
+#: ../src/mail/e-mail-reader.c:2440
 msgid "_Delete Message"
 msgstr "_Delete Message"
 
-#: ../src/mail/e-mail-reader.c:2409
+#: ../src/mail/e-mail-reader.c:2442
 msgid "Mark the selected messages for deletion"
 msgstr "Mark the selected messages for deletion"
 
-#: ../src/mail/e-mail-reader.c:2414
-msgid "_Add note..."
-msgstr "_Add note..."
+#: ../src/mail/e-mail-reader.c:2447
+#| msgid "_Add note..."
+msgid "_Add note…"
+msgstr "_Add note…"
 
-#: ../src/mail/e-mail-reader.c:2416
+#: ../src/mail/e-mail-reader.c:2449
 msgid "Add a note for the selected message"
 msgstr "Add a note for the selected message"
 
-#: ../src/mail/e-mail-reader.c:2421
+#: ../src/mail/e-mail-reader.c:2454
 msgid "Delete no_te"
 msgstr "Delete no_te"
 
-#: ../src/mail/e-mail-reader.c:2423
+#: ../src/mail/e-mail-reader.c:2456
 msgid "Delete the note for the selected message"
 msgstr "Delete the note for the selected message"
 
-#: ../src/mail/e-mail-reader.c:2428
-msgid "_Edit note..."
-msgstr "_Edit note..."
+#: ../src/mail/e-mail-reader.c:2461
+#| msgid "_Edit note..."
+msgid "_Edit note…"
+msgstr "_Edit note…"
 
-#: ../src/mail/e-mail-reader.c:2430
+#: ../src/mail/e-mail-reader.c:2463
 msgid "Edit a note for the selected message"
 msgstr "Edit a note for the selected message"
 
-#: ../src/mail/e-mail-reader.c:2435
-msgid "Create a Filter Rule for Mailing _List..."
+#: ../src/mail/e-mail-reader.c:2468
+#| msgid "Create a Filter Rule for Mailing _List..."
+msgid "Create a Filter Rule for Mailing _List…"
 msgstr "Create a Filter Rule for Mailing _List…"
 
-#: ../src/mail/e-mail-reader.c:2437
+#: ../src/mail/e-mail-reader.c:2470
 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:2442
-msgid "Create a Filter Rule for _Recipients..."
+#: ../src/mail/e-mail-reader.c:2475
+#| msgid "Create a Filter Rule for _Recipients..."
+msgid "Create a Filter Rule for _Recipients…"
 msgstr "Create a Filter Rule for _Recipients…"
 
-#: ../src/mail/e-mail-reader.c:2444
+#: ../src/mail/e-mail-reader.c:2477
 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:2449
-msgid "Create a Filter Rule for Se_nder..."
+#: ../src/mail/e-mail-reader.c:2482
+#| msgid "Create a Filter Rule for Se_nder..."
+msgid "Create a Filter Rule for Se_nder…"
 msgstr "Create a Filter Rule for Se_nder…"
 
-#: ../src/mail/e-mail-reader.c:2451
+#: ../src/mail/e-mail-reader.c:2484
 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:2456
-msgid "Create a Filter Rule for _Subject..."
+#: ../src/mail/e-mail-reader.c:2489
+#| msgid "Create a Filter Rule for _Subject..."
+msgid "Create a Filter Rule for _Subject…"
 msgstr "Create a Filter Rule for _Subject…"
 
-#: ../src/mail/e-mail-reader.c:2458
+#: ../src/mail/e-mail-reader.c:2491
 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:2463
+#: ../src/mail/e-mail-reader.c:2496
 msgid "A_pply Filters"
 msgstr "A_pply Filters"
 
-#: ../src/mail/e-mail-reader.c:2465
+#: ../src/mail/e-mail-reader.c:2498
 msgid "Apply filter rules to the selected messages"
 msgstr "Apply filter rules to the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2470
-msgid "_Find in Message..."
+#: ../src/mail/e-mail-reader.c:2503
+#| msgid "Find in Message"
+msgid "_Find in Message…"
 msgstr "_Find in Message…"
 
-#: ../src/mail/e-mail-reader.c:2472
+#: ../src/mail/e-mail-reader.c:2505
 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:2477
+#: ../src/mail/e-mail-reader.c:2510
 msgid "_Clear Flag"
 msgstr "_Clear Flag"
 
-#: ../src/mail/e-mail-reader.c:2479
+#: ../src/mail/e-mail-reader.c:2512
 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:2484
+#: ../src/mail/e-mail-reader.c:2517
 msgid "_Flag Completed"
 msgstr "_Flag Completed"
 
-#: ../src/mail/e-mail-reader.c:2486
+#: ../src/mail/e-mail-reader.c:2519
 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:2491
-msgid "Follow _Up..."
+#: ../src/mail/e-mail-reader.c:2524
+#| msgid "Follow Up"
+msgid "Follow _Up…"
 msgstr "Follow _Up…"
 
-#: ../src/mail/e-mail-reader.c:2493
+#: ../src/mail/e-mail-reader.c:2526
 msgid "Flag the selected messages for follow-up"
 msgstr "Flag the selected messages for follow-up"
 
-#: ../src/mail/e-mail-reader.c:2498
+#: ../src/mail/e-mail-reader.c:2531
 #: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "_Attached"
 
-#: ../src/mail/e-mail-reader.c:2500 ../src/mail/e-mail-reader.c:2507
+#: ../src/mail/e-mail-reader.c:2533 ../src/mail/e-mail-reader.c:2540
 #: ../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:2505
+#: ../src/mail/e-mail-reader.c:2538
 msgid "Forward As _Attached"
 msgstr "Forward As _Attached"
 
-#: ../src/mail/e-mail-reader.c:2512
+#: ../src/mail/e-mail-reader.c:2545
 #: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ../src/mail/e-mail-reader.c:2514 ../src/mail/e-mail-reader.c:2521
+#: ../src/mail/e-mail-reader.c:2547 ../src/mail/e-mail-reader.c:2554
 #: ../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:2519
+#: ../src/mail/e-mail-reader.c:2552
 msgid "Forward As _Inline"
 msgstr "Forward As _Inline"
 
-#: ../src/mail/e-mail-reader.c:2526
+#: ../src/mail/e-mail-reader.c:2559
 #: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ../src/mail/e-mail-reader.c:2528 ../src/mail/e-mail-reader.c:2535
+#: ../src/mail/e-mail-reader.c:2561 ../src/mail/e-mail-reader.c:2568
 #: ../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:2533
+#: ../src/mail/e-mail-reader.c:2566
 msgid "Forward As _Quoted"
 msgstr "Forward As _Quoted"
 
-#: ../src/mail/e-mail-reader.c:2540
+#: ../src/mail/e-mail-reader.c:2573
 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:2549
+#: ../src/mail/e-mail-reader.c:2582
 msgid "N_one"
 msgstr "N_one"
 
-#: ../src/mail/e-mail-reader.c:2556
+#: ../src/mail/e-mail-reader.c:2589
 msgid "_Load Images"
 msgstr "_Load Images"
 
-#: ../src/mail/e-mail-reader.c:2558
+#: ../src/mail/e-mail-reader.c:2591
 msgid "Force images in HTML mail to be loaded"
 msgstr "Force images in HTML mail to be loaded"
 
-#: ../src/mail/e-mail-reader.c:2563 ../src/mail/e-mail-reader.c:2982
+#: ../src/mail/e-mail-reader.c:2596 ../src/mail/e-mail-reader.c:3015
 msgid "_Ignore Subthread"
 msgstr "_Ignore Subthread"
 
-#: ../src/mail/e-mail-reader.c:2565
+#: ../src/mail/e-mail-reader.c:2598
 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:2570 ../src/mail/e-mail-reader.c:2986
+#: ../src/mail/e-mail-reader.c:2603 ../src/mail/e-mail-reader.c:3019
 msgid "_Ignore Thread"
 msgstr "_Ignore Thread"
 
-#: ../src/mail/e-mail-reader.c:2572
+#: ../src/mail/e-mail-reader.c:2605
 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:2577
+#: ../src/mail/e-mail-reader.c:2610
 msgid "_Important"
 msgstr "_Important"
 
-#: ../src/mail/e-mail-reader.c:2579
+#: ../src/mail/e-mail-reader.c:2612
 msgid "Mark the selected messages as important"
 msgstr "Mark the selected messages as important"
 
-#: ../src/mail/e-mail-reader.c:2584
+#: ../src/mail/e-mail-reader.c:2617
 msgid "_Junk"
 msgstr "_Junk"
 
-#: ../src/mail/e-mail-reader.c:2586
+#: ../src/mail/e-mail-reader.c:2619
 msgid "Mark the selected messages as junk"
 msgstr "Mark the selected messages as junk"
 
-#: ../src/mail/e-mail-reader.c:2591
+#: ../src/mail/e-mail-reader.c:2624
 msgid "_Not Junk"
 msgstr "_Not Junk"
 
-#: ../src/mail/e-mail-reader.c:2593
+#: ../src/mail/e-mail-reader.c:2626
 msgid "Mark the selected messages as not being junk"
 msgstr "Mark the selected messages as not being junk"
 
-#: ../src/mail/e-mail-reader.c:2598
+#: ../src/mail/e-mail-reader.c:2631
 msgid "_Read"
 msgstr "_Read"
 
-#: ../src/mail/e-mail-reader.c:2600
+#: ../src/mail/e-mail-reader.c:2633
 msgid "Mark the selected messages as having been read"
 msgstr "Mark the selected messages as having been read"
 
-#: ../src/mail/e-mail-reader.c:2605 ../src/mail/e-mail-reader.c:3006
+#: ../src/mail/e-mail-reader.c:2638 ../src/mail/e-mail-reader.c:3039
 msgid "Do not _Ignore Subthread"
 msgstr "Do not _Ignore Subthread"
 
-#: ../src/mail/e-mail-reader.c:2607
+#: ../src/mail/e-mail-reader.c:2640
 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:2612 ../src/mail/e-mail-reader.c:3010
+#: ../src/mail/e-mail-reader.c:2645 ../src/mail/e-mail-reader.c:3043
 msgid "Do not _Ignore Thread"
 msgstr "Do not _Ignore Thread"
 
-#: ../src/mail/e-mail-reader.c:2614
+#: ../src/mail/e-mail-reader.c:2647
 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:2619
+#: ../src/mail/e-mail-reader.c:2652
 msgid "Uni_mportant"
 msgstr "Uni_mportant"
 
-#: ../src/mail/e-mail-reader.c:2621
+#: ../src/mail/e-mail-reader.c:2654
 msgid "Mark the selected messages as unimportant"
 msgstr "Mark the selected messages as unimportant"
 
-#: ../src/mail/e-mail-reader.c:2626
+#: ../src/mail/e-mail-reader.c:2659
 msgid "_Unread"
 msgstr "_Unread"
 
-#: ../src/mail/e-mail-reader.c:2628
+#: ../src/mail/e-mail-reader.c:2661
 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:2633
+#: ../src/mail/e-mail-reader.c:2666
 #: ../src/modules/mail/e-mail-attachment-handler.c:417
-msgid "_Edit as New Message..."
+#| msgid "_Edit as New Message..."
+msgid "_Edit as New Message…"
 msgstr "_Edit as New Message…"
 
-#: ../src/mail/e-mail-reader.c:2635
+#: ../src/mail/e-mail-reader.c:2668
 #: ../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:2640
+#: ../src/mail/e-mail-reader.c:2673
 msgid "Compose _New Message"
 msgstr "Compose _New Message"
 
-#: ../src/mail/e-mail-reader.c:2642
+#: ../src/mail/e-mail-reader.c:2675
 msgid "Open a window for composing a mail message"
 msgstr "Open a window for composing a mail message"
 
-#: ../src/mail/e-mail-reader.c:2647
+#: ../src/mail/e-mail-reader.c:2680
 msgid "_Open in New Window"
 msgstr "_Open in New Window"
 
-#: ../src/mail/e-mail-reader.c:2649
+#: ../src/mail/e-mail-reader.c:2682
 msgid "Open the selected messages in a new window"
 msgstr "Open the selected messages in a new window"
 
-#: ../src/mail/e-mail-reader.c:2654
-msgid "_Move to Folder..."
+#: ../src/mail/e-mail-reader.c:2687
+#| msgid "_Move to Folder"
+msgid "_Move to Folder…"
 msgstr "_Move to Folder…"
 
-#: ../src/mail/e-mail-reader.c:2656
+#: ../src/mail/e-mail-reader.c:2689
 msgid "Move selected messages to another folder"
 msgstr "Move selected messages to another folder"
 
-#: ../src/mail/e-mail-reader.c:2661
+#: ../src/mail/e-mail-reader.c:2694
 msgid "_Next Message"
 msgstr "_Next Message"
 
-#: ../src/mail/e-mail-reader.c:2663
+#: ../src/mail/e-mail-reader.c:2696
 msgid "Display the next message"
 msgstr "Display the next message"
 
-#: ../src/mail/e-mail-reader.c:2668
+#: ../src/mail/e-mail-reader.c:2701
 msgid "Next _Important Message"
 msgstr "Next _Important Message"
 
-#: ../src/mail/e-mail-reader.c:2670
+#: ../src/mail/e-mail-reader.c:2703
 msgid "Display the next important message"
 msgstr "Display the next important message"
 
-#: ../src/mail/e-mail-reader.c:2675
+#: ../src/mail/e-mail-reader.c:2708
 msgid "Next _Thread"
 msgstr "Next _Thread"
 
-#: ../src/mail/e-mail-reader.c:2677
+#: ../src/mail/e-mail-reader.c:2710
 msgid "Display the next thread"
 msgstr "Display the next thread"
 
-#: ../src/mail/e-mail-reader.c:2682
+#: ../src/mail/e-mail-reader.c:2715
 msgid "Next _Unread Message"
 msgstr "Next _Unread Message"
 
-#: ../src/mail/e-mail-reader.c:2684
+#: ../src/mail/e-mail-reader.c:2717
 msgid "Display the next unread message"
 msgstr "Display the next unread message"
 
-#: ../src/mail/e-mail-reader.c:2689
+#: ../src/mail/e-mail-reader.c:2722
 msgid "_Previous Message"
 msgstr "_Previous Message"
 
-#: ../src/mail/e-mail-reader.c:2691
+#: ../src/mail/e-mail-reader.c:2724
 msgid "Display the previous message"
 msgstr "Display the previous message"
 
-#: ../src/mail/e-mail-reader.c:2696
+#: ../src/mail/e-mail-reader.c:2729
 msgid "Pr_evious Important Message"
 msgstr "Pr_evious Important Message"
 
-#: ../src/mail/e-mail-reader.c:2698
+#: ../src/mail/e-mail-reader.c:2731
 msgid "Display the previous important message"
 msgstr "Display the previous important message"
 
-#: ../src/mail/e-mail-reader.c:2703
+#: ../src/mail/e-mail-reader.c:2736
 msgid "Previous T_hread"
 msgstr "Previous T_hread"
 
-#: ../src/mail/e-mail-reader.c:2705
+#: ../src/mail/e-mail-reader.c:2738
 msgid "Display the previous thread"
 msgstr "Display the previous thread"
 
-#: ../src/mail/e-mail-reader.c:2710
+#: ../src/mail/e-mail-reader.c:2743
 msgid "P_revious Unread Message"
 msgstr "P_revious Unread Message"
 
-#: ../src/mail/e-mail-reader.c:2712
+#: ../src/mail/e-mail-reader.c:2745
 msgid "Display the previous unread message"
 msgstr "Display the previous unread message"
 
-#: ../src/mail/e-mail-reader.c:2719
+#: ../src/mail/e-mail-reader.c:2752
 msgid "Print this message"
 msgstr "Print this message"
 
-#: ../src/mail/e-mail-reader.c:2726
+#: ../src/mail/e-mail-reader.c:2759
 msgid "Preview the message to be printed"
 msgstr "Preview the message to be printed"
 
-#: ../src/mail/e-mail-reader.c:2731
+#: ../src/mail/e-mail-reader.c:2764
 #: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "Re_direct"
 
-#: ../src/mail/e-mail-reader.c:2733
+#: ../src/mail/e-mail-reader.c:2766
 #: ../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:2738
+#: ../src/mail/e-mail-reader.c:2771
 msgid "Remo_ve Attachments"
 msgstr "Remo_ve Attachments"
 
-#: ../src/mail/e-mail-reader.c:2740
+#: ../src/mail/e-mail-reader.c:2773
 msgid "Remove attachments"
 msgstr "Remove attachments"
 
-#: ../src/mail/e-mail-reader.c:2745
+#: ../src/mail/e-mail-reader.c:2778
 msgid "Remove Du_plicate Messages"
 msgstr "Remove Du_plicate Messages"
 
-#: ../src/mail/e-mail-reader.c:2747
+#: ../src/mail/e-mail-reader.c:2780
 msgid "Checks selected messages for duplicates"
 msgstr "Checks selected messages for duplicates"
 
-#: ../src/mail/e-mail-reader.c:2752 ../src/mail/em-composer-utils.c:4227
+#: ../src/mail/e-mail-reader.c:2785 ../src/mail/em-composer-utils.c:4099
 #: ../src/mail/mail.error.xml.h:28
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1500
+#: ../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:2754
+#: ../src/mail/e-mail-reader.c:2787
 #: ../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:2759
+#: ../src/mail/e-mail-reader.c:2792
 msgid "Al_ternative Reply…"
 msgstr "Al_ternative Reply…"
 
-#: ../src/mail/e-mail-reader.c:2761
+#: ../src/mail/e-mail-reader.c:2794
 msgid "Choose reply options for the selected message"
 msgstr "Choose reply options for the selected message"
 
-#: ../src/mail/e-mail-reader.c:2766 ../src/mail/em-composer-utils.c:4222
+#: ../src/mail/e-mail-reader.c:2799 ../src/mail/em-composer-utils.c:4094
 #: ../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:2768
+#: ../src/mail/e-mail-reader.c:2801
 #: ../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:2773
+#: ../src/mail/e-mail-reader.c:2806
 #: ../src/modules/mail/e-mail-attachment-handler.c:410
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: ../src/mail/e-mail-reader.c:2775
+#: ../src/mail/e-mail-reader.c:2808
 #: ../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:2780
-msgid "_Save as mbox..."
+#: ../src/mail/e-mail-reader.c:2813
+#| msgid "_Save as mbox..."
+msgid "_Save as mbox…"
 msgstr "_Save as mbox…"
 
-#: ../src/mail/e-mail-reader.c:2782
+#: ../src/mail/e-mail-reader.c:2815
 msgid "Save selected messages as an mbox file"
 msgstr "Save selected messages as an mbox file"
 
-#: ../src/mail/e-mail-reader.c:2794
+#: ../src/mail/e-mail-reader.c:2827
 msgid "_Message Source"
 msgstr "_Message Source"
 
-#: ../src/mail/e-mail-reader.c:2796
+#: ../src/mail/e-mail-reader.c:2829
 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:2808
+#: ../src/mail/e-mail-reader.c:2841
 msgid "_Undelete Message"
 msgstr "_Undelete Message"
 
-#: ../src/mail/e-mail-reader.c:2810
+#: ../src/mail/e-mail-reader.c:2843
 msgid "Undelete the selected messages"
 msgstr "Undelete the selected messages"
 
-#: ../src/mail/e-mail-reader.c:2815
+#: ../src/mail/e-mail-reader.c:2848
 msgid "_Normal Size"
 msgstr "_Normal Size"
 
-#: ../src/mail/e-mail-reader.c:2817
+#: ../src/mail/e-mail-reader.c:2850
 msgid "Reset the text to its original size"
 msgstr "Reset the text to its original size"
 
-#: ../src/mail/e-mail-reader.c:2822
+#: ../src/mail/e-mail-reader.c:2855
 msgid "_Zoom In"
 msgstr "_Zoom In"
 
-#: ../src/mail/e-mail-reader.c:2824
+#: ../src/mail/e-mail-reader.c:2857
 msgid "Increase the text size"
 msgstr "Increase the text size"
 
-#: ../src/mail/e-mail-reader.c:2831
+#: ../src/mail/e-mail-reader.c:2864
 msgid "Decrease the text size"
 msgstr "Decrease the text size"
 
-#: ../src/mail/e-mail-reader.c:2838
+#: ../src/mail/e-mail-reader.c:2871
 msgid "Cre_ate"
 msgstr "Cre_ate"
 
-#: ../src/mail/e-mail-reader.c:2845
+#: ../src/mail/e-mail-reader.c:2878
 msgid "Ch_aracter Encoding"
 msgstr "Ch_aracter Encoding"
 
-#: ../src/mail/e-mail-reader.c:2852
+#: ../src/mail/e-mail-reader.c:2885
 #: ../src/modules/mail/e-mail-attachment-handler.c:424
 msgid "F_orward As"
 msgstr "F_orward As"
 
-#: ../src/mail/e-mail-reader.c:2859
+#: ../src/mail/e-mail-reader.c:2892
 msgid "_Label"
 msgstr "_Label"
 
-#: ../src/mail/e-mail-reader.c:2866
+#: ../src/mail/e-mail-reader.c:2899
 msgid "_Group Reply"
 msgstr "_Group Reply"
 
-#: ../src/mail/e-mail-reader.c:2873
+#: ../src/mail/e-mail-reader.c:2906
 msgid "_Go To"
 msgstr "_Go To"
 
-#: ../src/mail/e-mail-reader.c:2880
+#: ../src/mail/e-mail-reader.c:2913
 msgid "Mar_k As"
 msgstr "Mar_k As"
 
-#: ../src/mail/e-mail-reader.c:2887
+#: ../src/mail/e-mail-reader.c:2920
 msgid "_Message"
 msgstr "_Message"
 
-#: ../src/mail/e-mail-reader.c:2894
+#: ../src/mail/e-mail-reader.c:2927
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../src/mail/e-mail-reader.c:2904
-msgid "Create a Search Folder from Mailing _List..."
+#: ../src/mail/e-mail-reader.c:2937
+#| msgid "Create a Search Folder from Mailing _List..."
+msgid "Create a Search Folder from Mailing _List…"
 msgstr "Create a Search Folder from Mailing _List…"
 
-#: ../src/mail/e-mail-reader.c:2906
+#: ../src/mail/e-mail-reader.c:2939
 msgid "Create a search folder for this mailing list"
 msgstr "Create a search folder for this mailing list"
 
-#: ../src/mail/e-mail-reader.c:2911
-msgid "Create a Search Folder from Recipien_ts..."
+#: ../src/mail/e-mail-reader.c:2944
+#| msgid "Create a Search Folder from Recipien_ts..."
+msgid "Create a Search Folder from Recipien_ts…"
 msgstr "Create a Search Folder from Recipien_ts…"
 
-#: ../src/mail/e-mail-reader.c:2913
+#: ../src/mail/e-mail-reader.c:2946
 msgid "Create a search folder for these recipients"
 msgstr "Create a search folder for these recipients"
 
-#: ../src/mail/e-mail-reader.c:2918
-msgid "Create a Search Folder from Sen_der..."
+#: ../src/mail/e-mail-reader.c:2951
+#| msgid "Create a Search Folder from Sen_der..."
+msgid "Create a Search Folder from Sen_der…"
 msgstr "Create a Search Folder from Sen_der…"
 
-#: ../src/mail/e-mail-reader.c:2920
+#: ../src/mail/e-mail-reader.c:2953
 msgid "Create a search folder for this sender"
 msgstr "Create a search folder for this sender"
 
-#: ../src/mail/e-mail-reader.c:2925
-msgid "Create a Search Folder from S_ubject..."
+#: ../src/mail/e-mail-reader.c:2958
+#| msgid "Create a Search Folder from S_ubject..."
+msgid "Create a Search Folder from S_ubject…"
 msgstr "Create a Search Folder from S_ubject…"
 
-#: ../src/mail/e-mail-reader.c:2927
+#: ../src/mail/e-mail-reader.c:2960
 msgid "Create a search folder for this subject"
 msgstr "Create a search folder for this subject"
 
-#: ../src/mail/e-mail-reader.c:2974
-msgid "Mark for Follo_w Up..."
+#: ../src/mail/e-mail-reader.c:3007
+#| msgid "Mark for Follo_w Up..."
+msgid "Mark for Follo_w Up…"
 msgstr "Mark for Follo_w Up…"
 
-#: ../src/mail/e-mail-reader.c:2990
+#: ../src/mail/e-mail-reader.c:3023
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: ../src/mail/e-mail-reader.c:2994
+#: ../src/mail/e-mail-reader.c:3027
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: ../src/mail/e-mail-reader.c:2998
+#: ../src/mail/e-mail-reader.c:3031
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: ../src/mail/e-mail-reader.c:3002
+#: ../src/mail/e-mail-reader.c:3035
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: ../src/mail/e-mail-reader.c:3014
+#: ../src/mail/e-mail-reader.c:3047
 msgid "Mark as Uni_mportant"
 msgstr "Mark as Uni_mportant"
 
-#: ../src/mail/e-mail-reader.c:3018
+#: ../src/mail/e-mail-reader.c:3051
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: ../src/mail/e-mail-reader.c:3066
+#: ../src/mail/e-mail-reader.c:3099
 msgid "_Caret Mode"
 msgstr "_Caret Mode"
 
-#: ../src/mail/e-mail-reader.c:3068
+#: ../src/mail/e-mail-reader.c:3101
 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:3074
+#: ../src/mail/e-mail-reader.c:3107
 msgid "All Message _Headers"
 msgstr "All Message _Headers"
 
-#: ../src/mail/e-mail-reader.c:3076
+#: ../src/mail/e-mail-reader.c:3109
 msgid "Show messages with all email headers"
 msgstr "Show messages with all e-mail headers"
 
-#: ../src/mail/e-mail-reader.c:3647
+#: ../src/mail/e-mail-reader.c:3680
 msgid "Retrieving message"
 msgstr "Retrieving message"
 
-#: ../src/mail/e-mail-reader.c:5008
+#: ../src/mail/e-mail-reader.c:5041
 #: ../src/modules/mail/e-mail-attachment-handler.c:389
 msgid "_Forward"
 msgstr "_Forward"
 
-#: ../src/mail/e-mail-reader.c:5009
+#: ../src/mail/e-mail-reader.c:5042
 #: ../src/modules/mail/e-mail-attachment-handler.c:391
 msgid "Forward the selected message to someone"
 msgstr "Forward the selected message to someone"
@@ -17739,52 +18193,52 @@ msgstr "Forward the selected message to someone"
 #. * (if possible and if that configuration option is enabled), or else
 #. * it will reply to all. The word "Group" was chosen because it covers
 #. * either of those, without too strongly implying one or the other.
-#: ../src/mail/e-mail-reader.c:5028
+#: ../src/mail/e-mail-reader.c:5061
 msgid "Group Reply"
 msgstr "Group Reply"
 
-#: ../src/mail/e-mail-reader.c:5029
+#: ../src/mail/e-mail-reader.c:5062
 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:5095 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:5128 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Delete"
 
-#: ../src/mail/e-mail-reader.c:5107
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../src/mail/e-mail-reader.c:5140
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Next"
 msgstr "Next"
 
-#: ../src/mail/e-mail-reader.c:5111
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
+#: ../src/mail/e-mail-reader.c:5144
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1242
 msgid "Previous"
 msgstr "Previous"
 
-#: ../src/mail/e-mail-reader.c:5120 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:5153 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Reply"
 
-#: ../src/mail/e-mail-reader.c:6275
+#: ../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:6277
+#: ../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:6294
+#: ../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:6311
+#: ../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:6363
+#: ../src/mail/e-mail-reader.c:6396
 msgid "Load remote content"
 msgstr "Load remote content"
 
@@ -17860,7 +18314,7 @@ msgstr[1] "Messages"
 msgid "Parsing message"
 msgstr "Parsing message"
 
-#: ../src/mail/e-mail-request.c:276
+#: ../src/mail/e-mail-request.c:288
 msgid "The message has no text content."
 msgstr "The message has no text content."
 
@@ -17928,14 +18382,15 @@ 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..."
-msgstr "Waiting for attachments to load..."
+#| msgid "Waiting for attachments to load..."
+msgid "Waiting for attachments to load…"
+msgstr "Waiting for attachments to load…"
 
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../src/mail/em-composer-utils.c:2176
+#: ../src/mail/em-composer-utils.c:2027
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -17943,79 +18398,79 @@ msgstr ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
-#: ../src/mail/em-composer-utils.c:2182
+#: ../src/mail/em-composer-utils.c:2033
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: ../src/mail/em-composer-utils.c:2187
+#: ../src/mail/em-composer-utils.c:2038
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
 #. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the 
subject of the original message. Both 'Re'-s in the 'reply-attribution' translation context should translate 
into the same string, the same as the ':' separator.
-#: ../src/mail/em-composer-utils.c:2919
+#: ../src/mail/em-composer-utils.c:2799
 #, c-format
 msgctxt "reply-attribution"
 msgid "Re: %s"
 msgstr "Re: %s"
 
-#: ../src/mail/em-composer-utils.c:3529
+#: ../src/mail/em-composer-utils.c:3417
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
-#: ../src/mail/em-composer-utils.c:4173
+#: ../src/mail/em-composer-utils.c:4045
 msgid "Alternative Reply"
 msgstr "Alternative Reply"
 
-#: ../src/mail/em-composer-utils.c:4176
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../src/mail/em-composer-utils.c:4048
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Reply"
 msgstr "_Reply"
 
-#: ../src/mail/em-composer-utils.c:4189
+#: ../src/mail/em-composer-utils.c:4061
 msgid "Recipients:"
 msgstr "Recipients:"
 
-#: ../src/mail/em-composer-utils.c:4217
+#: ../src/mail/em-composer-utils.c:4089
 msgid "Reply to _Sender"
 msgstr "Reply to _Sender"
 
-#: ../src/mail/em-composer-utils.c:4239
+#: ../src/mail/em-composer-utils.c:4111
 msgid "Reply style:"
 msgstr "Reply style:"
 
-#: ../src/mail/em-composer-utils.c:4247
+#: ../src/mail/em-composer-utils.c:4119
 msgid "_Default"
 msgstr "_Default"
 
-#: ../src/mail/em-composer-utils.c:4251
+#: ../src/mail/em-composer-utils.c:4123
 msgid "Attach_ment"
 msgstr "Attach_ment"
 
-#: ../src/mail/em-composer-utils.c:4255
+#: ../src/mail/em-composer-utils.c:4127
 msgid "Inline (_Outlook style)"
 msgstr "Inline (_Outlook style)"
 
-#: ../src/mail/em-composer-utils.c:4259
+#: ../src/mail/em-composer-utils.c:4131
 msgid "_Quote"
 msgstr "_Quote"
 
-#: ../src/mail/em-composer-utils.c:4263
+#: ../src/mail/em-composer-utils.c:4135
 msgid "Do _Not Quote"
 msgstr "Do _Not Quote"
 
-#: ../src/mail/em-composer-utils.c:4270
+#: ../src/mail/em-composer-utils.c:4142
 msgid "_Format message in HTML"
 msgstr "_Format message in HTML"
 
-#: ../src/mail/em-composer-utils.c:4280
+#: ../src/mail/em-composer-utils.c:4152
 msgid "Apply t_emplate"
 msgstr "Apply t_emplate"
 
-#: ../src/mail/em-composer-utils.c:4292
+#: ../src/mail/em-composer-utils.c:4164
 msgid "Preserve original message S_ubject"
 msgstr "Preserve original message S_ubject"
 
-#: ../src/mail/em-composer-utils.c:4358
+#: ../src/mail/em-composer-utils.c:4230
 #, c-format
 msgid "one recipient"
 msgid_plural "%d recipients"
@@ -18023,16 +18478,15 @@ msgstr[0] "one recipient"
 msgstr[1] "%d recipients"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:4776
+#: ../src/mail/em-composer-utils.c:4639
 msgid "Posting destination"
 msgstr "Posting destination"
 
-#: ../src/mail/em-composer-utils.c:4781
+#: ../src/mail/em-composer-utils.c:4644
 msgid "Choose folders to post the message to."
 msgstr "Choose folders to post the message to."
 
 #: ../src/mail/em-filter-editor.c:43
-#| msgid "Description List"
 msgid "Description of Filters"
 msgstr "Description of Filters"
 
@@ -18041,17 +18495,14 @@ msgstr "Description of Filters"
 #. the third '%s' is replaced with the account name
 #: ../src/mail/em-filter-editor.c:167
 #, c-format
-#| msgid "List of accounts"
 msgid "%s (%s, for account %s)"
 msgstr "%s (%s, for account %s)"
 
 #: ../src/mail/em-filter-editor.c:167 ../src/mail/em-filter-editor.c:171
-#| msgid "Enabled"
 msgid "enabled"
 msgstr "enabled"
 
 #: ../src/mail/em-filter-editor.c:167 ../src/mail/em-filter-editor.c:171
-#| msgid "Disable"
 msgid "disabled"
 msgstr "disabled"
 
@@ -18063,12 +18514,10 @@ msgid "%s (%s, for any account)"
 msgstr "%s (%s, for any account)"
 
 #: ../src/mail/em-filter-editor.c:183
-#| msgid "all the following conditions"
 msgid "If all the following conditions are met"
 msgstr "If all the following conditions are met"
 
 #: ../src/mail/em-filter-editor.c:186
-#| msgid "any of the following conditions"
 msgid "If any of the following conditions are met"
 msgstr "If any of the following conditions are met"
 
@@ -18078,7 +18527,6 @@ msgid "Then"
 msgstr "Then"
 
 #: ../src/mail/em-filter-editor.c:408
-#| msgid "Message Filters"
 msgid "De_scribe Filters…"
 msgstr "De_scribe Filters…"
 
@@ -18104,106 +18552,126 @@ msgstr "_For Account:"
 msgid "Add Ac_tion"
 msgstr "Add Ac_tion"
 
-#: ../src/mail/em-folder-properties.c:241
+#: ../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"
+
+#: ../src/mail/em-folder-properties.c:494
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Unread messages:"
 msgstr[1] "Unread messages:"
 
-#: ../src/mail/em-folder-properties.c:252
+#: ../src/mail/em-folder-properties.c:505
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total messages:"
 msgstr[1] "Total messages:"
 
-#: ../src/mail/em-folder-properties.c:273
+#: ../src/mail/em-folder-properties.c:526
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Quota usage (%s):"
 
-#: ../src/mail/em-folder-properties.c:275
+#: ../src/mail/em-folder-properties.c:528
 #, c-format
 msgid "Quota usage"
 msgstr "Quota usage"
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../src/mail/em-folder-properties.c:419
+#: ../src/mail/em-folder-properties.c:672
 msgid "_Send Account Override:"
 msgstr "_Send Account Override:"
 
-#: ../src/mail/em-folder-properties.c:626
+#: ../src/mail/em-folder-properties.c:912
 msgid "Archive this folder using these settings:"
 msgstr "Archive this folder using these settings:"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:638
+#: ../src/mail/em-folder-properties.c:924
 msgctxt "autoarchive"
 msgid "Auto-_cleanup messages older than"
 msgstr "Auto-_cleanup messages older than"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:651
+#: ../src/mail/em-folder-properties.c:937
 msgctxt "autoarchive"
 msgid "days"
 msgstr "days"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:653
+#: ../src/mail/em-folder-properties.c:939
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "weeks"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:655
+#: ../src/mail/em-folder-properties.c:941
 msgctxt "autoarchive"
 msgid "months"
 msgstr "months"
 
-#: ../src/mail/em-folder-properties.c:661
+#: ../src/mail/em-folder-properties.c:947
 msgid "Move messages to the default archive _folder"
 msgstr "Move messages to the default archive _folder"
 
-#: ../src/mail/em-folder-properties.c:668
+#: ../src/mail/em-folder-properties.c:954
 msgid "_Move messages to:"
 msgstr "_Move messages to:"
 
-#: ../src/mail/em-folder-properties.c:672
+#: ../src/mail/em-folder-properties.c:958
 msgid "Archive folder"
 msgstr "Archive folder"
 
-#: ../src/mail/em-folder-properties.c:672
+#: ../src/mail/em-folder-properties.c:958
 msgid "Select folder to use for Archive"
 msgstr "Select folder to use for Archive"
 
-#: ../src/mail/em-folder-properties.c:676
+#: ../src/mail/em-folder-properties.c:962
 msgid "_Delete messages"
 msgstr "_Delete messages"
 
-#: ../src/mail/em-folder-properties.c:1031
+#: ../src/mail/em-folder-properties.c:1317
 msgid "Server Tag"
 msgstr "Server Tag"
 
-#: ../src/mail/em-folder-properties.c:1035 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/em-folder-properties.c:1321 ../src/mail/filtertypes.xml.in.h:29
 #: ../src/mail/searchtypes.xml.in.h:31 ../src/mail/vfoldertypes.xml.in.h:31
 msgid "Label"
 msgstr "Label"
 
+#: ../src/mail/em-folder-properties.c:1370
+#| msgid "_Switcher Appearance"
+msgid "Appearance"
+msgstr "Appearance"
+
 #. Translators: "Archive" is a noun (This is a tab heading in the mail folder properties)
-#: ../src/mail/em-folder-properties.c:1087
+#: ../src/mail/em-folder-properties.c:1374
 msgid "Archive"
 msgstr "Archive"
 
-#: ../src/mail/em-folder-properties.c:1090 ../src/mail/mail-config.ui.h:123
+#: ../src/mail/em-folder-properties.c:1377 ../src/mail/mail-config.ui.h:123
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Labels"
 
-#: ../src/mail/em-folder-properties.c:1169
+#: ../src/mail/em-folder-properties.c:1455
 msgid "Folder Properties"
 msgstr "Folder Properties"
 
-#: ../src/mail/em-folder-properties.c:1408
+#: ../src/mail/em-folder-properties.c:1694
 msgid "Gathering folder properties"
 msgstr "Gathering folder properties"
 
@@ -18215,7 +18683,7 @@ msgstr "<click here to select a folder>"
 msgid "Create a new folder"
 msgstr "Create a new folder"
 
-#: ../src/mail/em-folder-tree.c:682
+#: ../src/mail/em-folder-tree.c:685
 msgid "Folder names cannot contain “/”"
 msgstr "Folder names cannot contain “/”"
 
@@ -18237,52 +18705,47 @@ msgstr "Folder names cannot contain “/”"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../src/mail/em-folder-tree.c:876
+#: ../src/mail/em-folder-tree.c:879
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../src/mail/em-folder-tree.c:1731
+#: ../src/mail/em-folder-tree.c:1741
 msgid "Mail Folder Tree"
 msgstr "Mail Folder Tree"
 
-#: ../src/mail/em-folder-tree.c:2280
+#: ../src/mail/em-folder-tree.c:2290
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: ../src/mail/em-folder-tree.c:2283
+#: ../src/mail/em-folder-tree.c:2293
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: ../src/mail/em-folder-tree.c:2290 ../src/mail/message-list.c:2632
+#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: ../src/mail/em-folder-tree.c:2294 ../src/mail/message-list.c:2634
+#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: ../src/mail/em-folder-tree.c:2313
+#: ../src/mail/em-folder-tree.c:2323
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
 #. UNMATCHED is always last.
-#: ../src/mail/em-folder-tree-model.c:445
-#: ../src/mail/em-folder-tree-model.c:447
+#: ../src/mail/em-folder-tree-model.c:460
+#: ../src/mail/em-folder-tree-model.c:462
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../src/mail/em-folder-tree-model.c:1326
-#: ../src/mail/em-folder-tree-model.c:1703
-msgid "Loading..."
-msgstr "Loading…"
-
 #: ../src/mail/em-folder-utils.c:111
 #, c-format
 msgid "Moving folder “%s”"
@@ -18324,8 +18787,8 @@ msgid "Subscribe To _All"
 msgstr "Subscribe To _All"
 
 #: ../src/mail/em-subscription-editor.c:936
-#: ../src/mail/em-subscription-editor.c:1888 ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1660
+#: ../src/mail/em-subscription-editor.c:1890 ../src/mail/mail.error.xml.h:73
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1706
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
@@ -18337,7 +18800,7 @@ msgstr "Unsu_bscribe From Hidden"
 msgid "Unsubscribe From _All"
 msgstr "Unsubscribe From _All"
 
-#: ../src/mail/em-subscription-editor.c:1313
+#: ../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
@@ -18347,7 +18810,7 @@ msgid_plural "%d unread, "
 msgstr[0] "%d unread, "
 msgstr[1] "%d unread, "
 
-#: ../src/mail/em-subscription-editor.c:1317
+#: ../src/mail/em-subscription-editor.c:1319
 #: ../src/modules/mail/e-mail-shell-view-private.c:1019
 #, c-format
 msgid "%d total"
@@ -18355,60 +18818,60 @@ msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: ../src/mail/em-subscription-editor.c:1729
+#: ../src/mail/em-subscription-editor.c:1731
 msgid "Folder Subscriptions"
 msgstr "Folder Subscriptions"
 
-#: ../src/mail/em-subscription-editor.c:1764
+#: ../src/mail/em-subscription-editor.c:1766
 msgid "_Account:"
 msgstr "_Account:"
 
-#: ../src/mail/em-subscription-editor.c:1777
+#: ../src/mail/em-subscription-editor.c:1779
 msgid "Clear Search"
 msgstr "Clear Search"
 
-#: ../src/mail/em-subscription-editor.c:1794
+#: ../src/mail/em-subscription-editor.c:1796
 msgid "Sho_w items that contain:"
 msgstr "Sho_w items that contain:"
 
-#: ../src/mail/em-subscription-editor.c:1841
+#: ../src/mail/em-subscription-editor.c:1843
 msgid "Subscribe to the selected folder"
 msgstr "Subscribe to the selected folder"
 
-#: ../src/mail/em-subscription-editor.c:1842
+#: ../src/mail/em-subscription-editor.c:1844
 msgid "Su_bscribe"
 msgstr "Su_bscribe"
 
-#: ../src/mail/em-subscription-editor.c:1887
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1662
+#: ../src/mail/em-subscription-editor.c:1889
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1708
 msgid "Unsubscribe from the selected folder"
 msgstr "Unsubscribe from the selected folder"
 
-#: ../src/mail/em-subscription-editor.c:1927
+#: ../src/mail/em-subscription-editor.c:1929
 msgid "Collapse all folders"
 msgstr "Collapse all folders"
 
-#: ../src/mail/em-subscription-editor.c:1928
+#: ../src/mail/em-subscription-editor.c:1930
 msgid "C_ollapse All"
 msgstr "C_ollapse All"
 
-#: ../src/mail/em-subscription-editor.c:1938
+#: ../src/mail/em-subscription-editor.c:1940
 msgid "Expand all folders"
 msgstr "Expand all folders"
 
-#: ../src/mail/em-subscription-editor.c:1939
+#: ../src/mail/em-subscription-editor.c:1941
 msgid "E_xpand All"
 msgstr "E_xpand All"
 
-#: ../src/mail/em-subscription-editor.c:1949
+#: ../src/mail/em-subscription-editor.c:1951
 msgid "Refresh the folder list"
 msgstr "Refresh the folder list"
 
-#: ../src/mail/em-subscription-editor.c:1961
+#: ../src/mail/em-subscription-editor.c:1963
 msgid "Stop the current operation"
 msgstr "Stop the current operation"
 
-#: ../src/mail/em-subscription-editor.c:1962
+#: ../src/mail/em-subscription-editor.c:1964
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "_Stop"
 msgstr "_Stop"
@@ -18847,7 +19310,7 @@ msgstr "Evolution KMail importer"
 msgid "Import mail and contacts from KMail."
 msgstr "Import mail and contacts from KMail."
 
-#: ../src/mail/importers/kmail-libs.c:150
+#: ../src/mail/importers/kmail-libs.c:149
 #: ../src/modules/mail/e-mail-shell-view-private.c:1040
 msgid "Trash"
 msgstr "Wastebasket"
@@ -19005,7 +19468,6 @@ msgid "_Forward style:"
 msgstr "_Forward style:"
 
 #: ../src/mail/mail-config.ui.h:20
-#| msgid "_Languages"
 msgid "_Language:"
 msgstr "_Language:"
 
@@ -19670,7 +20132,7 @@ msgstr ""
 "folders?"
 
 #: ../src/mail/mail.error.xml.h:42
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1540
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1579
 msgid "_Empty Trash"
 msgstr "_Empty Wastebasket"
 
@@ -20088,7 +20550,6 @@ msgid "In Current _Folder Only"
 msgstr "In Current _Folder Only"
 
 #: ../src/mail/mail.error.xml.h:141
-#| msgid "In Current _Folder Only"
 msgid "_Always In Current Folder Only"
 msgstr "_Always In Current Folder Only"
 
@@ -20262,7 +20723,6 @@ msgid "Failed to remove attachments from messages."
 msgstr "Failed to remove attachments from messages."
 
 #: ../src/mail/mail.error.xml.h:183
-#| msgid "Failed to download messages for offline viewing."
 msgid "Failed to download messages for offline viewing for account “{0}”."
 msgstr "Failed to download messages for offline viewing for account “{0}”."
 
@@ -20408,7 +20868,8 @@ 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..."
+msgid "Canceling…"
 msgstr "Cancelling…"
 
 #: ../src/mail/mail-send-recv.c:610
@@ -20428,11 +20889,13 @@ msgid "Cancel _All"
 msgstr "Cancel _All"
 
 #: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:1470
-msgid "Updating..."
+#| msgid "Updating..."
+msgid "Updating…"
 msgstr "Updating…"
 
 #: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:952
-msgid "Waiting..."
+#| msgid "Waiting..."
+msgid "Waiting…"
 msgstr "Waiting…"
 
 #: ../src/mail/mail-send-recv.c:1436
@@ -20467,87 +20930,87 @@ msgstr "Edit Search Folder"
 msgid "New Search Folder"
 msgstr "New Search Folder"
 
-#: ../src/mail/message-list.c:306
+#: ../src/mail/message-list.c:309
 msgid "Unseen"
 msgstr "Unseen"
 
-#: ../src/mail/message-list.c:307
+#: ../src/mail/message-list.c:310
 msgid "Seen"
 msgstr "Seen"
 
-#: ../src/mail/message-list.c:308
+#: ../src/mail/message-list.c:311
 msgid "Answered"
 msgstr "Answered"
 
-#: ../src/mail/message-list.c:309
+#: ../src/mail/message-list.c:312
 msgid "Forwarded"
 msgstr "Forwarded"
 
-#: ../src/mail/message-list.c:310
+#: ../src/mail/message-list.c:313
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: ../src/mail/message-list.c:311
+#: ../src/mail/message-list.c:314
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: ../src/mail/message-list.c:324
+#: ../src/mail/message-list.c:327
 msgid "Lowest"
 msgstr "Lowest"
 
-#: ../src/mail/message-list.c:325
+#: ../src/mail/message-list.c:328
 msgid "Lower"
 msgstr "Lower"
 
-#: ../src/mail/message-list.c:329
+#: ../src/mail/message-list.c:332
 msgid "Higher"
 msgstr "Higher"
 
-#: ../src/mail/message-list.c:330
+#: ../src/mail/message-list.c:333
 msgid "Highest"
 msgstr "Highest"
 
-#: ../src/mail/message-list.c:479 ../src/mail/message-list.c:6690
+#: ../src/mail/message-list.c:482
 msgid "Generating message list"
 msgstr "Generating message list"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2154
-#: ../src/modules/itip-formatter/itip-view.c:269
+#: ../src/mail/message-list.c:2151
+#: ../src/modules/itip-formatter/itip-view.c:268
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: ../src/mail/message-list.c:2163
+#: ../src/mail/message-list.c:2160
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: ../src/mail/message-list.c:2175
+#: ../src/mail/message-list.c:2172
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../src/mail/message-list.c:2183
+#: ../src/mail/message-list.c:2180
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../src/mail/message-list.c:2185
+#: ../src/mail/message-list.c:2182
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../src/mail/message-list.c:3265
+#: ../src/mail/message-list.c:3267
 msgid "Select all visible messages"
 msgstr "Select all visible messages"
 
-#: ../src/mail/message-list.c:4010 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4022 ../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:5559
+#: ../src/mail/message-list.c:5591
 msgid "Follow-up"
 msgstr "Follow-up"
 
-#: ../src/mail/message-list.c:6629
+#: ../src/mail/message-list.c:6654
 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 "
@@ -20559,10 +21022,15 @@ 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:6637
+#: ../src/mail/message-list.c:6662
 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"
+msgid "Generating message list…"
+msgstr "Generating message list…"
+
 #: ../src/mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Flagged"
@@ -20592,7 +21060,7 @@ msgid "Subject — Trimmed"
 msgstr "Subject — Trimmed"
 
 #: ../src/mail/message-list.etspec.h:21
-#: ../src/plugins/save-calendar/csv-format.c:372
+#: ../src/plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
@@ -20613,32 +21081,32 @@ msgid "Subject or Addresses contains"
 msgstr "Subject or Addresses contains"
 
 #: ../src/mail/searchtypes.xml.in.h:58
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2111
 msgid "Recipients contain"
 msgstr "Recipients contain"
 
 #: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2104
 msgid "Message contains"
 msgstr "Message contains"
 
 #: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2079
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2125
 msgid "Subject contains"
 msgstr "Subject contains"
 
 #: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2118
 msgid "Sender contains"
 msgstr "Sender contains"
 
 #: ../src/mail/searchtypes.xml.in.h:62
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2090
 msgid "Body contains"
 msgstr "Body contains"
 
 #: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2097
 msgid "Free form expression"
 msgstr "Free form expression"
 
@@ -20666,7 +21134,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:326
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:271
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:180
 msgid "New Memo List"
 msgstr "New Memo List"
@@ -20802,7 +21270,8 @@ 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..."
+msgid "Co_py All Contacts To…"
 msgstr "Co_py All Contacts To…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1017
@@ -20818,16 +21287,18 @@ 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..."
-msgstr "_Manage Address Book groups..."
+#| msgid "_Manage Address Book groups..."
+msgid "_Manage Address Book groups…"
+msgstr "_Manage Address Book groups…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1031
-#: ../src/modules/calendar/e-task-shell-view-actions.c:735
+#: ../src/modules/calendar/e-task-shell-view-actions.c:733
 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..."
+msgid "Mo_ve All Contacts To…"
 msgstr "Mo_ve All Contacts To…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1038
@@ -20847,9 +21318,9 @@ msgid "Show properties of the selected address book"
 msgstr "Show properties of the selected address book"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1057
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1346
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:628
-#: ../src/modules/calendar/e-task-shell-view-actions.c:754
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:626
+#: ../src/modules/calendar/e-task-shell-view-actions.c:752
 msgid "Re_fresh"
 msgstr "Re_fresh"
 
@@ -20870,11 +21341,12 @@ msgid "Show map with all contacts from selected address book"
 msgstr "Show map with all contacts from selected address book"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1078
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:642
-#: ../src/modules/calendar/e-task-shell-view-actions.c:768
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1639
-msgid "_Rename..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../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…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1080
@@ -20886,7 +21358,8 @@ msgid "Stop loading"
 msgstr "Stop loading"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1092
-msgid "_Copy Contact To..."
+#| msgid "_Copy Contact To..."
+msgid "_Copy Contact To…"
 msgstr "_Copy Contact To…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1094
@@ -20898,7 +21371,8 @@ msgid "_Delete Contact"
 msgstr "_Delete Contact"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1106
-msgid "_Find in Contact..."
+#| msgid "_Find in Contact..."
+msgid "_Find in Contact…"
 msgstr "_Find in Contact…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1108
@@ -20906,7 +21380,8 @@ 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"
+msgid "_Forward Contact…"
 msgstr "_Forward Contact…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1115
@@ -20914,7 +21389,8 @@ 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..."
+msgid "_Move Contact To…"
 msgstr "_Move Contact To…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1122
@@ -20922,11 +21398,13 @@ 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"
+msgid "_New Contact…"
 msgstr "_New Contact…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1134
-msgid "New Contact _List..."
+#| msgid "New Contact List"
+msgid "New Contact _List…"
 msgstr "New Contact _List…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1141
@@ -20938,7 +21416,8 @@ 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"
+msgid "_Send Message to Contact…"
 msgstr "_Send Message to Contact…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1150
@@ -20946,24 +21425,25 @@ msgid "Send a message to the selected contacts"
 msgstr "Send a message to the selected contacts"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1157
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1530
-#: ../src/modules/calendar/e-task-shell-view-actions.c:833
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../src/modules/calendar/e-task-shell-view-actions.c:831
 msgid "_Actions"
 msgstr "_Actions"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1164
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:686
-#: ../src/modules/calendar/e-task-shell-view-actions.c:840
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1788
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:684
+#: ../src/modules/calendar/e-task-shell-view-actions.c:838
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1834
 msgid "_Preview"
 msgstr "_Preview"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1177
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1559
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:703
-#: ../src/modules/calendar/e-task-shell-view-actions.c:857
-msgid "_Manage groups..."
-msgstr "_Manage groups..."
+#: ../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…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1193
 msgid "Address Book Map"
@@ -20986,9 +21466,9 @@ msgid "Show maps in contact preview window"
 msgstr "Show maps in contact preview window"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1254
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:768
-#: ../src/modules/calendar/e-task-shell-view-actions.c:934
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1946
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:766
+#: ../src/modules/calendar/e-task-shell-view-actions.c:932
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
 msgid "_Classic View"
 msgstr "_Classic View"
 
@@ -20997,9 +21477,9 @@ msgid "Show contact preview below the contact list"
 msgstr "Show contact preview below the contact list"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1261
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:775
-#: ../src/modules/calendar/e-task-shell-view-actions.c:941
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1953
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:773
+#: ../src/modules/calendar/e-task-shell-view-actions.c:939
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1999
 msgid "_Vertical View"
 msgstr "_Vertical View"
 
@@ -21008,17 +21488,17 @@ msgid "Show contact preview alongside the contact list"
 msgstr "Show contact preview alongside the contact list"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1278
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:792
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1000
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1675
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:790
+#: ../src/modules/calendar/e-task-shell-view-actions.c:998
 msgid "Unmatched"
 msgstr "Unmatched"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1288
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1733
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:802
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1010
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:800
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1008
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2083
 #: ../src/shell/e-shell-content.c:639
 msgid "Advanced Search"
 msgstr "Advanced Search"
@@ -21046,7 +21526,8 @@ 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"
+msgid "_Save as vCard…"
 msgstr "_Save as vCard…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1360
@@ -21073,7 +21554,7 @@ msgstr "_Send Message to List"
 msgid "_Send Message to Contact"
 msgstr "_Send Message to Contact"
 
-#: ../src/modules/alarm-notify/alarm-notify.c:169
+#: ../src/modules/alarm-notify/alarm-notify.c:171
 #, c-format
 msgid "Failed to launch command “%s”:"
 msgstr "Failed to launch command “%s”:"
@@ -21121,11 +21602,13 @@ 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..."
-msgstr "Checking content of backup file “%s”, please wait..."
+#| 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..."
+msgid "_Back up Evolution Data…"
 msgstr "_Back up Evolution Data…"
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:460
@@ -21133,7 +21616,8 @@ 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..."
+msgid "R_estore Evolution Data…"
 msgstr "R_estore Evolution Data…"
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:467
@@ -21329,25 +21813,26 @@ msgstr "Junk filter using Bogofilter"
 msgid "Choose an Address Book"
 msgstr "Choose an Address Book"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:250
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:263
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:294
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:310
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:128
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:264
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:277
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:313
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:334
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:147
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:168
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:274
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:288
 msgid "Find Address Books"
 msgstr "Find Address Books"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:285
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:299
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Avoid IfMatch (needed on Apache < 2.2.8)"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:336
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:426
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:185
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:352
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:453
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:233
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr "URL is not a valid http:// nor https:// URL"
 
@@ -21515,38 +22000,38 @@ msgstr "Browse until limit is reached"
 msgid "Server address cannot be empty"
 msgstr "Server address cannot be empty"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:110
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:112
 #: ../src/modules/cal-config-google/e-google-chooser-button.c:226
 msgid "Choose a Calendar"
 msgstr "Choose a Calendar"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:114
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:116
 #: ../src/modules/cal-config-google/e-google-chooser-button.c:230
 msgid "Choose a Memo List"
 msgstr "Choose a Memo List"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:118
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:120
 #: ../src/modules/cal-config-google/e-google-chooser-button.c:234
 msgid "Choose a Task List"
 msgstr "Choose a Task List"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:326
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:349
 msgid "Find Calendars"
 msgstr "Find Calendars"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:329
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:352
 msgid "Find Memo Lists"
 msgstr "Find Memo Lists"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:332
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:355
 msgid "Find Task Lists"
 msgstr "Find Task Lists"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:351
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:374
 msgid "Email:"
 msgstr "E-mail:"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:356
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:380
 msgid "Server handles meeting invitations"
 msgstr "Server handles meeting invitations"
 
@@ -21622,124 +22107,125 @@ msgstr "Units:"
 msgid "Location cannot be empty"
 msgstr "Location cannot be empty"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:285
+#: ../src/modules/calendar/e-cal-attachment-handler.c:283
 #: ../src/smime/gui/smime-ui.ui.h:7
 msgid "I_mport"
 msgstr "I_mport"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:335
+#: ../src/modules/calendar/e-cal-attachment-handler.c:333
 msgid "Importing an event"
 msgstr "Importing an event"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:339
+#: ../src/modules/calendar/e-cal-attachment-handler.c:337
 msgid "Importing a memo"
 msgstr "Importing a memo"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:343
+#: ../src/modules/calendar/e-cal-attachment-handler.c:341
 msgid "Importing a task"
 msgstr "Importing a task"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:401
+#: ../src/modules/calendar/e-cal-attachment-handler.c:399
 msgid "Select a Calendar"
 msgstr "Select a Calendar"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:408
+#: ../src/modules/calendar/e-cal-attachment-handler.c:406
 msgid "Select a Memo List"
 msgstr "Select a Memo List"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:415
+#: ../src/modules/calendar/e-cal-attachment-handler.c:413
 msgid "Select a Task List"
 msgstr "Select a Task List"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:422
+#: ../src/modules/calendar/e-cal-attachment-handler.c:420
 msgid "I_mport to Calendar"
 msgstr "I_mport to Calendar"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:429
+#: ../src/modules/calendar/e-cal-attachment-handler.c:427
 msgid "I_mport to Memo List"
 msgstr "I_mport to Memo List"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:436
+#: ../src/modules/calendar/e-cal-attachment-handler.c:434
 msgid "I_mport to Task List"
 msgstr "I_mport to Task List"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:569
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:566
 #, c-format
 msgid "Copying an event into the calendar “%s”"
 msgstr "Copying an event into the calendar “%s”"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:570
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:567
 #, c-format
 msgid "Moving an event into the calendar “%s”"
 msgstr "Moving an event into the calendar “%s”"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:575
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:572
 #, c-format
 msgid "Copying a memo into the memo list “%s”"
 msgstr "Copying a memo into the memo list “%s”"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:576
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:573
 #, c-format
 msgid "Moving a memo into the memo list “%s”"
 msgstr "Moving a memo into the memo list “%s”"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:581
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:578
 #, c-format
 msgid "Copying a task into the task list “%s”"
 msgstr "Copying a task into the task list “%s”"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:582
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:579
 #, c-format
 msgid "Moving a task into the task list “%s”"
 msgstr "Moving a task into the task list “%s”"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:699
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:694
 msgid "Calendar Selector"
 msgstr "Calendar Selector"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:705
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:700
 msgid "Memo List Selector"
 msgstr "Memo List Selector"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:710
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:705
 msgid "Task List Selector"
 msgstr "Task List Selector"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:524
+#: ../src/modules/calendar/e-calendar-preferences.c:521
 msgid "Selected Calendars for Notifications of Reminders"
 msgstr "Selected Calendars for Notifications of Reminders"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:531
-msgid "Selected Memo Lists for Notifications of Reminders"
-msgstr "Selected Memo Lists for Notifications of Reminders"
-
-#: ../src/modules/calendar/e-calendar-preferences.c:538
+#: ../src/modules/calendar/e-calendar-preferences.c:528
 msgid "Selected Task Lists for Notifications of Reminders"
 msgstr "Selected Task Lists for Notifications of Reminders"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:634
+#: ../src/modules/calendar/e-calendar-preferences.c:612
 msgid "Meeting Invitations"
 msgstr "Meeting Invitations"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:660
+#: ../src/modules/calendar/e-calendar-preferences.c:638
 msgid "_Delete message after acting"
 msgstr "_Delete message after acting"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:674
-#: ../src/modules/calendar/e-calendar-preferences.c:705
+#: ../src/modules/calendar/e-calendar-preferences.c:645
+#| msgid "_Preserve my reminder"
+msgid "_Preserve existing reminder by default"
+msgstr "_Preserve existing reminder by default"
+
+#: ../src/modules/calendar/e-calendar-preferences.c:659
+#: ../src/modules/calendar/e-calendar-preferences.c:690
 msgid "Conflict Search"
 msgstr "Conflict Search"
 
 #. Source selector
-#: ../src/modules/calendar/e-calendar-preferences.c:689
+#: ../src/modules/calendar/e-calendar-preferences.c:674
 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:1129
+#: ../src/modules/calendar/e-calendar-preferences.c:1113
 msgid "Ti_me and date:"
 msgstr "Ti_me and date:"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1130
+#: ../src/modules/calendar/e-calendar-preferences.c:1114
 msgid "_Date only:"
 msgstr "_Date only:"
 
@@ -21804,7 +22290,7 @@ msgid "_24 hour"
 msgstr "_24 hour"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:18
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Work Week"
 msgstr "Work Week"
 
@@ -21933,7 +22419,6 @@ msgid "Allo_w direct edit of event Summary"
 msgstr "Allo_w direct edit of event Summary"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:59
-#| msgid "Hide cancelled tasks"
 msgid "Hi_de cancelled events"
 msgstr "Hi_de cancelled events"
 
@@ -21974,8 +22459,9 @@ 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"
-msgstr "Display reminders in _notification area only"
+#| msgid "Display reminders in _notification area only"
+msgid "Display Reminders window with _notifications"
+msgstr "Display Reminders window with _notifications"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Keep reminder notification _window always on top"
@@ -22013,16 +22499,16 @@ msgstr "before every anniversary/birthday"
 msgid "Select the sources for reminder notification:"
 msgstr "Select the sources for reminder notification:"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
 msgid "Default Free/Busy Server"
 msgstr "Default Free/Busy Server"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:91
 #, 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:93
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
 msgid ""
 "Specify login user name as part of the URL in case the server requires "
 "authentication, like: https://USER example com/"
@@ -22030,49 +22516,49 @@ msgstr ""
 "Specify login user name as part of the URL in case the server requires "
 "authentication, like: https://USER example com/"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:94
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:93
 msgid "Publishing Information"
 msgstr "Publishing Information"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:115
+#: ../src/modules/calendar/e-cal-shell-backend.c:118
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Appointment"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:117
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1474
+#: ../src/modules/calendar/e-cal-shell-backend.c:120
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:122
+#: ../src/modules/calendar/e-cal-shell-backend.c:125
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "All Day A_ppointment"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:124
+#: ../src/modules/calendar/e-cal-shell-backend.c:127
 msgid "Create a new all-day appointment"
 msgstr "Create a new all-day appointment"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:129
+#: ../src/modules/calendar/e-cal-shell-backend.c:132
 msgctxt "New"
 msgid "M_eeting"
 msgstr "M_eeting"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:131
+#: ../src/modules/calendar/e-cal-shell-backend.c:134
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:139
+#: ../src/modules/calendar/e-cal-shell-backend.c:142
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndar"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:141
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../src/modules/calendar/e-cal-shell-backend.c:144
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1279
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:258
+#: ../src/modules/calendar/e-cal-shell-backend.c:261
 msgid "Calendar and Tasks"
 msgstr "Calendar and Tasks"
 
@@ -22096,373 +22582,385 @@ msgstr ""
 msgid "Purge events older than"
 msgstr "Purge events older than"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:940
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:919
 msgid "Making an occurrence movable"
 msgstr "Making an occurrence movable"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1140
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1112
 msgid "event"
 msgstr "event"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1142
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:512
-#: ../src/modules/calendar/e-task-shell-view-actions.c:631
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1114
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:204
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:278
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:510
+#: ../src/modules/calendar/e-task-shell-view-actions.c:629
 msgid "Save as iCalendar"
 msgstr "Save as iCalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1276
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:593
-#: ../src/modules/calendar/e-task-shell-view-actions.c:719
-msgid "_Copy..."
+#: ../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…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1235
 msgid "D_elete Calendar"
 msgstr "D_elete Calendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1237
 msgid "Delete the selected calendar"
 msgstr "Delete the selected calendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1244
 msgid "Go Back"
 msgstr "Go Back"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1251
 msgid "Go Forward"
 msgstr "Go Forward"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1258
 msgid "Select today"
 msgstr "Select today"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1263
 msgid "Select _Date"
 msgstr "Select _Date"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1265
 msgid "Select a specific date"
 msgstr "Select a specific date"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1318
-msgid "_Manage Calendar groups..."
-msgstr "_Manage Calendar groups..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1270
+#| msgid "_Manage Calendar groups..."
+msgid "_Manage Calendar groups…"
+msgstr "_Manage Calendar groups…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1272
 msgid "Manage Calendar groups order and visibility"
 msgstr "Manage Calendar groups order and visibility"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1277
 msgid "_New Calendar"
 msgstr "_New Calendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
-#: ../src/modules/calendar/e-task-shell-view-actions.c:824
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../src/modules/calendar/e-task-shell-view-actions.c:822
 msgid "Purg_e"
 msgstr "Purg_e"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1341
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Purge old appointments and meetings"
 msgstr "Purge old appointments and meetings"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Refresh the selected calendar"
 msgstr "Refresh the selected calendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1305
 msgid "Re_fresh list of account calendars"
 msgstr "Re_fresh list of account calendars"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Rename the selected calendar"
 msgstr "Rename the selected calendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Find _Next"
 msgstr "Find _Next"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1369
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Find next occurrence of the current search string"
 msgstr "Find next occurrence of the current search string"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Find _Previous"
 msgstr "Find _Previous"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Find previous occurrence of the current search string"
 msgstr "Find previous occurrence of the current search string"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Stop _Running Search"
 msgstr "Stop _Running Search"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1335
 msgid "Stop currently running search"
 msgstr "Stop currently running search"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1340
 msgid "Sho_w All Calendars"
 msgstr "Sho_w All Calendars"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Show _Only This Calendar"
 msgstr "Show _Only This Calendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1402
-msgid "Cop_y to 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:1409
-msgid "_Delegate Meeting..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1361
+#| msgid "_Delegate Meeting..."
+msgid "_Delegate Meeting…"
 msgstr "_Delegate Meeting…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "_Delete Appointment"
 msgstr "_Delete Appointment"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1418
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Delete selected appointments"
 msgstr "Delete selected appointments"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "Delete This _Occurrence"
 msgstr "Delete This _Occurrence"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "Delete this occurrence"
 msgstr "Delete this occurrence"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "Delete All Occ_urrences"
 msgstr "Delete All Occ_urrences"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1432
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete all occurrences"
 msgstr "Delete all occurrences"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1437
-msgid "Edit as Ne_w..."
-msgstr "Edit as Ne_w..."
+#: ../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…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Edit the current appointment as new"
 msgstr "Edit the current appointment as new"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1444
-msgid "New All Day _Event..."
+#: ../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…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1446
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Create a new all day event"
 msgstr "Create a new all-day event"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:241
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:315
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:586
-#: ../src/modules/calendar/e-task-shell-view-actions.c:712
-msgid "_Forward as iCalendar..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:238
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:318
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:584
+#: ../src/modules/calendar/e-task-shell-view-actions.c:710
+#| msgid "_Forward as iCalendar"
+msgid "_Forward as iCalendar…"
 msgstr "_Forward as iCalendar…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1460
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1412
 msgid "Create a new meeting"
 msgstr "Create a new meeting"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1465
-msgid "Mo_ve to Calendar..."
+#: ../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…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "Make this Occurrence _Movable"
 msgstr "Make this Occurrence _Movable"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "_Open Appointment"
 msgstr "_Open Appointment"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1488
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1440
 msgid "View the current appointment"
 msgstr "View the current appointment"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1507
-msgid "_Schedule Meeting..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1459
+#| msgid "_Schedule Meeting..."
+msgid "_Schedule Meeting…"
 msgstr "_Schedule Meeting…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1509
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1461
 msgid "Converts an appointment to a meeting"
 msgstr "Converts an appointment to a meeting"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1514
-msgid "Conv_ert to Appointment..."
+#: ../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…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1516
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1468
 msgid "Converts a meeting to an appointment"
 msgstr "Converts a meeting to an appointment"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1521
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "Quit"
 msgstr "Quit"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1657
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Day"
 msgstr "Day"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Show one day"
 msgstr "Show one day"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1664
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1616
 msgid "List"
 msgstr "List"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1666
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "Show as list"
 msgstr "Show as list"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1671
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1623
 msgid "Month"
 msgstr "Month"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1673
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Show one month"
 msgstr "Show one month"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1630
 msgid "Week"
 msgstr "Week"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Show one week"
 msgstr "Show one week"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Show one work week"
 msgstr "Show one work week"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1647
 msgid "Active Appointments"
 msgstr "Active Appointments"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1661
 msgid "Next 7 Days’ Appointments"
 msgstr "Next 7 Days’ Appointments"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1668
 msgid "Occurs Less Than 5 Times"
 msgstr "Occurs Less Than 5 Times"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1747
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:816
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1024
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1699
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:814
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1022
 msgid "Description contains"
 msgstr "Description contains"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1754
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:823
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1031
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:821
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
 msgid "Summary contains"
 msgstr "Summary contains"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1764
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1778
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:360
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:833
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:847
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1041
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
-msgid "Print..."
-msgstr "Print..."
-
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1766
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1730
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:831
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:845
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1039
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1053
+#| msgid "Print"
+msgid "Print…"
+msgstr "Print…"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1718
 msgid "Print this calendar"
 msgstr "Print this calendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1773
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1725
 msgid "Preview the calendar to be printed"
 msgstr "Preview the calendar to be printed"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1795
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:282
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:370
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:864
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1072
-msgid "_Save as iCalendar..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1747
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:279
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:862
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1070
+#| msgid "Save as iCalendar"
+msgid "_Save as iCalendar…"
 msgstr "_Save as iCalendar…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1872
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1824
 msgid "Go To"
 msgstr "Go To"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:205
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:510
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:202
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:508
 msgid "memo"
 msgstr "memo"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:248
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:663
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:245
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:661
 msgid "New _Memo"
 msgstr "New _Memo"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:247
 #: ../src/modules/calendar/e-memo-shell-backend.c:79
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:665
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:663
 msgid "Create a new memo"
 msgstr "Create a new memo"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:255
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:670
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:668
 msgid "_Open Memo"
 msgstr "_Open Memo"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:672
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:254
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:670
 msgid "View the selected memo"
 msgstr "View the selected memo"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:350
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:677
-#: ../src/modules/calendar/e-task-shell-view-actions.c:817
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:353
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:675
+#: ../src/modules/calendar/e-task-shell-view-actions.c:815
 msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:849
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:847
 msgid "Print the selected memo"
 msgstr "Print the selected memo"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:885
+#: ../src/modules/calendar/e-cal-shell-view-private.c:911
 msgid "Searching next matching event"
 msgstr "Searching next matching event"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:886
+#: ../src/modules/calendar/e-cal-shell-view-private.c:912
 msgid "Searching previous matching event"
 msgstr "Searching previous matching event"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:907
+#: ../src/modules/calendar/e-cal-shell-view-private.c:933
 #, 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:911
+#: ../src/modules/calendar/e-cal-shell-view-private.c:937
 #, 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:934
+#: ../src/modules/calendar/e-cal-shell-view-private.c:960
 msgid "Cannot search with no active calendar"
 msgstr "Cannot search with no active calendar"
 
@@ -22470,58 +22968,58 @@ msgstr "Cannot search with no active calendar"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:273
-#: ../src/modules/calendar/e-task-shell-view-actions.c:629
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:276
+#: ../src/modules/calendar/e-task-shell-view-actions.c:627
 msgid "task"
 msgstr "task"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:308
-#: ../src/modules/calendar/e-task-shell-view-actions.c:691
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:311
+#: ../src/modules/calendar/e-task-shell-view-actions.c:689
 msgid "_Assign Task"
 msgstr "_Assign Task"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:322
-#: ../src/modules/calendar/e-task-shell-view-actions.c:789
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:325
+#: ../src/modules/calendar/e-task-shell-view-actions.c:787
 msgid "_Mark as Complete"
 msgstr "_Mark as Complete"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../src/modules/calendar/e-task-shell-view-actions.c:791
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:327
+#: ../src/modules/calendar/e-task-shell-view-actions.c:789
 msgid "Mark selected tasks as complete"
 msgstr "Mark selected tasks as complete"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:329
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:332
 msgid "_Mark as Incomplete"
 msgstr "_Mark as Incomplete"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../src/modules/calendar/e-task-shell-view-actions.c:798
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:334
+#: ../src/modules/calendar/e-task-shell-view-actions.c:796
 msgid "Mark selected tasks as incomplete"
 msgstr "Mark selected tasks as incomplete"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:336
-#: ../src/modules/calendar/e-task-shell-view-actions.c:803
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../src/modules/calendar/e-task-shell-view-actions.c:801
 msgid "New _Task"
 msgstr "New _Task"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:341
 #: ../src/modules/calendar/e-task-shell-backend.c:77
-#: ../src/modules/calendar/e-task-shell-view-actions.c:805
+#: ../src/modules/calendar/e-task-shell-view-actions.c:803
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:343
-#: ../src/modules/calendar/e-task-shell-view-actions.c:810
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../src/modules/calendar/e-task-shell-view-actions.c:808
 msgid "_Open Task"
 msgstr "_Open Task"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../src/modules/calendar/e-task-shell-view-actions.c:812
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:348
+#: ../src/modules/calendar/e-task-shell-view-actions.c:810
 msgid "View the selected task"
 msgstr "View the selected task"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:362
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1057
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
 msgid "Print the selected task"
 msgstr "Print the selected task"
 
@@ -22545,7 +23043,7 @@ msgid "Memo Li_st"
 msgstr "Memo Li_st"
 
 #: ../src/modules/calendar/e-memo-shell-backend.c:96
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:616
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Create a new memo list"
 msgstr "Create a new memo list"
 
@@ -22554,79 +23052,81 @@ msgstr "Create a new memo list"
 msgid "Print Memos"
 msgstr "Print Memos"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:572
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:570
 msgid "_Delete Memo"
 msgstr "_Delete Memo"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:579
-msgid "_Find in Memo..."
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:577
+#| msgid "_Find in Memo..."
+msgid "_Find in Memo…"
 msgstr "_Find in Memo…"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:581
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:579
 msgid "Search for text in the displayed memo"
 msgstr "Search for text in the displayed memo"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:600
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:598
 msgid "D_elete Memo List"
 msgstr "D_elete Memo List"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:602
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Delete the selected memo list"
 msgstr "Delete the selected memo list"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:607
-msgid "_Manage Memo List groups..."
-msgstr "_Manage Memo List groups..."
+#: ../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…"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:609
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:607
 msgid "Manage Memo List groups order and visibility"
 msgstr "Manage Memo List groups order and visibility"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:612
 msgid "_New Memo List"
 msgstr "_New Memo List"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:630
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Refresh the selected memo list"
 msgstr "Refresh the selected memo list"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:635
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:633
 msgid "Re_fresh list of account memo lists"
 msgstr "Re_fresh list of account memo lists"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:644
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Rename the selected memo list"
 msgstr "Rename the selected memo list"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:649
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:647
 msgid "Show _Only This Memo List"
 msgstr "Show _Only This Memo List"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:656
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:654
 msgid "Sho_w All Memo Lists"
 msgstr "Sho_w All Memo Lists"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:747
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:745
 msgid "Memo _Preview"
 msgstr "Memo _Preview"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:749
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:747
 msgid "Show memo preview pane"
 msgstr "Show memo preview pane"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:770
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:768
 msgid "Show memo preview below the memo list"
 msgstr "Show memo preview below the memo list"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:777
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:775
 msgid "Show memo preview alongside the memo list"
 msgstr "Show memo preview alongside the memo list"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:835
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:833
 msgid "Print the list of memos"
 msgstr "Print the list of memos"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:842
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:840
 msgid "Preview the list of memos to be printed"
 msgstr "Preview the list of memos to be printed"
 
@@ -22671,7 +23171,7 @@ msgid "Tas_k List"
 msgstr "Tas_k List"
 
 #: ../src/modules/calendar/e-task-shell-backend.c:94
-#: ../src/modules/calendar/e-task-shell-view-actions.c:742
+#: ../src/modules/calendar/e-task-shell-view-actions.c:740
 msgid "Create a new task list"
 msgstr "Create a new task list"
 
@@ -22680,7 +23180,7 @@ msgstr "Create a new task list"
 msgid "Print Tasks"
 msgstr "Print Tasks"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:573
+#: ../src/modules/calendar/e-task-shell-view-actions.c:571
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -22692,119 +23192,121 @@ msgstr ""
 "\n"
 "Really erase these tasks?"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:580
+#: ../src/modules/calendar/e-task-shell-view-actions.c:578
 msgid "Do not ask me again"
 msgstr "Do not ask me again"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:698
+#: ../src/modules/calendar/e-task-shell-view-actions.c:696
 msgid "_Delete Task"
 msgstr "_Delete Task"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:705
-msgid "_Find in Task..."
+#: ../src/modules/calendar/e-task-shell-view-actions.c:703
+#| msgid "_Find in Task..."
+msgid "_Find in Task…"
 msgstr "_Find in Task…"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:707
+#: ../src/modules/calendar/e-task-shell-view-actions.c:705
 msgid "Search for text in the displayed task"
 msgstr "Search for text in the displayed task"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:726
+#: ../src/modules/calendar/e-task-shell-view-actions.c:724
 msgid "D_elete Task List"
 msgstr "D_elete Task List"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:728
+#: ../src/modules/calendar/e-task-shell-view-actions.c:726
 msgid "Delete the selected task list"
 msgstr "Delete the selected task list"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:733
-msgid "_Manage Task List groups..."
-msgstr "_Manage Task List groups..."
+#: ../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…"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:740
+#: ../src/modules/calendar/e-task-shell-view-actions.c:738
 msgid "_New Task List"
 msgstr "_New Task List"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:756
+#: ../src/modules/calendar/e-task-shell-view-actions.c:754
 msgid "Refresh the selected task list"
 msgstr "Refresh the selected task list"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:761
+#: ../src/modules/calendar/e-task-shell-view-actions.c:759
 msgid "Re_fresh list of account task lists"
 msgstr "Re_fresh list of account task lists"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:770
+#: ../src/modules/calendar/e-task-shell-view-actions.c:768
 msgid "Rename the selected task list"
 msgstr "Rename the selected task list"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:775
+#: ../src/modules/calendar/e-task-shell-view-actions.c:773
 msgid "Sho_w All Task Lists"
 msgstr "Sho_w All Task Lists"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:782
+#: ../src/modules/calendar/e-task-shell-view-actions.c:780
 msgid "Show _Only This Task List"
 msgstr "Show _Only This Task List"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:796
+#: ../src/modules/calendar/e-task-shell-view-actions.c:794
 msgid "Mar_k as Incomplete"
 msgstr "Mar_k as Incomplete"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:826
+#: ../src/modules/calendar/e-task-shell-view-actions.c:824
 msgid "Delete completed tasks"
 msgstr "Delete completed tasks"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:913
+#: ../src/modules/calendar/e-task-shell-view-actions.c:911
 msgid "Task _Preview"
 msgstr "Task _Preview"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:915
+#: ../src/modules/calendar/e-task-shell-view-actions.c:913
 msgid "Show task preview pane"
 msgstr "Show task preview pane"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:936
+#: ../src/modules/calendar/e-task-shell-view-actions.c:934
 msgid "Show task preview below the task list"
 msgstr "Show task preview below the task list"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:943
+#: ../src/modules/calendar/e-task-shell-view-actions.c:941
 msgid "Show task preview alongside the task list"
 msgstr "Show task preview alongside the task list"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:951
+#: ../src/modules/calendar/e-task-shell-view-actions.c:949
 msgid "Active Tasks"
 msgstr "Active Tasks"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:965
+#: ../src/modules/calendar/e-task-shell-view-actions.c:963
 msgid "Cancelled Tasks"
 msgstr "Cancelled Tasks"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:972
+#: ../src/modules/calendar/e-task-shell-view-actions.c:970
 msgid "Completed Tasks"
 msgstr "Completed Tasks"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:979
+#: ../src/modules/calendar/e-task-shell-view-actions.c:977
 msgid "Next 7 Days’ Tasks"
 msgstr "Next 7 Days’ Tasks"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:986
+#: ../src/modules/calendar/e-task-shell-view-actions.c:984
 msgid "Overdue Tasks"
 msgstr "Overdue Tasks"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:993
+#: ../src/modules/calendar/e-task-shell-view-actions.c:991
 msgid "Tasks with Attachments"
 msgstr "Tasks with Attachments"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1043
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1041
 msgid "Print the list of tasks"
 msgstr "Print the list of tasks"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1050
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
 msgid "Preview the list of tasks to be printed"
 msgstr "Preview the list of tasks to be printed"
 
-#: ../src/modules/calendar/e-task-shell-view.c:345
+#: ../src/modules/calendar/e-task-shell-view.c:346
 msgid "Delete Tasks"
 msgstr "Delete Tasks"
 
-#: ../src/modules/calendar/e-task-shell-view.c:347
+#: ../src/modules/calendar/e-task-shell-view.c:348
 msgid "Delete Task"
 msgstr "Delete Task"
 
@@ -22815,19 +23317,19 @@ msgid_plural "%d tasks"
 msgstr[0] "%d task"
 msgstr[1] "%d tasks"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:331
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:326
 msgid "Convert to M_eeting"
 msgstr "Convert to M_eeting"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:333
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:328
 msgid "Convert the message to a meeting request"
 msgstr "Convert the message to a meeting request"
 
-#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:357
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:365
 msgid "Convert to M_essage"
 msgstr "Convert to M_essage"
 
-#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:359
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:367
 msgid "Convert to the mail message"
 msgstr "Convert to the mail message"
 
@@ -22881,7 +23383,7 @@ msgstr "LDAP server"
 msgid "Looking up LDAP server…"
 msgstr "Looking up LDAP server…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:242
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:279
 msgid "Look up in SRV records"
 msgstr "Look up in SRV records"
 
@@ -22913,194 +23415,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:260
+#: ../src/modules/itip-formatter/itip-view.c:259
 msgid "Today %H:%M"
 msgstr "Today %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:264
+#: ../src/modules/itip-formatter/itip-view.c:263
 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:273
+#: ../src/modules/itip-formatter/itip-view.c:272
 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:288
+#: ../src/modules/itip-formatter/itip-view.c:287
 msgid "Tomorrow %H:%M"
 msgstr "Tomorrow %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:292
+#: ../src/modules/itip-formatter/itip-view.c:291
 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:297
+#: ../src/modules/itip-formatter/itip-view.c:296
 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:301
+#: ../src/modules/itip-formatter/itip-view.c:300
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Tomorrow %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../src/modules/itip-formatter/itip-view.c:320
+#: ../src/modules/itip-formatter/itip-view.c:319
 #, 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:325
+#: ../src/modules/itip-formatter/itip-view.c:324
 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:329
+#: ../src/modules/itip-formatter/itip-view.c:328
 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:334
+#: ../src/modules/itip-formatter/itip-view.c:333
 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:338
+#: ../src/modules/itip-formatter/itip-view.c:337
 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:347
+#: ../src/modules/itip-formatter/itip-view.c:346
 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:353
+#: ../src/modules/itip-formatter/itip-view.c:352
 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:357
+#: ../src/modules/itip-formatter/itip-view.c:356
 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:362
+#: ../src/modules/itip-formatter/itip-view.c:361
 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:366
+#: ../src/modules/itip-formatter/itip-view.c:365
 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:372
+#: ../src/modules/itip-formatter/itip-view.c:371
 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:377
+#: ../src/modules/itip-formatter/itip-view.c:376
 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:381
+#: ../src/modules/itip-formatter/itip-view.c:380
 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:386
+#: ../src/modules/itip-formatter/itip-view.c:385
 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:390
+#: ../src/modules/itip-formatter/itip-view.c:389
 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:429
+#: ../src/modules/itip-formatter/itip-view.c:517
 #: ../src/modules/itip-formatter/itip-view.c:518
-#: ../src/modules/itip-formatter/itip-view.c:519
-#: ../src/modules/itip-formatter/itip-view.c:608
+#: ../src/modules/itip-formatter/itip-view.c:607
 msgid "An unknown person"
 msgstr "An unknown person"
 
-#: ../src/modules/itip-formatter/itip-view.c:433
-#: ../src/modules/itip-formatter/itip-view.c:523
-#: ../src/modules/itip-formatter/itip-view.c:612
+#: ../src/modules/itip-formatter/itip-view.c:432
+#: ../src/modules/itip-formatter/itip-view.c:522
+#: ../src/modules/itip-formatter/itip-view.c:611
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Please respond on behalf of %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:435
-#: ../src/modules/itip-formatter/itip-view.c:525
-#: ../src/modules/itip-formatter/itip-view.c:614
+#: ../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 "Received on behalf of %s"
 msgstr "Received on behalf of %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:440
+#: ../src/modules/itip-formatter/itip-view.c:439
 #, 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:442
+#: ../src/modules/itip-formatter/itip-view.c:441
 #, 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:447
+#: ../src/modules/itip-formatter/itip-view.c:446
 #, 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:450
+#: ../src/modules/itip-formatter/itip-view.c:449
 #, 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:452
+#: ../src/modules/itip-formatter/itip-view.c:451
 #, 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:458
+#: ../src/modules/itip-formatter/itip-view.c:457
 #, 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:460
+#: ../src/modules/itip-formatter/itip-view.c:459
 #, 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:464
+#: ../src/modules/itip-formatter/itip-view.c:463
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -23109,87 +23611,87 @@ msgstr ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:466
+#: ../src/modules/itip-formatter/itip-view.c:465
 #, 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:470
+#: ../src/modules/itip-formatter/itip-view.c:469
 #, 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:472
+#: ../src/modules/itip-formatter/itip-view.c:471
 #, 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:476
+#: ../src/modules/itip-formatter/itip-view.c:475
 #, 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:478
+#: ../src/modules/itip-formatter/itip-view.c:477
 #, c-format
 msgid "%s has cancelled the following meeting:"
 msgstr "%s has cancelled the following meeting:"
 
-#: ../src/modules/itip-formatter/itip-view.c:482
+#: ../src/modules/itip-formatter/itip-view.c:481
 #, 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:484
+#: ../src/modules/itip-formatter/itip-view.c:483
 #, 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:488
+#: ../src/modules/itip-formatter/itip-view.c:487
 #, 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:490
+#: ../src/modules/itip-formatter/itip-view.c:489
 #, 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:530
+#: ../src/modules/itip-formatter/itip-view.c:529
 #, 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:532
+#: ../src/modules/itip-formatter/itip-view.c:531
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s has published the following task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:537
+#: ../src/modules/itip-formatter/itip-view.c:536
 #, 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:540
+#: ../src/modules/itip-formatter/itip-view.c:539
 #, 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:542
+#: ../src/modules/itip-formatter/itip-view.c:541
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s has assigned you a task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:548
+#: ../src/modules/itip-formatter/itip-view.c:547
 #, 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:550
+#: ../src/modules/itip-formatter/itip-view.c:549
 #, 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:554
+#: ../src/modules/itip-formatter/itip-view.c:553
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -23198,202 +23700,214 @@ msgstr ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 
-#: ../src/modules/itip-formatter/itip-view.c:556
+#: ../src/modules/itip-formatter/itip-view.c:555
 #, 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:560
+#: ../src/modules/itip-formatter/itip-view.c:559
 #, 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:562
+#: ../src/modules/itip-formatter/itip-view.c:561
 #, 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:566
+#: ../src/modules/itip-formatter/itip-view.c:565
 #, 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:568
+#: ../src/modules/itip-formatter/itip-view.c:567
 #, 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:572
+#: ../src/modules/itip-formatter/itip-view.c:571
 #, 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:574
+#: ../src/modules/itip-formatter/itip-view.c:573
 #, 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:578
+#: ../src/modules/itip-formatter/itip-view.c:577
 #, 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:580
+#: ../src/modules/itip-formatter/itip-view.c:579
 #, 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:619
+#: ../src/modules/itip-formatter/itip-view.c:618
 #, 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:621
+#: ../src/modules/itip-formatter/itip-view.c:620
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s has published the following memo:"
 
-#: ../src/modules/itip-formatter/itip-view.c:626
+#: ../src/modules/itip-formatter/itip-view.c:625
 #, 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:628
+#: ../src/modules/itip-formatter/itip-view.c:627
 #, 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:632
+#: ../src/modules/itip-formatter/itip-view.c:631
 #, 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:634
+#: ../src/modules/itip-formatter/itip-view.c:633
 #, 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:859
+#: ../src/modules/itip-formatter/itip-view.c:858
 msgid "All day:"
 msgstr "All day:"
 
-#: ../src/modules/itip-formatter/itip-view.c:865
+#: ../src/modules/itip-formatter/itip-view.c:864
 msgid "Start day:"
 msgstr "Start day:"
 
-#: ../src/modules/itip-formatter/itip-view.c:865
-#: ../src/modules/itip-formatter/itip-view.c:1683
+#: ../src/modules/itip-formatter/itip-view.c:864
+#: ../src/modules/itip-formatter/itip-view.c:1678
 msgid "Start time:"
 msgstr "Start time:"
 
-#: ../src/modules/itip-formatter/itip-view.c:874
+#: ../src/modules/itip-formatter/itip-view.c:873
 msgid "End day:"
 msgstr "End day:"
 
-#: ../src/modules/itip-formatter/itip-view.c:874
-#: ../src/modules/itip-formatter/itip-view.c:1684
+#: ../src/modules/itip-formatter/itip-view.c:873
+#: ../src/modules/itip-formatter/itip-view.c:1679
 msgid "End time:"
 msgstr "End time:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1214
+#: ../src/modules/itip-formatter/itip-view.c:1213
 msgid "Ope_n Calendar"
 msgstr "Ope_n Calendar"
 
-#: ../src/modules/itip-formatter/itip-view.c:1217
+#: ../src/modules/itip-formatter/itip-view.c:1216
 msgid "_Decline all"
 msgstr "_Decline all"
 
-#: ../src/modules/itip-formatter/itip-view.c:1220
+#: ../src/modules/itip-formatter/itip-view.c:1219
 msgid "_Decline"
 msgstr "_Decline"
 
-#: ../src/modules/itip-formatter/itip-view.c:1223
+#: ../src/modules/itip-formatter/itip-view.c:1222
 msgid "_Tentative all"
 msgstr "_Tentative all"
 
-#: ../src/modules/itip-formatter/itip-view.c:1226
+#: ../src/modules/itip-formatter/itip-view.c:1225
 msgid "_Tentative"
 msgstr "_Tentative"
 
-#: ../src/modules/itip-formatter/itip-view.c:1229
+#: ../src/modules/itip-formatter/itip-view.c:1228
 msgid "Acce_pt all"
 msgstr "Acce_pt all"
 
-#: ../src/modules/itip-formatter/itip-view.c:1232
+#: ../src/modules/itip-formatter/itip-view.c:1231
 msgid "Acce_pt"
 msgstr "Acce_pt"
 
-#: ../src/modules/itip-formatter/itip-view.c:1235
+#: ../src/modules/itip-formatter/itip-view.c:1234
 msgid "Send _Information"
 msgstr "Send _Information"
 
-#: ../src/modules/itip-formatter/itip-view.c:1238
+#: ../src/modules/itip-formatter/itip-view.c:1237
 msgid "_Update Attendee Status"
 msgstr "_Update Attendee Status"
 
-#: ../src/modules/itip-formatter/itip-view.c:1241
+#: ../src/modules/itip-formatter/itip-view.c:1240
 #: ../src/smime/gui/certificate-manager.c:1661
 msgid "_Update"
 msgstr "_Update"
 
-#: ../src/modules/itip-formatter/itip-view.c:1686
-#: ../src/modules/itip-formatter/itip-view.c:1734
-#: ../src/modules/itip-formatter/itip-view.c:1805
+#: ../src/modules/itip-formatter/itip-view.c:1681
+#: ../src/modules/itip-formatter/itip-view.c:1729
+#: ../src/modules/itip-formatter/itip-view.c:1800
 msgid "Comment:"
 msgstr "Comment:"
 
 #. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1722
+#: ../src/modules/itip-formatter/itip-view.c:1717
 msgid "Send reply to sender"
 msgstr "Send reply to sender"
 
 #. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1737
+#: ../src/modules/itip-formatter/itip-view.c:1732
 msgid "Send _updates to attendees"
 msgstr "Send _updates to attendees"
 
 #. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1740
+#: ../src/modules/itip-formatter/itip-view.c:1735
 msgid "_Apply to all instances"
 msgstr "_Apply to all instances"
 
-#: ../src/modules/itip-formatter/itip-view.c:1741
+#: ../src/modules/itip-formatter/itip-view.c:1736
 msgid "Show time as _free"
 msgstr "Show time as _free"
 
-#: ../src/modules/itip-formatter/itip-view.c:1742
+#: ../src/modules/itip-formatter/itip-view.c:1737
 msgid "_Preserve my reminder"
 msgstr "_Preserve my reminder"
 
-#: ../src/modules/itip-formatter/itip-view.c:1743
+#: ../src/modules/itip-formatter/itip-view.c:1738
 msgid "_Inherit reminder"
 msgstr "_Inherit reminder"
 
-#: ../src/modules/itip-formatter/itip-view.c:2079
+#: ../src/modules/itip-formatter/itip-view.c:2074
 msgid "_Tasks:"
 msgstr "_Tasks:"
 
-#: ../src/modules/itip-formatter/itip-view.c:2082
+#: ../src/modules/itip-formatter/itip-view.c:2077
 msgid "_Memos:"
 msgstr "_Memos:"
 
-#: ../src/modules/itip-formatter/itip-view.c:3139
+#: ../src/modules/itip-formatter/itip-view.c:3151
 msgid "Sa_ve"
 msgstr "Sa_ve"
 
-#: ../src/modules/itip-formatter/itip-view.c:3661
-#: ../src/modules/itip-formatter/itip-view.c:5227
+#: ../src/modules/itip-formatter/itip-view.c:3695
+#: ../src/modules/itip-formatter/itip-view.c:5448
 msgid "Attendee status updated"
 msgstr "Attendee status updated"
 
-#: ../src/modules/itip-formatter/itip-view.c:3876
+#: ../src/modules/itip-formatter/itip-view.c:3905
 #, 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:3882
+#: ../src/modules/itip-formatter/itip-view.c:3912
+#, 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
+#, 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
 #, c-format
 msgid ""
 "The calendar “%s” contains an appointment which conflicts with this meeting"
@@ -23404,145 +23918,266 @@ msgstr[0] ""
 msgstr[1] ""
 "The calendar “%s” contains %d appointments which conflict with this meeting"
 
-#: ../src/modules/itip-formatter/itip-view.c:3915
+#: ../src/modules/itip-formatter/itip-view.c:3939
+#, 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
+#, 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
 #, 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:3924
+#: ../src/modules/itip-formatter/itip-view.c:3991
+#, 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
+#, 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
 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:4066
+#: ../src/modules/itip-formatter/itip-view.c:4149
 msgid "Unable to find any calendars"
 msgstr "Unable to find any calendars"
 
-#: ../src/modules/itip-formatter/itip-view.c:4074
+#: ../src/modules/itip-formatter/itip-view.c:4157
 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:4079
+#: ../src/modules/itip-formatter/itip-view.c:4162
 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:4084
+#: ../src/modules/itip-formatter/itip-view.c:4167
 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:4425
-msgid "Opening the calendar. Please wait..."
-msgstr "Opening the calendar. Please wait…"
-
-#: ../src/modules/itip-formatter/itip-view.c:4430
+#: ../src/modules/itip-formatter/itip-view.c:4461
 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:4838
+#: ../src/modules/itip-formatter/itip-view.c:4465
+#| msgid "Searching for an existing version of this appointment"
+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"
+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..."
+msgid "Opening the calendar. Please wait…"
+msgstr "Opening the calendar. Please wait…"
+
+#: ../src/modules/itip-formatter/itip-view.c:4944
+#, 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
+#, 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
 #, c-format
-msgid "Unable to send item to calendar “%s”.  %s"
-msgstr "Unable to send item to calendar “%s”.  %s"
+#| 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:4853
+#: ../src/modules/itip-formatter/itip-view.c:4980
 #, c-format
 msgid "Sent to calendar “%s” as accepted"
 msgstr "Sent to calendar “%s” as accepted"
 
-#: ../src/modules/itip-formatter/itip-view.c:4858
+#: ../src/modules/itip-formatter/itip-view.c:4985
+#, 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
+#, 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
 #, c-format
 msgid "Sent to calendar “%s” as tentative"
 msgstr "Sent to calendar “%s” as tentative"
 
-#: ../src/modules/itip-formatter/itip-view.c:4864
+#: ../src/modules/itip-formatter/itip-view.c:5005
+#, 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
+#, 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
 #, c-format
 msgid "Sent to calendar “%s” as declined"
 msgstr "Sent to calendar “%s” as declined"
 
-#: ../src/modules/itip-formatter/itip-view.c:4870
+#: ../src/modules/itip-formatter/itip-view.c:5025
+#, 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
+#, 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
 #, c-format
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "Sent to calendar “%s” as cancelled"
 
-#: ../src/modules/itip-formatter/itip-view.c:4905
-#: ../src/modules/itip-formatter/itip-view.c:5364
-#: ../src/modules/itip-formatter/itip-view.c:5467
-msgid "Saving changes to the calendar. Please wait..."
+#: ../src/modules/itip-formatter/itip-view.c:5045
+#, 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
+#, 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..."
+msgid "Saving changes to the calendar. Please wait…"
 msgstr "Saving changes to the calendar. Please wait…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4959
+#: ../src/modules/itip-formatter/itip-view.c:5071
+#| msgid "Saving changes to the calendar. Please wait..."
+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..."
+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
 msgid "Unable to parse item"
 msgstr "Unable to parse item"
 
-#: ../src/modules/itip-formatter/itip-view.c:5151
+#: ../src/modules/itip-formatter/itip-view.c:5373
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organiser has removed the delegate %s "
 
-#: ../src/modules/itip-formatter/itip-view.c:5168
+#: ../src/modules/itip-formatter/itip-view.c:5390
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Sent a cancellation notice to the delegate"
 
-#: ../src/modules/itip-formatter/itip-view.c:5172
+#: ../src/modules/itip-formatter/itip-view.c:5394
 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:5219
+#: ../src/modules/itip-formatter/itip-view.c:5440
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Unable to update attendee. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5254
+#: ../src/modules/itip-formatter/itip-view.c:5473
 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:5329
+#: ../src/modules/itip-formatter/itip-view.c:5558
 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:5400
-#: ../src/modules/itip-formatter/itip-view.c:5438
+#: ../src/modules/itip-formatter/itip-view.c:5633
+#: ../src/modules/itip-formatter/itip-view.c:5671
 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:5499
+#: ../src/modules/itip-formatter/itip-view.c:5732
 msgid "Meeting information sent"
 msgstr "Meeting information sent"
 
-#: ../src/modules/itip-formatter/itip-view.c:5504
+#: ../src/modules/itip-formatter/itip-view.c:5737
 msgid "Task information sent"
 msgstr "Task information sent"
 
-#: ../src/modules/itip-formatter/itip-view.c:5509
+#: ../src/modules/itip-formatter/itip-view.c:5742
 msgid "Memo information sent"
 msgstr "Memo information sent"
 
-#: ../src/modules/itip-formatter/itip-view.c:5520
+#: ../src/modules/itip-formatter/itip-view.c:5753
 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:5525
+#: ../src/modules/itip-formatter/itip-view.c:5758
 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:5530
+#: ../src/modules/itip-formatter/itip-view.c:5763
 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:5595
+#: ../src/modules/itip-formatter/itip-view.c:5808
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5600
+#: ../src/modules/itip-formatter/itip-view.c:5813
 msgid "Save Calendar"
 msgstr "Save Calendar"
 
-#: ../src/modules/itip-formatter/itip-view.c:5649
-#: ../src/modules/itip-formatter/itip-view.c:5662
+#: ../src/modules/itip-formatter/itip-view.c:5861
+#: ../src/modules/itip-formatter/itip-view.c:5874
 msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
-#: ../src/modules/itip-formatter/itip-view.c:5650
-#: ../src/modules/itip-formatter/itip-view.c:5663
+#: ../src/modules/itip-formatter/itip-view.c:5862
+#: ../src/modules/itip-formatter/itip-view.c:5875
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -23550,15 +24185,15 @@ msgstr ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 
-#: ../src/modules/itip-formatter/itip-view.c:5725
-#: ../src/modules/itip-formatter/itip-view.c:5806
-#: ../src/modules/itip-formatter/itip-view.c:5902
+#: ../src/modules/itip-formatter/itip-view.c:5957
+#: ../src/modules/itip-formatter/itip-view.c:6041
+#: ../src/modules/itip-formatter/itip-view.c:6145
 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:5726
-#: ../src/modules/itip-formatter/itip-view.c:5807
-#: ../src/modules/itip-formatter/itip-view.c:5903
+#: ../src/modules/itip-formatter/itip-view.c:5958
+#: ../src/modules/itip-formatter/itip-view.c:6042
+#: ../src/modules/itip-formatter/itip-view.c:6146
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -23566,11 +24201,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:5816
+#: ../src/modules/itip-formatter/itip-view.c:6051
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
-#: ../src/modules/itip-formatter/itip-view.c:5817
+#: ../src/modules/itip-formatter/itip-view.c:6052
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -23578,12 +24213,12 @@ msgstr ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 
-#: ../src/modules/itip-formatter/itip-view.c:6384
+#: ../src/modules/itip-formatter/itip-view.c:6639
 msgctxt "cal-itip"
 msgid "None"
 msgstr "None"
 
-#: ../src/modules/itip-formatter/itip-view.c:6400
+#: ../src/modules/itip-formatter/itip-view.c:6657
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
@@ -23819,303 +24454,327 @@ msgstr "Create a new mail folder"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:751
+#: ../src/modules/mail/e-mail-shell-backend.c:782
 msgctxt "NetworkMonitor"
 msgid "base"
 msgstr "base"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:754
+#: ../src/modules/mail/e-mail-shell-backend.c:785
 msgctxt "NetworkMonitor"
 msgid "netlink"
 msgstr "netlink"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:757
+#: ../src/modules/mail/e-mail-shell-backend.c:788
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "networkmanager"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:787
+#: ../src/modules/mail/e-mail-shell-backend.c:818
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "Method to detect _online state:"
 
+#. Translators: The '%s' is replaced with the actual name of the GNetworkMonitor implementation
+#: ../src/modules/mail/e-mail-shell-backend.c:829
+#, c-format
+#| msgid "Defaults"
+msgctxt "NetworkMonitor"
+msgid "Default (%s)"
+msgstr "Default (%s)"
+
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:796
+#: ../src/modules/mail/e-mail-shell-backend.c:833
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Default"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:810
+#: ../src/modules/mail/e-mail-shell-backend.c:850
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Always Online"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:879
+#: ../src/modules/mail/e-mail-shell-backend.c:919
 msgid "Mail Preferences"
 msgstr "Mail Preferences"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:888
+#: ../src/modules/mail/e-mail-shell-backend.c:928
 msgid "Composer Preferences"
 msgstr "Composer Preferences"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:897
+#: ../src/modules/mail/e-mail-shell-backend.c:937
 msgid "Network Preferences"
 msgstr "Network Preferences"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../src/modules/mail/e-mail-shell-backend.c:1258
+#: ../src/modules/mail/e-mail-shell-backend.c:1298
 msgctxt "label"
 msgid "None"
 msgstr "None"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:821
-msgid "Marking messages as read..."
-msgstr "Marking messages as read..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:853
+#| msgid "Marking messages as read..."
+msgid "Marking messages as read…"
+msgstr "Marking messages as read…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1226
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1258
 msgid "Go to Folder"
 msgstr "Go to Folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1230
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1262
 msgid "_Select"
 msgstr "_Select"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1533
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1572
 msgid "_Disable Account"
 msgstr "_Disable Account"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1535
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1574
 msgid "Disable this account"
 msgstr "Disable this account"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1542
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1581
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Permanently remove all the deleted messages from all folders"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1547
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1586
 msgid "Empty _Junk"
 msgstr "Empty _Junk"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1549
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1588
 msgid "Delete all Junk messages from all folders"
 msgstr "Delete all Junk messages from all folders"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1556
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1595
 msgid "Edit properties of this account"
 msgstr "Edit properties of this account"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1563
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1602
 msgid "Refresh list of folders of this account"
 msgstr "Refresh list of folders of this account"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1568
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1607
 msgid "_Download Messages for Offline Usage"
 msgstr "_Download Messages for Offline Usage"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1570
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1609
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Download messages of accounts and folders marked for offline usage"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1575
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Fl_ush Outbox"
 msgstr "Fl_ush Outbox"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1582
-msgid "_Copy Folder To..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1621
+#| msgid "Copy Folder To"
+msgid "_Copy Folder To…"
 msgstr "_Copy Folder To…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1584
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Copy the selected folder into another folder"
 msgstr "Copy the selected folder into another folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1591
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1630
 msgid "Permanently remove this folder"
 msgstr "Permanently remove this folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1596
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1635
+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"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1642
 msgid "E_xpunge"
 msgstr "E_xpunge"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1598
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1644
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Permanently remove all deleted messages from this folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1603
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1695
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1649
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1741
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_k All Messages as Read"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1605
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1697
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1651
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1743
 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:1610
-msgid "_Move Folder To..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1656
+#| msgid "Move Folder To"
+msgid "_Move Folder To…"
 msgstr "_Move Folder To…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1612
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1658
 msgid "Move the selected folder into another folder"
 msgstr "Move the selected folder into another folder"
 
 #. Translators: An action caption to create a new mail folder
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1618
-msgid "_New..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
+#| msgid "_New"
+msgid "_New…"
 msgstr "_New…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1620
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Create a new folder for storing mail"
 msgstr "Create a new folder for storing mail"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1627
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Change the properties of this folder"
 msgstr "Change the properties of this folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1634
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
 msgid "Refresh the folder"
 msgstr "Refresh the folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1641
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
 msgid "Change the name of this folder"
 msgstr "Change the name of this folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1646
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
 msgid "Select Message _Thread"
 msgstr "Select Message _Thread"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1648
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Select all messages in the same thread as the selected message"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1653
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
 msgid "Select Message S_ubthread"
 msgstr "Select Message S_ubthread"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1655
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
 msgid "Select all replies to the currently selected message"
 msgstr "Select all replies to the currently selected message"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1667
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1713
 msgid "Empty _Trash"
 msgstr "Empty Was_tebasket"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1669
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1715
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Permanently remove all the deleted messages from all accounts"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1674
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1720
 msgid "Go to _Folder"
 msgstr "Go to _Folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1676
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1722
 msgid "Opens a dialog to select a folder to go to"
 msgstr "Opens a dialog to select a folder to go to"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1688
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1734
 msgid "_Manage Subscriptions"
 msgstr "_Manage Subscriptions"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1690
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1774
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1736
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1820
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Subscribe or unsubscribe to folders on remote servers"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1702
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1748
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1769
 msgid "Send / _Receive"
 msgstr "Send / _Receive"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1704
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1750
 msgid "Send queued items and retrieve new items"
 msgstr "Send queued items and retrieve new items"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1755
 msgid "R_eceive All"
 msgstr "R_eceive All"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1711
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1757
 msgid "Receive new items from all accounts"
 msgstr "Receive new items from all accounts"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1762
 msgid "_Send All"
 msgstr "_Send All"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1718
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1764
 msgid "Send queued items in all accounts"
 msgstr "Send queued items in all accounts"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1746
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1792
 msgid "Cancel the current mail operation"
 msgstr "Cancel the current mail operation"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
 msgid "Collapse All _Threads"
 msgstr "Collapse All _Threads"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1753
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1799
 msgid "Collapse all message threads"
 msgstr "Collapse all message threads"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
 msgid "E_xpand All Threads"
 msgstr "E_xpand All Threads"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1760
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1806
 msgid "Expand all message threads"
 msgstr "Expand all message threads"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
 msgid "_Message Filters"
 msgstr "_Message Filters"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1767
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1813
 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:1772
-msgid "_Subscriptions..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
+#| msgid "_Subscriptions..."
+msgid "_Subscriptions…"
 msgstr "_Subscriptions…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1781
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1827
 msgid "F_older"
 msgstr "F_older"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1798
-msgid "C_reate Search Folder From Search..."
+#: ../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…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1805
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
 msgid "Search F_olders"
 msgstr "Search F_olders"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1807
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1853
 msgid "Create or edit search folder definitions"
 msgstr "Create or edit search folder definitions"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1850
-msgid "_New Folder..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
+#| msgid "_New Folder..."
+msgid "_New Folder…"
 msgstr "_New Folder…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1878
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1924
 msgid "Show Message _Preview"
 msgstr "Show Message _Preview"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1880
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
 msgid "Show message preview pane"
 msgstr "Show message preview pane"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1886
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1932
 msgid "Show _Attachment Bar"
 msgstr "Show _Attachment Bar"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1888
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1934
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments"
@@ -24123,111 +24782,111 @@ msgstr ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1894
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
 msgid "Show _Deleted Messages"
 msgstr "Show _Deleted Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1942
 msgid "Show deleted messages with a line through them"
 msgstr "Show deleted messages with a line through them"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1902
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
 msgid "Show _Junk Messages"
 msgstr "Show _Junk Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1904
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1950
 msgid "Show junk messages with a red line through them"
 msgstr "Show junk messages with a red line through them"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1910
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1956
 msgid "_Group By Threads"
 msgstr "_Group By Threads"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1912
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
 msgid "Threaded message list"
 msgstr "Threaded message list"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1918
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1964
 msgid "Show To _Do Bar"
 msgstr "Show To _Do Bar"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1920
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1966
 msgid "Show To Do bar with appointments and tasks"
 msgstr "Show To Do bar with appointments and tasks"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1972
 msgid "_Unmatched Folder Enabled"
 msgstr "_Unmatched Folder Enabled"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1928
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1974
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Toggles whether Unmatched search folder is enabled"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1994
 msgid "Show message preview below the message list"
 msgstr "Show message preview below the message list"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1955
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2001
 msgid "Show message preview alongside the message list"
 msgstr "Show message preview alongside the message list"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1963
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2009
 msgid "All Messages"
 msgstr "All Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1970
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
 msgid "Important Messages"
 msgstr "Important Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1977
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2023
 msgid "Last 5 Days’ Messages"
 msgstr "Last 5 Days’ Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1984
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2030
 msgid "Messages Not Junk"
 msgstr "Messages Not Junk"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1991
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
 msgid "Messages with Attachments"
 msgstr "Messages with Attachments"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1998
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
 msgid "Messages with Notes"
 msgstr "Messages with Notes"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2005
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
 msgid "No Label"
 msgstr "No Label"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2012
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
 msgid "Read Messages"
 msgstr "Read Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2019
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
 msgid "Unread Messages"
 msgstr "Unread Messages"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2026
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
 msgid "Message Thread"
 msgstr "Message Thread"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2086
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2132
 msgid "Subject or Addresses contain"
 msgstr "Subject or Addresses contain"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2096
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2142
 msgid "All Accounts"
 msgstr "All Accounts"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2103
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2149
 msgid "Current Account"
 msgstr "Current Account"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2110
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2156
 msgid "Current Folder"
 msgstr "Current Folder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2117
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2163
 msgid "Current Folder and Subfolders"
 msgstr "Current Folder and Subfolders"
 
@@ -24327,7 +24986,6 @@ msgid "Language(s)"
 msgstr "Language(s)"
 
 #: ../src/modules/mail/em-composer-prefs.c:1340
-#| msgid "Saving user interface state"
 msgid "Same as user interface"
 msgstr "Same as user interface"
 
@@ -24621,7 +25279,6 @@ msgstr "Do not _show this wizard again"
 
 #. Translators: This is part of "Alternatively, you can %s (email, contacts and calendaring) instead." 
sentence from the same translation context.
 #: ../src/modules/startup-wizard/e-startup-assistant.c:206
-#| msgid "Collection _Account"
 msgctxt "wizard-ca-note"
 msgid "create a collection account"
 msgstr "create a collection account"
@@ -24634,22 +25291,24 @@ 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..."
+msgid "Loading accounts…"
 msgstr "Loading accounts…"
 
 #: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:93
-msgid "_Format as..."
+#| msgid "_Format as..."
+msgid "_Format as…"
 msgstr "_Format as…"
 
 #: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:101
 msgid "_Other languages"
 msgstr "_Other languages"
 
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:498
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:493
 msgid "Text Highlight"
 msgstr "Text Highlight"
 
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:499
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:494
 msgid "Syntax highlighting of mail parts"
 msgstr "Syntax highlighting of mail parts"
 
@@ -25451,30 +26110,30 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Notifies you when new mail messages arrive."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../src/plugins/mail-to-task/mail-to-task.c:200
+#: ../src/plugins/mail-to-task/mail-to-task.c:198
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Created from a mail by %s"
 
 #. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:605
+#: ../src/plugins/mail-to-task/mail-to-task.c:600
 msgctxt "mail-to-task"
 msgid "_Cancel"
 msgstr "_Cancel"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:607
+#: ../src/plugins/mail-to-task/mail-to-task.c:602
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "_Edit"
 
 #. Translators: Dialog button to create a New event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:609
+#: ../src/plugins/mail-to-task/mail-to-task.c:604
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "_New"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:627
+#: ../src/plugins/mail-to-task/mail-to-task.c:622
 #, c-format
 msgid ""
 "Selected calendar contains event “%s” already. Would you like to edit the "
@@ -25483,7 +26142,7 @@ msgstr ""
 "Selected calendar contains event “%s” already. Would you like to edit the "
 "old event?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:630
+#: ../src/plugins/mail-to-task/mail-to-task.c:625
 #, c-format
 msgid ""
 "Selected task list contains task “%s” already. Would you like to edit the "
@@ -25492,7 +26151,7 @@ msgstr ""
 "Selected task list contains task “%s” already. Would you like to edit the "
 "old task?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:633
+#: ../src/plugins/mail-to-task/mail-to-task.c:628
 #, c-format
 msgid ""
 "Selected memo list contains memo “%s” already. Would you like to edit the "
@@ -25502,7 +26161,7 @@ msgstr ""
 "old memo?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:653
+#: ../src/plugins/mail-to-task/mail-to-task.c:648
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -25518,7 +26177,7 @@ msgstr[1] ""
 "add them all?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:660
+#: ../src/plugins/mail-to-task/mail-to-task.c:655
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -25534,7 +26193,7 @@ msgstr[1] ""
 "add them all?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:667
+#: ../src/plugins/mail-to-task/mail-to-task.c:662
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -25549,29 +26208,29 @@ msgstr[1] ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:688
+#: ../src/plugins/mail-to-task/mail-to-task.c:683
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Do you wish to continue converting remaining mails?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:764
+#: ../src/plugins/mail-to-task/mail-to-task.c:759
 msgid "[No Summary]"
 msgstr "[No Summary]"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:777
+#: ../src/plugins/mail-to-task/mail-to-task.c:772
 msgid "Invalid object returned from a server"
 msgstr "Invalid object returned from a server"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:831
+#: ../src/plugins/mail-to-task/mail-to-task.c:826
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "An error occurred during processing: %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:869
+#: ../src/plugins/mail-to-task/mail-to-task.c:864
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Cannot open calendar. %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:873
+#: ../src/plugins/mail-to-task/mail-to-task.c:868
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -25579,7 +26238,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:876
+#: ../src/plugins/mail-to-task/mail-to-task.c:871
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -25587,7 +26246,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:879
+#: ../src/plugins/mail-to-task/mail-to-task.c:874
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -25595,35 +26254,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:1301
+#: ../src/plugins/mail-to-task/mail-to-task.c:1299
 msgid "Create an _Appointment"
 msgstr "Create an _Appointment"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1303
+#: ../src/plugins/mail-to-task/mail-to-task.c:1301
 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:1308
+#: ../src/plugins/mail-to-task/mail-to-task.c:1306
 msgid "Create a Mem_o"
 msgstr "Create a Mem_o"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1310
+#: ../src/plugins/mail-to-task/mail-to-task.c:1308
 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:1315
+#: ../src/plugins/mail-to-task/mail-to-task.c:1313
 msgid "Create a _Task"
 msgstr "Create a _Task"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1317
+#: ../src/plugins/mail-to-task/mail-to-task.c:1315
 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:1325
+#: ../src/plugins/mail-to-task/mail-to-task.c:1323
 msgid "Create a _Meeting"
 msgstr "Create a _Meeting"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1327
+#: ../src/plugins/mail-to-task/mail-to-task.c:1325
 msgid "Create a new meeting from the selected message"
 msgstr "Create a new meeting from the selected message"
 
@@ -25820,75 +26479,75 @@ msgstr "Edit Location"
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../src/plugins/save-calendar/csv-format.c:158
+#: ../src/plugins/save-calendar/csv-format.c:154
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../src/plugins/save-calendar/csv-format.c:374
+#: ../src/plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "Description List"
 
-#: ../src/plugins/save-calendar/csv-format.c:375
+#: ../src/plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "Categories List"
 
-#: ../src/plugins/save-calendar/csv-format.c:376
+#: ../src/plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "Comment List"
 
-#: ../src/plugins/save-calendar/csv-format.c:379
+#: ../src/plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "Contact List"
 
-#: ../src/plugins/save-calendar/csv-format.c:380
+#: ../src/plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "Start"
 
-#: ../src/plugins/save-calendar/csv-format.c:381
+#: ../src/plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "End"
 
-#: ../src/plugins/save-calendar/csv-format.c:382
+#: ../src/plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Due"
 
-#: ../src/plugins/save-calendar/csv-format.c:383
+#: ../src/plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "percent Done"
 
-#: ../src/plugins/save-calendar/csv-format.c:385
+#: ../src/plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "URL"
 
-#: ../src/plugins/save-calendar/csv-format.c:386
+#: ../src/plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "Attendees List"
 
-#: ../src/plugins/save-calendar/csv-format.c:388
+#: ../src/plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "Modified"
 
-#: ../src/plugins/save-calendar/csv-format.c:561
+#: ../src/plugins/save-calendar/csv-format.c:537
 msgid "A_dvanced options for the CSV format"
 msgstr "A_dvanced options for the CSV format"
 
-#: ../src/plugins/save-calendar/csv-format.c:569
+#: ../src/plugins/save-calendar/csv-format.c:545
 msgid "Prepend a _header"
 msgstr "Prepend a _header"
 
-#: ../src/plugins/save-calendar/csv-format.c:578
+#: ../src/plugins/save-calendar/csv-format.c:554
 msgid "_Value delimiter:"
 msgstr "_Value delimiter:"
 
-#: ../src/plugins/save-calendar/csv-format.c:589
+#: ../src/plugins/save-calendar/csv-format.c:565
 msgid "_Record delimiter:"
 msgstr "_Record delimiter:"
 
-#: ../src/plugins/save-calendar/csv-format.c:600
+#: ../src/plugins/save-calendar/csv-format.c:576
 msgid "_Encapsulate values with:"
 msgstr "_Encapsulate values with:"
 
-#: ../src/plugins/save-calendar/csv-format.c:626
+#: ../src/plugins/save-calendar/csv-format.c:602
 msgid "Comma separated values (.csv)"
 msgstr "Comma separated values (.csv)"
 
@@ -25914,7 +26573,7 @@ msgstr "Save a calendar or task list to disk."
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../src/plugins/save-calendar/rdf-format.c:383
+#: ../src/plugins/save-calendar/rdf-format.c:373
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
@@ -25943,10 +26602,6 @@ msgid "Save the selected task list to disk"
 msgstr "Save the selected task list to disk"
 
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:2
-#| msgid ""
-#| "Drafts based template plugin. You can use variables like $ORIG[subject], "
-#| "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values "
-#| "from an email you are replying to."
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
 "$ORIG[from], $ORIG[to], $ORIG[body], $ORIG[quoted-body] or $ORIG[reply-"
@@ -25969,11 +26624,13 @@ msgid "Save as Template"
 msgstr "Save as Template"
 
 #: ../src/shell/e-shell.c:379
-msgid "Preparing to go offline..."
+#| 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..."
+msgid "Preparing to go online…"
 msgstr "Preparing to go online…"
 
 #: ../src/shell/e-shell.c:519
@@ -25981,7 +26638,8 @@ msgid "Preparing to quit"
 msgstr "Preparing to quit"
 
 #: ../src/shell/e-shell.c:525
-msgid "Preparing to quit..."
+#| msgid "Preparing to quit"
+msgid "Preparing to quit…"
 msgstr "Preparing to quit…"
 
 #: ../src/shell/e-shell.c:1088
@@ -25992,15 +26650,15 @@ 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:873
+#: ../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:803
+#: ../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:901
+#: ../src/shell/e-shell.c:1476 ../src/shell/e-shell-window-actions.c:919
 msgid "_Quit"
 msgstr "_Quit"
 
@@ -26054,289 +26712,303 @@ msgstr ""
 "Waldo Luís Ribeiro <waldoribeiro sapo pt>"
 
 #: ../src/shell/e-shell-utils.c:354
-msgid "Evolution Website"
-msgstr "Evolution Website"
+msgid "Website"
+msgstr "Website"
 
 #: ../src/shell/e-shell-view.c:295
 msgid "Saving user interface state"
 msgstr "Saving user interface state"
 
-#: ../src/shell/e-shell-window-actions.c:293
+#: ../src/shell/e-shell-window-actions.c:311
 msgid "Categories Editor"
 msgstr "Categories Editor"
 
-#: ../src/shell/e-shell-window-actions.c:596
+#: ../src/shell/e-shell-window-actions.c:614
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy is not installed."
 
-#: ../src/shell/e-shell-window-actions.c:597
+#: ../src/shell/e-shell-window-actions.c:615
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy could not be run."
 
-#: ../src/shell/e-shell-window-actions.c:793
-#| msgid "Collection _Account"
+#: ../src/shell/e-shell-window-actions.c:811
 msgid "Collect_ion Account"
 msgstr "Collect_ion Account"
 
-#: ../src/shell/e-shell-window-actions.c:795
-#| msgid "Create a new mail account"
+#: ../src/shell/e-shell-window-actions.c:813
 msgid "Create a new collection account"
 msgstr "Create a new collection account"
 
-#: ../src/shell/e-shell-window-actions.c:805
+#: ../src/shell/e-shell-window-actions.c:823
 msgid "Show information about Evolution"
 msgstr "Show information about Evolution"
 
-#: ../src/shell/e-shell-window-actions.c:810
+#: ../src/shell/e-shell-window-actions.c:828
 msgid "_Accounts"
 msgstr "_Accounts"
 
-#: ../src/shell/e-shell-window-actions.c:812
+#: ../src/shell/e-shell-window-actions.c:830
 msgid "Configure Evolution Accounts"
 msgstr "Configure Evolution Accounts"
 
-#: ../src/shell/e-shell-window-actions.c:817
-#: ../src/shell/e-shell-window-actions.c:831
+#: ../src/shell/e-shell-window-actions.c:835
+#: ../src/shell/e-shell-window-actions.c:849
 msgid "_Close Window"
 msgstr "_Close Window"
 
-#: ../src/shell/e-shell-window-actions.c:838
+#: ../src/shell/e-shell-window-actions.c:856
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../src/shell/e-shell-window-actions.c:840
+#: ../src/shell/e-shell-window-actions.c:858
 msgid "Open the Evolution User Guide"
 msgstr "Open the Evolution User Guide"
 
-#: ../src/shell/e-shell-window-actions.c:866
-msgid "I_mport..."
+#: ../src/shell/e-shell-window-actions.c:884
+#| msgid "I_mport"
+msgid "I_mport…"
 msgstr "I_mport…"
 
-#: ../src/shell/e-shell-window-actions.c:868
+#: ../src/shell/e-shell-window-actions.c:886
 msgid "Import data from other programs"
 msgstr "Import data from other programs"
 
-#: ../src/shell/e-shell-window-actions.c:875
+#: ../src/shell/e-shell-window-actions.c:893
 msgid "Create a new window displaying this view"
 msgstr "Create a new window displaying this view"
 
-#: ../src/shell/e-shell-window-actions.c:887
+#: ../src/shell/e-shell-window-actions.c:905
 msgid "Available Cate_gories"
 msgstr "Available Cate_gories"
 
-#: ../src/shell/e-shell-window-actions.c:889
+#: ../src/shell/e-shell-window-actions.c:907
 msgid "Manage available categories"
 msgstr "Manage available categories"
 
-#: ../src/shell/e-shell-window-actions.c:903
+#: ../src/shell/e-shell-window-actions.c:921
 msgid "Exit the program"
 msgstr "Exit the program"
 
-#: ../src/shell/e-shell-window-actions.c:908
-msgid "_Advanced Search..."
+#: ../src/shell/e-shell-window-actions.c:926
+#| msgid "Advanced Search"
+msgid "_Advanced Search…"
 msgstr "_Advanced Search…"
 
-#: ../src/shell/e-shell-window-actions.c:910
+#: ../src/shell/e-shell-window-actions.c:928
 msgid "Construct a more advanced search"
 msgstr "Construct a more advanced search"
 
-#: ../src/shell/e-shell-window-actions.c:917
+#: ../src/shell/e-shell-window-actions.c:935
 msgid "Clear the current search parameters"
 msgstr "Clear the current search parameters"
 
-#: ../src/shell/e-shell-window-actions.c:922
-msgid "_Edit Saved Searches..."
+#: ../src/shell/e-shell-window-actions.c:940
+#| msgid "_Edit Saved Searches..."
+msgid "_Edit Saved Searches…"
 msgstr "_Edit Saved Searches…"
 
-#: ../src/shell/e-shell-window-actions.c:924
+#: ../src/shell/e-shell-window-actions.c:942
 msgid "Manage your saved searches"
 msgstr "Manage your saved searches"
 
-#: ../src/shell/e-shell-window-actions.c:931
+#: ../src/shell/e-shell-window-actions.c:949
 msgid "Click here to change the search type"
 msgstr "Click here to change the search type"
 
-#: ../src/shell/e-shell-window-actions.c:936
+#: ../src/shell/e-shell-window-actions.c:954
 msgid "_Find Now"
 msgstr "_Find Now"
 
-#: ../src/shell/e-shell-window-actions.c:938
+#: ../src/shell/e-shell-window-actions.c:956
 msgid "Execute the current search parameters"
 msgstr "Execute the current search parameters"
 
-#: ../src/shell/e-shell-window-actions.c:943
-msgid "_Save Search..."
+#: ../src/shell/e-shell-window-actions.c:961
+#| msgid "Save Search"
+msgid "_Save Search…"
 msgstr "_Save Search…"
 
-#: ../src/shell/e-shell-window-actions.c:945
+#: ../src/shell/e-shell-window-actions.c:963
 msgid "Save the current search parameters"
 msgstr "Save the current search parameters"
 
-#: ../src/shell/e-shell-window-actions.c:957
-msgid "Submit _Bug Report..."
+#: ../src/shell/e-shell-window-actions.c:975
+#| msgid "_Forward Contacts"
+msgid "_Keyboard Shortcuts"
+msgstr "_Keyboard Shortcuts"
+
+#: ../src/shell/e-shell-window-actions.c:977
+msgid "Show keyboard shortcuts"
+msgstr "Show keyboard shortcuts"
+
+#: ../src/shell/e-shell-window-actions.c:982
+#| msgid "Submit Bug Report"
+msgid "Submit _Bug Report…"
 msgstr "Submit _Bug Report…"
 
-#: ../src/shell/e-shell-window-actions.c:959
+#: ../src/shell/e-shell-window-actions.c:984
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Submit a bug report using Bug Buddy"
 
-#: ../src/shell/e-shell-window-actions.c:964
+#: ../src/shell/e-shell-window-actions.c:989
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: ../src/shell/e-shell-window-actions.c:966
+#: ../src/shell/e-shell-window-actions.c:991
 msgid "Put Evolution into offline mode"
 msgstr "Put Evolution into offline mode"
 
-#: ../src/shell/e-shell-window-actions.c:971
+#: ../src/shell/e-shell-window-actions.c:996
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: ../src/shell/e-shell-window-actions.c:973
+#: ../src/shell/e-shell-window-actions.c:998
 msgid "Put Evolution into online mode"
 msgstr "Put Evolution into online mode"
 
-#: ../src/shell/e-shell-window-actions.c:1001
+#: ../src/shell/e-shell-window-actions.c:1026
 msgid "Lay_out"
 msgstr "Lay_out"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:1009
+#: ../src/shell/e-shell-window-actions.c:1034
 msgid "_New"
 msgstr "_New"
 
-#: ../src/shell/e-shell-window-actions.c:1016
+#: ../src/shell/e-shell-window-actions.c:1041
 msgid "_Search"
 msgstr "_Search"
 
-#: ../src/shell/e-shell-window-actions.c:1023
+#: ../src/shell/e-shell-window-actions.c:1048
 msgid "_Switcher Appearance"
 msgstr "_Switcher Appearance"
 
-#: ../src/shell/e-shell-window-actions.c:1037
+#: ../src/shell/e-shell-window-actions.c:1062
 msgid "_Window"
 msgstr "_Window"
 
-#: ../src/shell/e-shell-window-actions.c:1066
+#: ../src/shell/e-shell-window-actions.c:1091
 msgid "Show _Menu Bar"
 msgstr "Show _Menu Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1068
+#: ../src/shell/e-shell-window-actions.c:1093
 msgid "Show the menu bar"
 msgstr "Show the menu bar"
 
-#: ../src/shell/e-shell-window-actions.c:1074
+#: ../src/shell/e-shell-window-actions.c:1099
 msgid "Show Side _Bar"
 msgstr "Show Side _Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1076
+#: ../src/shell/e-shell-window-actions.c:1101
 msgid "Show the side bar"
 msgstr "Show the side bar"
 
-#: ../src/shell/e-shell-window-actions.c:1082
+#: ../src/shell/e-shell-window-actions.c:1107
 msgid "Show _Buttons"
 msgstr "Show _Buttons"
 
-#: ../src/shell/e-shell-window-actions.c:1084
+#: ../src/shell/e-shell-window-actions.c:1109
 msgid "Show the switcher buttons"
 msgstr "Show the switcher buttons"
 
-#: ../src/shell/e-shell-window-actions.c:1090
+#: ../src/shell/e-shell-window-actions.c:1115
 msgid "Show _Status Bar"
 msgstr "Show _Status Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1092
+#: ../src/shell/e-shell-window-actions.c:1117
 msgid "Show the status bar"
 msgstr "Show the status bar"
 
-#: ../src/shell/e-shell-window-actions.c:1098
+#: ../src/shell/e-shell-window-actions.c:1123
 msgid "Show _Tool Bar"
 msgstr "Show _Tool Bar"
 
-#: ../src/shell/e-shell-window-actions.c:1100
+#: ../src/shell/e-shell-window-actions.c:1125
 msgid "Show the tool bar"
 msgstr "Show the tool bar"
 
-#: ../src/shell/e-shell-window-actions.c:1122
+#: ../src/shell/e-shell-window-actions.c:1147
 msgid "_Icons Only"
 msgstr "_Icons Only"
 
-#: ../src/shell/e-shell-window-actions.c:1124
+#: ../src/shell/e-shell-window-actions.c:1149
 msgid "Display window buttons with icons only"
 msgstr "Display window buttons with icons only"
 
-#: ../src/shell/e-shell-window-actions.c:1129
+#: ../src/shell/e-shell-window-actions.c:1154
 msgid "_Text Only"
 msgstr "_Text Only"
 
-#: ../src/shell/e-shell-window-actions.c:1131
+#: ../src/shell/e-shell-window-actions.c:1156
 msgid "Display window buttons with text only"
 msgstr "Display window buttons with text only"
 
-#: ../src/shell/e-shell-window-actions.c:1136
+#: ../src/shell/e-shell-window-actions.c:1161
 msgid "Icons _and Text"
 msgstr "Icons _and Text"
 
-#: ../src/shell/e-shell-window-actions.c:1138
+#: ../src/shell/e-shell-window-actions.c:1163
 msgid "Display window buttons with icons and text"
 msgstr "Display window buttons with icons and text"
 
-#: ../src/shell/e-shell-window-actions.c:1143
+#: ../src/shell/e-shell-window-actions.c:1168
 msgid "Tool_bar Style"
 msgstr "Tool_bar Style"
 
-#: ../src/shell/e-shell-window-actions.c:1145
+#: ../src/shell/e-shell-window-actions.c:1170
 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:1153
+#: ../src/shell/e-shell-window-actions.c:1178
 msgid "Delete Current View"
 msgstr "Delete Current View"
 
-#: ../src/shell/e-shell-window-actions.c:1160
-msgid "Save Custom View..."
+#: ../src/shell/e-shell-window-actions.c:1185
+#| msgid "Save Custom View"
+msgid "Save Custom View…"
 msgstr "Save Custom View…"
 
-#: ../src/shell/e-shell-window-actions.c:1162
+#: ../src/shell/e-shell-window-actions.c:1187
 msgid "Save current custom view"
 msgstr "Save current custom view"
 
-#: ../src/shell/e-shell-window-actions.c:1169
+#: ../src/shell/e-shell-window-actions.c:1194
 msgid "C_urrent View"
 msgstr "C_urrent View"
 
-#: ../src/shell/e-shell-window-actions.c:1179
+#: ../src/shell/e-shell-window-actions.c:1204
 msgid "Custom View"
 msgstr "Custom View"
 
-#: ../src/shell/e-shell-window-actions.c:1181
+#: ../src/shell/e-shell-window-actions.c:1206
 msgid "Current view is a customized view"
 msgstr "Current view is a customised view"
 
-#: ../src/shell/e-shell-window-actions.c:1189
-msgid "Page Set_up..."
+#: ../src/shell/e-shell-window-actions.c:1214
+#| msgid "Page Setup:"
+msgid "Page Set_up…"
 msgstr "Page Set_up…"
 
-#: ../src/shell/e-shell-window-actions.c:1191
+#: ../src/shell/e-shell-window-actions.c:1216
 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:1561
+#: ../src/shell/e-shell-window-actions.c:1586
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: ../src/shell/e-shell-window-actions.c:1684
+#: ../src/shell/e-shell-window-actions.c:1709
 #, c-format
 msgid "Select view: %s"
 msgstr "Select view: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1701
+#: ../src/shell/e-shell-window-actions.c:1726
 #, c-format
 msgid "Delete view: %s"
 msgstr "Delete view: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1805
+#: ../src/shell/e-shell-window-actions.c:1830
 msgid "Execute these search parameters"
 msgstr "Execute these search parameters"
 
@@ -26356,22 +27028,6 @@ msgstr "%s — Evolution"
 #. Preview/Alpha/Beta version warning message
 #: ../src/shell/main.c:192
 #, no-c-format
-#| msgid ""
-#| "Hi.  Thanks for taking the time to download this preview release\n"
-#| "of the Evolution groupware suite.\n"
-#| "\n"
-#| "This version of Evolution is not yet complete. It is getting close,\n"
-#| "but some features are either unfinished or do not work properly.\n"
-#| "\n"
-#| "If you want a stable version of Evolution, we urge you to uninstall\n"
-#| "this version, and install version %s instead.\n"
-#| "\n"
-#| "If you find bugs, please report them to us at bugzilla.gnome.org.\n"
-#| "This product comes with no warranty and is not intended for\n"
-#| "individuals prone to violent fits of anger.\n"
-#| "\n"
-#| "We hope that you enjoy the results of our hard work, and we\n"
-#| "eagerly await your contributions!\n"
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -26421,7 +27077,7 @@ msgstr "Do not tell me again"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../src/shell/main.c:312
+#: ../src/shell/main.c:325
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "“mail”, “calendar”, “contacts”, “tasks”, and “memos”"
@@ -26429,39 +27085,39 @@ msgstr ""
 "Start Evolution showing the specified component. Available options are "
 "“mail”, “calendar”, “contacts”, “tasks”, and “memos”"
 
-#: ../src/shell/main.c:316
+#: ../src/shell/main.c:329
 msgid "Apply the given geometry to the main window"
 msgstr "Apply the given geometry to the main window"
 
-#: ../src/shell/main.c:320
+#: ../src/shell/main.c:333
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: ../src/shell/main.c:322
+#: ../src/shell/main.c:335
 msgid "Ignore network availability"
 msgstr "Ignore network availability"
 
-#: ../src/shell/main.c:325
+#: ../src/shell/main.c:338
 msgid "Forcibly shut down Evolution"
 msgstr "Forcibly shut down Evolution"
 
-#: ../src/shell/main.c:328
+#: ../src/shell/main.c:341
 msgid "Disable loading of any plugins."
 msgstr "Disable loading of any plugins."
 
-#: ../src/shell/main.c:330
+#: ../src/shell/main.c:343
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Disable preview pane of Mail, Contacts and Tasks."
 
-#: ../src/shell/main.c:334
+#: ../src/shell/main.c:347
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Import URIs or filenames given as rest of arguments."
 
-#: ../src/shell/main.c:336
+#: ../src/shell/main.c:349
 msgid "Request a running Evolution process to quit"
 msgstr "Request a running Evolution process to quit"
 
-#: ../src/shell/main.c:418
+#: ../src/shell/main.c:431
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -26470,11 +27126,11 @@ msgstr ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
 "System error: %s"
 
-#: ../src/shell/main.c:474 ../src/shell/main.c:479
+#: ../src/shell/main.c:490 ../src/shell/main.c:495
 msgid "— The Evolution PIM and Email Client"
 msgstr "— The Evolution PIM and Email Client"
 
-#: ../src/shell/main.c:541
+#: ../src/shell/main.c:551
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26483,7 +27139,7 @@ msgstr ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run “%s --help” for more information.\n"
 
-#: ../src/shell/main.c:547
+#: ../src/shell/main.c:557
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -26492,6 +27148,10 @@ msgstr ""
 "%s: --force-online and --offline cannot be used together.\n"
 "  Run “%s --help” for more information.\n"
 
+#: ../src/shell/shell.error.xml.h:1
+msgid "Importing..."
+msgstr "Importing…"
+
 #: ../src/shell/shell.error.xml.h:2
 msgid "Upgrade from previous version failed:"
 msgstr "Upgrade from previous version failed:"
@@ -26725,8 +27385,9 @@ msgid "Email Address"
 msgstr "E-mail Address"
 
 #: ../src/smime/gui/certificate-manager.c:648
-msgid "Select a file to backup your key and certificate..."
-msgstr "Select a file to backup your key and certificate..."
+#| 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…"
 
 #. To Translators:
 #. * %s-backup.p12 is the default file name suggested by the file selection dialog,
@@ -26749,8 +27410,9 @@ 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..."
-msgstr "Please select a file..."
+#| msgid "Please select a file..."
+msgid "Please select a file…"
+msgstr "Please select a file…"
 
 #: ../src/smime/gui/certificate-manager.c:755
 msgid "_Include certificate chain in the backup"
@@ -26797,7 +27459,8 @@ 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..."
+msgid "Select a certificate to import…"
 msgstr "Select a certificate to import…"
 
 #: ../src/smime/gui/certificate-manager.c:997
@@ -27097,15 +27760,261 @@ msgstr "Unable to write store to disk, err_code: %i"
 msgid "Imported Certificate"
 msgstr "Imported Certificate"
 
+#~ msgid "%d week"
+#~ msgid_plural "%d weeks"
+#~ msgstr[0] "%d week"
+#~ msgstr[1] "%d weeks"
+
+#~ msgctxt "cal-task-status"
+#~ msgid "None"
+#~ msgstr "None"
+
+#~ msgid "_Attachment..."
+#~ msgstr "_Attachment…"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Atte_ndees..."
+#~ msgstr "Atte_ndees..."
+
+#~ msgid "%d day before"
+#~ msgid_plural "%d days before"
+#~ msgstr[0] "%d day before"
+#~ msgstr[1] "%d days before"
+
+#~ msgid "%d hour before"
+#~ msgid_plural "%d hours before"
+#~ msgstr[0] "%d hour before"
+#~ msgstr[1] "%d hours before"
+
+#~ msgid "%d minute before"
+#~ msgid_plural "%d minutes before"
+#~ msgstr[0] "%d minute before"
+#~ msgstr[1] "%d minutes before"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "15 minutes before"
+#~ msgstr "15 minutes before"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "1 hour before"
+#~ msgstr "1 hour before"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "1 day before"
+#~ msgstr "1 day before"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "_Categories..."
+#~ msgstr "_Categories..."
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Not Started"
+#~ msgstr "Not Started"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "In Progress"
+#~ msgstr "In Progress"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Completed"
+#~ msgstr "Completed"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Cancelled"
+#~ msgstr "Cancelled"
+
+#~ msgid "Saving changes..."
+#~ msgstr "Saving changes..."
+
+#~ msgid "_Print..."
+#~ msgstr "_Print…"
+
+#~ msgid "Pre_view..."
+#~ msgstr "Pre_view..."
+
+#~ msgid "Select..."
+#~ msgstr "Select…"
+
+#~ msgid "Atte_ndees..."
+#~ msgstr "Atte_ndees…"
+
+#~ msgid "New _Appointment..."
+#~ msgstr "New _Appointment…"
+
+#~ msgid "New _Meeting..."
+#~ msgstr "New _Meeting…"
+
+#~ msgid "New _Task..."
+#~ msgstr "New _Task..."
+
+#~ msgid "_Open..."
+#~ msgstr "_Open..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_Delete..."
+
+#~ msgid "Save as..."
+#~ msgstr "Save as…"
+
+#~ msgid "Save _As..."
+#~ msgstr "Save _As…"
+
+#~ msgid "A_dd Attachment..."
+#~ msgstr "A_dd Attachment…"
+
+#~ msgid "Other..."
+#~ msgstr "Other…"
+
+#~ msgid "_Find..."
+#~ msgstr "_Find..."
+
+#~ msgid "Re_place..."
+#~ msgstr "Re_place..."
+
+#~ msgid "_Image..."
+#~ msgstr "_Image..."
+
+#~ msgid "_Link..."
+#~ msgstr "_Link..."
+
+#~ msgid "_Rule..."
+#~ msgstr "_Rule..."
+
+#~ msgid "_Table..."
+#~ msgstr "_Table..."
+
+#~ msgid "Cell..."
+#~ msgstr "Cell..."
+
+#~ msgid "Image..."
+#~ msgstr "Image..."
+
+#~ msgid "Link..."
+#~ msgstr "Link..."
+
+#~ msgid "Page..."
+#~ msgstr "Page..."
+
+#~ msgid "Rule..."
+#~ msgstr "Rule..."
+
+#~ msgid "Table..."
+#~ msgstr "Table..."
+
+#~ msgid "Text..."
+#~ msgstr "Text..."
+
+#~ msgid "More..."
+#~ msgstr "More…"
+
+#~ msgid "Add a C_olumn..."
+#~ msgstr "Add a C_olumn…"
+
+#~ msgid "Custo_mize Current View..."
+#~ msgstr "Custo_mise Current View…"
+
+#~ msgid "Save _Image..."
+#~ msgstr "Save _Image…"
+
+#~ msgid "Storing changes..."
+#~ msgstr "Storing changes..."
+
+#~ msgid "Retrieving message..."
+#~ msgstr "Retrieving message..."
+
+#~ msgid "_Archive..."
+#~ msgstr "_Archive..."
+
+#~ msgid "_Copy to Folder..."
+#~ msgstr "_Copy to Folder…"
+
+#~ msgid "_Find in Message..."
+#~ msgstr "_Find in Message…"
+
+#~ msgid "Follow _Up..."
+#~ msgstr "Follow _Up…"
+
+#~ msgid "_Move to Folder..."
+#~ msgstr "_Move to Folder…"
+
+#~ msgid "Loading..."
+#~ msgstr "Loading…"
+
+#~ msgid "_Rename..."
+#~ msgstr "_Rename…"
+
+#~ msgid "_Forward Contact..."
+#~ msgstr "_Forward Contact…"
+
+#~ msgid "_New Contact..."
+#~ msgstr "_New Contact…"
+
+#~ msgid "New Contact _List..."
+#~ msgstr "New Contact _List…"
+
+#~ msgid "_Send Message to Contact..."
+#~ msgstr "_Send Message to Contact…"
+
+#~ msgid "_Save as vCard..."
+#~ msgstr "_Save as vCard…"
+
+#~ msgid "Selected Memo Lists for Notifications of Reminders"
+#~ msgstr "Selected Memo Lists for Notifications of Reminders"
+
+#~ msgid "_Copy..."
+#~ msgstr "_Copy…"
+
+#~ msgid "New All Day _Event..."
+#~ msgstr "New All Day _Event…"
+
+#~ msgid "_Forward as iCalendar..."
+#~ msgstr "_Forward as iCalendar…"
+
+#~ msgid "Print..."
+#~ msgstr "Print..."
+
+#~ msgid "_Save as iCalendar..."
+#~ msgstr "_Save as iCalendar…"
+
+#~ msgid "_Copy Folder To..."
+#~ msgstr "_Copy Folder To…"
+
+#~ msgid "_Move Folder To..."
+#~ msgstr "_Move Folder To…"
+
+#~ msgid "_New..."
+#~ msgstr "_New…"
+
+#~ msgid "Preparing to quit..."
+#~ msgstr "Preparing to quit…"
+
+#~ msgid "Evolution Website"
+#~ msgstr "Evolution Website"
+
+#~ msgid "I_mport..."
+#~ msgstr "I_mport…"
+
+#~ msgid "_Advanced Search..."
+#~ msgstr "_Advanced Search…"
+
+#~ msgid "_Save Search..."
+#~ msgstr "_Save Search…"
+
+#~ msgid "Submit _Bug Report..."
+#~ msgstr "Submit _Bug Report…"
+
+#~ msgid "Save Custom View..."
+#~ msgstr "Save Custom View…"
+
+#~ msgid "Page Set_up..."
+#~ msgstr "Page Set_up…"
+
 #~ msgid "Summary:"
 #~ msgstr "Summary:"
 
 #~ msgid "%d/%m/%Y"
 #~ msgstr "%d/%m/%Y"
 
-#~ msgid "Default reminder snooze interval, in minutes"
-#~ msgstr "Default reminder snooze interval, in minutes"
-
 #~ msgid ""
 #~ "Default reminder snooze interval, in minutes, to be filled in the "
 #~ "reminder notification dialog"
@@ -27188,9 +28097,6 @@ msgstr "Imported Certificate"
 #~ msgid "_Snooze"
 #~ msgstr "_Snooze"
 
-#~ msgid "_Print"
-#~ msgstr "_Print"
-
 #~ msgid "location of appointment"
 #~ msgstr "location of appointment"
 
@@ -27523,18 +28429,6 @@ msgstr "Imported Certificate"
 #~ "configured to send an e-mail.  Evolution will display\n"
 #~ "a normal reminder dialogue box instead."
 
-#~ msgid "Day View"
-#~ msgstr "Day View"
-
-#~ msgid "Work Week View"
-#~ msgstr "Work Week View"
-
-#~ msgid "Week View"
-#~ msgstr "Week View"
-
-#~ msgid "Month View"
-#~ msgstr "Month View"
-
 #~ msgid "start of appointment"
 #~ msgstr "start of appointment"
 
@@ -27704,9 +28598,6 @@ msgstr "Imported Certificate"
 #~ msgid "_Delegatees"
 #~ msgstr "_Delegatees"
 
-#~ msgid "Atte_ndees"
-#~ msgstr "Atte_ndees"
-
 #~ msgid "%d day before appointment"
 #~ msgid_plural "%d days before appointment"
 #~ msgstr[0] "%d day before appointment"
@@ -31091,9 +31982,6 @@ msgstr "Imported Certificate"
 #~ msgid "Loading calendar..."
 #~ msgstr "Loading calendar…"
 
-#~ msgid "Organizer:"
-#~ msgstr "Organiser:"
-
 #~ msgid "Server Message:"
 #~ msgstr "Server Message:"
 
@@ -31248,9 +32136,6 @@ msgstr "Imported Certificate"
 #~ msgid "Select Trash Folder"
 #~ msgstr "Select Wastebasket Folder"
 
-#~ msgid "Sent and Draft Messages"
-#~ msgstr "Sent and Draft Messages"
-
 #~ msgid "Top Posting Option"
 #~ msgstr "Top Posting Option"
 
@@ -32220,9 +33105,6 @@ msgstr "Imported Certificate"
 #~ msgid "Cursor Mode"
 #~ msgstr "Cursor Mode"
 
-#~ msgid "Selected Column"
-#~ msgstr "Selected Column"
-
 #~ msgid "Focused Column"
 #~ msgstr "Focused Column"
 
@@ -32450,9 +33332,6 @@ msgstr "Imported Certificate"
 #~ msgid "Save Memo"
 #~ msgstr "Save Memo"
 
-#~ msgid "Save Task"
-#~ msgstr "Save Task"
-
 #~ msgid "<b>Alarm</b>"
 #~ msgstr "<b>Alarm</b>"
 
@@ -33246,9 +34125,6 @@ msgstr "Imported Certificate"
 #~ msgid "Folder contact"
 #~ msgstr "Folder contact"
 
-#~ msgid "Folder owner"
-#~ msgstr "Folder owner"
-
 #~ msgid "Folder visible"
 #~ msgstr "Folder visible"
 
@@ -33848,15 +34724,6 @@ msgstr "Imported Certificate"
 #~ msgid "Evolution Calendar/Task editor"
 #~ msgstr "Evolution Calendar/Task editor"
 
-#~ msgid "Evolution's Calendar component"
-#~ msgstr "Evolution's Calendar component"
-
-#~ msgid "Evolution's Memos component"
-#~ msgstr "Evolution's Memos component"
-
-#~ msgid "Evolution's Tasks component"
-#~ msgstr "Evolution's Tasks component"
-
 #~ msgid "Memo_s"
 #~ msgstr "Memo_s"
 
@@ -33925,9 +34792,6 @@ msgstr "Imported Certificate"
 #~ msgid "P_rint..."
 #~ msgstr "P_rint…"
 
-#~ msgid "_Forward as iCalendar"
-#~ msgstr "_Forward as iCalendar"
-
 #~ msgid "_Mark Selected Tasks as Complete"
 #~ msgstr "_Mark Selected Tasks as Complete"
 
@@ -34026,9 +34890,6 @@ msgstr "Imported Certificate"
 #~ msgid "Evolution Mail accounts configuration control"
 #~ msgstr "Evolution Mail accounts configuration control"
 
-#~ msgid "Evolution Mail component"
-#~ msgstr "Evolution Mail component"
-
 #~ msgid "Evolution Mail composer"
 #~ msgstr "Evolution Mail composer"
 
@@ -34047,12 +34908,6 @@ msgstr "Imported Certificate"
 #~ msgid "Signature(s)"
 #~ msgstr "Signature(s)"
 
-#~ msgid "_Copy to Folder"
-#~ msgstr "_Copy to Folder"
-
-#~ msgid "_Move to Folder"
-#~ msgstr "_Move to Folder"
-
 #~ msgid "Cancel _Drag"
 #~ msgstr "Cancel _Drag"
 
@@ -34101,9 +34956,6 @@ msgstr "Imported Certificate"
 #~ msgid "untitled_image.%s"
 #~ msgstr "untitled_image.%s"
 
-#~ msgid "_Reply to sender"
-#~ msgstr "_Reply to sender"
-
 #~ msgid "Open in %s..."
 #~ msgstr "Open in %s…"
 
@@ -34325,9 +35177,6 @@ msgstr "Imported Certificate"
 #~ msgid "_Move Folder Contacts To"
 #~ msgstr "_Move Folder Contacts To"
 
-#~ msgid "_Rename"
-#~ msgstr "_Rename"
-
 #~ msgid "_Save Contact as VCard..."
 #~ msgstr "_Save Contact as vCard…"
 
@@ -34388,9 +35237,6 @@ msgstr "Imported Certificate"
 #~ msgid "Hide window buttons"
 #~ msgstr "Hide window buttons"
 
-#~ msgid "Submit Bug Report"
-#~ msgstr "Submit Bug Report"
-
 #~ msgid "Toggle whether we are working offline."
 #~ msgstr "Toggle whether we are working offline."
 
@@ -34409,9 +35255,6 @@ msgstr "Imported Certificate"
 #~ msgid "_Hide Buttons"
 #~ msgstr "_Hide Buttons"
 
-#~ msgid "Save Custom View"
-#~ msgstr "Save Custom View"
-
 #~ msgid "Unknown character set: %s"
 #~ msgstr "Unknown character set: %s"
 
@@ -35243,9 +36086,6 @@ msgstr "Imported Certificate"
 #~ msgid "Orientation"
 #~ msgstr "Orientation"
 
-#~ msgid "Page Setup:"
-#~ msgstr "Page Setup:"
-
 #~ msgid "Paper source:"
 #~ msgstr "Paper source:"
 
@@ -35405,9 +36245,6 @@ msgstr "Imported Certificate"
 #~ msgid "F_ind:"
 #~ msgstr "F_ind:"
 
-#~ msgid "Find in Message"
-#~ msgstr "Find in Message"
-
 #~ msgid "None Selected"
 #~ msgstr "None Selected"
 


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