[evolution] Update British English translation

[Translations User D-L <translations src gnome org>]

commit 410c39c59687599c099f6c27c685783272a5d675
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Fri Sep 8 10:56:26 2017 +0000

    Update British English translation

 po/en_GB.po |21350 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 11739 insertions(+), 9611 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 55b11a1..851b362 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,17 +4,17 @@
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
 # Philip Withnall <philip tecnocode co uk>, 2010.
 # Chris Leonard <cjlhomeaddress gmail com>, 2012.
-# Bruce Cowan <bruce bcowan me uk>, 2009, 2010, 2011, 2012, 2013, 2016.
+# Bruce Cowan <bruce bcowan eu>, 2009, 2010, 2011, 2012, 2013, 2016, 2017.
 #
-#: ../shell/main.c:522
+#: ../src/shell/main.c:519
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-09-02 20:32+0000\n"
-"PO-Revision-Date: 2016-09-04 13:42+0200\n"
-"Last-Translator: David King <amigadave amigadave com>\n"
+"POT-Creation-Date: 2017-08-04 08:14+0000\n"
+"PO-Revision-Date: 2017-09-08 11:55+0100\n"
+"Last-Translator: Bruce Cowan <bruce bcowan eu>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
@@ -24,11 +24,3421 @@ msgstr ""
 "X-Generator: Gtranslator 2.91.7\n"
 "X-Project-Style: gnome\n"
 
-#: ../addressbook/addressbook.error.xml.h:1
+#: ../evolution.appdata.xml.in.h:1 ../data/evolution.desktop.in.in.h:1
+#: ../src/mail/e-mail-browser.c:1098
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
+#: ../src/shell/e-shell-window-private.c:240
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../evolution.appdata.xml.in.h:2 ../data/evolution.desktop.in.in.h:4
+msgid "Manage your email, contacts and schedule"
+msgstr "Manage your e-mail, contacts and schedule"
+
+#: ../evolution.appdata.xml.in.h:3
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+
+#: ../evolution.appdata.xml.in.h:4
+#| msgid ""
+#| "Evolution supports a wide range of industry standard data formats and "
+#| "network protocols for information exchange, with an emphasis on standards "
+#| "compliance and security. Evolution can also integrate smoothly with "
+#| "Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) "
+#| "extension."
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the “Exchange Web Services” (EWS) extension."
+msgstr ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the “Exchange Web Services” (EWS) extension."
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+msgid "Evolution Alarm Notify"
+msgstr "Evolution Alarm Notify"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Calendar event notifications"
+msgstr "Calendar event notifications"
+
+#: ../data/evolution.desktop.in.in.h:2 ../src/shell/e-shell-utils.c:428
+msgid "Groupware Suite"
+msgstr "Groupware Suite"
+
+#: ../data/evolution.desktop.in.in.h:3
+msgid "Evolution Mail and Calendar"
+msgstr "Evolution Mail and Calendar"
+
+#: ../data/evolution.desktop.in.in.h:5
+msgid "email;calendar;contact;addressbook;task;"
+msgstr "email;calendar;contact;addressbook;task;"
+
+#: ../data/evolution.desktop.in.in.h:6
+msgid "New Window"
+msgstr "New Window"
+
+#: ../data/evolution.desktop.in.in.h:7
+#| msgid "Compose Message"
+msgid "Compose a Message"
+msgstr "Compose a Message"
+
+#: ../data/evolution.desktop.in.in.h:8
+#: ../src/e-util/e-name-selector-dialog.c:448
+#: ../src/modules/addressbook/e-book-shell-backend.c:307
+#: ../src/modules/addressbook/e-book-shell-view.c:371
+msgid "Contacts"
+msgstr "Contacts"
+
+#: ../data/evolution.desktop.in.in.h:9
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:845
+#: ../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:197
+#: ../src/modules/calendar/e-cal-shell-view.c:582
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "Calendar"
+
+#: ../data/evolution.desktop.in.in.h:10 ../src/e-util/e-send-options.c:536
+#: ../src/mail/importers/elm-importer.c:330
+#: ../src/mail/importers/kmail-importer.c:251
+#: ../src/mail/importers/pine-importer.c:423
+#: ../src/modules/mail/e-mail-shell-view.c:1247
+#: ../src/smime/gui/certificate-manager.c:1682
+msgid "Mail"
+msgstr "Mail"
+
+#: ../data/evolution.desktop.in.in.h:11 ../src/calendar/gui/e-memo-table.c:368
+#: ../src/e-util/e-webdav-browser.c:459
+#: ../src/modules/calendar/e-cal-shell-content.c:1719
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:194
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:209
+#: ../src/modules/calendar/e-memo-shell-view.c:313
+msgid "Memos"
+msgstr "Memos"
+
+#: ../data/evolution.desktop.in.in.h:12 ../src/calendar/gui/e-task-table.c:696
+#: ../src/calendar/gui/print.c:2408
+#: ../src/calendar/importers/icalendar-importer.c:77
+#: ../src/calendar/importers/icalendar-importer.c:1114
+#: ../src/e-util/e-webdav-browser.c:460
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
+#: ../src/modules/calendar/e-cal-shell-content.c:1679
+#: ../src/modules/calendar/e-task-shell-view-actions.c:218
+#: ../src/modules/calendar/e-task-shell-view-actions.c:233
+#: ../src/modules/calendar/e-task-shell-view.c:471
+msgid "Tasks"
+msgstr "Tasks"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
+msgid "Enable address formatting"
+msgstr "Enable address formatting"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
+msgid ""
+"Whether addresses should be formatted according to standard in their "
+"destination country"
+msgstr ""
+"Whether addresses should be formatted according to standard in their "
+"destination country"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
+msgid "Autocomplete length"
+msgstr "Autocomplete length"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "Show autocompleted name with an address"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+"Whether to force showing the e-mail address with the name of the "
+"autocompleted contact in the entry."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
+msgid "URI for the folder last used in the select names dialog"
+msgstr "URI for the folder last used in the select names dialogue"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
+msgid "URI for the folder last used in the select names dialog."
+msgstr "URI for the folder last used in the select names dialogue."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
+msgid "Contact layout style"
+msgstr "Contact layout style"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
+#| msgid ""
+#| "The layout style determines where to place the preview pane in relation "
+#| "to the contact list. \"0\" (Classic View) places the preview pane below "
+#| "the contact list. \"1\" (Vertical View) places the preview pane next to "
+#| "the contact list."
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. “0” (Classic View) places the preview pane below the "
+"contact list. “1” (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. “0” (Classic View) places the preview pane below the "
+"contact list. “1” (Vertical View) places the preview pane next to the "
+"contact list."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
+msgid "Contact preview pane position (horizontal)"
+msgstr "Contact preview pane position (horizontal)"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr "Position of the contact preview pane when oriented horizontally."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
+msgid "Contact preview pane position (vertical)"
+msgstr "Contact preview pane position (vertical)"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr "Position of the contact preview pane when oriented vertically."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
+msgid "Show maps"
+msgstr "Show maps"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
+msgid "Whether to show maps in preview pane"
+msgstr "Whether to show maps in preview pane"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
+msgid "Primary address book"
+msgstr "Primary address book"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
+#| msgid ""
+#| "The UID of the selected (or \"primary\") address book in the sidebar of "
+#| "the \"Contacts\" view"
+msgid ""
+"The UID of the selected (or “primary”) address book in the sidebar of the "
+"“Contacts” view"
+msgstr ""
+"The UID of the selected (or “primary”) address book in the sidebar of the "
+"“Contacts” view"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
+msgid "Show preview pane"
+msgstr "Show preview pane"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
+msgid "Whether to show the preview pane."
+msgstr "Whether to show the preview pane."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
+msgid "true"
+msgstr "true"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
+msgid "Whether to show phone numbers in the editor"
+msgstr "Whether to show phone numbers in the editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
+msgid "Whether to show SIP addresses in the editor"
+msgstr "Whether to show SIP addresses in the editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
+msgid "Whether to show IM addresses in the editor"
+msgstr "Whether to show IM addresses in the editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
+msgid "Whether to show mailing Home addresses in the editor"
+msgstr "Whether to show mailing Home addresses in the editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
+msgid "Whether to show mailing addresses Work in the editor"
+msgstr "Whether to show mailing addresses Work in the editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
+msgid "Whether to show mailing addresses Other in the editor"
+msgstr "Whether to show mailing addresses Other in the editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
+msgid "Whether to show Web Addresses in the editor"
+msgstr "Whether to show Web Addresses in the editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
+msgid "Whether to show job information in the editor"
+msgstr "Whether to show job information in the editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
+msgid "Whether to show Miscellaneous information in the editor"
+msgstr "Whether to show Miscellaneous information in the editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
+msgid "Whether to show notes in the editor"
+msgstr "Whether to show notes in the editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:32
+msgid "Whether to show Certificates tab in the editor"
+msgstr "Whether to show Certificates tab in the editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:33
+#| msgid "Create a new contact list"
+msgid "Where to open contact locations"
+msgstr "Where to open contact locations"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:34
+msgid ""
+"Currently supported values are “openstreetmap” and “google”; if unknown set, "
+"uses “openstreetmap”"
+msgstr ""
+"Currently supported values are “openstreetmap” and “google”; if unknown set, "
+"uses “openstreetmap”"
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "Convert mail messages to Unicode"
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:3
+msgid "Full path command to run Bogofilter"
+msgstr "Full path command to run Bogofilter"
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
+msgid ""
+"Full path to a Bogofilter command. If not set, then a compile-time path is "
+"used, usually /usr/bin/bogofilter. The command should not contain any other "
+"arguments."
+msgstr ""
+"Full path to a Bogofilter command. If not set, then a compile-time path is "
+"used, usually /usr/bin/bogofilter. The command should not contain any other "
+"arguments."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
+msgid "Save directory for reminder audio"
+msgstr "Save directory for reminder audio"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
+msgid "Directory for saving reminder audio files"
+msgstr "Directory for saving reminder audio files"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
+msgid "Birthday and anniversary reminder value"
+msgstr "Birthday and anniversary reminder value"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr "Number of units for determining a birthday or anniversary reminder"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
+msgid "Birthday and anniversary reminder units"
+msgstr "Birthday and anniversary reminder units"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
+#| msgid ""
+#| "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+#| "\"days\""
+msgid ""
+"Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
+msgstr ""
+"Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
+msgid "Compress weekends in month view"
+msgstr "Compress weekends in month view"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday"
+msgstr ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
+msgid "Ask for confirmation when deleting items"
+msgstr "Ask for confirmation when deleting items"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
+msgid "Whether to ask for confirmation when deleting an appointment or task"
+msgstr "Whether to ask for confirmation when deleting an appointment or task"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
+msgid "Confirm expunge"
+msgstr "Confirm expunge"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
+msgid "Whether to ask for confirmation when expunging appointments and tasks"
+msgstr "Whether to ask for confirmation when expunging appointments and tasks"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
+msgid "Month view vertical pane position"
+msgstr "Month view vertical pane position"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar"
+msgstr ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
+msgid "Workday end hour"
+msgstr "Workday end hour"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+msgstr "Hour the workday ends on, in twenty four hour format, 0 to 23"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
+msgid "Workday end minute"
+msgstr "Workday end minute"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "Minute the workday ends on, 0 to 59."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
+msgid "Workday start hour"
+msgstr "Workday start hour"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr "Hour the workday starts on, in twenty four hour format, 0 to 23."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
+msgid "Workday start minute"
+msgstr "Workday start minute"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "Minute the workday starts on, 0 to 59."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
+msgid "Workday start time for Monday"
+msgstr "Workday start time for Monday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+msgid ""
+"Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, "
+"or -1 to use day-start-hour and day-start-minute"
+msgstr ""
+"Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, "
+"or -1 to use day-start-hour and day-start-minute"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+msgid "Workday end time for Monday"
+msgstr "Workday end time for Monday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-end-hour and day-end-minute"
+msgstr ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-end-hour and day-end-minute"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+msgid "Workday start time for Tuesday"
+msgstr "Workday start time for Tuesday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-start-hour and day-start-minute"
+msgstr ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-start-hour and day-start-minute"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+msgid "Workday end time for Tuesday"
+msgstr "Workday end time for Tuesday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+msgid "Workday start time for Wednesday"
+msgstr "Workday start time for Wednesday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+msgid "Workday end time for Wednesday"
+msgstr "Workday end time for Wednesday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+msgid "Workday start time for Thursday"
+msgstr "Workday start time for Thursday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+msgid "Workday end time for Thursday"
+msgstr "Workday end time for Thursday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+msgid "Workday start time for Friday"
+msgstr "Workday start time for Friday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+msgid "Workday end time for Friday"
+msgstr "Workday end time for Friday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+msgid "Workday start time for Saturday"
+msgstr "Workday start time for Saturday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+msgid "Workday end time for Saturday"
+msgstr "Workday end time for Saturday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+msgid "Workday start time for Sunday"
+msgstr "Workday start time for Sunday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+msgid "Workday end time for Sunday"
+msgstr "Workday end time for Sunday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
+msgid "The second timezone for a Day View"
+msgstr "The second timezone for a Day View"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
+#| msgid ""
+#| "Shows the second time zone in a Day View, if set. Value is similar to one "
+#| "used in a 'timezone' key"
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a “timezone” key"
+msgstr ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a “timezone” key"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
+msgid "Recently used second time zones in a Day View"
+msgstr "Recently used second time zones in a Day View"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
+msgid "List of recently used second time zones in a Day View"
+msgstr "List of recently used second time zones in a Day View"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
+msgid "Maximum number of recently used timezones to remember"
+msgstr "Maximum number of recently used timezones to remember"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
+#| msgid ""
+#| "Maximum number of recently used timezones to remember in a 'day-second-"
+#| "zones' list"
+msgid ""
+"Maximum number of recently used timezones to remember in a “day-second-"
+"zones” list"
+msgstr ""
+"Maximum number of recently used timezones to remember in a “day-second-"
+"zones” list"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
+msgid "Default reminder value"
+msgstr "Default reminder value"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
+msgid "Number of units for determining a default reminder"
+msgstr "Number of units for determining a default reminder"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
+msgid "Default reminder units"
+msgstr "Default reminder units"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
+#| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
+msgid "Units for a default reminder, “minutes”, “hours” or “days”"
+msgstr "Units for a default reminder, “minutes”, “hours” or “days”"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+msgid "Default reminder snooze interval, in minutes"
+msgstr "Default reminder snooze interval, in minutes"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+msgid ""
+"Default reminder snooze interval, in minutes, to be filled in the reminder "
+"notification dialog"
+msgstr ""
+"Default reminder snooze interval, in minutes, to be filled in the reminder "
+"notification dialogue"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "Show categories field in the event/meeting/task editor"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "Whether to show categories field in the event/meeting editor"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "Show Role field in the event/task/meeting editor"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "Whether to show role field in the event/task/meeting editor"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "Show RSVP field in the event/task/meeting editor"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "Whether to show RSVP field in the event/task/meeting editor"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+msgid "Show status field in the event/task/meeting editor"
+msgstr "Show status field in the event/task/meeting editor"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr "Whether to show status field in the event/task/meeting editor"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+msgid "Show timezone field in the event/meeting editor"
+msgstr "Show timezone field in the event/meeting editor"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "Whether to show timezone field in the event/meeting editor"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+msgid "Show type field in the event/task/meeting editor"
+msgstr "Show type field in the event/task/meeting editor"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "Whether to show type field in the event/task/meeting editor"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+msgid "Hide completed tasks"
+msgstr "Hide completed tasks"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+msgid "Whether to hide completed tasks in the tasks view"
+msgstr "Whether to hide completed tasks in the tasks view"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+msgid "Hide task units"
+msgstr "Hide task units"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#| msgid ""
+#| "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days"
+#| "\""
+msgid "Units for determining when to hide tasks, “minutes”, “hours” or “days”"
+msgstr "Units for determining when to hide tasks, “minutes”, “hours” or “days”"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+msgid "Hide task value"
+msgstr "Hide task value"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+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:70
+msgid "Horizontal pane position"
+msgstr "Horizontal pane position"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels"
+msgstr ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+msgid "Last reminder time"
+msgstr "Last reminder time"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+msgid "Time the last reminder ran, in time_t"
+msgstr "Time the last reminder ran, in time_t"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+#| msgctxt "iCalImp"
+#| msgid "has reminders"
+msgid "Allow past reminders"
+msgstr "Allow past reminders"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+msgid ""
+"Whether can show reminders for events/tasks/memos which already happened"
+msgstr ""
+"Whether can show reminders for events/tasks/memos which already happened"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+#| msgid "Marcus Bains Line Color - Day View"
+msgid "Marcus Bains Line Color — Day View"
+msgstr "Marcus Bains Line Colour — Day View"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+msgid "Color to draw the Marcus Bains line in the Day View"
+msgstr "Colour to draw the Marcus Bains line in the Day View"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#| msgid "Marcus Bains Line Color - Time bar"
+msgid "Marcus Bains Line Color — Time bar"
+msgstr "Marcus Bains Line Colour — Time bar"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
+msgstr ""
+"Colour to draw the Marcus Bains Line in the Time bar (empty for default)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+msgid "Marcus Bains Line"
+msgstr "Marcus Bains Line"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
+msgstr ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+msgid "Memo preview pane position (horizontal)"
+msgstr "Memo preview pane position (horizontal)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+msgid "Position of the task preview pane when oriented horizontally"
+msgstr "Position of the task preview pane when oriented horizontally"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
+msgid "Memo layout style"
+msgstr "Memo layout style"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#| msgid ""
+#| "The layout style determines where to place the preview pane in relation "
+#| "to the memo list. \"0\" (Classic View) places the preview pane below the "
+#| "memo list. \"1\" (Vertical View) places the preview pane next to the memo "
+#| "list"
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. “0” (Classic View) places the preview pane below the memo "
+"list. “1” (Vertical View) places the preview pane next to the memo list"
+msgstr ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. “0” (Classic View) places the preview pane below the memo "
+"list. “1” (Vertical View) places the preview pane next to the memo list"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+msgid "Memo preview pane position (vertical)"
+msgstr "Memo preview pane position (vertical)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+msgid "Position of the memo preview pane when oriented vertically"
+msgstr "Position of the memo preview pane when oriented vertically"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+msgid "Month view horizontal pane position"
+msgstr "Month view horizontal pane position"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels"
+msgstr ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+msgid "Scroll Month View by a week, not by a month"
+msgstr "Scroll Month View by a week, not by a month"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+msgid "Whether to scroll a Month View by a week, not by a month"
+msgstr "Whether to scroll a Month View by a week, not by a month"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+msgid "Reminder programs"
+msgstr "Reminder programs"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+msgid "Programs that are allowed to be run by reminders"
+msgstr "Programs that are allowed to be run by reminders"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+msgid "Show display reminders in notification tray"
+msgstr "Show display reminders in notification tray"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+msgid "Whether or not to use the notification tray for display reminders"
+msgstr "Whether or not to use the notification tray for display reminders"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#| msgid "Sh_ow reminder notifications"
+msgid "Show reminder notification dialog always on top"
+msgstr "Show reminder notification dialogue always on top"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+msgid ""
+"Whether or not to show reminder notification dialog always on top. Note this "
+"works only as a hint for the window manager, which may or may not obey it."
+msgstr ""
+"Whether or not to show reminder notification dialogue always on top. Note "
+"this works only as a hint for the window manager, which may or may not obey "
+"it."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+msgid "Preferred New button item"
+msgstr "Preferred New button item"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+msgid "Name of the preferred New toolbar button item"
+msgstr "Name of the preferred New toolbar button item"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+msgid "Primary calendar"
+msgstr "Primary calendar"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#| msgid ""
+#| "The UID of the selected (or \"primary\") calendar in the sidebar of the "
+#| "\"Calendar\" view"
+msgid ""
+"The UID of the selected (or “primary”) calendar in the sidebar of the "
+"“Calendar” view"
+msgstr ""
+"The UID of the selected (or “primary”) calendar in the sidebar of the "
+"“Calendar” view"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+msgid "Primary memo list"
+msgstr "Primary memo list"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#| msgid ""
+#| "The UID of the selected (or \"primary\") memo list in the sidebar of the "
+#| "\"Memos\" view"
+msgid ""
+"The UID of the selected (or “primary”) memo list in the sidebar of the "
+"“Memos” view"
+msgstr ""
+"The UID of the selected (or “primary”) memo list in the sidebar of the "
+"“Memos” view"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+msgid "Primary task list"
+msgstr "Primary task list"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#| msgid ""
+#| "The UID of the selected (or \"primary\") task list in the sidebar of the "
+#| "\"Tasks\" view"
+msgid ""
+"The UID of the selected (or “primary”) task list in the sidebar of the "
+"“Tasks” view"
+msgstr ""
+"The UID of the selected (or “primary”) task list in the sidebar of the "
+"“Tasks” view"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+msgid "Free/busy template URL"
+msgstr "Free/busy template URL"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain"
+msgstr ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+msgid "Recurrent Events in Italic"
+msgstr "Recurrent Events in Italic"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+msgid "Show days with recurrent events in italic font in bottom left calendar"
+msgstr "Show days with recurrent events in italic font in bottom left calendar"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+msgid "Search range for time-based searching in years"
+msgstr "Search range for time-based searching in years"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+msgid ""
+"How many years can the time-based search go forward or backward from "
+"currently selected day when searching for another occurrence; default is ten "
+"years"
+msgstr ""
+"How many years can the time-based search go forward or backward from "
+"currently selected day when searching for another occurrence; default is ten "
+"years"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+msgid "Show appointment end times in week and month views"
+msgstr "Show appointment end times in week and month views"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+msgid "Whether to display the end time of events in the week and month views"
+msgstr "Whether to display the end time of events in the week and month views"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+msgid "Show appointment icons in the month view"
+msgstr "Show appointment icons in the month view"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+msgid "Whether to show icons of events in the month view"
+msgstr "Whether to show icons of events in the month view"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+msgid "Show the memo preview pane"
+msgstr "Show the memo preview pane"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#| msgid "If \"true\", show the memo preview pane in the main window"
+msgid "If “true”, show the memo preview pane in the main window"
+msgstr "If “true”, show the memo preview pane in the main window"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+msgid "Show the task preview pane"
+msgstr "Show the task preview pane"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#| msgid "If \"true\", show the task preview pane in the main window"
+msgid "If “true”, show the task preview pane in the main window"
+msgstr "If “true”, show the task preview pane in the main window"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "Show week numbers in Day View, Work Week View, and Date Navigator"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+msgid "Whether to show week numbers in various places in the Calendar"
+msgstr "Whether to show week numbers in various places in the Calendar"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+msgid "Vertical position for the tag pane"
+msgstr "Vertical position for the tag pane"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+msgid "Highlight tasks due today"
+msgstr "Highlight tasks due today"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+msgid ""
+"Whether highlight tasks due today with a special color (task-due-today-color)"
+msgstr ""
+"Whether highlight tasks due today with a special colour (task-due-today-"
+"color)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+msgid "Tasks due today color"
+msgstr "Tasks due today colour"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#| msgid ""
+#| "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
+#| "together with task-due-today-highlight"
+msgid ""
+"Background color of tasks that are due today, in “#rrggbb” format. Used "
+"together with task-due-today-highlight"
+msgstr ""
+"Background colour of tasks that are due today, in “#rrggbb” format. Used "
+"together with task-due-today-highlight"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+msgid "Task preview pane position (horizontal)"
+msgstr "Task preview pane position (horizontal)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+msgid "Task layout style"
+msgstr "Task layout style"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#| msgid ""
+#| "The layout style determines where to place the preview pane in relation "
+#| "to the task list. \"0\" (Classic View) places the preview pane below the "
+#| "task list. \"1\" (Vertical View) places the preview pane next to the task "
+#| "list"
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. “0” (Classic View) places the preview pane below the task "
+"list. “1” (Vertical View) places the preview pane next to the task list"
+msgstr ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. “0” (Classic View) places the preview pane below the task "
+"list. “1” (Vertical View) places the preview pane next to the task list"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+msgid "Task preview pane position (vertical)"
+msgstr "Task preview pane position (vertical)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+msgid "Position of the task preview pane when oriented vertically"
+msgstr "Position of the task preview pane when oriented vertically"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+msgid "Show reminders for completed tasks"
+msgstr "Show reminders for completed tasks"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+msgid ""
+"Whether to show reminders for completed tasks. When set to false, reminders "
+"for completed tasks are suppressed."
+msgstr ""
+"Whether to show reminders for completed tasks. When set to false, reminders "
+"for completed tasks are suppressed."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+msgid "Highlight overdue tasks"
+msgstr "Highlight overdue tasks"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+msgid ""
+"Whether highlight overdue tasks with a special color (task-overdue-color)"
+msgstr ""
+"Whether highlight overdue tasks with a special colour (task-overdue-color)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
+msgid "Overdue tasks color"
+msgstr "Overdue tasks colour"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
+#| msgid ""
+#| "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
+#| "together with task-overdue-highlight."
+msgid ""
+"Background color of tasks that are overdue, in “#rrggbb” format. Used "
+"together with task-overdue-highlight."
+msgstr ""
+"Background colour of tasks that are overdue, in “#rrggbb” format. Used "
+"together with task-overdue-highlight."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+msgid "Time divisions"
+msgstr "Time divisions"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+msgid "Intervals shown in Day and Work Week views, in minutes"
+msgstr "Intervals shown in Day and Work Week views, in minutes"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+msgid "Timezone"
+msgstr "Timezone"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#| msgid ""
+#| "The default timezone to use for dates and times in the calendar, as an "
+#| "untranslated Olson timezone database location like \"America/New York\""
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olson timezone database location like “America/New York”"
+msgstr ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olson timezone database location like “America/New York”"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
+msgid "Twenty four hour time format"
+msgstr "Twenty four hour time format"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
+msgid "Whether to show times in twenty four hour format instead of using am/pm"
+msgstr ""
+"Whether to show times in twenty four hour format instead of using am/pm"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
+msgid "Birthday and anniversary reminder"
+msgstr "Birthday and anniversary reminder"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr "Whether to set a reminder for birthdays and anniversaries"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+msgid "Default appointment reminder"
+msgstr "Default appointment reminder"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+msgid "Whether to set a default reminder for appointments"
+msgstr "Whether to set a default reminder for appointments"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+msgid "Use system timezone"
+msgstr "Use system timezone"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+msgid "Use the system timezone instead of the timezone selected in Evolution"
+msgstr "Use the system timezone instead of the timezone selected in Evolution"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+msgid "First day of the week"
+msgstr "First day of the week"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
+msgid "Monday is a work day"
+msgstr "Monday is a work day"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+msgid "Tuesday is a work day"
+msgstr "Tuesday is a work day"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
+msgid "Wednesday is a work day"
+msgstr "Wednesday is a work day"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+msgid "Thursday is a work day"
+msgstr "Thursday is a work day"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+msgid "Friday is a work day"
+msgstr "Friday is a work day"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
+msgid "Saturday is a work day"
+msgstr "Saturday is a work day"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
+msgid "Sunday is a work day"
+msgstr "Sunday is a work day"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
+msgid "Create events, memos and tasks as Private by default"
+msgstr "Create events, memos and tasks as Private by default"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
+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:161
+#| msgid ""
+#| "This key was deprecated in version 3.10 and should no longer be used. Use "
+#| "\"week-start-day-name\" instead."
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"“week-start-day-name” instead."
+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:162
+msgid "(Deprecated) Work days"
+msgstr "(Deprecated) Work days"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:163
+#| 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-day-monday\", \"work-day-tuesday\", etc. keys instead.)"
+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-"
+"day-monday”, “work-day-tuesday”, etc. keys instead.)"
+msgstr ""
+"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-"
+"day-monday”, “work-day-tuesday”, etc. keys instead.)"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:1
+msgid "Previous Evolution version"
+msgstr "Previous Evolution version"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:2
+#| msgid ""
+#| "The most recently used version of Evolution, expressed as \"major.minor."
+#| "micro\". This is used for data and settings migration from older to newer "
+#| "versions."
+msgid ""
+"The most recently used version of Evolution, expressed as “major.minor."
+"micro”. This is used for data and settings migration from older to newer "
+"versions."
+msgstr ""
+"The most recently used version of Evolution, expressed as “major.minor."
+"micro”. This is used for data and settings migration from older to newer "
+"versions."
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:3
+msgid "List of disabled plugins"
+msgstr "List of disabled plugins"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:4
+msgid "The list of disabled plugins in Evolution"
+msgstr "The list of disabled plugins in Evolution"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:5
+#| msgid "The window's X coordinate"
+msgid "The window’s X coordinate"
+msgstr "The window’s X coordinate"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:6
+#| msgid "The window's Y coordinate"
+msgid "The window’s Y coordinate"
+msgstr "The window’s Y coordinate"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:7
+#| msgid "The window's width in pixels"
+msgid "The window’s width in pixels"
+msgstr "The window’s width in pixels"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:8
+#| msgid "The window's height in pixels"
+msgid "The window’s height in pixels"
+msgstr "The window’s height in pixels"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:9
+msgid "Whether the window is maximized"
+msgstr "Whether the window is maximised"
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
+#| msgid "Gnome Calendar's calendar import done"
+msgid "GNOME Calendar’s calendar import done"
+msgstr "GNOME Calendar’s calendar import done"
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
+#| msgid "Whether calendar from Gnome Calendar has been imported or not"
+msgid "Whether calendar from GNOME Calendar has been imported or not"
+msgstr "Whether calendar from GNOME Calendar has been imported or not"
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
+#| msgid "Gnome Calendar's tasks import done"
+msgid "GNOME Calendar’s tasks import done"
+msgstr "GNOME Calendar’s tasks import done"
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
+#| msgid "Whether tasks from Gnome Calendar have been imported or not"
+msgid "Whether tasks from GNOME Calendar have been imported or not"
+msgstr "Whether tasks from GNOME Calendar have been imported or not"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Check whether Evolution is the default mailer"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "Every time Evolution starts, check whether it is the default mailer."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
+msgid "Default charset in which to compose messages"
+msgstr "Default charset in which to compose messages"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
+msgid "Default charset in which to compose messages. Uses UTF-8, if not set."
+msgstr "Default charset in which to compose messages. Uses UTF-8, if not set."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
+msgid "Name of the editor to prefer in the message composer"
+msgstr "Name of the editor to prefer in the message composer"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
+#| msgid ""
+#| "If the name doesn't correspond to any known editor, then the built-in "
+#| "WebKit editor is used."
+msgid ""
+"If the name doesn’t correspond to any known editor, then the built-in WebKit "
+"editor is used."
+msgstr ""
+"If the name doesn’t correspond to any known editor, then the built-in WebKit "
+"editor is used."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
+msgid "Path where picture gallery should search for its content"
+msgstr "Path where picture gallery should search for its content"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
+#| msgid ""
+#| "This value can be an empty string, which means it'll use the system "
+#| "Picture folder, usually set to ~/Pictures. This folder will be also used "
+#| "when the set path is not pointing to the existent folder"
+msgid ""
+"This value can be an empty string, which means it’ll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder"
+msgstr ""
+"This value can be an empty string, which means it’ll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
+msgid "Spell check inline"
+msgstr "Spell check inline"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
+msgid "Draw spelling error indicators on words as you type."
+msgstr "Draw spelling error indicators on words as you type."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
+msgid "Automatic link recognition"
+msgstr "Automatic link recognition"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
+msgid "Recognize links in text and replace them."
+msgstr "Recognise links in text and replace them."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+msgid "Automatic emoticon recognition"
+msgstr "Automatic emoticon recognition"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+msgid ""
+"Recognize emoticons in text and replace them with images or Unicode "
+"characters."
+msgstr ""
+"Recognise emoticons in text and replace them with images or Unicode "
+"characters."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+msgid "Unicode emoticons"
+msgstr "Unicode emoticons"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+msgid "Use Unicode characters for emoticons."
+msgstr "Use Unicode characters for emoticons."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+msgid "Attribute message"
+msgstr "Attribute message"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author"
+msgstr ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+msgid "Forward message"
+msgstr "Forward message"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows"
+msgstr ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+msgid "Original message"
+msgstr "Original message"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows"
+msgstr ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
+msgid "Group Reply replies to list"
+msgstr "Group Reply replies to list"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+#| msgid ""
+#| "Instead of the normal \"Reply to All\" behaviour, this option will make "
+#| "the 'Group Reply' toolbar button try to reply only to the mailing list "
+#| "through which you happened to receive the copy of the message to which "
+#| "you're replying."
+msgid ""
+"Instead of the normal “Reply to All” behaviour, this option will make the "
+"“Group Reply” toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you’re "
+"replying."
+msgstr ""
+"Instead of the normal “Reply to All” behaviour, this option will make the "
+"“Group Reply” toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you’re "
+"replying."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+msgid "Put the cursor at the bottom of replies"
+msgstr "Put the cursor at the bottom of replies"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+msgstr ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
+msgid "Always request read receipt"
+msgstr "Always request read receipt"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr "Whether a read receipt request gets added to every message by default."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
+msgid "Send HTML mail by default"
+msgstr "Send HTML mail by default"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+msgid "Send HTML mail by default."
+msgstr "Send HTML mail by default."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
+msgid "Spell checking languages"
+msgstr "Spell checking languages"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+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 "Show \"Bcc\" field when sending a mail message"
+msgid "Show “Bcc” field when sending a mail message"
+msgstr "Show “Bcc” field when sending a mail message"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#| msgid ""
+#| "Show the \"Bcc\" field when sending a mail message. This is controlled "
+#| "from the View menu when a mail account is chosen."
+msgid ""
+"Show the “Bcc” field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Show the “Bcc” field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#| msgid "Show \"Cc\" field when sending a mail message"
+msgid "Show “Cc” field when sending a mail message"
+msgstr "Show “Cc” field when sending a mail message"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#| msgid ""
+#| "Show the \"Cc\" field when sending a mail message. This is controlled "
+#| "from the View menu when a mail account is chosen."
+msgid ""
+"Show the “Cc” field when sending a mail message. This is controlled from the "
+"View menu when a mail account is chosen."
+msgstr ""
+"Show the “Cc” field when sending a mail message. This is controlled from the "
+"View menu when a mail account is chosen."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#| msgid "Show \"From\" override field when sending a mail message"
+msgid "Show “From” override field when sending a mail message"
+msgstr "Show “From” override field when sending a mail message"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#| msgid ""
+#| "Show the \"From\" override field when sending a mail message. This is "
+#| "controlled from the View menu when a mail account is chosen."
+msgid ""
+"Show the “From” override field when sending a mail message. This is "
+"controlled from the View menu when a mail account is chosen."
+msgstr ""
+"Show the “From” override field when sending a mail message. This is "
+"controlled from the View menu when a mail account is chosen."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#| msgid "Show \"Reply To\" field when sending a mail message"
+msgid "Show “Reply To” field when sending a mail message"
+msgstr "Show “Reply To” field when sending a mail message"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#| msgid ""
+#| "Show the \"Reply To\" field when sending a mail message. This is "
+#| "controlled from the View menu when a mail account is chosen."
+msgid ""
+"Show the “Reply To” field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+"Show the “Reply To” field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#| msgid "Show \"From\" field when posting to a newsgroup"
+msgid "Show “From” field when posting to a newsgroup"
+msgstr "Show “From” field when posting to a newsgroup"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#| msgid ""
+#| "Show the \"From\" field when posting to a newsgroup. This is controlled "
+#| "from the View menu when a news account is chosen."
+msgid ""
+"Show the “From” field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+"Show the “From” field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#| msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgid "Show “Reply To” field when posting to a newsgroup"
+msgstr "Show “Reply To” field when posting to a newsgroup"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#| msgid ""
+#| "Show the \"Reply To\" field when posting to a newsgroup. This is "
+#| "controlled from the View menu when a news account is chosen."
+msgid ""
+"Show the “Reply To” field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+"Show the “Reply To” field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+msgid "Digitally sign replies when the original message is signed"
+msgstr "Digitally sign replies when the original message is signed"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+msgid ""
+"Automatically enable PGP or S/MIME signatures when replying to a message "
+"which is also PGP or S/MIME signed."
+msgstr ""
+"Automatically enable PGP or S/MIME signatures when replying to a message "
+"which is also PGP or S/MIME signed."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+msgid "Encode filenames in an Outlook/GMail way"
+msgstr "Encode filenames in an Outlook/GMail way"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+msgid ""
+"Encode filenames in the mail headers same as Outlook or GMail do, to let "
+"them display correctly filenames with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
+msgstr ""
+"Encode filenames in the mail headers same as Outlook or GMail do, to let "
+"them display correctly filenames with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+msgid "Send messages through Outbox folder"
+msgstr "Send messages through Outbox folder"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+msgid ""
+"Always save messages to Outbox folder when sending, to let a user choose "
+"when the messages should be sent."
+msgstr ""
+"Always save messages to Outbox folder when sending, to let a user choose "
+"when the messages should be sent."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+msgid "Include signature in new messages only"
+msgstr "Include signature in new messages only"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+msgid ""
+"Include selected signature only for new messages, but have no signature "
+"added for Replies or Forwards."
+msgstr ""
+"Include selected signature only for new messages, but have no signature "
+"added for Replies or Forwards."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+msgid "Put personalized signatures at the top of replies"
+msgstr "Put personalised signatures at the top of replies"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+msgstr ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+msgid "Do not add signature delimiter"
+msgstr "Do not add signature delimiter"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+msgid "Ignore list Reply-To:"
+msgstr "Ignore list Reply-To:"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#| msgid ""
+#| "Some mailing lists set a Reply-To: header to trick users into sending "
+#| "replies to the list, even when they ask Evolution to make a private "
+#| "reply. Setting this option to TRUE will attempt to ignore such Reply-To: "
+#| "headers, so that Evolution will do as you ask it. If you use the private "
+#| "reply action, it will reply privately, while if you use the 'Reply to "
+#| "List' action it will do that. It works by comparing the Reply-To: header "
+#| "with a List-Post: header, if there is one."
+msgid ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the “Reply to List” action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the “Reply to List” action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#| msgid "List of localized 'Re'"
+msgid "List of localized “Re”"
+msgstr "List of localized “Re”"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#| msgid ""
+#| "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
+#| "text when replying to a message, as an addition to the standard \"Re\" "
+#| "prefix. An example is 'SV,AV'."
+msgid ""
+"Comma-separated list of localized “Re” abbreviations to skip in a subject "
+"text when replying to a message, as an addition to the standard “Re” prefix. "
+"An example is “SV,AV”."
+msgstr ""
+"Comma-separated list of localized “Re” abbreviations to skip in a subject "
+"text when replying to a message, as an addition to the standard “Re” prefix. "
+"An example is “SV,AV”."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#| msgid "List of localized 'Re'"
+msgid "List of localized “Re” separators"
+msgstr "List of localised “Re” separators"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#| msgid ""
+#| "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
+#| "text when replying to a message, as an addition to the standard \"Re\" "
+#| "prefix. An example is 'SV,AV'."
+msgid ""
+"A list of localized “Re” separators, used to skip in a subject text when "
+"replying to a message, as an addition to the standard “:” and the Unicode "
+"“︰” separators."
+msgstr ""
+"A list of localised “Re” separators, used to skip in a subject text when "
+"replying to a message, as an addition to the standard “:” and the Unicode "
+"“︰” separators."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+msgid "Number of characters for wrapping"
+msgstr "Number of characters for wrapping"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+msgid "Will autowrap lines after given number of characters."
+msgstr "Will autowrap lines after given number of characters."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#| msgid ""
+#| "Number of To and CC recipients to ask 'prompt-on-many-to-cc-recips' from"
+msgid ""
+"Number of To and CC recipients to ask “prompt-on-many-to-cc-recips” from"
+msgstr ""
+"Number of To and CC recipients to ask “prompt-on-many-to-cc-recips” from"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+msgid ""
+"When to ask, when the number of To and CC recipients reaches this value."
+msgstr ""
+"When to ask, when the number of To and CC recipients reaches this value."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
+msgstr "Whether to always show Sign and Encrypt buttons on the toolbar"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#| msgid ""
+#| "If set to 'true', the Sign and Encrypt buttons for either PGP or S/MIME "
+#| "are always shown in the composer's toolbar. Otherwise they are shown only "
+#| "when being used."
+msgid ""
+"If set to “true”, the Sign and Encrypt buttons for either PGP or S/MIME are "
+"always shown in the composer’s toolbar. Otherwise they are shown only when "
+"being used."
+msgstr ""
+"If set to “true”, the Sign and Encrypt buttons for either PGP or S/MIME are "
+"always shown in the composer’s toolbar. Otherwise they are shown only when "
+"being used."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+msgid "Wrap quoted text in replies"
+msgstr "Wrap quoted text in replies"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#| msgid "If set to 'true' quoted text in replies will be wrapped."
+msgid "If set to “true” quoted text in replies will be wrapped."
+msgstr "If set to “true” quoted text in replies will be wrapped."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+msgid "Whether to obey Content-Disposition:inline message header hint"
+msgstr "Whether to obey Content-Disposition:inline message header hint"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#| msgid ""
+#| "Set to 'false' to block automatic display of attachments with Content-"
+#| "Disposition: inline."
+msgid ""
+"Set to “false” to block automatic display of attachments with Content-"
+"Disposition: inline."
+msgstr ""
+"Set to “false” to block automatic display of attachments with Content-"
+"Disposition: inline."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+msgid "Save file format for drag-and-drop operation"
+msgstr "Save file format for drag-and-drop operation"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#| msgid "Can be either 'mbox' or 'pdf'."
+msgid "Can be either “mbox” or “pdf”."
+msgstr "Can be either “mbox” or “pdf”."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+msgid "Show image animations"
+msgstr "Show image animations"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+msgid "Enable or disable type ahead search feature"
+msgstr "Enable or disable type ahead search feature"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+msgstr ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+msgid "Enable or disable magic space bar"
+msgstr "Enable or disable magic space bar"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr "Enable use of a similar message list view settings for all folders"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr "Enable use of a similar message list view settings for all folders."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#| msgid "Mark citations in the message \"Preview\""
+msgid "Mark citations in the message “Preview”"
+msgstr "Mark citations in the message “Preview”"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#| msgid "Mark citations in the message \"Preview\"."
+msgid "Mark citations in the message “Preview”."
+msgstr "Mark citations in the message “Preview”."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+msgid "Citation highlight color"
+msgstr "Citation highlight colour"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+msgid "Citation highlight color."
+msgstr "Citation highlight colour."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+msgid "Enable/disable caret mode"
+msgstr "Enable/disable caret mode"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr "Enable caret mode, so that you can see a cursor when reading mail."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+msgid "Default charset in which to display messages"
+msgstr "Default charset in which to display messages"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+msgid "Default charset in which to display messages."
+msgstr "Default charset in which to display messages."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+msgid "Automatically load images for HTML messages over HTTP"
+msgstr "Automatically load images for HTML messages over HTTP"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+msgid "Show notification about missing remote content"
+msgstr "Show notification about missing remote content"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+msgid ""
+"When the message preview shows a message which requires to download remote "
+"content, while the download is not allowed for the user or the site, then "
+"show a notification about it on top of the preview panel."
+msgstr ""
+"When the message preview shows a message which requires to download remote "
+"content, while the download is not allowed for the user or the site, then "
+"show a notification about it on top of the preview panel."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+msgid "Show Animations"
+msgstr "Show Animations"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+msgid "Show animated images as animations."
+msgstr "Show animated images as animations."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+msgid "Show all message headers"
+msgstr "Show all message headers"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+msgid "Show all the headers when viewing a messages."
+msgstr "Show all the headers when viewing a messages."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+msgid "List of headers to show when viewing a message."
+msgstr "List of headers to show when viewing a message."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+msgid ""
+"Each header is represented as a pair: the header name, and a boolean "
+"indicating whether the header is enabled. Disabled headers are not shown "
+"when viewing a message, but are still listed in Preferences."
+msgstr ""
+"Each header is represented as a pair: the header name, and a boolean "
+"indicating whether the header is enabled. Disabled headers are not shown "
+"when viewing a message, but are still listed in Preferences."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+msgid "Show photo of the sender"
+msgstr "Show photo of the sender"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+msgid "Show the photo of the sender in the message reading pane."
+msgstr "Show the photo of the sender in the message reading pane."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+msgid "Search gravatar.com for photo of the sender"
+msgstr "Search gravatar.com for photo of the sender"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+msgid "Allow searching also at gravatar.com for photo of the sender."
+msgstr "Allow searching also at gravatar.com for photo of the sender."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+msgid "Mark as Seen after specified timeout"
+msgstr "Mark as Seen after specified timeout"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+msgid "Mark as Seen after specified timeout."
+msgstr "Mark as Seen after specified timeout."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+msgid "Mark as Seen always after specified timeout"
+msgstr "Mark as Seen always after specified timeout"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+msgid ""
+"If set to true, the selected message will be set as unread after the timeout "
+"also after the folder change."
+msgstr ""
+"If set to true, the selected message will be set as unread after the timeout "
+"also after the folder change."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+msgid "Timeout for marking messages as seen"
+msgstr "Timeout for marking messages as seen"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+msgid "Timeout in milliseconds for marking messages as seen."
+msgstr "Timeout in milliseconds for marking messages as seen."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+msgid "Show Attachment Bar"
+msgstr "Show Attachment Bar"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+msgid ""
+"Show Attachment Bar below the message preview pane when the message has "
+"attachments."
+msgstr ""
+"Show Attachment Bar below the message preview pane when the message has "
+"attachments."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+msgid "Sender email-address column in the message list"
+msgstr "Sender e-mail address column in the message list"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr ""
+"Show the e-mail address of the sender in a separate column in the message "
+"list."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+msgid "Show deleted messages in the message-list"
+msgstr "Show deleted messages in the message-list"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr "Show deleted messages (with a strike-through) in the message-list."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+msgid "Show junk messages in the message-list"
+msgstr "Show junk messages in the message-list"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+msgid "Show junk messages (with a red strike-through) in the message-list."
+msgstr "Show junk messages (with a red strike-through) in the message-list."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+msgid "Enable Unmatched search folder"
+msgstr "Enable Unmatched search folder"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+msgid ""
+"Enable Unmatched search folder within Search Folders. It does nothing if "
+"Search Folders are disabled."
+msgstr ""
+"Enable Unmatched search folder within Search Folders. It does nothing if "
+"Search Folders are disabled."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "Hides the per-folder preview and removes the selection"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#| msgid ""
+#| "This key is read only once and reset to \"false\" after read. This "
+#| "unselects the mail in the list and removes the preview for that folder."
+msgid ""
+"This key is read only once and reset to “false” after read. This unselects "
+"the mail in the list and removes the preview for that folder."
+msgstr ""
+"This key is read only once and reset to “false” after read. This unselects "
+"the mail in the list and removes the preview for that folder."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+msgid "Height of the message-list pane"
+msgstr "Height of the message-list pane"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+msgid "Height of the message-list pane."
+msgstr "Height of the message-list pane."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+msgid "Whether message headers are collapsed in the user interface"
+msgstr "Whether message headers are collapsed in the user interface"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+msgid "Width of the message-list pane"
+msgstr "Width of the message-list pane"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+msgid "Width of the message-list pane."
+msgstr "Width of the message-list pane."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+msgid "Layout style"
+msgstr "Layout style"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#| msgid ""
+#| "The layout style determines where to place the preview pane in relation "
+#| "to the message list. \"0\" (Classic View) places the preview pane below "
+#| "the message list. \"1\" (Vertical View) places the preview pane next to "
+#| "the message list."
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. “0” (Classic View) places the preview pane below the "
+"message list. “1” (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. “0” (Classic View) places the preview pane below the "
+"message list. “1” (Vertical View) places the preview pane next to the "
+"message list."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+msgid "Variable width font"
+msgstr "Variable width font"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+msgid "The variable width font for mail display."
+msgstr "The variable width font for mail display."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+msgid "Terminal font"
+msgstr "Terminal font"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+msgid "The terminal font for mail display."
+msgstr "The terminal font for mail display."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+msgid "Use custom fonts"
+msgstr "Use custom fonts"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+msgid "Use custom fonts for displaying mail."
+msgstr "Use custom fonts for displaying mail."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr "Compress display of addresses in To/Cc/Bcc"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+"Compress display of addresses in To/Cc/Bcc to the number specified in "
+"address_count."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr "Number of addresses to display in To/Cc/Bcc"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#| msgid ""
+#| "This sets the number of addresses to show in default message list view, "
+#| "beyond which a '...' is shown."
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a “...” is shown."
+msgstr ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a “...” is shown."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+msgid "Thread the message-list based on Subject"
+msgstr "Thread the message-list based on Subject"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+"Whether to fall back on threading by subjects when the messages do not "
+"contain In-Reply-To or References headers."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+msgid "Default value for thread expand state"
+msgstr "Default value for thread expand state"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+msgid "Whether sort threads based on latest message in that thread"
+msgstr "Whether sort threads based on latest message in that thread"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#| msgid ""
+#| "This setting specifies whether the threads should be sorted based on "
+#| "latest message in each thread, rather than by message's date. Evolution "
+#| "requires a restart."
+msgid ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message’s date. Evolution requires a "
+"restart."
+msgstr ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message’s date. Evolution requires a "
+"restart."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+msgid "Whether sort thread children always ascending"
+msgstr "Whether sort thread children always ascending"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+msgid ""
+"This setting specifies whether the thread children should be sorted always "
+"ascending, rather than using the same sort order as in the thread root level."
+msgstr ""
+"This setting specifies whether the thread children should be sorted always "
+"ascending, rather than using the same sort order as in the thread root level."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+msgid "Sort accounts alphabetically in a folder tree"
+msgstr "Sort accounts alphabetically in a folder tree"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+msgid ""
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
+"true accounts are sorted alphabetically, with an exception of On This "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user"
+msgstr ""
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
+"true accounts are sorted alphabetically, with an exception of On This "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+msgid "Log filter actions"
+msgstr "Log filter actions"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+msgid "Log filter actions to the specified log file."
+msgstr "Log filter actions to the specified log file."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+msgid "Logfile to log filter actions"
+msgstr "Logfile to log filter actions"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+msgid ""
+"If not set, or being “stdout”, then the logging is done to stdout, instead "
+"to a file."
+msgstr ""
+"If not set, or being “stdout”, then the logging is done to stdout, instead "
+"to a file."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+msgid "Flush Outbox after filtering"
+msgstr "Flush Outbox after filtering"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#| msgid ""
+#| "Whether to flush Outbox after filtering is done. Outbox flush will happen "
+#| "only when there was used any 'Forward to' filter action and approximately "
+#| "one minute after the last action invocation."
+msgid ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any “Forward to” filter action and approximately "
+"one minute after the last action invocation."
+msgstr ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any “Forward to” filter action and approximately "
+"one minute after the last action invocation."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+msgid "Default forward style"
+msgstr "Default forward style"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+msgid "Default reply style"
+msgstr "Default reply style"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
+msgstr "Prompt on send when using key accelerator (Ctrl+Enter)"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+msgid ""
+"Prompt the user when he or she tries to send a message with a key "
+"accelerator."
+msgstr ""
+"Prompt the user when he or she tries to send a message with a key "
+"accelerator."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+msgid "Prompt on empty subject"
+msgstr "Prompt on empty subject"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+"Prompt the user when he or she tries to send a message without a Subject."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+msgid "Prompt when emptying the trash"
+msgstr "Prompt when emptying the wastebasket"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+msgid "Prompt the user when he or she tries to empty the trash."
+msgstr "Prompt the user when he or she tries to empty the wastebasket."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+msgid "Prompt when user expunges"
+msgstr "Prompt when user expunges"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr "Prompt the user when he or she tries to expunge a folder."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#| msgid "Prompt when user expunges"
+msgid "Prompt when user calls Empty Junk"
+msgstr "Prompt when user calls Empty Junk"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#| msgid "Prompt the user when he or she tries to expunge a folder."
+msgid "Prompt the user when he or she tries to Empty a Junk folder."
+msgstr "Prompt the user when he or she tries to Empty a Junk folder."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr "Prompt before sending to recipients not entered as mail addresses"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
+msgstr ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+msgid "Prompt when user only fills Bcc"
+msgstr "Prompt when user only fills Bcc"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Prompt when user tries to send a message with no To or Cc recipients."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr "Prompt when user tries to send unwanted HTML"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+msgid "Prompt when user tries to open 10 or more messages at once"
+msgstr "Prompt when user tries to open 10 or more messages at once"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+msgid "Prompt while marking multiple messages"
+msgstr "Prompt while marking multiple messages"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "Enable or disable the prompt whilst marking multiple messages."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+msgid "Prompt when deleting messages in search folder"
+msgstr "Prompt when deleting messages in search folder"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+msgid ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
+msgstr ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
+msgstr "Asks whether to copy a folder by drag &amp; drop in the folder tree"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#| msgid ""
+#| "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
+#| "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
+#| "folders in folder tree without asking, or 'ask' - (or any other value) "
+#| "will ask user."
+msgid ""
+"Possible values are: “never” — do not allow copy with drag &amp; drop of "
+"folders in folder tree, “always” — allow copy with drag &amp; drop of "
+"folders in folder tree without asking, or “ask” — (or any other value) will "
+"ask user."
+msgstr ""
+"Possible values are: “never” — do not allow copy with drag &amp; drop of "
+"folders in folder tree, “always” — allow copy with drag &amp; drop of "
+"folders in folder tree without asking, or “ask” — (or any other value) will "
+"ask user."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
+msgstr "Asks whether to move a folder by drag &amp; drop in the folder tree"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#| msgid ""
+#| "Possible values are: 'never' - do not allow move with drag &amp; drop of "
+#| "folders in folder tree, 'always' - allow move with drag &amp; drop of "
+#| "folders in folder tree without asking, or 'ask' - (or any other value) "
+#| "will ask user."
+msgid ""
+"Possible values are: “never” — do not allow move with drag &amp; drop of "
+"folders in folder tree, “always” — allow move with drag &amp; drop of "
+"folders in folder tree without asking, or “ask” — (or any other value) will "
+"ask user."
+msgstr ""
+"Possible values are: “never” — do not allow move with drag &amp; drop of "
+"folders in folder tree, “always” — allow move with drag &amp; drop of "
+"folders in folder tree without asking, or “ask” — (or any other value) will "
+"ask user."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+msgid "Prompt when replying privately to list messages"
+msgstr "Prompt when replying privately to list messages"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+msgstr ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "Prompt when mailing list hijacks private replies"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying sending "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+msgid "Prompt when replying to many recipients"
+msgstr "Prompt when replying to many recipients"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#| msgid ""
+#| "Prompt when switching composer mode and the content needs to lose its "
+#| "formatting"
+msgid ""
+"Prompt when switching composer format and the content needs to lose its "
+"formatting"
+msgstr ""
+"Prompt when switching composer format and the content needs to lose its "
+"formatting"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#| msgid ""
+#| "It disables/enables the repeated prompts to warn that you are switching "
+#| "composer mode and the content needs to lose its formatting."
+msgid ""
+"It disables/enables the repeated prompts to warn that you are switching "
+"composer format and the content needs to lose its formatting."
+msgstr ""
+"It disables/enables the repeated prompts to warn that you are switching "
+"composer format and the content needs to lose its formatting."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+msgid "Prompt when sending to many To and CC recipients"
+msgstr "Prompt when sending to many To and CC recipients"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#| msgid ""
+#| "Enable or disable the prompt when sending to many To and CC recipients. "
+#| "The 'composer-many-to-cc-recips-num' defines the threshold."
+msgid ""
+"Enable or disable the prompt when sending to many To and CC recipients. The "
+"“composer-many-to-cc-recips-num” defines the threshold."
+msgstr ""
+"Enable or disable the prompt when sending to many To and CC recipients. The "
+"“composer-many-to-cc-recips-num” defines the threshold."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+msgid ""
+"Policy for automatically closing the message browser window when forwarding "
+"or replying to the displayed message."
+msgstr ""
+"Policy for automatically closing the message browser window when forwarding "
+"or replying to the displayed message."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+msgid "Empty Trash folders on exit"
+msgstr "Empty Wastebasket folders on exit"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Empty all Wastebasket folders when exiting Evolution."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+msgid "Minimum days between emptying the trash on exit"
+msgstr "Minimum number of days between emptying the wastebasket on exit"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr "Minimum time between emptying the wastebasket on exit, in days."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+msgid "Last time Empty Trash was run"
+msgstr "Last time Empty Wastebasket was run"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+"The last time Empty Wastebasket was run, in days since January 1st, 1970 "
+"(Epoch)."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "Amount of time in seconds the error should be shown on the status bar."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+msgid "Level beyond which the message should be logged."
+msgstr "Level beyond which the message should be logged."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#| msgid ""
+#| "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+#| "debug messages."
+msgid ""
+"This can have three possible values. “0” for errors. “1” for warnings. “2” "
+"for debug messages."
+msgstr ""
+"This can have three possible values. “0” for errors. “1” for warnings. “2” "
+"for debug messages."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#| msgid "Show original \"Date\" header value."
+msgid "Show original “Date” header value."
+msgstr "Show original “Date” header value."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#| msgid ""
+#| "Show the original \"Date\" header (with a local time only if the time "
+#| "zone differs). Otherwise always show \"Date\" header value in a user "
+#| "preferred format and local time zone."
+msgid ""
+"Show the original “Date” header (with a local time only if the time zone "
+"differs). Otherwise always show “Date” header value in a user preferred "
+"format and local time zone."
+msgstr ""
+"Show the original “Date” header (with a local time only if the time zone "
+"differs). Otherwise always show “Date” header value in a user preferred "
+"format and local time zone."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+msgid "List of Labels and their associated colors"
+msgstr "List of Labels and their associated colours"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
+msgstr ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+msgid "Check incoming mail being junk"
+msgstr "Check incoming mail being junk"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+msgid "Run junk test on incoming mail."
+msgstr "Run junk test on incoming mail."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+msgid "Empty Junk folders on exit"
+msgstr "Empty Junk folders on exit"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "Empty all Junk folders when exiting Evolution."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+msgid "Minimum days between emptying the junk on exit"
+msgstr "Minimum days between emptying the junk on exit"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr "Minimum time between emptying the junk on exit, in days."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+msgid "Last time Empty Junk was run"
+msgstr "Last time Empty Junk was run"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+msgid "The default plugin for Junk hook"
+msgstr "The default plugin for Junk hook"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#| msgid ""
+#| "This is the default junk plugin, even though there are multiple plugins "
+#| "enabled. If the default listed plugin is disabled, then it won't fall "
+#| "back to the other available plugins."
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won’t fall back "
+"to the other available plugins."
+msgstr ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won’t fall back "
+"to the other available plugins."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+msgid "Determines whether to lookup in address book for sender email"
+msgstr "Determines whether to look up in address book for sender e-mail"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#| msgid ""
+#| "Determines whether to lookup the sender email in address book. If found, "
+#| "it shouldn't be a spam. It looks up in the books marked for "
+#| "autocompletion. It can be slow, if remote address books (like LDAP) are "
+#| "marked for autocompletion."
+msgid ""
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn’t be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
+msgstr ""
+"Determines whether to lookup the sender e-mail in address book. If found, it "
+"shouldn’t be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local address book only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local address book only to exclude "
+"mail sent by known contacts from junk filtering."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+msgid "Determines whether to use custom headers to check for junk"
+msgstr "Determines whether to use custom headers to check for junk"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
+msgstr ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+msgid "Custom headers to use while checking for junk."
+msgstr "Custom headers to use while checking for junk."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#| msgid ""
+#| "Custom headers to use while checking for junk. The list elements are "
+#| "string in the format \"headername=value\"."
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format “headername=value”."
+msgstr ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format “headername=value”."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+msgid "UID string of the default account."
+msgstr "UID string of the default account."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+msgid "Save directory"
+msgstr "Save directory"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+msgid "Directory for saving mail component files."
+msgstr "Directory for saving mail component files."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+msgid "Composer load/attach directory"
+msgstr "Composer load/attach directory"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+msgid "Directory for loading/attaching files to composer."
+msgstr "Directory for loading/attaching files to composer."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+msgid "Check for new messages on start"
+msgstr "Check for new messages on start"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+msgid ""
+"Whether to check for new messages when Evolution is started. This includes "
+"also sending messages from Outbox."
+msgstr ""
+"Whether to check for new messages when Evolution is started. This includes "
+"also sending messages from Outbox."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+msgid "Check for new messages in all active accounts"
+msgstr "Check for new messages in all active accounts"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#| msgid ""
+#| "Whether to check for new messages in all active accounts regardless of "
+#| "the account \"Check for new messages every X minutes\" option when "
+#| "Evolution is started. This option is used only together with "
+#| "'send_recv_on_start' option."
+msgid ""
+"Whether to check for new messages in all active accounts regardless of the "
+"account “Check for new messages every X minutes” option when Evolution is "
+"started. This option is used only together with “send_recv_on_start” option."
+msgstr ""
+"Whether to check for new messages in all active accounts regardless of the "
+"account “Check for new messages every X minutes” option when Evolution is "
+"started. This option is used only together with “send_recv_on_start” option."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+msgid "Server synchronization interval"
+msgstr "Server synchronisation interval"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"Controls how frequently local changes are synchronised with the remote mail "
+"server. The interval must be at least 30 seconds."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+msgid "Allow expunge in virtual folders"
+msgstr "Allow expunge in virtual folders"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#| msgid ""
+#| "Enables Expunge in virtual folders, which means that the Folder->Expunge "
+#| "will be callable in virtual folders, while the expunge itself will be "
+#| "done in all folders for all deleted messages within the virtual folder, "
+#| "not only for deleted messages belonging to the virtual folder."
+msgid ""
+"Enables Expunge in virtual folders, which means that the Folder→Expunge will "
+"be callable in virtual folders, while the expunge itself will be done in all "
+"folders for all deleted messages within the virtual folder, not only for "
+"deleted messages belonging to the virtual folder."
+msgstr ""
+"Enables Expunge in virtual folders, which means that the Folder→Expunge will "
+"be callable in virtual folders, while the expunge itself will be done in all "
+"folders for all deleted messages within the virtual folder, not only for "
+"deleted messages belonging to the virtual folder."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../src/mail/mail-config.ui.h:9
+#| msgid "Inherit theme colors in HTML mode"
+msgid "Inherit theme colors in HTML format"
+msgstr "Inherit theme colours in HTML format"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+msgid ""
+"When enabled the theme colors for background, text and links are sent in "
+"resulting HTML formatted message."
+msgstr ""
+"When enabled the theme colours for background, text and links are sent in "
+"resulting HTML formatted message."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
+msgid "An Archive folder for On This Computer folders."
+msgstr "An Archive folder for On This Computer folders."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+msgid ""
+"An Archive folder to use for Messages|Archive... feature when in an On This "
+"Computer folder."
+msgstr ""
+"An Archive folder to use for Messages|Archive... feature when in an On This "
+"Computer folder."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+#| msgid "Whether to show icons of events in the month view"
+msgid "Whether the To Do bar is visible in the main window"
+msgstr "Whether the To Do bar is visible in the main window"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
+#| msgid "If \"true\", show the memo preview pane in the main window."
+msgid "Stores whether the To Do bar is visible in the main window."
+msgstr "Stores whether the To Do bar is visible in the main window."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+#| msgid "If \"true\", show the memo preview pane in the main window"
+msgid "Width of the To Do bar in the main window"
+msgstr "Width of the To Do bar in the main window"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
+#| msgid "The default Y coordinate for the main window."
+msgid "Holds the width of the To Do bar for the main window."
+msgstr "Holds the width of the To Do bar for the main window."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
+#| msgid "Whether the shell window's tool bar is visible"
+msgid "Whether the To Do bar is visible in a sub-window"
+msgstr "Whether the To Do bar is visible in a sub-window"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
+msgid "Stores whether the To Do bar is visible in a sub-window."
+msgstr "Stores whether the To Do bar is visible in a sub-window."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
+msgid "Width of the To Do bar in a sub-window"
+msgstr "Width of the To Do bar in a sub-window"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
+#| msgid "Default width of the mail browser window."
+msgid "Holds the width of the To Do bar for a sub-window."
+msgstr "Holds the width of the To Do bar for a sub-window."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
+#| msgid "Whether the toolbar should be visible."
+msgid "Whether the To Do bar should show also completed tasks"
+msgstr "Whether the To Do bar should show also completed tasks"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
+msgid "Stores whether the To Do bar should show also completed tasks."
+msgstr "Stores whether the To Do bar should show also completed tasks."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
+#| msgid "Startup wizard"
+msgid "Show start up wizard"
+msgstr "Show start up wizard"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
+msgid "Whether show start up wizard when there is no mail account configured."
+msgstr "Whether show start up wizard when there is no mail account configured."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
+msgid "(Deprecated) Default forward style"
+msgstr "(Deprecated) Default forward style"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
+#| msgid ""
+#| "This key was deprecated in version 3.10 and should no longer be used. Use "
+#| "\"forward-style-name\" instead."
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"“forward-style-name” instead."
+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:256
+msgid "(Deprecated) Default reply style"
+msgstr "(Deprecated) Default reply style"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
+#| msgid ""
+#| "This key was deprecated in version 3.10 and should no longer be used. Use "
+#| "\"reply-style-name\" instead."
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"“reply-style-name” instead."
+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:258
+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:259
+#| msgid ""
+#| "This key was deprecated in version 3.10 and should no longer be used. Use "
+#| "\"show-headers\" instead."
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"“show-headers” instead."
+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:260
+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:261
+#| msgid ""
+#| "This key was deprecated in version 3.10 and should no longer be used. Use "
+#| "\"image-loading-policy\" instead."
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"“image-loading-policy” instead."
+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:262
+msgid ""
+"(Deprecated) Asks whether to close the message window when the user forwards "
+"or replies to the message shown in the window"
+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:263
+#| msgid ""
+#| "This key was deprecated in version 3.10 and should no longer be used. Use "
+#| "\"browser-close-on-reply-policy\" instead."
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"“browser-close-on-reply-policy” instead."
+msgstr ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"“browser-close-on-reply-policy” instead."
+
+#. Translators: This is the a list of words for the attach reminder plugin to look
+#. for in a message body. Please use any number of words here in your language that might
+#. indicate that an attachment should have been attached to the message.
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
+msgid "['attachment','attaching','attached','enclosed']"
+msgstr "['attachment','attaching','attached','enclosed']"
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:6
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:1
+msgid "Address book source"
+msgstr "Address book source"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
+msgid "Address book to use for storing automatically synced contacts."
+msgstr "Address book to use for storing automatically synced contacts."
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
+msgid "Auto sync Pidgin contacts"
+msgstr "Auto sync Pidgin contacts"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
+msgid "Whether Pidgin contacts should be automatically synced."
+msgstr "Whether Pidgin contacts should be automatically synced."
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
+msgid "Enable autocontacts"
+msgstr "Enable autocontacts"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
+#| msgid ""
+#| "Whether contacts should be automatically added to the user's address book."
+msgid ""
+"Whether contacts should be automatically added to the user’s address book."
+msgstr ""
+"Whether contacts should be automatically added to the user’s address book."
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
+msgid "Pidgin address book source"
+msgstr "Pidgin address book source"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
+msgid ""
+"Address book to use for storing automatically synced contacts from Pidgin."
+msgstr ""
+"Address book to use for storing automatically synced contacts from Pidgin."
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
+msgid "Pidgin check interval"
+msgstr "Pidgin check interval"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
+msgid "Check interval for Pidgin syncing of contacts."
+msgstr "Check interval for Pidgin syncing of contacts."
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
+msgid "Pidgin last sync MD5"
+msgstr "Pidgin last sync MD5"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
+msgid "Pidgin last sync MD5."
+msgstr "Pidgin last sync MD5."
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
+msgid "Pidgin last sync time"
+msgstr "Pidgin last sync time"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
+msgid "Pidgin last sync time."
+msgstr "Pidgin last sync time."
+
+#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
+msgid "List of Custom Headers"
+msgstr "List of Custom Headers"
+
+#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
+#| msgid ""
+#| "The key specifies the list of custom headers that you can add to an "
+#| "outgoing message. The format for specifying a Header and Header value is: "
+#| "Name of the custom header followed by \"=\" and the values separated by "
+#| "\";\""
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by “=” and the values separated by “;”"
+msgstr ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by “=” and the values separated by “;”"
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
+msgid "Default External Editor"
+msgstr "Default External Editor"
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr "The default command that must be used as the editor."
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
+msgid "Automatically launch when a new mail is edited"
+msgstr "Automatically launch when a new mail is edited"
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
+msgid "Automatically launch editor when key is pressed in the mail composer."
+msgstr "Automatically launch editor when key is pressed in the mail composer."
+
+#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
+msgid "Insert Face picture by default"
+msgstr "Insert Face picture by default"
+
+#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
+msgid "Delete processed"
+msgstr "Delete processed"
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:2
+msgid "Whether to delete processed iTip objects"
+msgstr "Whether to delete processed iTip objects"
+
+#: ../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."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr "Whether to notify new messages in Inbox folder only."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:3
+msgid "Enable D-Bus messages."
+msgstr "Enable D-Bus messages."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "Generates a D-Bus message when new mail messages arrive."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
+msgid "Enable icon in notification area."
+msgstr "Enable icon in notification area."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr "Show new mail icon in notification area when new messages arrive."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:7
+msgid "Popup message together with the icon."
+msgstr "Popup message together with the icon."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:8
+msgid "Whether show message over the icon when new messages arrive."
+msgstr "Whether show message over the icon when new messages arrive."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
+msgid "Enable audible notifications when new messages arrive."
+msgstr "Enable audible notifications when new messages arrive."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
+#| msgid ""
+#| "Whether to make a sound of any kind when new messages arrive. If \"false"
+#| "\", the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-"
+#| "file\" and \"notify-sound-use-theme\" keys are disregarded."
+msgid ""
+"Whether to make a sound of any kind when new messages arrive. If “false”, "
+"the “notify-sound-beep”, “notify-sound-file”, “notify-sound-play-file” and "
+"“notify-sound-use-theme” keys are disregarded."
+msgstr ""
+"Whether to make a sound of any kind when new messages arrive. If “false”, "
+"the “notify-sound-beep”, “notify-sound-file”, “notify-sound-play-file” and "
+"“notify-sound-use-theme” keys are disregarded."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
+msgid "Whether to emit a beep."
+msgstr "Whether to emit a beep."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
+msgid "Whether to emit a beep when new messages arrive."
+msgstr "Whether to emit a beep when new messages arrive."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
+msgid "Sound filename to be played."
+msgstr "Sound filename to be played."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
+#| msgid ""
+#| "Sound file to be played when new messages arrive, if \"notify-sound-play-"
+#| "file\" is \"true\"."
+msgid ""
+"Sound file to be played when new messages arrive, if “notify-sound-play-"
+"file” is “true”."
+msgstr ""
+"Sound file to be played when new messages arrive, if “notify-sound-play-"
+"file” is “true”."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
+msgid "Whether to play a sound file."
+msgstr "Whether to play a sound file."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
+#| msgid ""
+#| "Whether to play a sound file when new messages arrive. The name of the "
+#| "sound file is given by the 'notify-sound-file' key."
+msgid ""
+"Whether to play a sound file when new messages arrive. The name of the sound "
+"file is given by the “notify-sound-file” key."
+msgstr ""
+"Whether to play a sound file when new messages arrive. The name of the sound "
+"file is given by the “notify-sound-file” key."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
+msgid "Use sound theme"
+msgstr "Use sound theme"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr "Play themed sound when new messages arrive, if not in beep mode."
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
+msgid "Mode to use when displaying mails"
+msgstr "Mode to use when displaying mails"
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
+#| msgid ""
+#| "The mode to use for displaying mails. \"normal\" makes Evolution choose "
+#| "the best part to show, \"prefer_plain\" makes it use the text part, if "
+#| "present, \"prefer_source\" makes it use the text part, if present, "
+#| "otherwise shows HTML source, and \"only_plain\" forces Evolution to only "
+#| "show plain text"
+msgid ""
+"The mode to use for displaying mails. “normal” makes Evolution choose the "
+"best part to show, “prefer_plain” makes it use the text part, if present, "
+"“prefer_source” makes it use the text part, if present, otherwise shows HTML "
+"source, and “only_plain” forces Evolution to only show plain text"
+msgstr ""
+"The mode to use for displaying mails. “normal” makes Evolution choose the "
+"best part to show, “prefer_plain” makes it use the text part, if present, "
+"“prefer_source” makes it use the text part, if present, otherwise shows HTML "
+"source, and “only_plain” forces Evolution to only show plain text"
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
+msgid "Whether to show suppressed HTML output"
+msgstr "Whether to show suppressed HTML output"
+
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
+msgid "List of Destinations for publishing"
+msgstr "List of Destinations for publishing"
+
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
+msgid ""
+"The key specifies the list of destinations to where publish calendars. Each "
+"values specifies an XML with setup for publishing to one destination."
+msgstr ""
+"The key specifies the list of destinations to where publish calendars. Each "
+"values specifies an XML with setup for publishing to one destination."
+
+#: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
+msgid "Skip development warning dialog"
+msgstr "Skip development warning dialogue"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+"Whether the warning dialogue in development versions of Evolution is skipped."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
+msgid "Initial attachment view"
+msgstr "Initial attachment view"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
+#| msgid ""
+#| "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is "
+#| "List View."
+msgid ""
+"Initial view for attachment bar widgets. “0” is Icon View, “1” is List View."
+msgstr ""
+"Initial view for attachment bar widgets. “0” is Icon View, “1” is List View."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
+msgid "Initial file chooser folder"
+msgstr "Initial file chooser folder"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "Initial folder for GtkFileChooser dialogues."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
+msgid "Compression format used by autoar"
+msgstr "Compression format used by autoar"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
+msgid ""
+"Compression format used when compressing attached directories with autoar."
+msgstr ""
+"Compression format used when compressing attached directories with autoar."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
+msgid "Compression filter used by autoar"
+msgstr "Compression filter used by autoar"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
+msgid ""
+"Compression filter used when compressing attached directories with autoar."
+msgstr ""
+"Compression filter used when compressing attached directories with autoar."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
+#: ../src/shell/main.c:320
+msgid "Start in offline mode"
+msgstr "Start in offline mode"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr ""
+"Whether Evolution will start up in offline mode instead of online mode."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
+msgid "Offline folder paths"
+msgstr "Offline folder paths"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage."
+msgstr ""
+"List of paths for the folders to be synchronised to disk for offline usage."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
+msgid "Enable express mode"
+msgstr "Enable express mode"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
+msgid "Flag that enables a much simplified user interface."
+msgstr "Flag that enables a much simplified user interface."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
+msgid "List of button names to hide in the window switcher"
+msgstr "List of button names to hide in the window switcher"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+#| msgid ""
+#| "Valid values are 'mail', 'addressbook', 'calendar', 'tasks' and 'memos'. "
+#| "Change of this requires restart of the application."
+msgid ""
+"Valid values are “mail”, “addressbook”, “calendar”, “tasks” and “memos”. "
+"Change of this requires restart of the application."
+msgstr ""
+"Valid values are “mail”, “addressbook”, “calendar”, “tasks” and “memos”. "
+"Change of this requires restart of the application."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
+msgid "Window buttons are visible"
+msgstr "Window buttons are visible"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
+msgid "Whether the window buttons should be visible."
+msgstr "Whether the window buttons should be visible."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
+msgid "Window button style"
+msgstr "Window button style"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
+#| msgid ""
+#| "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+#| "\"toolbar\". If \"toolbar\" is set, the style of the buttons is "
+#| "determined by the GNOME toolbar setting."
+msgid ""
+"The style of the window buttons. Can be “text”, “icons”, “both”, “toolbar”. "
+"If “toolbar” is set, the style of the buttons is determined by the GNOME "
+"toolbar setting."
+msgstr ""
+"The style of the window buttons. Can be “text”, “icons”, “both”, “toolbar”. "
+"If “toolbar” is set, the style of the buttons is determined by the GNOME "
+"toolbar setting."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
+#| msgid "Sidebar is visible"
+msgid "Menubar is visible"
+msgstr "Menubar is visible"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
+#| msgid "Whether the sidebar should be visible."
+msgid "Whether the menubar should be visible."
+msgstr "Whether the menubar should be visible."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+msgid "Toolbar is visible"
+msgstr "Toolbar is visible"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
+msgid "Whether the toolbar should be visible."
+msgstr "Whether the toolbar should be visible."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
+msgid "Sidebar is visible"
+msgstr "Sidebar is visible"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:28
+msgid "Whether the sidebar should be visible."
+msgstr "Whether the sidebar should be visible."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:29
+msgid "Statusbar is visible"
+msgstr "Statusbar is visible"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:30
+msgid "Whether the status bar should be visible."
+msgstr "Whether the status bar should be visible."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:31
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "ID or alias of the component to be shown by default at start-up."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:32
+msgid "Default sidebar width"
+msgstr "Default sidebar width"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:33
+msgid "The default width for the sidebar, in pixels."
+msgstr "The default width for the sidebar, in pixels."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:34
+msgid "Enable special WebKit developer features"
+msgstr "Enable special WebKit developer features"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:35
+msgid "Any change of this option requires restart of Evolution."
+msgstr "Any change of this option requires restart of Evolution."
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
+msgid "Use only local spam tests."
+msgstr "Use only local spam tests."
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
+msgid "Use only the local spam tests (no DNS)."
+msgstr "Use only the local spam tests (no DNS)."
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
+msgid "Full path command to run spamassassin"
+msgstr "Full path command to run spamassassin"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
+msgid ""
+"Full path to a spamassassin command. If not set, then a compile-time path is "
+"used, usually /usr/bin/spamassassin. The command should not contain any "
+"other arguments."
+msgstr ""
+"Full path to a spamassassin command. If not set, then a compile-time path is "
+"used, usually /usr/bin/spamassassin. The command should not contain any "
+"other arguments."
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
+msgid "Full path command to run sa-learn"
+msgstr "Full path command to run sa-learn"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
+msgid ""
+"Full path to a sa-learn command. If not set, then a compile-time path is "
+"used, usually /usr/bin/sa-learn. The command should not contain any other "
+"arguments."
+msgstr ""
+"Full path to a sa-learn command. If not set, then a compile-time path is "
+"used, usually /usr/bin/sa-learn. The command should not contain any other "
+"arguments."
+
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:1
+msgid "Theme name to use, defaults to “bclear”"
+msgstr "Theme name to use, defaults to “bclear”"
+
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:2
+msgid ""
+"Use “highlight --list-scripts=themes” to get the list of installed themes "
+"and then the value to one of them. The change requires only re-format of the "
+"message part to take into effect, like using right-click→Format As→...."
+msgstr ""
+"Use “highlight --list-scripts=themes” to get the list of installed themes "
+"and then the value to one of them. The change requires only re-format of the "
+"message part to take into effect, like using right-click→Format As→...."
+
+#: ../data/views/addressbook/galview.xml.h:1
+msgid "_Address Cards"
+msgstr "_Address Cards"
+
+#: ../data/views/addressbook/galview.xml.h:2
+#: ../data/views/calendar/galview.xml.h:5
+msgid "_List View"
+msgstr "_List View"
+
+#: ../data/views/addressbook/galview.xml.h:3
+msgid "By _Company"
+msgstr "By _Company"
+
+#: ../data/views/calendar/galview.xml.h:1
+msgid "_Day View"
+msgstr "_Day View"
+
+#: ../data/views/calendar/galview.xml.h:2
+msgid "_Work Week View"
+msgstr "_Work Week View"
+
+#: ../data/views/calendar/galview.xml.h:3
+msgid "W_eek View"
+msgstr "W_eek View"
+
+#: ../data/views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr "_Month View"
+
+#: ../data/views/mail/galview.xml.h:1
+msgid "_Messages"
+msgstr "_Messages"
+
+#: ../data/views/mail/galview.xml.h:2
+msgid "As _Sent Folder"
+msgstr "As _Sent Folder"
+
+#: ../data/views/mail/galview.xml.h:3
+msgid "By Su_bject"
+msgstr "By Su_bject"
+
+#: ../data/views/mail/galview.xml.h:4
+msgid "By Se_nder"
+msgstr "By Se_nder"
+
+#: ../data/views/mail/galview.xml.h:5
+msgid "By S_tatus"
+msgstr "By S_tatus"
+
+#: ../data/views/mail/galview.xml.h:6
+msgid "By _Follow Up Flag"
+msgstr "By _Follow Up Flag"
+
+#: ../data/views/mail/galview.xml.h:7
+msgid "For _Wide View"
+msgstr "For _Wide View"
+
+#: ../data/views/mail/galview.xml.h:8
+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
+msgid "_Memos"
+msgstr "_Memos"
+
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2443
+#: ../src/plugins/pst-import/pst-importer.c:571
+msgid "_Tasks"
+msgstr "_Tasks"
+
+#: ../data/views/tasks/galview.xml.h:2
+msgid "With _Due Date"
+msgstr "With _Due Date"
+
+#: ../data/views/tasks/galview.xml.h:3
+msgid "With _Status"
+msgstr "With _Status"
+
+#: ../src/addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
 msgstr "This address book could not be opened."
 
-#: ../addressbook/addressbook.error.xml.h:2
+#: ../src/addressbook/addressbook.error.xml.h:2
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -36,11 +3446,11 @@ msgstr ""
 "This address book server might be unreachable, the server name may be "
 "misspelt, or your network connection could be down."
 
-#: ../addressbook/addressbook.error.xml.h:3
+#: ../src/addressbook/addressbook.error.xml.h:3
 msgid "Failed to authenticate with LDAP server."
 msgstr "Failed to authenticate with LDAP server."
 
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../src/addressbook/addressbook.error.xml.h:4
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -50,12 +3460,12 @@ msgstr ""
 "supported login method. Remember that many passwords are case-sensitive; "
 "your caps lock might be on."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../src/addressbook/addressbook.error.xml.h:5
 msgid "This address book server does not have any suggested search bases."
 msgstr "This address book server does not have any suggested search bases."
 
 #  addressbook:ldap-search-base secondary
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../src/addressbook/addressbook.error.xml.h:6
 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 "
@@ -65,73 +3475,82 @@ msgstr ""
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../src/addressbook/addressbook.error.xml.h:7
 msgid "This server does not support LDAPv3 schema information."
 msgstr "This server does not support LDAPv3 schema information."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../src/addressbook/addressbook.error.xml.h:8
 msgid "Could not get schema information for LDAP server."
 msgstr "Could not get schema information for LDAP server."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../src/addressbook/addressbook.error.xml.h:9
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP server did not respond with valid schema information."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../src/addressbook/addressbook.error.xml.h:10
 msgid "Could not remove address book."
 msgstr "Could not remove address book."
 
-#: ../addressbook/addressbook.error.xml.h:11
-msgid "Delete address book '{0}'?"
-msgstr "Delete address book '{0}'?"
+#: ../src/addressbook/addressbook.error.xml.h:11
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete address book “{0}”?"
+msgstr "Are you sure you want to delete address book “{0}”?"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../src/addressbook/addressbook.error.xml.h:12
 msgid "This address book will be removed permanently."
 msgstr "This address book will be removed permanently."
 
-#: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
-#: ../mail/mail.error.xml.h:69
+#: ../src/addressbook/addressbook.error.xml.h:13
+#: ../src/calendar/calendar.error.xml.h:7 ../src/e-util/e-system.error.xml.h:27
+#: ../src/mail/mail.error.xml.h:69
 msgid "Do _Not Delete"
 msgstr "Do _Not Delete"
 
-#: ../addressbook/addressbook.error.xml.h:14
-msgid "Delete remote address book &quot;{0}&quot;?"
-msgstr "Delete remote address book &quot;{0}&quot;?"
+#: ../src/addressbook/addressbook.error.xml.h:14
+#| msgid "Delete remote address book &quot;{0}&quot;?"
+msgid "Delete remote address book “{0}”?"
+msgstr "Delete remote address book “{0}”?"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../src/addressbook/addressbook.error.xml.h:15
+#| msgid ""
+#| "This will permanently remove the address book &quot;{0}&quot; from the "
+#| "server. Are you sure you want to proceed?"
 msgid ""
-"This will permanently remove the address book &quot;{0}&quot; from the "
-"server. Are you sure you want to proceed?"
+"This will permanently remove the address book “{0}” from the server. Are you "
+"sure you want to proceed?"
 msgstr ""
-"This will permanently remove the address book &quot;{0}&quot; from the "
-"server. Are you sure you want to proceed?"
+"This will permanently remove the address book “{0}” from the server. Are you "
+"sure you want to proceed?"
 
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:65
+#: ../src/addressbook/addressbook.error.xml.h:16
+#: ../src/calendar/calendar.error.xml.h:65
+#: ../src/e-util/e-system.error.xml.h:28
 msgid "_Delete From Server"
 msgstr "_Delete From Server"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../src/addressbook/addressbook.error.xml.h:17
 msgid "Category editor not available."
 msgstr "Category editor not available."
 
-#: ../addressbook/addressbook.error.xml.h:18
-msgid "Unable to open address book '{0}'"
-msgstr "Unable to open address book '{0}'"
+#: ../src/addressbook/addressbook.error.xml.h:18
+#| msgid "Unable to open address book '{0}'"
+msgid "Unable to open address book “{0}”"
+msgstr "Unable to open address book “{0}”"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../src/addressbook/addressbook.error.xml.h:19
 msgid "Unable to perform search."
 msgstr "Unable to perform search."
 
-#: ../addressbook/addressbook.error.xml.h:20
-msgid "Failed to refresh address book '{0}'"
-msgstr "Failed to refresh address book '{0}'"
+#: ../src/addressbook/addressbook.error.xml.h:20
+#| msgid "Failed to refresh address book '{0}'"
+msgid "Failed to refresh address book “{0}”"
+msgstr "Failed to refresh address book “{0}”"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../src/addressbook/addressbook.error.xml.h:21
 msgid "Would you like to save your changes?"
 msgstr "Would you like to save your changes?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../src/addressbook/addressbook.error.xml.h:22
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
@@ -139,15 +3558,15 @@ msgstr ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../src/addressbook/addressbook.error.xml.h:23
 msgid "_Discard"
 msgstr "_Discard"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../src/addressbook/addressbook.error.xml.h:24
 msgid "Cannot move contact."
 msgstr "Cannot move contact."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../src/addressbook/addressbook.error.xml.h:25
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -155,37 +3574,38 @@ msgstr ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../src/addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "The image you have selected is large. Do you want to resize and store it?"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../src/addressbook/addressbook.error.xml.h:27
 msgid "_Resize"
 msgstr "_Resize"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../src/addressbook/addressbook.error.xml.h:28
 msgid "_Use as it is"
 msgstr "_Use as it is"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../src/addressbook/addressbook.error.xml.h:29
 msgid "_Do not save"
 msgstr "_Do not save"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../src/addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "Unable to save {0}."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../src/addressbook/addressbook.error.xml.h:31
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Error saving {0} to {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:32
-msgid "Address '{0}' already exists."
-msgstr "Address '{0}' already exists."
+#: ../src/addressbook/addressbook.error.xml.h:32
+#| msgid "Address '{0}' already exists."
+msgid "Address “{0}” already exists."
+msgstr "Address “{0}” already exists."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../src/addressbook/addressbook.error.xml.h:33
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -193,27 +3613,31 @@ msgstr ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
 
-#: ../addressbook/addressbook.error.xml.h:34
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
-#: ../addressbook/gui/widgets/eab-contact-merging.c:723
-#: ../calendar/gui/e-comp-editor-page-general.c:1357
-#: ../e-util/e-mail-signature-manager.c:328
-#: ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16
-#: ../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
-#: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625
-#: ../mail/mail-config.ui.h:58 ../modules/mail/em-composer-prefs.c:416
-#: ../plugins/attachment-reminder/attachment-reminder.c:457
-#: ../plugins/email-custom-header/email-custom-header.c:839
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../plugins/templates/templates.c:465
+#: ../src/addressbook/addressbook.error.xml.h:34
+#: ../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:1355
+#: ../src/e-util/e-accounts-window.c:1540
+#: ../src/e-util/e-mail-signature-manager.c:328
+#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:23
+#: ../src/mail/e-mail-account-manager.c:719
+#: ../src/mail/e-mail-label-manager.c:371
+#: ../src/mail/em-folder-properties.c:1031
+#: ../src/mail/em-vfolder-editor-rule.c:397
+#: ../src/mail/em-vfolder-editor-rule.c:626 ../src/mail/mail-config.ui.h:61
+#: ../src/modules/mail/em-composer-prefs.c:422
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:543
+#: ../src/plugins/email-custom-header/email-custom-header.c:837
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:32
+#: ../src/plugins/templates/templates.c:463
 msgid "_Add"
 msgstr "_Add"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../src/addressbook/addressbook.error.xml.h:35
 msgid "Some addresses already exist in this contact list."
 msgstr "Some addresses already exist in this contact list."
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../src/addressbook/addressbook.error.xml.h:36
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
@@ -221,571 +3645,613 @@ msgstr ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../src/addressbook/addressbook.error.xml.h:37
 msgid "Skip duplicates"
 msgstr "Skip duplicates"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../src/addressbook/addressbook.error.xml.h:38
 msgid "Add with duplicates"
 msgstr "Add with duplicates"
 
-#: ../addressbook/addressbook.error.xml.h:39
-msgid "List '{0}' is already in this contact list."
-msgstr "List '{0}' is already in this contact list."
+#: ../src/addressbook/addressbook.error.xml.h:39
+#| msgid "List '{0}' is already in this contact list."
+msgid "List “{0}” is already in this contact list."
+msgstr "List “{0}” is already in this contact list."
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../src/addressbook/addressbook.error.xml.h:40
+#| msgid ""
+#| "A contact list named '{0}' is already in this contact list. Would you "
+#| "like to add it anyway?"
 msgid ""
-"A contact list named '{0}' is already in this contact list. Would you like "
+"A contact list named “{0}” is already in this contact list. Would you like "
 "to add it anyway?"
 msgstr ""
-"A contact list named '{0}' is already in this contact list. Would you like "
+"A contact list named “{0}” is already in this contact list. Would you like "
 "to add it anyway?"
 
-#: ../addressbook/addressbook.error.xml.h:41
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
+#: ../src/addressbook/addressbook.error.xml.h:41
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1280
 msgid "Failed to delete contact"
 msgstr "Failed to delete contact"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../src/addressbook/addressbook.error.xml.h:42
 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."
 
-#: ../addressbook/addressbook.error.xml.h:43
+#: ../src/addressbook/addressbook.error.xml.h:43
 msgid "Cannot add new contact"
 msgstr "Cannot add new contact"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:45
+#: ../src/addressbook/addressbook.error.xml.h:45
+#| 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."
 msgid ""
-"'{0}' is a read-only address book and cannot be modified. Please select a "
+"“{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."
 msgstr ""
-"'{0}' is a read-only address book and cannot be modified. Please select a "
+"“{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."
 
-#: ../addressbook/addressbook.error.xml.h:46
+#: ../src/addressbook/addressbook.error.xml.h:46
 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
-#: ../addressbook/addressbook.error.xml.h:48
+#: ../src/addressbook/addressbook.error.xml.h:48
+#| 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."
+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."
+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:49
+#| msgid "Search for text in the displayed contact"
+msgid "Something has gone wrong when displaying the contact"
+msgstr "Something has gone wrong when displaying the contact"
+
+#: ../src/addressbook/addressbook.error.xml.h:50
 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."
+"A WebKitWebProcess crashed when displaying the contact. You can try again by "
+"moving to another contact and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
 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."
+"A WebKitWebProcess crashed when displaying the contact. You can try again by "
+"moving to another contact and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:1
+msgid "Show Telephone"
+msgstr "Show Telephone"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:2
+msgid "Show SIP Address"
+msgstr "Show SIP Address"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:3
+msgid "Show Instant Messaging"
+msgstr "Show Instant Messaging"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Show Web Addresses"
+msgstr "Show Web Addresses"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:5
+msgid "Show Job section"
+msgstr "Show Job section"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:6
+msgid "Show Miscellaneous"
+msgstr "Show Miscellaneous"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:7
+msgid "Show Home Mailing Address"
+msgstr "Show Home Mailing Address"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:727
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:749
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:8
+msgid "Show Work Mailing Address"
+msgstr "Show Work Mailing Address"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:9
+msgid "Show Other Mailing Address"
+msgstr "Show Other Mailing Address"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:10
+msgid "Show Notes"
+msgstr "Show Notes"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:11
+msgid "Show Certificates"
+msgstr "Show Certificates"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:725
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:747
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3108
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1996
+#: ../src/mail/mail-config.ui.h:38
+msgid "Options"
+msgstr "Options"
+
+#. This is only shown if the EActivity has a GCancellable.
+#. no flags
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3271
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3504
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4319
+#: ../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-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/composer/e-composer-actions.c:227 ../src/e-util/e-activity-bar.c:357
+#: ../src/e-util/e-attachment-dialog.c:309
+#: ../src/e-util/e-attachment-store.c:664
+#: ../src/e-util/e-attachment-store.c:832 ../src/e-util/e-attachment-view.c:302
+#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:140
+#: ../src/e-util/e-category-editor.c:211 ../src/e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-color-chooser-widget.c:125
+#: ../src/e-util/e-filter-datespec.c:289
+#: ../src/e-util/e-html-editor-actions.c:321
+#: ../src/e-util/e-html-editor-actions.c:415
+#: ../src/e-util/e-image-chooser-dialog.c:169
+#: ../src/e-util/e-mail-signature-script-dialog.c:366
+#: ../src/e-util/e-passwords.c:468 ../src/e-util/e-rule-context.c:813
+#: ../src/e-util/e-rule-editor.c:178 ../src/e-util/e-rule-editor.c:280
+#: ../src/e-util/e-rule-editor.c:789 ../src/e-util/e-send-options.ui.h:16
+#: ../src/e-util/e-source-config-dialog.c:360
+#: ../src/e-util/e-source-selector-dialog.c:370
+#: ../src/e-util/e-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:4096
+#: ../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:168 ../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:747 ../src/mail/mail-send-recv.c:829
+#: ../src/mail/mail-vfolder-ui.c:149 ../src/mail/mail-vfolder-ui.c:271
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:277
+#: ../src/modules/backup-restore/evolution-backup-tool.c:932
+#: ../src/modules/calendar/e-cal-attachment-handler.c:283
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
+#: ../src/plugins/face/face.c:295
+#: ../src/plugins/publish-calendar/publish-calendar.c:788
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:419
+#: ../src/plugins/save-calendar/save-calendar.c:185
+#: ../src/shell/e-shell-content.c:639 ../src/shell/e-shell-content.c:746
+#: ../src/shell/e-shell-utils.c:70 ../src/shell/e-shell-utils.c:139
+#: ../src/smime/gui/certificate-manager.c:665
+#: ../src/smime/gui/certificate-manager.c:742
+#: ../src/smime/gui/certificate-manager.c:966
+#: ../src/smime/gui/certificate-manager.c:1348
+#: ../src/smime/gui/e-cert-selector.c:235 ../src/smime/gui/smime-ui.ui.h:17
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3505
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:719
+#: ../src/calendar/calendar.error.xml.h:47
+#: ../src/calendar/gui/e-comp-editor.c:2115
+#: ../src/composer/e-composer-actions.c:228
+#: ../src/composer/e-composer-actions.c:348
+#: ../src/e-util/e-attachment-store.c:833
+#: ../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:4097
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:268
+#: ../src/shell/e-shell-content.c:640 ../src/shell/e-shell-utils.c:140
+#: ../src/smime/gui/certificate-manager.c:666
+#: ../src/smime/gui/certificate-manager.c:743
+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/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:1309 ../src/shell/e-shell-window-actions.c:994
+msgid "_Help"
+msgstr "_Help"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Image"
 msgstr "Image"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:18
 msgid "Nic_kname:"
 msgstr "Nic_kname:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "_File under:"
 msgstr "_File under:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
 msgid "_Where:"
 msgstr "_Where:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Ca_tegories..."
 msgstr "Ca_tegories…"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Full _Name..."
 msgstr "Full _Name…"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:749
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1163
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: ../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/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "E-mail"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "_Wants to receive HTML mail"
 msgstr "_Wants to receive HTML mail"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Telephone"
 msgstr "Telephone"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:26
 msgid "SIP Address"
 msgstr "SIP Address"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "Instant Messaging"
 msgstr "Instant Messaging"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../addressbook/importers/evolution-vcard-importer.c:983
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../src/addressbook/importers/evolution-vcard-importer.c:981
 msgid "Contact"
 msgstr "Contact"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Home Page:"
 msgstr "_Home Page:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../calendar/gui/e-comp-editor-event.c:729
-#: ../modules/itip-formatter/itip-view.c:2033
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../src/calendar/gui/e-comp-editor-event.c:727
+#: ../src/modules/itip-formatter/itip-view.c:2045
 msgid "_Calendar:"
 msgstr "_Calendar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Free/Busy:"
 msgstr "_Free/Busy:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Video Chat:"
 msgstr "_Video Chat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "Home Page:"
 msgstr "Home Page:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../modules/cal-config-google/e-cal-config-google.c:94
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../src/modules/cal-config-google/e-cal-config-google.c:97
 msgid "Calendar:"
 msgstr "Calendar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "Free/Busy:"
 msgstr "Free/Busy:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "Video Chat:"
 msgstr "Video Chat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Blog:"
 msgstr "_Blog:"
 
 #. Translators: an accessibility name
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "Blog:"
 msgstr "Blog:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "Web Addresses"
 msgstr "Web Addresses"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Profession:"
 msgstr "_Profession:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgctxt "Job"
 msgid "_Title:"
 msgstr "_Title:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Company:"
 msgstr "_Company:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Department:"
 msgstr "_Department:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Office:"
 msgstr "_Office:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_Manager:"
 msgstr "_Manager:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Assistant:"
 msgstr "_Assistant:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "Job"
 msgstr "Job"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Spouse:"
 msgstr "_Spouse:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Birthday:"
 msgstr "_Birthday:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "_Anniversary:"
 msgstr "_Anniversary:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:875
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../calendar/gui/e-calendar-view.c:2044
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:893
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
+#: ../src/calendar/gui/e-calendar-view.c:2045
 msgid "Anniversary"
 msgstr "Anniversary"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:874
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../calendar/gui/e-calendar-view.c:2043
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
+#: ../src/calendar/gui/e-calendar-view.c:2044
 msgid "Birthday"
 msgstr "Birthday"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../src/modules/addressbook/autocompletion-config.c:127
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:55
 msgid "Personal Information"
 msgstr "Personal Information"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:56
 msgid "_City:"
 msgstr "_City:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:57
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/Postal Code:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:58
 msgid "_State/Province:"
 msgstr "_State/Province/County:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:59
 msgid "_Country:"
 msgstr "_Country:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:60
 msgid "_PO Box:"
 msgstr "_PO Box:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
-#: ../composer/e-composer-from-header.c:123
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:61
+#: ../src/composer/e-composer-from-header.c:122
 msgid "_Address:"
 msgstr "_Address:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/widgets/eab-contact-display.c:356
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../addressbook/gui/widgets/e-contact-map.c:369
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:62
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:83
+#: ../src/addressbook/gui/widgets/e-contact-map.c:367
 msgid "Home"
 msgstr "Home"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:842
-#: ../addressbook/gui/widgets/e-contact-map.c:382
+#: ../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/e-contact-map.c:380
 msgid "Work"
 msgstr "Work"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:83
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:512
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:909
-#: ../calendar/gui/e-cal-model.c:3825
+#: ../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/calendar/gui/e-cal-model.c:3825
 msgid "Other"
 msgstr "Other"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:65
 msgid "Mailing Address"
 msgstr "Mailing Address"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
-#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
-#: ../mail/vfoldertypes.xml.in.h:53
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:66
+#: ../src/mail/filtertypes.xml.in.h:50 ../src/mail/searchtypes.xml.in.h:52
+#: ../src/mail/vfoldertypes.xml.in.h:53
 msgid "Notes"
 msgstr "Notes"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:67
 msgid "Add _PGP"
 msgstr "Add _PGP"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:68
 msgid "Add _X.509"
 msgstr "Add _X.509"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
-#: ../calendar/gui/e-comp-editor-page-general.c:1373
-#: ../e-util/e-attachment-view.c:357 ../e-util/e-filter-rule.c:225
-#: ../e-util/e-mail-signature-manager.c:368
-#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.error.xml.h:18
-#: ../e-util/filter.ui.h:18 ../mail/e-mail-label-manager.c:391
-#: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:630
-#: ../mail/mail-config.ui.h:59
-#: ../plugins/attachment-reminder/attachment-reminder.c:467
-#: ../plugins/email-custom-header/email-custom-header.c:849
-#: ../plugins/publish-calendar/publish-calendar.c:791
-#: ../plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../plugins/templates/templates.c:475
+#: ../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:1371
+#: ../src/e-util/e-attachment-view.c:356 ../src/e-util/e-filter-rule.c:223
+#: ../src/e-util/e-mail-signature-manager.c:368
+#: ../src/e-util/e-name-selector-dialog.c:1037
+#: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:25
+#: ../src/mail/e-mail-config-identity-page.c:871
+#: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:438
+#: ../src/mail/em-folder-properties.c:1037
+#: ../src/mail/em-vfolder-editor-rule.c:631 ../src/mail/mail-config.ui.h:62
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:553
+#: ../src/plugins/email-custom-header/email-custom-header.c:847
+#: ../src/plugins/publish-calendar/publish-calendar.c:789
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../src/plugins/templates/templates.c:473
 msgid "_Remove"
 msgstr "_Remove"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:70
 msgid "Load P_GP"
 msgstr "Load P_GP"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:71
 msgid "_Load X.509"
 msgstr "_Load X.509"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3507
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
-#: ../addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2107
-#: ../composer/e-composer-actions.c:230 ../composer/e-composer-actions.c:347
-#: ../e-util/e-attachment-store.c:831
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3863
-#: ../e-util/gal-view-instance-save-as-dialog.c:270
-#: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:137
-#: ../smime/gui/certificate-manager.c:668
-#: ../smime/gui/certificate-manager.c:745
-msgid "_Save"
-msgstr "_Save"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
-#: ../modules/addressbook/e-book-shell-backend.c:314
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:72
+#: ../src/modules/addressbook/e-book-shell-backend.c:318
 msgid "Certificates"
 msgstr "Certificates"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
-#: ../calendar/gui/e-comp-editor.c:2004 ../calendar/gui/e-comp-editor.c:2076
-#: ../e-util/e-preferences-window.c:382 ../e-util/e-send-options.ui.h:41
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:955
-msgid "_Help"
-msgstr "_Help"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1998
-#: ../mail/mail-config.ui.h:37
-msgid "Options"
-msgstr "Options"
-
-#. This is only shown if the EActivity has a GCancellable.
-#. no flags
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3273
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3506
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4321
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:222
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../addressbook/gui/widgets/eab-contact-merging.c:474
-#: ../addressbook/gui/widgets/eab-contact-merging.c:718
-#: ../addressbook/gui/widgets/eab-gui-util.c:318
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1365
-#: ../calendar/gui/e-cal-dialogs.c:689
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:303
-#: ../composer/e-composer-actions.c:229 ../e-util/e-activity-bar.c:359
-#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:666
-#: ../e-util/e-attachment-store.c:830 ../e-util/e-attachment-view.c:303
-#: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
-#: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
-#: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
-#: ../e-util/e-html-editor-actions.c:323 ../e-util/e-html-editor-actions.c:414
-#: ../e-util/e-image-chooser-dialog.c:171
-#: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
-#: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
-#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:791
-#: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
-#: ../e-util/e-source-selector-dialog.c:372 ../e-util/e-table-config.c:548
-#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3862
-#: ../e-util/gal-view-instance-save-as-dialog.c:269
-#: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
-#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
-#: ../mail/mail-config.ui.h:2 ../mail/mail.error.xml.h:16
-#: ../mail/mail-send-recv.c:746 ../mail/mail-send-recv.c:828
-#: ../mail/mail-vfolder-ui.c:148 ../mail/mail-vfolder-ui.c:270
-#: ../modules/backup-restore/evolution-backup-tool.c:899
-#: ../modules/calendar/e-cal-attachment-handler.c:285
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
-#: ../plugins/face/face.c:297
-#: ../plugins/publish-calendar/publish-calendar.c:790
-#: ../plugins/publish-calendar/url-editor-dialog.c:421
-#: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
-#: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:72
-#: ../shell/e-shell-utils.c:136 ../smime/gui/certificate-manager.c:667
-#: ../smime/gui/certificate-manager.c:744
-#: ../smime/gui/certificate-manager.c:968
-#: ../smime/gui/certificate-manager.c:1350 ../smime/gui/e-cert-selector.c:237
-#: ../smime/gui/smime-ui.ui.h:23
-msgid "_Cancel"
-msgstr "_Cancel"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
-msgid "Show Telephone"
-msgstr "Show Telephone"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
-msgid "Show SIP Address"
-msgstr "Show SIP Address"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
-msgid "Show Instant Messaging"
-msgstr "Show Instant Messaging"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
-msgid "Show Web Addresses"
-msgstr "Show Web Addresses"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:66
-msgid "Show Job section"
-msgstr "Show Job section"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:67
-msgid "Show Miscellaneous"
-msgstr "Show Miscellaneous"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:68
-msgid "Show Home Mailing Address"
-msgstr "Show Home Mailing Address"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:69
-msgid "Show Work Mailing Address"
-msgstr "Show Work Mailing Address"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:70
-msgid "Show Other Mailing Address"
-msgstr "Show Other Mailing Address"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:71
-msgid "Show Notes"
-msgstr "Show Notes"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:72
-msgid "Show Certificates"
-msgstr "Show Certificates"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../calendar/gui/e-comp-editor.c:2039 ../e-util/e-html-editor-actions.c:899
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:260
+#: ../src/calendar/gui/e-comp-editor.c:2047
+#: ../src/e-util/e-html-editor-actions.c:913
 msgid "_Undo"
 msgstr "_Undo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/e-comp-editor.c:2041 ../e-util/e-focus-tracker.c:122
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:262
+#: ../src/calendar/gui/e-comp-editor.c:2049 ../src/e-util/e-focus-tracker.c:120
 msgid "Undo"
 msgstr "Undo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../calendar/gui/e-comp-editor.c:2046 ../e-util/e-html-editor-actions.c:885
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:267
+#: ../src/calendar/gui/e-comp-editor.c:2054
+#: ../src/e-util/e-html-editor-actions.c:899
 msgid "_Redo"
 msgstr "_Redo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/e-comp-editor.c:2048 ../e-util/e-focus-tracker.c:138
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:269
+#: ../src/calendar/gui/e-comp-editor.c:2056 ../src/e-util/e-focus-tracker.c:136
 msgid "Redo"
 msgstr "Redo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-#: ../addressbook/gui/widgets/eab-gui-util.c:503
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:501
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:323
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:321
 msgid "Error modifying contact"
 msgstr "Error modifying contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:343
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:341
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:743
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:741
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3102
 #, c-format
-msgid "Contact Editor - %s"
+#| msgid "Contact Editor - %s"
+msgid "Contact Editor — %s"
 msgstr "Contact Editor — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3240
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3238
 msgid "X.509 certificates"
 msgstr "X.509 certificates"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3243
 msgid "PGP keys"
 msgstr "PGP keys"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
-#: ../smime/gui/certificate-manager.c:691
-#: ../smime/gui/certificate-manager.c:980
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3249
+#: ../src/smime/gui/certificate-manager.c:689
+#: ../src/smime/gui/certificate-manager.c:978
 msgid "All files"
 msgstr "All files"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3269
 msgid "Open PGP key"
 msgstr "Open PGP key"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3269
 msgid "Open X.509 certificate"
 msgstr "Open X.509 certificate"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3274
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4322
-#: ../e-util/e-attachment-store.c:664 ../e-util/e-category-editor.c:146
-#: ../e-util/e-html-editor-actions.c:324 ../e-util/e-html-editor-actions.c:415
-#: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
-#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:969
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4320
+#: ../src/e-util/e-attachment-store.c:662 ../src/e-util/e-category-editor.c:148
+#: ../src/e-util/e-html-editor-actions.c:322
+#: ../src/e-util/e-html-editor-actions.c:416
+#: ../src/e-util/e-image-chooser-dialog.c:172 ../src/plugins/face/face.c:296
+#: ../src/shell/e-shell-utils.c:71 ../src/smime/gui/certificate-manager.c:967
 msgid "_Open"
 msgstr "_Open"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3291
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3522
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3289
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3520
 msgid "Chosen file is not a local file."
 msgstr "Chosen file is not a local file."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3304
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3302
 #, c-format
 msgid "Failed to load certificate: %s"
 msgstr "Failed to load certificate: %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
 msgctxt "cert-kind"
 msgid "X.509"
 msgstr "X.509"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
 msgctxt "cert-kind"
 msgid "PGP"
 msgstr "PGP"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
 msgid "Save PGP key"
 msgstr "Save PGP key"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
 msgid "Save X.509 certificate"
 msgstr "Save X.509 certificate"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3534
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3532
 #, c-format
 msgid "Failed to save certificate: %s"
 msgstr "Failed to save certificate: %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4318
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4316
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4323
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4321
 msgid "_No image"
 msgstr "_No image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4672
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4670
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -793,459 +4259,468 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4678
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4676
 #, c-format
-msgid "'%s' has an invalid format"
-msgstr "'%s' has an invalid format"
+#| msgid "'%s' has an invalid format"
+msgid "“%s” has an invalid format"
+msgstr "“%s” has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4686
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4684
 #, c-format
-msgid "'%s' cannot be a future date"
-msgstr "'%s' cannot be a future date"
+#| msgid "'%s' cannot be a future date"
+msgid "“%s” cannot be a future date"
+msgstr "“%s” cannot be a future date"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4694
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4692
 #, c-format
-msgid "%s'%s' has an invalid format"
-msgstr "%s'%s' has an invalid format"
+#| msgid "%s'%s' has an invalid format"
+msgid "%s“%s” has an invalid format"
+msgstr "%s“%s” has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4707
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4721
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4705
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4719
 #, c-format
-msgid "%s'%s' is empty"
-msgstr "%s'%s' is empty"
+#| msgid "%s'%s' is empty"
+msgid "%s“%s” is empty"
+msgstr "%s“%s” is empty"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4736
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4734
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
-#: ../addressbook/gui/contact-editor/fullname.ui.h:13
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:304
-#: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
-#: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
-#: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
-#: ../e-util/e-html-editor-link-dialog.c:257 ../e-util/e-passwords.c:471
-#: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
-#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:792
-#: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
-#: ../e-util/e-source-selector-dialog.c:373 ../e-util/e-table-config.c:549
-#: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
-#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-tag-editor.c:243
-#: ../mail/em-folder-selector.c:43 ../mail/mail-config.ui.h:3
-#: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
-#: ../mail/mail-vfolder-ui.c:271
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
-#: ../plugins/publish-calendar/url-editor-dialog.c:422
-#: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
-#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1351
-#: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
+#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:221
+#: ../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/e-util/e-attachment-dialog.c:311
+#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:212
+#: ../src/e-util/e-charset-combo-box.c:100
+#: ../src/e-util/e-color-chooser-widget.c:126
+#: ../src/e-util/e-filter-datespec.c:290
+#: ../src/e-util/e-html-editor-link-dialog.c:255
+#: ../src/e-util/e-passwords.c:469 ../src/e-util/e-rule-context.c:814
+#: ../src/e-util/e-rule-editor.c:179 ../src/e-util/e-rule-editor.c:281
+#: ../src/e-util/e-rule-editor.c:790 ../src/e-util/e-send-options.ui.h:17
+#: ../src/e-util/e-source-config-dialog.c:361
+#: ../src/e-util/e-source-selector-dialog.c:371
+#: ../src/e-util/e-table-config.c:549 ../src/e-util/e-table-config.ui.h:4
+#: ../src/e-util/e-timezone-dialog.ui.h:3
+#: ../src/mail/e-mail-config-window.c:335 ../src/mail/e-mail-tag-editor.c:169
+#: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
+#: ../src/mail/mail-dialogs.ui.h:24 ../src/mail/mail-vfolder-ui.c:150
+#: ../src/mail/mail-vfolder-ui.c:272
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:278
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:420
+#: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:747
+#: ../src/shell/main.c:180 ../src/smime/gui/certificate-manager.c:1349
+#: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
 msgid "_OK"
 msgstr "_OK"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:451
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:449
 msgid "Contact Quick-Add"
 msgstr "Contact Quick-Add"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "_Edit Full"
 msgstr "_Edit Full"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:505
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:503
 msgid "_Full name"
 msgstr "_Full name"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:518
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:516
 msgid "E_mail"
 msgstr "E_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:531
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:529
 msgid "_Select Address Book"
 msgstr "_Select Address Book"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:1
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Mr."
 msgstr "Mr."
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:2
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:2
 msgid "Mrs."
 msgstr "Mrs."
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:3
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:3
 msgid "Ms."
 msgstr "Ms."
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:4
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:4
 msgid "Miss"
 msgstr "Miss"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:5
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:5
 msgid "Dr."
 msgstr "Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:6
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:6
 msgid "Sr."
 msgstr "Sr."
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:7
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:8
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:8
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:9
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:9
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:10
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:10
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:11
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:11
 msgid "Esq."
 msgstr "Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:12
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:12
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Full Name"
 msgstr "Full Name"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:15
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_First:"
 msgstr "_First:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:16
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:16
 msgctxt "FullName"
 msgid "_Title:"
 msgstr "_Title:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Middle:"
 msgstr "_Middle:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:18
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:18
 msgid "_Last:"
 msgstr "_Last:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:19
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:19
 msgid "_Suffix:"
 msgstr "_Suffix:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:815
 msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
 msgstr "_List name:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "Members"
 msgstr "Members"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Type an e-mail address or drag a contact into the list below:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Hide addresses when sending mail to this list"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
 msgid "Add an email to the List"
 msgstr "Add an email to the List"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
 msgid "Remove an email address from the List"
 msgstr "Remove an email address from the List"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
-msgid "Insert email addresses from Address Book"
-msgstr "Insert email addresses from Address Book"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:13
 msgid "_Select..."
 msgstr "_Select…"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:13
-#: ../e-util/filter.ui.h:19
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
+msgid "Insert email addresses from Address Book"
+msgstr "Insert email addresses from Address Book"
+
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
+#: ../src/e-util/filter.ui.h:26
 msgid "_Top"
 msgstr "_Top"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
-#: ../e-util/e-source-selector.c:3471 ../e-util/filter.ui.h:20
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
+#: ../src/e-util/e-source-selector.c:3469 ../src/e-util/filter.ui.h:27
 msgid "_Up"
 msgstr "_Up"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
-#: ../e-util/e-source-selector.c:3472 ../e-util/filter.ui.h:21
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
+#: ../src/e-util/e-source-selector.c:3470 ../src/e-util/filter.ui.h:28
 msgid "_Down"
 msgstr "_Down"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../e-util/filter.ui.h:22
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
+#: ../src/e-util/filter.ui.h:29
 msgid "_Bottom"
 msgstr "_Bottom"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:942
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:940
 msgid "Contact List Members"
 msgstr "Contact List Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1487
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1499
 msgid "_Members"
 msgstr "_Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1627
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1639
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1647
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1659
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1667
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1679
 msgid "Error removing list"
 msgstr "Error removing list"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1221
+#: ../src/addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1225
 msgid "Name contains"
 msgstr "Name contains"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1214
+#: ../src/addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1218
 msgid "Email begins with"
 msgstr "E-mail begins with"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1207
-#: ../modules/calendar/e-cal-shell-view-actions.c:1664
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
-#: ../modules/calendar/e-task-shell-view-actions.c:985
+#: ../src/addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../src/calendar/gui/caltypes.xml.in.h:26
+#: ../src/calendar/gui/memotypes.xml.in.h:19
+#: ../src/calendar/gui/tasktypes.xml.in.h:30
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1211
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1713
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:782
+#: ../src/modules/calendar/e-task-shell-view-actions.c:983
 msgid "Any field contains"
 msgstr "Any field contains"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
-#: ../addressbook/gui/widgets/ea-minicard-view.c:225
+#: ../src/addressbook/gui/widgets/ea-addressbook-view.c:92
+#: ../src/addressbook/gui/widgets/ea-addressbook-view.c:101
+#: ../src/addressbook/gui/widgets/ea-minicard-view.c:223
 msgid "evolution address book"
 msgstr "evolution address book"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:149
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:185
 msgid "Copy _Email Address"
 msgstr "Copy _E-mail Address"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view.c:359
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:187
+#: ../src/e-util/e-web-view.c:368
 msgid "Copy the email address to the clipboard"
 msgstr "Copy the e-mail address to the clipboard"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view.c:371
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:192
+#: ../src/e-util/e-web-view.c:380
 msgid "_Send New Message To..."
 msgstr "_Send New Message To…"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view.c:373
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:194
+#: ../src/e-util/e-web-view.c:382
 msgid "Send a mail message to this address"
 msgstr "Send a mail message to this address"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view.c:1279
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:321
+#: ../src/e-util/e-web-view.c:1349
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:335
+#, c-format
+#| msgid "Click to open %s"
+msgid "Click to open map for %s"
+msgstr "Click to open map for %s"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:154
 msgid "Open map"
 msgstr "Open map"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:450
 msgid "SIP"
 msgstr "SIP"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:694
 msgid "List Members:"
 msgstr "List Members:"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:766
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Nickname"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:767
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:768
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:769
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:770
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:771
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:772
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:773
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:774
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:762
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:775
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:837
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Company"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:838
 msgid "Department"
 msgstr "Department"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:839
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "Office"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:840
 msgid "Profession"
 msgstr "Profession"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:841
 msgid "Position"
 msgstr "Position"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Manager"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:825
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:843
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Assistant"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:844
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:827
-#: ../data/evolution.desktop.in.in.h:9 ../e-util/e-send-options.c:546
-#: ../modules/calendar/e-cal-shell-view-actions.c:199
-#: ../modules/calendar/e-cal-shell-view.c:579
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "Calendar"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:828
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:846
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Free/Busy"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:847
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:888
 msgid "Phone"
 msgstr "Phone"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:830
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:848
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:832
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:873
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:899
+#: ../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
 msgid "Address"
 msgstr "Address"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:886
 msgid "Home Page"
 msgstr "Home Page"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:887
 msgid "Web Log"
 msgstr "Web Log"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:871
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../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"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:876
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:894
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Spouse"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:886
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:904
 msgid "Personal"
 msgstr "Personal"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:931
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Note"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1145
 msgid "List Members"
 msgstr "List Members"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1166
 msgid "Job Title"
 msgstr "Job Title"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1189
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1207
 msgid "Home page"
 msgstr "Home page"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1199
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1217
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:261
-#: ../calendar/gui/e-cal-component-preview.c:308
-#: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
-#: ../calendar/gui/print.c:3588 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/mail-send-recv.c:967
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:259
+#: ../src/calendar/gui/e-cal-component-preview.c:308
+#: ../src/calendar/gui/e-cal-model-tasks.c:314
+#: ../src/calendar/gui/e-cal-model-tasks.c:556
+#: ../src/calendar/gui/e-task-table.c:209
+#: ../src/calendar/gui/e-task-table.c:224
+#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3586
+#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:966
 msgid "Cancelled"
 msgstr "Cancelled"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:457
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:455
 msgid "Merge Contact"
 msgstr "Merge Contact"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:475
-#: ../addressbook/gui/widgets/eab-contact-merging.c:724
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:473
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:722
 msgid "_Merge"
 msgstr "_Merge"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:713
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:711
 msgid "Duplicate Contact Detected"
 msgstr "Duplicate Contact Detected"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:771
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:769
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
@@ -1253,7 +4728,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?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:774
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:772
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
@@ -1261,23 +4736,23 @@ msgstr ""
 "The name or e-mail address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:789
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:787
 msgid "Changed Contact:"
 msgstr "Changed Contact:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:791
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:789
 msgid "New Contact:"
 msgstr "New Contact:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:830
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:828
 msgid "Conflicting Contact:"
 msgstr "Conflicting Contact:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:832
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:830
 msgid "Old Contact:"
 msgstr "Old Contact:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:121
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:119
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1287,7 +4762,7 @@ msgstr ""
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the address book once in online mode to download its contents."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:138
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1296,7 +4771,7 @@ msgstr ""
 "This address book cannot be opened.  Please check that the path %s exists "
 "and that permissions are set to access it."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:151
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1304,7 +4779,7 @@ msgstr ""
 "This version of Evolution does not have LDAP support compiled into it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:160
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1312,11 +4787,11 @@ msgstr ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Detailed error message:"
 msgstr "Detailed error message:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:209
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1328,7 +4803,7 @@ msgstr ""
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this address book."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:218
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:216
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1341,138 +4816,141 @@ msgstr ""
 "preferences for this address book."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:224
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "The backend for this address book was unable to parse this query. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:229
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "The backend for this address book refused to perform this query. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:237
-#: ../addressbook/gui/widgets/eab-gui-util.c:243
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:235
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:241
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "This query did not complete successfully. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:265
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:263
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:314
 msgid "Select Address Book"
 msgstr "Select Address Book"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:398
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:396
 msgid "list"
 msgstr "list"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:587
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:585
 msgid "Move contact to"
 msgstr "Move contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:589
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:587
 msgid "Copy contact to"
 msgstr "Copy contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:592
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:590
 msgid "Move contacts to"
 msgstr "Move contacts to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:592
 msgid "Copy contacts to"
 msgstr "Copy contacts to"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:162
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:160
 msgid "No contacts"
 msgstr "No contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:164
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contact"
 msgstr[1] "%d contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:372
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:370
 msgid "Error getting book view"
 msgstr "Error getting book view"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:819
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:817
 msgid "Search Interrupted"
 msgstr "Search Interrupted"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:221
+#: ../src/addressbook/gui/widgets/e-addressbook-table-adapter.c:219
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:682
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Cut selected contacts to the clipboard"
 msgstr "Cut selected contacts to the clipboard"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:688
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:686
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copy selected contacts to the clipboard"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:694
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:692
 msgid "Paste contacts from the clipboard"
 msgstr "Paste contacts from the clipboard"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:700
-#: ../modules/addressbook/e-book-shell-view-actions.c:1017
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:698
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1021
 msgid "Delete selected contacts"
 msgstr "Delete selected contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:706
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Select all visible contacts"
 msgstr "Select all visible contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1333
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1328
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Are you sure you want to delete these contact lists?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1337
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1332
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Are you sure you want to delete this contact list?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1341
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1336
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Are you sure you want to delete this contact list (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1347
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1342
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Are you sure you want to delete these contacts?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1351
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1346
 msgid "Are you sure you want to delete this contact?"
 msgstr "Are you sure you want to delete this contact?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1355
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1350
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Are you sure you want to delete this contact (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1366
-#: ../calendar/gui/e-comp-editor.c:1997 ../e-util/e-focus-tracker.c:785
-#: ../e-util/evolution-source-viewer.c:805 ../mail/e-mail-account-manager.c:736
-#: ../modules/addressbook/e-book-shell-view-actions.c:1089
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
-#: ../modules/calendar/e-memo-shell-view-actions.c:678
-#: ../modules/calendar/e-task-shell-view-actions.c:832
-#: ../modules/mail/e-mail-shell-view-actions.c:1752
-#: ../shell/e-shell-window-actions.c:813
-#: ../smime/gui/certificate-manager.c:1674 ../smime/gui/smime-ui.ui.h:10
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1361
+#: ../src/calendar/gui/e-comp-editor.c:2005
+#: ../src/e-util/e-accounts-window.c:1727 ../src/e-util/e-focus-tracker.c:783
+#: ../src/e-util/evolution-source-viewer.c:806
+#: ../src/e-util/e-webdav-browser.c:2688
+#: ../src/mail/e-mail-account-manager.c:737
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1093
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:676
+#: ../src/modules/calendar/e-task-shell-view-actions.c:830
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
+#: ../src/shell/e-shell-window-actions.c:852
+#: ../src/smime/gui/certificate-manager.c:1672 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "_Delete"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1508
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1487,99 +4965,100 @@ msgstr[1] ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1521
-msgid "_Don't Display"
-msgstr "_Don't Display"
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1516
+#| msgid "_Don't Display"
+msgid "_Don’t Display"
+msgstr "_Don’t Display"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1522
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1517
 msgid "Display _All Contacts"
 msgstr "Display _All Contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "File As"
 msgstr "File As"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Given Name"
 msgstr "Given Name"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Family Name"
 msgstr "Family Name"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 msgid "Email 3"
 msgstr "E-mail 3"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Assistant Phone"
 msgstr "Assistant Phone"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 msgid "Business Phone"
 msgstr "Business Phone"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Business Phone 2"
 msgstr "Business Phone 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Business Fax"
 msgstr "Business Fax"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Callback Phone"
 msgstr "Callback Phone"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Car Phone"
 msgstr "Car Phone"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Company Phone"
 msgstr "Company Phone"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Home Phone"
 msgstr "Home Phone"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Phone 2"
 msgstr "Home Phone 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "Home Fax"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "ISDN Phone"
 msgstr "ISDN Phone"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Other Phone"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Other Fax"
 msgstr "Other Fax"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Pager"
 msgstr "Pager"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Primary Phone"
 msgstr "Primary Phone"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Telex"
 msgstr "Telex"
 
@@ -1589,94 +5068,95 @@ msgstr "Telex"
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "Unit"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Title"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:660
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: ../src/calendar/gui/e-meeting-list-view.c:658
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Role"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Website"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:42
 msgid "Journal"
 msgstr "Journal"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../calendar/gui/e-memo-table.etspec.h:4
-#: ../calendar/gui/e-task-table.etspec.h:12 ../e-util/e-categories-dialog.c:87
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:6
+#: ../src/calendar/gui/e-memo-table.etspec.h:4
+#: ../src/calendar/gui/e-task-table.etspec.h:12
+#: ../src/e-util/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "Categories"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:33
+#: ../src/addressbook/gui/widgets/ea-minicard.c:31
 msgid "Open"
 msgstr "Open"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:159
+#: ../src/addressbook/gui/widgets/ea-minicard.c:157
 msgid "Contact List: "
 msgstr "Contact List: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:160
+#: ../src/addressbook/gui/widgets/ea-minicard.c:158
 msgid "Contact: "
 msgstr "Contact: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:182
+#: ../src/addressbook/gui/widgets/ea-minicard.c:180
 msgid "evolution minicard"
 msgstr "evolution minicard"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:35
+#: ../src/addressbook/gui/widgets/ea-minicard-view.c:33
 msgid "New Contact"
 msgstr "New Contact"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+#: ../src/addressbook/gui/widgets/ea-minicard-view.c:34
 msgid "New Contact List"
 msgstr "New Contact List"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:208
+#: ../src/addressbook/gui/widgets/ea-minicard-view.c:206
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "current address book folder %s has %d card"
 msgstr[1] "current address book folder %s has %d cards"
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:377
+#: ../src/addressbook/gui/widgets/e-contact-map-window.c:374
 msgid "Contacts Map"
 msgstr "Contacts Map"
 
 #. Zoom-in button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:412
+#: ../src/addressbook/gui/widgets/e-contact-map-window.c:409
 msgid "Zoom _In"
 msgstr "Zoom _In"
 
 #. Zoom-out button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2424
+#: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
+#: ../src/mail/e-mail-reader.c:2415
 msgid "Zoom _Out"
 msgstr "Zoom _Out"
 
 #. Search button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:1858
-#: ../e-util/e-html-editor-find-dialog.c:252
-#: ../shell/e-shell-window-actions.c:890
+#: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
+#: ../src/e-util/e-html-editor-actions.c:1872
+#: ../src/e-util/e-html-editor-find-dialog.c:250
+#: ../src/shell/e-shell-window-actions.c:929
 msgid "_Find"
 msgstr "_Find"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1686,7 +5166,7 @@ msgstr ""
 "\n"
 "Searching for the Contacts…"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1700,7 +5180,7 @@ msgstr ""
 "\n"
 "or double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:194
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1714,7 +5194,7 @@ msgstr ""
 "\n"
 "Double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:198
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1724,7 +5204,7 @@ msgstr ""
 "\n"
 "Search for the Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1734,146 +5214,149 @@ msgstr ""
 "\n"
 "There are no items to show in this view."
 
-#: ../addressbook/importers/evolution-csv-importer.c:747
-#: ../addressbook/importers/evolution-ldif-importer.c:549
-#: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:481
-#: ../calendar/importers/icalendar-importer.c:978
-#: ../calendar/importers/icalendar-importer.c:1018 ../shell/shell.error.xml.h:1
+#: ../src/addressbook/importers/evolution-csv-importer.c:745
+#: ../src/addressbook/importers/evolution-ldif-importer.c:547
+#: ../src/addressbook/importers/evolution-vcard-importer.c:247
+#: ../src/calendar/importers/icalendar-importer.c:479
+#: ../src/calendar/importers/icalendar-importer.c:976
+#: ../src/calendar/importers/icalendar-importer.c:1016
+#: ../src/shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Importing…"
 
-#: ../addressbook/importers/evolution-csv-importer.c:929
-msgid "Can't open .csv file"
-msgstr "Can't open .csv file"
+#: ../src/addressbook/importers/evolution-csv-importer.c:927
+#| msgid "Can't open .csv file"
+msgid "Can’t open .csv file"
+msgstr "Can’t open .csv file"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1098
+#: ../src/addressbook/importers/evolution-csv-importer.c:1096
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlook Contacts CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1099
+#: ../src/addressbook/importers/evolution-csv-importer.c:1097
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlook Contacts CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1107
+#: ../src/addressbook/importers/evolution-csv-importer.c:1105
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozilla Contacts CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1108
+#: ../src/addressbook/importers/evolution-csv-importer.c:1106
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilla Contacts CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1116
+#: ../src/addressbook/importers/evolution-csv-importer.c:1114
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolution Contacts CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1117
+#: ../src/addressbook/importers/evolution-csv-importer.c:1115
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolution Contacts CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:719
-msgid "Can't open .ldif file"
-msgstr "Can't open .ldif file"
+#: ../src/addressbook/importers/evolution-ldif-importer.c:717
+#| msgid "Can't open .ldif file"
+msgid "Can’t open .ldif file"
+msgstr "Can’t open .ldif file"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:821
+#: ../src/addressbook/importers/evolution-ldif-importer.c:819
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:822
+#: ../src/addressbook/importers/evolution-ldif-importer.c:820
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF importer"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:646
+#: ../src/addressbook/importers/evolution-vcard-importer.c:644
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:647
+#: ../src/addressbook/importers/evolution-vcard-importer.c:645
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard Importer"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:874
+#: ../src/addressbook/printing/e-contact-print.c:872
 #, c-format
 msgid "Page %d"
 msgstr "Page %d"
 
-#: ../addressbook/util/eab-book-util.c:36
+#: ../src/addressbook/util/eab-book-util.c:34
 msgctxt "addressbook-label"
 msgid "Work Email"
 msgstr "Work E-mail"
 
-#: ../addressbook/util/eab-book-util.c:37
+#: ../src/addressbook/util/eab-book-util.c:35
 msgctxt "addressbook-label"
 msgid "Home Email"
 msgstr "Home E-mail"
 
-#: ../addressbook/util/eab-book-util.c:38
+#: ../src/addressbook/util/eab-book-util.c:36
 msgctxt "addressbook-label"
 msgid "Other Email"
 msgstr "Other E-mail"
 
-#: ../addressbook/util/eab-book-util.c:44
+#: ../src/addressbook/util/eab-book-util.c:42
 msgctxt "addressbook-label"
 msgid "Work SIP"
 msgstr "Work SIP"
 
-#: ../addressbook/util/eab-book-util.c:45
+#: ../src/addressbook/util/eab-book-util.c:43
 msgctxt "addressbook-label"
 msgid "Home SIP"
 msgstr "Home SIP"
 
-#: ../addressbook/util/eab-book-util.c:46
+#: ../src/addressbook/util/eab-book-util.c:44
 msgctxt "addressbook-label"
 msgid "Other SIP"
 msgstr "Other SIP"
 
-#: ../addressbook/util/eab-book-util.c:74
+#: ../src/addressbook/util/eab-book-util.c:72
 msgctxt "addressbook-label"
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/util/eab-book-util.c:75
+#: ../src/addressbook/util/eab-book-util.c:73
 msgctxt "addressbook-label"
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/util/eab-book-util.c:76
+#: ../src/addressbook/util/eab-book-util.c:74
 msgctxt "addressbook-label"
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/util/eab-book-util.c:77
+#: ../src/addressbook/util/eab-book-util.c:75
 msgctxt "addressbook-label"
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/util/eab-book-util.c:78
+#: ../src/addressbook/util/eab-book-util.c:76
 msgctxt "addressbook-label"
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/util/eab-book-util.c:79
+#: ../src/addressbook/util/eab-book-util.c:77
 msgctxt "addressbook-label"
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/util/eab-book-util.c:80
+#: ../src/addressbook/util/eab-book-util.c:78
 msgctxt "addressbook-label"
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/util/eab-book-util.c:81
+#: ../src/addressbook/util/eab-book-util.c:79
 msgctxt "addressbook-label"
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/util/eab-book-util.c:82
+#: ../src/addressbook/util/eab-book-util.c:80
 msgctxt "addressbook-label"
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../addressbook/util/eab-book-util.c:83
+#: ../src/addressbook/util/eab-book-util.c:81
 msgctxt "addressbook-label"
 msgid "Google Talk"
 msgstr "Google Talk"
@@ -1882,7 +5365,7 @@ msgstr "Google Talk"
 #. * if an email address type is not one of the predefined types,
 #. * this generic label is used instead of one of the predefined labels.
 #.
-#: ../addressbook/util/eab-book-util.c:126
+#: ../src/addressbook/util/eab-book-util.c:124
 msgctxt "addressbook-label"
 msgid "Email"
 msgstr "E-mail"
@@ -1892,7 +5375,7 @@ msgstr "E-mail"
 #. * this generic label is used instead of one of the predefined labels.
 #. * SIP=Session Initiation Protocol, used for voice over IP
 #.
-#: ../addressbook/util/eab-book-util.c:173
+#: ../src/addressbook/util/eab-book-util.c:171
 msgctxt "addressbook-label"
 msgid "SIP"
 msgstr "SIP"
@@ -1902,7 +5385,7 @@ msgstr "SIP"
 #. * this generic label is used instead of one of the predefined labels.
 #. * IM=Instant Messaging
 #.
-#: ../addressbook/util/eab-book-util.c:216
+#: ../src/addressbook/util/eab-book-util.c:214
 msgctxt "addressbook-label"
 msgid "IM"
 msgstr "IM"
@@ -1911,148 +5394,152 @@ msgstr "IM"
 #. * if a phone number type is not one of the predefined types,
 #. * this generic label is used instead of one of the predefined labels.
 #.
-#: ../addressbook/util/eab-book-util.c:271
+#: ../src/addressbook/util/eab-book-util.c:269
 msgctxt "addressbook-label"
 msgid "Phone"
 msgstr "Phone"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:105
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:103
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:118
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:116
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:131
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:129
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:358
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:357
 msgid "Start time"
 msgstr "Start time"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../calendar/alarm-notify/alarm-queue.c:1947
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:1
+#: ../src/calendar/alarm-notify/alarm-queue.c:1988
 msgid "Appointments"
 msgstr "Appointments"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:2
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:2
 msgid "Dismiss _All"
 msgstr "Dismiss _All"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:3
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:3
 msgid "_Snooze"
 msgstr "_Snooze"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../calendar/gui/e-comp-editor-page-general.c:1365
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2241
-#: ../calendar/gui/e-comp-editor.c:2062 ../e-util/e-html-editor-actions.c:908
-#: ../e-util/e-mail-signature-manager.c:358 ../e-util/filter.ui.h:17
-#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:173
-#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:63
-#: ../plugins/attachment-reminder/attachment-reminder.c:462
-#: ../plugins/email-custom-header/email-custom-header.c:844
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../plugins/templates/templates.c:470 ../shell/e-shell-window-actions.c:941
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1363
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
+#: ../src/calendar/gui/e-comp-editor.c:2070
+#: ../src/e-util/e-accounts-window.c:1719
+#: ../src/e-util/e-html-editor-actions.c:922
+#: ../src/e-util/e-mail-signature-manager.c:358
+#: ../src/e-util/e-webdav-browser.c:2681 ../src/e-util/filter.ui.h:24
+#: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:171
+#: ../src/mail/e-mail-label-manager.c:380
+#: ../src/mail/em-folder-properties.c:1034 ../src/mail/mail-config.ui.h:66
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:548
+#: ../src/plugins/email-custom-header/email-custom-header.c:842
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../src/plugins/templates/templates.c:468
+#: ../src/shell/e-shell-window-actions.c:980 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:5
 msgid "_Print"
 msgstr "_Print"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:164
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../src/e-util/e-alert-dialog.c:162
 msgid "_Dismiss"
 msgstr "_Dismiss"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1914
-#: ../calendar/alarm-notify/alarm-queue.c:1924
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
-#: ../modules/itip-formatter/itip-view.c:1666
-#: ../modules/itip-formatter/itip-view.c:1777
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../src/calendar/alarm-notify/alarm-queue.c:1955
+#: ../src/calendar/alarm-notify/alarm-queue.c:1965
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
+#: ../src/modules/itip-formatter/itip-view.c:1678
+#: ../src/modules/itip-formatter/itip-view.c:1789
 msgid "Location:"
 msgstr "Location:"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
 msgstr "location of appointment"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:9
 msgid "Snooze _time:"
 msgstr "Snooze _time:"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../e-util/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
-#: ../modules/calendar/e-cal-shell-view-actions.c:344
-#: ../plugins/publish-calendar/publish-calendar.ui.h:6
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:10
+#: ../src/e-util/e-interval-chooser.c:144 ../src/e-util/filter.ui.h:8
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:342
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "days"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:11
-#: ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:11
+#: ../src/e-util/e-interval-chooser.c:142 ../src/e-util/filter.ui.h:7
 msgid "hours"
 msgstr "hours"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:12
-#: ../e-util/e-interval-chooser.c:139 ../e-util/filter.ui.h:6
-#: ../mail/e-mail-config-provider-page.c:526
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:12
+#: ../src/e-util/e-interval-chooser.c:140 ../src/e-util/filter.ui.h:6
+#: ../src/mail/e-mail-config-provider-page.c:579
 msgid "minutes"
 msgstr "minutes"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1715
-#: ../calendar/alarm-notify/alarm-queue.c:1895
+#: ../src/calendar/alarm-notify/alarm-queue.c:1756
+#: ../src/calendar/alarm-notify/alarm-queue.c:1936
 msgid "No summary available."
 msgstr "No summary available."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1724
-#: ../calendar/alarm-notify/alarm-queue.c:1726
+#: ../src/calendar/alarm-notify/alarm-queue.c:1765
+#: ../src/calendar/alarm-notify/alarm-queue.c:1767
 msgid "No description available."
 msgstr "No description available."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1734
+#: ../src/calendar/alarm-notify/alarm-queue.c:1775
 msgid "No location information available."
 msgstr "No location information available."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1739
-#: ../calendar/alarm-notify/alarm-queue.c:1886
-#: ../calendar/alarm-notify/alarm-queue.c:2237
+#: ../src/calendar/alarm-notify/alarm-queue.c:1780
+#: ../src/calendar/alarm-notify/alarm-queue.c:1927
+#: ../src/calendar/alarm-notify/alarm-queue.c:2278
 msgid "Evolution Reminders"
 msgstr "Evolution Reminders"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1782
+#: ../src/calendar/alarm-notify/alarm-queue.c:1823
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "You have %d reminder"
 msgstr[1] "You have %d reminders"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2055
+#: ../src/calendar/alarm-notify/alarm-queue.c:2096
 msgid "Warning"
 msgstr "Warning"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2056 ../mail/mail-dialogs.ui.h:21
-#: ../modules/mailto-handler/evolution-mailto-handler.c:114
+#: ../src/calendar/alarm-notify/alarm-queue.c:2097
+#: ../src/mail/mail-dialogs.ui.h:20
 msgid "_No"
 msgstr "_No"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2057
-#: ../modules/mailto-handler/evolution-mailto-handler.c:115
+#: ../src/calendar/alarm-notify/alarm-queue.c:2098
 msgid "_Yes"
 msgstr "_Yes"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2061
+#: ../src/calendar/alarm-notify/alarm-queue.c:2102
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2069,17 +5556,17 @@ msgstr ""
 "\n"
 "Are you sure you want to run this program?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2076
+#: ../src/calendar/alarm-notify/alarm-queue.c:2117
 msgid "Do not ask me about this program again."
 msgstr "Do not ask me about this program again."
 
-#: ../calendar/alarm-notify/util.c:67
+#: ../src/calendar/alarm-notify/util.c:65
 msgid "invalid time"
 msgstr "invalid time"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start"
-#: ../calendar/alarm-notify/util.c:93 ../calendar/gui/e-alarm-list.c:370
-#: ../calendar/gui/misc.c:97
+#: ../src/calendar/alarm-notify/util.c:91
+#: ../src/calendar/gui/e-alarm-list.c:368 ../src/calendar/gui/misc.c:95
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -2087,8 +5574,8 @@ msgstr[0] "%d day"
 msgstr[1] "%d days"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start"
-#: ../calendar/alarm-notify/util.c:99 ../calendar/gui/e-alarm-list.c:382
-#: ../calendar/gui/misc.c:103
+#: ../src/calendar/alarm-notify/util.c:97
+#: ../src/calendar/gui/e-alarm-list.c:380 ../src/calendar/gui/misc.c:101
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -2096,8 +5583,8 @@ msgstr[0] "%d hour"
 msgstr[1] "%d hours"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start"
-#: ../calendar/alarm-notify/util.c:105 ../calendar/gui/e-alarm-list.c:388
-#: ../calendar/gui/misc.c:109
+#: ../src/calendar/alarm-notify/util.c:103
+#: ../src/calendar/gui/e-alarm-list.c:386 ../src/calendar/gui/misc.c:107
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2107,19 +5594,19 @@ msgstr[1] "%d minutes"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. 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")
-#: ../calendar/alarm-notify/util.c:109 ../calendar/gui/e-alarm-list.c:394
-#: ../calendar/gui/misc.c:113
+#: ../src/calendar/alarm-notify/util.c:107
+#: ../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"
 
-#: ../calendar/calendar.error.xml.h:1
+#: ../src/calendar/calendar.error.xml.h:1
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Would you like to send all the participants a cancellation notice?"
 
-#: ../calendar/calendar.error.xml.h:2
+#: ../src/calendar/calendar.error.xml.h:2
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2127,26 +5614,27 @@ msgstr ""
 "If you do not send a cancellation notice, the other participants may not "
 "know the meeting is cancelled."
 
-#: ../calendar/calendar.error.xml.h:3
+#: ../src/calendar/calendar.error.xml.h:3
 msgid "Do _not Send"
 msgstr "Do _not Send"
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../src/calendar/calendar.error.xml.h:4
 msgid "_Send Notice"
 msgstr "_Send Notice"
 
-#: ../calendar/calendar.error.xml.h:5 ../calendar/gui/e-cal-dialogs.c:502
+#: ../src/calendar/calendar.error.xml.h:5
+#: ../src/calendar/gui/e-cal-dialogs.c:507
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Are you sure you want to delete this meeting?"
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../src/calendar/calendar.error.xml.h:6
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "All information on this meeting will be deleted and can not be restored."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../src/calendar/calendar.error.xml.h:8
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2154,20 +5642,21 @@ msgstr ""
 "If you do not send a cancellation notice, the other participants may not "
 "know the task has been deleted."
 
-#: ../calendar/calendar.error.xml.h:9 ../calendar/gui/e-cal-dialogs.c:505
+#: ../src/calendar/calendar.error.xml.h:9
+#: ../src/calendar/gui/e-cal-dialogs.c:510
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Are you sure you want to delete this task?"
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../src/calendar/calendar.error.xml.h:10
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "All information on this task will be deleted and can not be restored."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../src/calendar/calendar.error.xml.h:11
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Would you like to send a cancellation notice for this memo?"
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../src/calendar/calendar.error.xml.h:12
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2175,50 +5664,55 @@ msgstr ""
 "If you do not send a cancellation notice, the other participants may not "
 "know the memo has been deleted."
 
-#: ../calendar/calendar.error.xml.h:13 ../calendar/gui/e-cal-dialogs.c:508
+#: ../src/calendar/calendar.error.xml.h:13
+#: ../src/calendar/gui/e-cal-dialogs.c:513
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Are you sure you want to delete this memo?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../src/calendar/calendar.error.xml.h:14
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr "All information on this memo will be deleted and can not be restored."
 
-#: ../calendar/calendar.error.xml.h:15
-msgid "Are you sure you want to delete the meeting titled '{0}'?"
-msgstr "Are you sure you want to delete the meeting titled '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:15
+#| msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgid "Are you sure you want to delete the meeting titled “{0}”?"
+msgstr "Are you sure you want to delete the meeting titled “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:16
-msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "Are you sure you want to delete the appointment titled '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:16
+#| msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgid "Are you sure you want to delete the appointment titled “{0}”?"
+msgstr "Are you sure you want to delete the appointment titled “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../src/calendar/calendar.error.xml.h:17
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "All information on this appointment will be deleted and can not be restored."
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../src/calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Are you sure you want to delete this appointment?"
 
-#: ../calendar/calendar.error.xml.h:19
-msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "Are you sure you want to delete the '{0}' task?"
+#: ../src/calendar/calendar.error.xml.h:19
+#| msgid "Are you sure you want to delete the '{0}' task?"
+msgid "Are you sure you want to delete the “{0}” task?"
+msgstr "Are you sure you want to delete the “{0}” task?"
 
-#: ../calendar/calendar.error.xml.h:20
-msgid "Are you sure you want to delete the memo '{0}'?"
-msgstr "Are you sure you want to delete the memo '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:20
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete the memo “{0}”?"
+msgstr "Are you sure you want to delete the memo “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../src/calendar/calendar.error.xml.h:21
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr "All information in this memo will be deleted and can not be restored."
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../src/calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Are you sure you want to delete these {0} appointments?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../src/calendar/calendar.error.xml.h:23
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -2226,91 +5720,92 @@ msgstr ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../src/calendar/calendar.error.xml.h:24
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Are you sure you want to delete these {0} tasks?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../src/calendar/calendar.error.xml.h:25
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 "All information on these tasks will be deleted and can not be restored."
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../src/calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Are you sure you want to delete these {0} memos?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../src/calendar/calendar.error.xml.h:27
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
 "All information in these memos will be deleted and can not be restored."
 
 #  calendar:prompt-save-task primary
-#: ../calendar/calendar.error.xml.h:28
+#: ../src/calendar/calendar.error.xml.h:28
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Would you like to save your changes to this meeting?"
 
 #  calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:29
+#: ../src/calendar/calendar.error.xml.h:29
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "You have changed this meeting, but not yet saved it."
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../src/calendar/calendar.error.xml.h:30
 msgid "_Save Changes"
 msgstr "_Save Changes"
 
-#: ../calendar/calendar.error.xml.h:31 ../composer/mail-composer.error.xml.h:13
+#: ../src/calendar/calendar.error.xml.h:31
+#: ../src/composer/mail-composer.error.xml.h:13
 msgid "_Discard Changes"
 msgstr "_Discard Changes"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../src/calendar/calendar.error.xml.h:32
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Would you like to save your changes to this appointment?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../src/calendar/calendar.error.xml.h:33
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "You have changed this appointment, but not yet saved it."
 
 #  calendar:prompt-save-task primary
-#: ../calendar/calendar.error.xml.h:34
+#: ../src/calendar/calendar.error.xml.h:34
 msgid "Would you like to save your changes to this task?"
 msgstr "Would you like to save your changes to this task?"
 
 #  calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:35
+#: ../src/calendar/calendar.error.xml.h:35
 msgid "You have changed this task, but not yet saved it."
 msgstr "You have changed this task, but not yet saved it."
 
 #  calendar:prompt-save-task primary
-#: ../calendar/calendar.error.xml.h:36
+#: ../src/calendar/calendar.error.xml.h:36
 msgid "Would you like to save your changes to this memo?"
 msgstr "Would you like to save your changes to this memo?"
 
 #  calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:37
+#: ../src/calendar/calendar.error.xml.h:37
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "You have made changes to this memo, but not yet saved them."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../src/calendar/calendar.error.xml.h:38
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Would you like to send meeting invitations to participants?"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../src/calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "E-mail invitations will be sent to all participants and allow them to reply."
 
-#: ../calendar/calendar.error.xml.h:40 ../composer/mail-composer.error.xml.h:36
-#: ../mail/mail.error.xml.h:8
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../src/calendar/calendar.error.xml.h:40
+#: ../src/composer/mail-composer.error.xml.h:38 ../src/mail/mail.error.xml.h:8
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Send"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../src/calendar/calendar.error.xml.h:41
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Would you like to send updated meeting information to participants?"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../src/calendar/calendar.error.xml.h:42
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2318,11 +5813,11 @@ msgstr ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../src/calendar/calendar.error.xml.h:43
 msgid "Would you like to send this task to participants?"
 msgstr "Would you like to send this task to participants?"
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../src/calendar/calendar.error.xml.h:44
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -2330,11 +5825,11 @@ msgstr ""
 "E-mail invitations will be sent to all participants and allow them to accept "
 "this task."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../src/calendar/calendar.error.xml.h:45
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Download in progress. Do you want to save the task?"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../src/calendar/calendar.error.xml.h:46
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2342,11 +5837,11 @@ msgstr ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../src/calendar/calendar.error.xml.h:48
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Download in progress. Do you want to save the appointment?"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../src/calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2354,11 +5849,11 @@ msgstr ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../src/calendar/calendar.error.xml.h:50
 msgid "Would you like to send updated task information to participants?"
 msgstr "Would you like to send updated task information to participants?"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../src/calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2366,11 +5861,11 @@ msgstr ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../src/calendar/calendar.error.xml.h:52
 msgid "Would you like to send this memo to participants?"
 msgstr "Would you like to send this memo to participants?"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../src/calendar/calendar.error.xml.h:53
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this memo."
@@ -2378,11 +5873,11 @@ msgstr ""
 "E-mail invitations will be sent to all participants and allow them to accept "
 "this memo."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../src/calendar/calendar.error.xml.h:54
 msgid "Would you like to send updated memo information to participants?"
 msgstr "Would you like to send updated memo information to participants?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../src/calendar/calendar.error.xml.h:55
 msgid ""
 "Sending updated information allows other participants to keep their memo "
 "lists up to date."
@@ -2390,75 +5885,90 @@ msgstr ""
 "Sending updated information allows other participants to keep their memo "
 "lists up to date."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../src/calendar/calendar.error.xml.h:56
 msgid "Editor could not be loaded."
 msgstr "Editor could not be loaded."
 
-#: ../calendar/calendar.error.xml.h:57
-msgid "Delete calendar '{0}'?"
-msgstr "Delete calendar '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:57
+#| msgid "Are you sure you want to delete the '{0}' task?"
+msgid "Are you sure you want to delete calendar “{0}”?"
+msgstr "Are you sure you want to delete calendar “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../src/calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "This calendar will be removed permanently."
 
-#: ../calendar/calendar.error.xml.h:59
-msgid "Delete task list '{0}'?"
-msgstr "Delete task list '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:59
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete task list “{0}”?"
+msgstr "Are you sure you want to delete task list “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../src/calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "This task list will be removed permanently."
 
-#: ../calendar/calendar.error.xml.h:61
-msgid "Delete memo list '{0}'?"
-msgstr "Delete memo list '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:61
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete memo list “{0}”?"
+msgstr "Are you sure you want to delete memo list “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../src/calendar/calendar.error.xml.h:62
 msgid "This memo list will be removed permanently."
 msgstr "This memo list will be removed permanently."
 
-#: ../calendar/calendar.error.xml.h:63
-msgid "Delete remote calendar '{0}'?"
-msgstr "Delete remote calendar '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:63
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete remote calendar “{0}”?"
+msgstr "Are you sure you want to delete remote calendar “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../src/calendar/calendar.error.xml.h:64
+#| msgid ""
+#| "This will permanently remove the calendar '{0}' from the server. Are you "
+#| "sure you want to proceed?"
 msgid ""
-"This will permanently remove the calendar '{0}' from the server. Are you "
+"This will permanently remove the calendar “{0}” from the server. Are you "
 "sure you want to proceed?"
 msgstr ""
-"This will permanently remove the calendar '{0}' from the server. Are you "
+"This will permanently remove the calendar “{0}” from the server. Are you "
 "sure you want to proceed?"
 
-#: ../calendar/calendar.error.xml.h:66
-msgid "Delete remote task list '{0}'?"
-msgstr "Delete remote task list '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:66
+#| msgid "Are you sure you want to delete these contact lists?"
+msgid "Are you sure you want to delete remote task list “{0}”?"
+msgstr "Are you sure you want to delete remote task list “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../src/calendar/calendar.error.xml.h:67
+#| msgid ""
+#| "This will permanently remove the task list '{0}' from the server. Are you "
+#| "sure you want to proceed?"
 msgid ""
-"This will permanently remove the task list '{0}' from the server. Are you "
+"This will permanently remove the task list “{0}” from the server. Are you "
 "sure you want to proceed?"
 msgstr ""
-"This will permanently remove the task list '{0}' from the server. Are you "
+"This will permanently remove the task list “{0}” from the server. Are you "
 "sure you want to proceed?"
 
-#: ../calendar/calendar.error.xml.h:68
-msgid "Delete remote memo list '{0}'?"
-msgstr "Delete remote memo list '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:68
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete remote memo list “{0}”?"
+msgstr "Are you sure you want to delete remote memo list “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../src/calendar/calendar.error.xml.h:69
+#| msgid ""
+#| "This will permanently remove the memo list '{0}' from the server. Are you "
+#| "sure you want to proceed?"
 msgid ""
-"This will permanently remove the memo list '{0}' from the server. Are you "
+"This will permanently remove the memo list “{0}” from the server. Are you "
 "sure you want to proceed?"
 msgstr ""
-"This will permanently remove the memo list '{0}' from the server. Are you "
+"This will permanently remove the memo list “{0}” from the server. Are you "
 "sure you want to proceed?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../src/calendar/calendar.error.xml.h:70
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "Are you sure you want to save the appointment without a summary?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../src/calendar/calendar.error.xml.h:71
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
@@ -2466,11 +5976,11 @@ msgstr ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../src/calendar/calendar.error.xml.h:72
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "Are you sure you want to save the task without a summary?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../src/calendar/calendar.error.xml.h:73
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
@@ -2478,461 +5988,586 @@ msgstr ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../src/calendar/calendar.error.xml.h:74
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Are you sure you want to save the memo without a summary?"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:76
-msgid "Error loading calendar '{0}'"
-msgstr "Error loading calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:76
+#| msgid "Error loading calendar '{0}'"
+msgid "Error loading calendar “{0}”"
+msgstr "Error loading calendar “{0}”"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../src/calendar/calendar.error.xml.h:77
 msgid "The calendar is not marked for offline usage."
 msgstr "The calendar is not marked for offline usage."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../src/calendar/calendar.error.xml.h:78
 msgid "Cannot save event"
 msgstr "Cannot save event"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:80
+#: ../src/calendar/calendar.error.xml.h:80
+#| msgid ""
+#| "'{0}' is a read-only calendar and cannot be modified. Please select a "
+#| "different calendar that can accept appointments."
 msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"“{0}” is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 msgstr ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"“{0}” is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../src/calendar/calendar.error.xml.h:81
 msgid "Cannot save task"
 msgstr "Cannot save task"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:83
+#: ../src/calendar/calendar.error.xml.h:83
+#| msgid ""
+#| "'{0}' does not support assigned tasks, please select a different task "
+#| "list."
 msgid ""
-"'{0}' does not support assigned tasks, please select a different task list."
+"“{0}” does not support assigned tasks, please select a different task list."
 msgstr ""
-"'{0}' does not support assigned tasks, please select a different task list."
+"“{0}” does not support assigned tasks, please select a different task list."
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:85
-msgid "Error loading task list '{0}'"
-msgstr "Error loading task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:85
+#| msgid "Error loading task list '{0}'"
+msgid "Error loading task list “{0}”"
+msgstr "Error loading task list “{0}”"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../src/calendar/calendar.error.xml.h:86
 msgid "The task list is not marked for offline usage."
 msgstr "The task list is not marked for offline usage."
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:88
-msgid "Error loading memo list '{0}'"
-msgstr "Error loading memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:88
+#| msgid "Error loading memo list '{0}'"
+msgid "Error loading memo list “{0}”"
+msgstr "Error loading memo list “{0}”"
 
-#: ../calendar/calendar.error.xml.h:89
+#: ../src/calendar/calendar.error.xml.h:89
 msgid "The memo list is not marked for offline usage."
 msgstr "The memo list is not marked for offline usage."
 
 #. Translators: {0} is the name of the calendar/memo list/task list.
-#: ../calendar/calendar.error.xml.h:91
-msgid "Failed to add timezone to '{0}'"
-msgstr "Failed to add timezone to '{0}'"
+#: ../src/calendar/calendar.error.xml.h:91
+#| msgid "Failed to add timezone to '{0}'"
+msgid "Failed to add timezone to “{0}”"
+msgstr "Failed to add timezone to “{0}”"
 
 #. The {0} is a calendar/memo list/task list name, which is useless here
-#: ../calendar/calendar.error.xml.h:93
+#: ../src/calendar/calendar.error.xml.h:93
 msgid "Failed to save attachments"
 msgstr "Failed to save attachments"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:95
-msgid "Failed to open calendar '{0}'"
-msgstr "Failed to open calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:95
+#| msgid "Failed to open calendar '{0}'"
+msgid "Failed to open calendar “{0}”"
+msgstr "Failed to open calendar “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:97
-msgid "Failed to open memo list '{0}'"
-msgstr "Failed to open memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:97
+#| msgid "Failed to open memo list '{0}'"
+msgid "Failed to open memo list “{0}”"
+msgstr "Failed to open memo list “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:99
-msgid "Failed to open task list '{0}'"
-msgstr "Failed to open task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:99
+#| msgid "Failed to open task list '{0}'"
+msgid "Failed to open task list “{0}”"
+msgstr "Failed to open task list “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:101
-msgid "Failed to create an event in the calendar '{0}'"
-msgstr "Failed to create an event in the calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:101
+#| msgid "Failed to create an event in the calendar '{0}'"
+msgid "Failed to create an event in the calendar “{0}”"
+msgstr "Failed to create an event in the calendar “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:103
-msgid "Failed to create a memo in the memo list '{0}'"
-msgstr "Failed to create a memo in the memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:103
+#| msgid "Failed to create a memo in the memo list '{0}'"
+msgid "Failed to create a memo in the memo list “{0}”"
+msgstr "Failed to create a memo in the memo list “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:105
-msgid "Failed to create a task in the task list '{0}'"
-msgstr "Failed to create a task in the task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:105
+#| msgid "Failed to create a task in the task list '{0}'"
+msgid "Failed to create a task in the task list “{0}”"
+msgstr "Failed to create a task in the task list “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:107
-msgid "Failed to modify an event in the calendar '{0}'"
-msgstr "Failed to modify an event in the calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:107
+#| msgid "Failed to modify an event in the calendar '{0}'"
+msgid "Failed to modify an event in the calendar “{0}”"
+msgstr "Failed to modify an event in the calendar “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:109
-msgid "Failed to modify a memo in the memo list '{0}'"
-msgstr "Failed to modify a memo in the memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:109
+#| msgid "Failed to modify a memo in the memo list '{0}'"
+msgid "Failed to modify a memo in the memo list “{0}”"
+msgstr "Failed to modify a memo in the memo list “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:111
-msgid "Failed to modify a task in the task list '{0}'"
-msgstr "Failed to modify a task in the task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:111
+#| msgid "Failed to modify a task in the task list '{0}'"
+msgid "Failed to modify a task in the task list “{0}”"
+msgstr "Failed to modify a task in the task list “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:113
-msgid "Failed to delete an event in the calendar '{0}'"
-msgstr "Failed to delete an event in the calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:113
+#| msgid "Failed to delete an event in the calendar '{0}'"
+msgid "Failed to delete an event in the calendar “{0}”"
+msgstr "Failed to delete an event in the calendar “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:115
-msgid "Failed to delete a memo in the memo list '{0}'"
-msgstr "Failed to delete a memo in the memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:115
+#| msgid "Failed to delete a memo in the memo list '{0}'"
+msgid "Failed to delete a memo in the memo list “{0}”"
+msgstr "Failed to delete a memo in the memo list “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:117
-msgid "Failed to delete a task in the task list '{0}'"
-msgstr "Failed to delete a task in the task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:117
+#| msgid "Failed to delete a task in the task list '{0}'"
+msgid "Failed to delete a task in the task list “{0}”"
+msgstr "Failed to delete a task in the task list “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:119
-msgid "Failed to update an event in the calendar '{0}'"
-msgstr "Failed to update an event in the calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:119
+#| msgid "Failed to update an event in the calendar '{0}'"
+msgid "Failed to update an event in the calendar “{0}”"
+msgstr "Failed to update an event in the calendar “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:121
-msgid "Failed to update a memo in the memo list '{0}'"
-msgstr "Failed to update a memo in the memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:121
+#| msgid "Failed to update a memo in the memo list '{0}'"
+msgid "Failed to update a memo in the memo list “{0}”"
+msgstr "Failed to update a memo in the memo list “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:123
-msgid "Failed to update a task in the task list '{0}'"
-msgstr "Failed to update a task in the task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:123
+#| msgid "Failed to update a task in the task list '{0}'"
+msgid "Failed to update a task in the task list “{0}”"
+msgstr "Failed to update a task in the task list “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:125
-msgid "Failed to send an event to the calendar '{0}'"
-msgstr "Failed to send an event to the calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:125
+#| msgid "Failed to send an event to the calendar '{0}'"
+msgid "Failed to send an event to the calendar “{0}”"
+msgstr "Failed to send an event to the calendar “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:127
-msgid "Failed to send a memo to the memo list '{0}'"
-msgstr "Failed to send a memo to the memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:127
+#| msgid "Failed to send a memo to the memo list '{0}'"
+msgid "Failed to send a memo to the memo list “{0}”"
+msgstr "Failed to send a memo to the memo list “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:129
-msgid "Failed to send a task to the task list '{0}'"
-msgstr "Failed to send a task to the task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:129
+#| msgid "Failed to send a task to the task list '{0}'"
+msgid "Failed to send a task to the task list “{0}”"
+msgstr "Failed to send a task to the task list “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:131
-msgid "Error creating view for the calendar '{0}'"
-msgstr "Error creating view for the calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:131
+#| msgid "Error creating view for the calendar '{0}'"
+msgid "Error creating view for the calendar “{0}”"
+msgstr "Error creating view for the calendar “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:133
-msgid "Error creating view for the task list '{0}'"
-msgstr "Error creating view for the task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:133
+#| msgid "Error creating view for the task list '{0}'"
+msgid "Error creating view for the task list “{0}”"
+msgstr "Error creating view for the task list “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:135
-msgid "Error creating view for the memo list '{0}'"
-msgstr "Error creating view for the memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:135
+#| msgid "Error creating view for the memo list '{0}'"
+msgid "Error creating view for the memo list “{0}”"
+msgstr "Error creating view for the memo list “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:137
-msgid "Failed to copy an event into the calendar '{0}'"
-msgstr "Failed to copy an event into the calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:137
+#| msgid "Failed to copy an event into the calendar '{0}'"
+msgid "Failed to copy an event into the calendar “{0}”"
+msgstr "Failed to copy an event into the calendar “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:139
-msgid "Failed to copy a task into the task list '{0}'"
-msgstr "Failed to copy a task into the task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:139
+#| msgid "Failed to copy a task into the task list '{0}'"
+msgid "Failed to copy a task into the task list “{0}”"
+msgstr "Failed to copy a task into the task list “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:141
-msgid "Failed to copy a memo into the memo list '{0}'"
-msgstr "Failed to copy a memo into the memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:141
+#| msgid "Failed to copy a memo into the memo list '{0}'"
+msgid "Failed to copy a memo into the memo list “{0}”"
+msgstr "Failed to copy a memo into the memo list “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:143
-msgid "Failed to move an event into the calendar '{0}'"
-msgstr "Failed to move an event into the calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:143
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to move an event into the calendar “{0}”"
+msgstr "Failed to move an event into the calendar “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:145
-msgid "Failed to move a task into the task list '{0}'"
-msgstr "Failed to move a task into the task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:145
+#| msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to move a task into the task list “{0}”"
+msgstr "Failed to move a task into the task list “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:147
-msgid "Failed to move a memo into the memo list '{0}'"
-msgstr "Failed to move a memo into the memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:147
+#| msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to move a memo into the memo list “{0}”"
+msgstr "Failed to move a memo into the memo list “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:149
-msgid "Failed to get an event from the calendar '{0}'"
-msgstr "Failed to get an event from the calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:149
+#| msgid "Failed to get an event from the calendar '{0}'"
+msgid "Failed to get an event from the calendar “{0}”"
+msgstr "Failed to get an event from the calendar “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:151
-msgid "Failed to get a task from the task list '{0}'"
-msgstr "Failed to get a task from the task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:151
+#| msgid "Failed to get a task from the task list '{0}'"
+msgid "Failed to get a task from the task list “{0}”"
+msgstr "Failed to get a task from the task list “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:153
-msgid "Failed to get a memo from the memo list '{0}'"
-msgstr "Failed to get a memo from the memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:153
+#| msgid "Failed to get a memo from the memo list '{0}'"
+msgid "Failed to get a memo from the memo list “{0}”"
+msgstr "Failed to get a memo from the memo list “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:155
-msgid "Copying an event into the calendar '{0}'"
-msgstr "Copying an event into the calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:155
+#| msgid "Copying an event into the calendar '{0}'"
+msgid "Copying an event into the calendar “{0}”"
+msgstr "Copying an event into the calendar “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:157
-msgid "Copying a task into the task list '{0}'"
-msgstr "Copying a task into the task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:157
+#| msgid "Copying a task into the task list '{0}'"
+msgid "Copying a task into the task list “{0}”"
+msgstr "Copying a task into the task list “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:159
-msgid "Copying a memo into the memo list '{0}'"
-msgstr "Copying a memo into the memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:159
+#| msgid "Copying a memo into the memo list '{0}'"
+msgid "Copying a memo into the memo list “{0}”"
+msgstr "Copying a memo into the memo list “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:161
-msgid "Moving an event into the calendar '{0}'"
-msgstr "Moving an event into the calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:161
+#| msgid "Moving an event into the calendar '{0}'"
+msgid "Moving an event into the calendar “{0}”"
+msgstr "Moving an event into the calendar “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:163
-msgid "Moving a task into the task list '{0}'"
-msgstr "Moving a task into the task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:163
+#| msgid "Moving a task into the task list '{0}'"
+msgid "Moving a task into the task list “{0}”"
+msgstr "Moving a task into the task list “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:165
-msgid "Moving a memo into the memo list '{0}'"
-msgstr "Moving a memo into the memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:165
+#| msgid "Moving a memo into the memo list '{0}'"
+msgid "Moving a memo into the memo list “{0}”"
+msgstr "Moving a memo into the memo list “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:167
-msgid "Failed to refresh calendar '{0}'"
-msgstr "Failed to refresh calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:167
+#| msgid "Failed to refresh calendar '{0}'"
+msgid "Failed to refresh calendar “{0}”"
+msgstr "Failed to refresh calendar “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:169
-msgid "Failed to refresh task list '{0}'"
-msgstr "Failed to refresh task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:169
+#| msgid "Failed to refresh task list '{0}'"
+msgid "Failed to refresh task list “{0}”"
+msgstr "Failed to refresh task list “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:171
-msgid "Failed to refresh memo list '{0}'"
-msgstr "Failed to refresh memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:171
+#| msgid "Failed to refresh memo list '{0}'"
+msgid "Failed to refresh memo list “{0}”"
+msgstr "Failed to refresh memo list “{0}”"
 
-#: ../calendar/calendar.error.xml.h:172
+#: ../src/calendar/calendar.error.xml.h:172
 msgid "Failed to make an occurrence movable"
 msgstr "Failed to make an occurrence movable"
 
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../calendar/gui/e-memo-table.etspec.h:2
-#: ../calendar/gui/e-task-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
+#: ../src/calendar/calendar.error.xml.h:173
+#| msgid "Create a new window displaying this view"
+msgid "Something has gone wrong when displaying the event"
+msgstr "Something has gone wrong when displaying the event"
+
+#: ../src/calendar/calendar.error.xml.h:174
+msgid ""
+"A WebKitWebProcess crashed when displaying the event. You can try again by "
+"moving to another event and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+msgstr ""
+"A WebKitWebProcess crashed when displaying the event. You can try again by "
+"moving to another event and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+
+#: ../src/calendar/calendar.error.xml.h:175
+#| msgid "Create a new window displaying this view"
+msgid "Something has gone wrong when displaying the memo"
+msgstr "Something has gone wrong when displaying the memo"
+
+#: ../src/calendar/calendar.error.xml.h:176
+msgid ""
+"A WebKitWebProcess crashed when displaying the memo. You can try again by "
+"moving to another memo and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+msgstr ""
+"A WebKitWebProcess crashed when displaying the memo. You can try again by "
+"moving to another memo and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+
+#: ../src/calendar/calendar.error.xml.h:177
+#| msgid "Mode to use when displaying mails"
+msgid "Something has gone wrong when displaying the task"
+msgstr "Something has gone wrong when displaying the task"
+
+#: ../src/calendar/calendar.error.xml.h:178
+msgid ""
+"A WebKitWebProcess crashed when displaying the task. You can try again by "
+"moving to another task and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+msgstr ""
+"A WebKitWebProcess crashed when displaying the task. You can try again by "
+"moving to another task and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+
+#: ../src/calendar/gui/caltypes.xml.in.h:1
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:3
+#: ../src/calendar/gui/e-memo-table.etspec.h:2
+#: ../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
 msgid "Summary"
 msgstr "Summary"
 
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/filtertypes.xml.in.h:2
-#: ../mail/searchtypes.xml.in.h:2 ../mail/vfoldertypes.xml.in.h:2
+#: ../src/calendar/gui/caltypes.xml.in.h:2
+#: ../src/calendar/gui/memotypes.xml.in.h:2
+#: ../src/calendar/gui/tasktypes.xml.in.h:2 ../src/mail/filtertypes.xml.in.h:2
+#: ../src/mail/searchtypes.xml.in.h:2 ../src/mail/vfoldertypes.xml.in.h:2
 msgid "contains"
 msgstr "contains"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/filtertypes.xml.in.h:3
-#: ../mail/searchtypes.xml.in.h:3 ../mail/vfoldertypes.xml.in.h:3
+#: ../src/calendar/gui/caltypes.xml.in.h:3
+#: ../src/calendar/gui/memotypes.xml.in.h:3
+#: ../src/calendar/gui/tasktypes.xml.in.h:3 ../src/mail/filtertypes.xml.in.h:3
+#: ../src/mail/searchtypes.xml.in.h:3 ../src/mail/vfoldertypes.xml.in.h:3
 msgid "does not contain"
 msgstr "does not contain"
 
-#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-attachment-tree-view.c:149 ../e-util/e-table-config.ui.h:7
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../src/calendar/gui/caltypes.xml.in.h:4
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:4
+#: ../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-table-config.ui.h:20
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
 msgstr "Description"
 
-#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:5
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../src/calendar/gui/caltypes.xml.in.h:5
+#: ../src/calendar/gui/memotypes.xml.in.h:5
+#: ../src/calendar/gui/tasktypes.xml.in.h:7
 msgid "Any Field"
 msgstr "Any Field"
 
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:7
+#: ../src/calendar/gui/caltypes.xml.in.h:6
+#: ../src/calendar/gui/memotypes.xml.in.h:7
 msgid "Classification"
 msgstr "Classification"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/filtertypes.xml.in.h:4
-#: ../mail/searchtypes.xml.in.h:4 ../mail/vfoldertypes.xml.in.h:4
+#: ../src/calendar/gui/caltypes.xml.in.h:7
+#: ../src/calendar/gui/memotypes.xml.in.h:8
+#: ../src/calendar/gui/tasktypes.xml.in.h:9 ../src/mail/filtertypes.xml.in.h:4
+#: ../src/mail/searchtypes.xml.in.h:4 ../src/mail/vfoldertypes.xml.in.h:4
 msgid "is"
 msgstr "is"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:10 ../mail/filtertypes.xml.in.h:5
-#: ../mail/searchtypes.xml.in.h:5 ../mail/vfoldertypes.xml.in.h:5
+#: ../src/calendar/gui/caltypes.xml.in.h:8
+#: ../src/calendar/gui/memotypes.xml.in.h:9
+#: ../src/calendar/gui/tasktypes.xml.in.h:10 ../src/mail/filtertypes.xml.in.h:5
+#: ../src/mail/searchtypes.xml.in.h:5 ../src/mail/vfoldertypes.xml.in.h:5
 msgid "is not"
 msgstr "is not"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:305 ../calendar/gui/e-cal-model.c:312
-#: ../calendar/gui/e-task-table.c:498 ../calendar/gui/memotypes.xml.h:10
+#: ../src/calendar/gui/caltypes.xml.in.h:9
+#: ../src/calendar/gui/e-cal-list-view.c:238
+#: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-cal-model.c:310
+#: ../src/calendar/gui/e-task-table.c:522
+#: ../src/calendar/gui/memotypes.xml.in.h:10
 msgid "Public"
 msgstr "Public"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:314 ../calendar/gui/e-task-table.c:499
-#: ../calendar/gui/memotypes.xml.h:11
+#: ../src/calendar/gui/caltypes.xml.in.h:10
+#: ../src/calendar/gui/e-cal-list-view.c:239
+#: ../src/calendar/gui/e-cal-model.c:312 ../src/calendar/gui/e-task-table.c:523
+#: ../src/calendar/gui/memotypes.xml.in.h:11
 msgid "Private"
 msgstr "Private"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
-#: ../calendar/gui/e-cal-model.c:316 ../calendar/gui/e-task-table.c:500
-#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-html-editor-page-dialog.c:115
-#: ../e-util/e-send-options.ui.h:7
+#: ../src/calendar/gui/caltypes.xml.in.h:11
+#: ../src/calendar/gui/e-cal-list-view.c:240
+#: ../src/calendar/gui/e-cal-model.c:314 ../src/calendar/gui/e-task-table.c:524
+#: ../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
 msgid "Confidential"
 msgstr "Confidential"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:5
+#: ../src/calendar/gui/caltypes.xml.in.h:12
+#: ../src/calendar/gui/memotypes.xml.in.h:6
+#: ../src/calendar/gui/tasktypes.xml.in.h:5
 msgid "Organizer"
 msgstr "Organiser"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-#: ../calendar/gui/tasktypes.xml.h:6
+#: ../src/calendar/gui/caltypes.xml.in.h:13
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../src/calendar/gui/tasktypes.xml.in.h:6
 msgid "Attendee"
 msgstr "Attendee"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:862
-#: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../src/calendar/gui/caltypes.xml.in.h:14
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:5
+#: ../src/mail/message-list.etspec.h:14
+#: ../src/plugins/publish-calendar/publish-calendar.c:860
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
+#: ../src/plugins/save-calendar/csv-format.c:387
 msgid "Location"
 msgstr "Location"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:327
+#: ../src/calendar/gui/caltypes.xml.in.h:15
+#: ../src/calendar/gui/memotypes.xml.in.h:13
+#: ../src/calendar/gui/tasktypes.xml.in.h:23
+#: ../src/e-util/e-categories-selector.c:328
 msgid "Category"
 msgstr "Category"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:51
-#: ../em-format/e-mail-formatter-print-headers.c:157
-#: ../mail/filtertypes.xml.in.h:47 ../mail/searchtypes.xml.in.h:49
-#: ../mail/vfoldertypes.xml.in.h:50
+#: ../src/calendar/gui/caltypes.xml.in.h:16
+#: ../src/calendar/gui/memotypes.xml.in.h:14
+#: ../src/calendar/gui/tasktypes.xml.in.h:15
+#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/em-format/e-mail-formatter-print-headers.c:155
+#: ../src/mail/filtertypes.xml.in.h:47 ../src/mail/searchtypes.xml.in.h:49
+#: ../src/mail/vfoldertypes.xml.in.h:50
 msgid "Attachments"
 msgstr "Attachments"
 
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:48
-#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
+#: ../src/calendar/gui/caltypes.xml.in.h:17
+#: ../src/calendar/gui/memotypes.xml.in.h:15
+#: ../src/calendar/gui/tasktypes.xml.in.h:16
+#: ../src/mail/filtertypes.xml.in.h:48 ../src/mail/searchtypes.xml.in.h:50
+#: ../src/mail/vfoldertypes.xml.in.h:51
 msgid "Exist"
 msgstr "Exist"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:49
-#: ../mail/searchtypes.xml.in.h:51 ../mail/vfoldertypes.xml.in.h:52
+#: ../src/calendar/gui/caltypes.xml.in.h:18
+#: ../src/calendar/gui/memotypes.xml.in.h:16
+#: ../src/calendar/gui/tasktypes.xml.in.h:17
+#: ../src/mail/filtertypes.xml.in.h:49 ../src/mail/searchtypes.xml.in.h:51
+#: ../src/mail/vfoldertypes.xml.in.h:52
 msgid "Do Not Exist"
 msgstr "Do Not Exist"
 
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2005
+#: ../src/calendar/gui/caltypes.xml.in.h:19
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2003
 msgid "Recurrence"
 msgstr "Recurrence"
 
-#: ../calendar/gui/caltypes.xml.h:20
+#: ../src/calendar/gui/caltypes.xml.in.h:20
 msgid "Occurs"
 msgstr "Occurs"
 
-#: ../calendar/gui/caltypes.xml.h:21
+#: ../src/calendar/gui/caltypes.xml.in.h:21
 msgid "Less Than"
 msgstr "Less Than"
 
-#: ../calendar/gui/caltypes.xml.h:22
+#: ../src/calendar/gui/caltypes.xml.in.h:22
 msgid "Exactly"
 msgstr "Exactly"
 
-#: ../calendar/gui/caltypes.xml.h:23
+#: ../src/calendar/gui/caltypes.xml.in.h:23
 msgid "More Than"
 msgstr "More Than"
 
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:28
+#: ../src/calendar/gui/caltypes.xml.in.h:24
+#: ../src/calendar/gui/memotypes.xml.in.h:17
+#: ../src/calendar/gui/tasktypes.xml.in.h:28
 msgid "Summary Contains"
 msgstr "Summary Contains"
 
-#: ../calendar/gui/caltypes.xml.h:25 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:29
+#: ../src/calendar/gui/caltypes.xml.in.h:25
+#: ../src/calendar/gui/memotypes.xml.in.h:18
+#: ../src/calendar/gui/tasktypes.xml.in.h:29
 msgid "Description Contains"
 msgstr "Description Contains"
 
-#: ../calendar/gui/ea-cal-view.c:283
+#: ../src/calendar/gui/ea-cal-view.c:281
 msgid "New Appointment"
 msgstr "New Appointment"
 
-#: ../calendar/gui/ea-cal-view.c:284
+#: ../src/calendar/gui/ea-cal-view.c:282
 msgid "New All Day Event"
 msgstr "New All Day Event"
 
-#: ../calendar/gui/ea-cal-view.c:285
+#: ../src/calendar/gui/ea-cal-view.c:283
 msgid "New Meeting"
 msgstr "New Meeting"
 
-#: ../calendar/gui/ea-cal-view.c:286
+#: ../src/calendar/gui/ea-cal-view.c:284
 msgid "Go to Today"
 msgstr "Go to Today"
 
-#: ../calendar/gui/ea-cal-view.c:287
+#: ../src/calendar/gui/ea-cal-view.c:285
 msgid "Go to Date"
 msgstr "Go to Date"
 
-#: ../calendar/gui/ea-cal-view-event.c:234
+#: ../src/calendar/gui/ea-cal-view-event.c:232
 msgid "It has reminders."
 msgstr "It has reminders."
 
-#: ../calendar/gui/ea-cal-view-event.c:237
+#: ../src/calendar/gui/ea-cal-view-event.c:235
 msgid "It has recurrences."
 msgstr "It has recurrences."
 
-#: ../calendar/gui/ea-cal-view-event.c:240
+#: ../src/calendar/gui/ea-cal-view-event.c:238
 msgid "It is a meeting."
 msgstr "It is a meeting."
 
-#: ../calendar/gui/ea-cal-view-event.c:247
+#: ../src/calendar/gui/ea-cal-view-event.c:245
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Calendar Event: Summary is %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:250
+#: ../src/calendar/gui/ea-cal-view-event.c:248
 msgid "Calendar Event: It has no summary."
 msgstr "Calendar Event: It has no summary."
 
-#: ../calendar/gui/ea-cal-view-event.c:273
+#: ../src/calendar/gui/ea-cal-view-event.c:271
 msgid "calendar view event"
 msgstr "calendar view event"
 
-#: ../calendar/gui/ea-cal-view-event.c:505
+#: ../src/calendar/gui/ea-cal-view-event.c:503
 msgid "Grab Focus"
 msgstr "Grab Focus"
 
-#: ../calendar/gui/ea-day-view.c:107 ../calendar/gui/ea-week-view.c:107
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../src/calendar/gui/ea-day-view.c:105 ../src/calendar/gui/ea-week-view.c:105
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -2941,43 +6576,49 @@ msgstr[1] "It has %d events."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:114 ../calendar/gui/ea-week-view.c:110
+#: ../src/calendar/gui/ea-day-view.c:112 ../src/calendar/gui/ea-week-view.c:108
 msgid "It has no events."
 msgstr "It has no events."
 
-#: ../calendar/gui/ea-day-view.c:121
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../src/calendar/gui/ea-day-view.c:119
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Work Week View: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:128
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../src/calendar/gui/ea-day-view.c:126
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Day View: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:157
+#: ../src/calendar/gui/ea-day-view.c:155
 msgid "calendar view for a work week"
 msgstr "calendar view for a work week"
 
-#: ../calendar/gui/ea-day-view.c:159
+#: ../src/calendar/gui/ea-day-view.c:157
 msgid "calendar view for one or more days"
 msgstr "calendar view for one or more days"
 
-#: ../calendar/gui/ea-day-view-main-item.c:266
-#: ../calendar/gui/ea-week-view-main-item.c:295
+#: ../src/calendar/gui/ea-day-view-main-item.c:264
+#: ../src/calendar/gui/ea-week-view-main-item.c:293
 msgid "a table to view and select the current time range"
 msgstr "a table to view and select the current time range"
 
-#: ../calendar/gui/ea-jump-button.c:150
+#: ../src/calendar/gui/ea-jump-button.c:148
 msgid "Jump button"
 msgstr "Jump button"
 
-#: ../calendar/gui/ea-jump-button.c:159
+#: ../src/calendar/gui/ea-jump-button.c:157
 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 weeks before start"
-#: ../calendar/gui/e-alarm-list.c:376
+#: ../src/calendar/gui/e-alarm-list.c:374
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -2985,45 +6626,49 @@ msgstr[0] "%d week"
 msgstr[1] "%d weeks"
 
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-alarm-list.c:421
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1829
+#: ../src/calendar/gui/e-alarm-list.c:419
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1827
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "Play a sound"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-alarm-list.c:425
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1827
+#: ../src/calendar/gui/e-alarm-list.c:423
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1825
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "Pop up an alert"
 
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-alarm-list.c:429
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1833
+#: ../src/calendar/gui/e-alarm-list.c:427
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1831
 msgctxt "cal-reminders"
 msgid "Send an email"
 msgstr "Send an e-mail"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-alarm-list.c:433
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1831
+#: ../src/calendar/gui/e-alarm-list.c:431
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1829
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Run a program"
 
-#: ../calendar/gui/e-alarm-list.c:439
+#: ../src/calendar/gui/e-alarm-list.c:437
 msgctxt "cal-reminders"
 msgid "Unknown action to be performed"
 msgstr "Unknown action to be performed"
 
-#: ../calendar/gui/e-alarm-list.c:454
+#. 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
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s before the start"
 msgstr "%s %s before the start"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#. 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
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s after the start"
@@ -3031,19 +6676,23 @@ msgstr "%s %s after the start"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:467
+#: ../src/calendar/gui/e-alarm-list.c:465
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s at the start"
 msgstr "%s at the start"
 
-#: ../calendar/gui/e-alarm-list.c:479
+#. 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
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s before the end"
 msgstr "%s %s before the end"
 
-#: ../calendar/gui/e-alarm-list.c:485
+#. 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
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s after the end"
@@ -3051,7 +6700,7 @@ msgstr "%s %s after the end"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:492
+#: ../src/calendar/gui/e-alarm-list.c:490
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s at the end"
@@ -3059,7 +6708,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"
-#: ../calendar/gui/e-alarm-list.c:516
+#: ../src/calendar/gui/e-alarm-list.c:514
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s at %s"
@@ -3067,308 +6716,333 @@ 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
-#: ../calendar/gui/e-alarm-list.c:524
+#: ../src/calendar/gui/e-alarm-list.c:522
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: ../calendar/gui/ea-week-view.c:114
+#: ../src/calendar/gui/ea-week-view.c:112
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Month View: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:119
+#: ../src/calendar/gui/ea-week-view.c:117
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Week View: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:148
+#: ../src/calendar/gui/ea-week-view.c:146
 msgid "calendar view for a month"
 msgstr "calendar view for a month"
 
-#: ../calendar/gui/ea-week-view.c:150
+#: ../src/calendar/gui/ea-week-view.c:148
 msgid "calendar view for one or more weeks"
 msgstr "calendar view for one or more weeks"
 
-#: ../calendar/gui/e-cal-component-preview.c:214 ../e-util/e-filter-rule.c:772
-#: ../mail/e-mail-config-page.c:126
+#: ../src/calendar/gui/e-cal-component-preview.c:214
+#: ../src/e-util/e-filter-rule.c:770 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "Untitled"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../src/calendar/gui/e-cal-component-preview.c:222
 msgid "Categories:"
 msgstr "Categories:"
 
-#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../src/calendar/gui/e-cal-component-preview.c:256
 msgid "Summary:"
 msgstr "Summary:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../src/calendar/gui/e-cal-component-preview.c:264
 msgid "Start Date:"
 msgstr "Start Date:"
 
-#: ../calendar/gui/e-cal-component-preview.c:275
+#: ../src/calendar/gui/e-cal-component-preview.c:275
 msgid "End Date:"
 msgstr "End Date:"
 
-#: ../calendar/gui/e-cal-component-preview.c:286
+#: ../src/calendar/gui/e-cal-component-preview.c:286
 msgid "Due Date:"
 msgstr "Due Date:"
 
-#: ../calendar/gui/e-cal-component-preview.c:298
-#: ../modules/itip-formatter/itip-view.c:1669
-#: ../modules/itip-formatter/itip-view.c:1786
+#: ../src/calendar/gui/e-cal-component-preview.c:298
+#: ../src/modules/itip-formatter/itip-view.c:1681
+#: ../src/modules/itip-formatter/itip-view.c:1798
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:302
-#: ../calendar/gui/e-cal-model-tasks.c:312
-#: ../calendar/gui/e-cal-model-tasks.c:554
-#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
-#: ../calendar/gui/print.c:3582
+#: ../src/calendar/gui/e-cal-component-preview.c:302
+#: ../src/calendar/gui/e-cal-model-tasks.c:310
+#: ../src/calendar/gui/e-cal-model-tasks.c:552
+#: ../src/calendar/gui/e-cal-model-tasks.c:633
+#: ../src/calendar/gui/e-task-table.c:205
+#: ../src/calendar/gui/e-task-table.c:220
+#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3580
 msgid "In Progress"
 msgstr "In Progress"
 
-#: ../calendar/gui/e-cal-component-preview.c:305
-#: ../calendar/gui/e-cal-model-tasks.c:314
-#: ../calendar/gui/e-cal-model-tasks.c:556
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
-#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3585
-#: ../calendar/gui/tasktypes.xml.h:13 ../plugins/save-calendar/csv-format.c:379
+#: ../src/calendar/gui/e-cal-component-preview.c:305
+#: ../src/calendar/gui/e-cal-model-tasks.c:312
+#: ../src/calendar/gui/e-cal-model-tasks.c:554
+#: ../src/calendar/gui/e-meeting-store.c:202
+#: ../src/calendar/gui/e-meeting-store.c:225
+#: ../src/calendar/gui/e-task-table.c:207
+#: ../src/calendar/gui/e-task-table.c:222
+#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3583
+#: ../src/calendar/gui/tasktypes.xml.in.h:13
+#: ../src/plugins/save-calendar/csv-format.c:377
 msgid "Completed"
 msgstr "Completed"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
-#: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
-#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
-#: ../calendar/gui/print.c:3579 ../calendar/gui/tasktypes.xml.h:11
+#: ../src/calendar/gui/e-cal-component-preview.c:312
+#: ../src/calendar/gui/e-cal-model-tasks.c:308
+#: ../src/calendar/gui/e-cal-model-tasks.c:550
+#: ../src/calendar/gui/e-task-table.c:203
+#: ../src/calendar/gui/e-task-table.c:218
+#: ../src/calendar/gui/e-task-table.c:631 ../src/calendar/gui/print.c:3577
+#: ../src/calendar/gui/tasktypes.xml.in.h:11
 msgid "Not Started"
 msgstr "Not Started"
 
-#: ../calendar/gui/e-cal-component-preview.c:325
+#: ../src/calendar/gui/e-cal-component-preview.c:325
 msgid "Priority:"
 msgstr "Priority:"
 
-#: ../calendar/gui/e-cal-component-preview.c:327
-#: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:318
+#: ../src/calendar/gui/e-cal-component-preview.c:327
+#: ../src/calendar/gui/e-task-table.c:548
+#: ../src/calendar/gui/tasktypes.xml.in.h:19
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:322
 msgid "High"
 msgstr "High"
 
-#: ../calendar/gui/e-cal-component-preview.c:329
-#: ../calendar/gui/e-cal-model.c:1890 ../calendar/gui/e-task-table.c:525
-#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:317
+#: ../src/calendar/gui/e-cal-component-preview.c:329
+#: ../src/calendar/gui/e-cal-model.c:1890
+#: ../src/calendar/gui/e-task-table.c:549
+#: ../src/calendar/gui/tasktypes.xml.in.h:20
+#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:321
 msgid "Normal"
 msgstr "Normal"
 
-#: ../calendar/gui/e-cal-component-preview.c:331
-#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:316
+#: ../src/calendar/gui/e-cal-component-preview.c:331
+#: ../src/calendar/gui/e-task-table.c:550
+#: ../src/calendar/gui/tasktypes.xml.in.h:21
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:320
 msgid "Low"
 msgstr "Low"
 
-#: ../calendar/gui/e-cal-component-preview.c:350
-#: ../mail/e-mail-config-service-page.c:670
+#: ../src/calendar/gui/e-cal-component-preview.c:350
+#: ../src/mail/e-mail-config-service-page.c:531
 msgid "Description:"
 msgstr "Description:"
 
-#: ../calendar/gui/e-cal-component-preview.c:381
+#: ../src/calendar/gui/e-cal-component-preview.c:381
 msgid "Web Page:"
 msgstr "Web Page:"
 
-#: ../calendar/gui/e-cal-data-model.c:1633
+#: ../src/calendar/gui/e-cal-data-model.c:1631
 #, c-format
-msgid "Creating view for calendar '%s'"
-msgstr "Creating view for calendar '%s'"
+#| msgid "Creating view for calendar '%s'"
+msgid "Creating view for calendar “%s”"
+msgstr "Creating view for calendar “%s”"
 
-#: ../calendar/gui/e-cal-data-model.c:1637
+#: ../src/calendar/gui/e-cal-data-model.c:1635
 #, c-format
-msgid "Creating view for task list '%s'"
-msgstr "Creating view for task list '%s'"
+#| msgid "Creating view for task list '%s'"
+msgid "Creating view for task list “%s”"
+msgstr "Creating view for task list “%s”"
 
-#: ../calendar/gui/e-cal-data-model.c:1641
+#: ../src/calendar/gui/e-cal-data-model.c:1639
 #, c-format
-msgid "Creating view for memo list '%s'"
-msgstr "Creating view for memo list '%s'"
+#| msgid "Creating view for memo list '%s'"
+msgid "Creating view for memo list “%s”"
+msgstr "Creating view for memo list “%s”"
 
-#: ../calendar/gui/e-cal-dialogs.c:214 ../calendar/gui/e-cal-ops.c:1957
+#: ../src/calendar/gui/e-cal-dialogs.c:219 ../src/calendar/gui/e-cal-ops.c:1966
 msgid "Destination is read only"
 msgstr "Destination is read only"
 
-#: ../calendar/gui/e-cal-dialogs.c:294
+#: ../src/calendar/gui/e-cal-dialogs.c:299
 #, c-format
-msgid "Copying events to the calendar '%s'"
-msgstr "Copying events to the calendar '%s'"
+#| msgid "Copying events to the calendar '%s'"
+msgid "Copying events to the calendar “%s”"
+msgstr "Copying events to the calendar “%s”"
 
-#: ../calendar/gui/e-cal-dialogs.c:300
+#: ../src/calendar/gui/e-cal-dialogs.c:305
 #, c-format
-msgid "Copying memos to the memo list '%s'"
-msgstr "Copying memos to the memo list '%s'"
+#| msgid "Copying memos to the memo list '%s'"
+msgid "Copying memos to the memo list “%s”"
+msgstr "Copying memos to the memo list “%s”"
 
-#: ../calendar/gui/e-cal-dialogs.c:306
+#: ../src/calendar/gui/e-cal-dialogs.c:311
 #, c-format
-msgid "Copying tasks to the task list '%s'"
-msgstr "Copying tasks to the task list '%s'"
+#| msgid "Copying tasks to the task list '%s'"
+msgid "Copying tasks to the task list “%s”"
+msgstr "Copying tasks to the task list “%s”"
 
-#: ../calendar/gui/e-cal-dialogs.c:525
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Delete this item from all other recipient's mailboxes?"
+#: ../src/calendar/gui/e-cal-dialogs.c:530
+#| msgid "_Delete this item from all other recipient's mailboxes?"
+msgid "_Delete this item from all other recipient’s mailboxes?"
+msgstr "_Delete this item from all other recipient’s mailboxes?"
 
-#: ../calendar/gui/e-cal-dialogs.c:528
+#: ../src/calendar/gui/e-cal-dialogs.c:533
 msgid "_Retract comment"
 msgstr "_Retract comment"
 
-#: ../calendar/gui/e-cal-dialogs.c:687
+#: ../src/calendar/gui/e-cal-dialogs.c:692
 msgid "Select Date"
 msgstr "Select Date"
 
-#: ../calendar/gui/e-cal-dialogs.c:688
-#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../src/calendar/gui/e-cal-dialogs.c:693
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1288
 msgid "Select _Today"
 msgstr "Select _Today"
 
-#: ../calendar/gui/e-cal-dialogs.c:707
+#: ../src/calendar/gui/e-cal-dialogs.c:712
 msgid "January"
 msgstr "January"
 
-#: ../calendar/gui/e-cal-dialogs.c:708
+#: ../src/calendar/gui/e-cal-dialogs.c:713
 msgid "February"
 msgstr "February"
 
-#: ../calendar/gui/e-cal-dialogs.c:709
+#: ../src/calendar/gui/e-cal-dialogs.c:714
 msgid "March"
 msgstr "March"
 
-#: ../calendar/gui/e-cal-dialogs.c:710
+#: ../src/calendar/gui/e-cal-dialogs.c:715
 msgid "April"
 msgstr "April"
 
-#: ../calendar/gui/e-cal-dialogs.c:711
+#: ../src/calendar/gui/e-cal-dialogs.c:716
 msgid "May"
 msgstr "May"
 
-#: ../calendar/gui/e-cal-dialogs.c:712
+#: ../src/calendar/gui/e-cal-dialogs.c:717
 msgid "June"
 msgstr "June"
 
-#: ../calendar/gui/e-cal-dialogs.c:713
+#: ../src/calendar/gui/e-cal-dialogs.c:718
 msgid "July"
 msgstr "July"
 
-#: ../calendar/gui/e-cal-dialogs.c:714
+#: ../src/calendar/gui/e-cal-dialogs.c:719
 msgid "August"
 msgstr "August"
 
-#: ../calendar/gui/e-cal-dialogs.c:715
+#: ../src/calendar/gui/e-cal-dialogs.c:720
 msgid "September"
 msgstr "September"
 
-#: ../calendar/gui/e-cal-dialogs.c:716
+#: ../src/calendar/gui/e-cal-dialogs.c:721
 msgid "October"
 msgstr "October"
 
-#: ../calendar/gui/e-cal-dialogs.c:717
+#: ../src/calendar/gui/e-cal-dialogs.c:722
 msgid "November"
 msgstr "November"
 
-#: ../calendar/gui/e-cal-dialogs.c:718
+#: ../src/calendar/gui/e-cal-dialogs.c:723
 msgid "December"
 msgstr "December"
 
-#: ../calendar/gui/e-cal-dialogs.c:868
+#: ../src/calendar/gui/e-cal-dialogs.c:873
 #, 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?"
 
-#: ../calendar/gui/e-cal-dialogs.c:870
+#: ../src/calendar/gui/e-cal-dialogs.c:875
 #, 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?"
 
-#: ../calendar/gui/e-cal-dialogs.c:874
+#: ../src/calendar/gui/e-cal-dialogs.c:879
 #, 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?"
 
-#: ../calendar/gui/e-cal-dialogs.c:878
+#: ../src/calendar/gui/e-cal-dialogs.c:883
 #, 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?"
 
-#: ../calendar/gui/e-cal-dialogs.c:904
+#: ../src/calendar/gui/e-cal-dialogs.c:909
 msgid "This Instance Only"
 msgstr "This Instance Only"
 
-#: ../calendar/gui/e-cal-dialogs.c:908
+#: ../src/calendar/gui/e-cal-dialogs.c:913
 msgid "This and Prior Instances"
 msgstr "This and Prior Instances"
 
-#: ../calendar/gui/e-cal-dialogs.c:914
+#: ../src/calendar/gui/e-cal-dialogs.c:919
 msgid "This and Future Instances"
 msgstr "This and Future Instances"
 
-#: ../calendar/gui/e-cal-dialogs.c:919
+#: ../src/calendar/gui/e-cal-dialogs.c:924
 msgid "All Instances"
 msgstr "All Instances"
 
-#: ../calendar/gui/e-cal-dialogs.c:1169 ../calendar/gui/e-cal-dialogs.c:1251
+#: ../src/calendar/gui/e-cal-dialogs.c:1174
+#: ../src/calendar/gui/e-cal-dialogs.c:1256
 msgid "Send my reminders with this event"
 msgstr "Send my reminders with this event"
 
-#: ../calendar/gui/e-cal-dialogs.c:1171 ../calendar/gui/e-cal-dialogs.c:1253
+#: ../src/calendar/gui/e-cal-dialogs.c:1176
+#: ../src/calendar/gui/e-cal-dialogs.c:1258
 msgid "Notify new attendees _only"
 msgstr "Notify new attendees _only"
 
-#: ../calendar/gui/e-calendar-view.c:452
+#: ../src/calendar/gui/e-calendar-view.c:451
 msgid "Cut selected events to the clipboard"
 msgstr "Cut selected events to the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:458
+#: ../src/calendar/gui/e-calendar-view.c:457
 msgid "Copy selected events to the clipboard"
 msgstr "Copy selected events to the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:464
+#: ../src/calendar/gui/e-calendar-view.c:463
 msgid "Paste events from the clipboard"
 msgstr "Paste events from the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:470
+#: ../src/calendar/gui/e-calendar-view.c:469
 msgid "Delete selected events"
 msgstr "Delete selected events"
 
-#: ../calendar/gui/e-calendar-view.c:852
-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:853
+#| msgid "Pasted text doesn't contain valid iCalendar data"
+msgid "Pasted text doesn’t contain valid iCalendar data"
+msgstr "Pasted text doesn’t contain valid iCalendar data"
 
-#: ../calendar/gui/e-calendar-view.c:863 ../calendar/gui/e-cal-ops.c:1554
+#: ../src/calendar/gui/e-calendar-view.c:864
+#: ../src/calendar/gui/e-cal-ops.c:1556
 msgid "Default calendar not found"
 msgstr "Default calendar not found"
 
-#: ../calendar/gui/e-calendar-view.c:868 ../calendar/gui/e-cal-ops.c:1557
+#: ../src/calendar/gui/e-calendar-view.c:869
+#: ../src/calendar/gui/e-cal-ops.c:1559
 msgid "Default memo list not found"
 msgstr "Default memo list not found"
 
-#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-cal-ops.c:1560
+#: ../src/calendar/gui/e-calendar-view.c:874
+#: ../src/calendar/gui/e-cal-ops.c:1562
 msgid "Default task list not found"
 msgstr "Default task list not found"
 
-#: ../calendar/gui/e-calendar-view.c:962
+#: ../src/calendar/gui/e-calendar-view.c:963
 msgid "No suitable component found"
 msgstr "No suitable component found"
 
-#: ../calendar/gui/e-calendar-view.c:1032
+#: ../src/calendar/gui/e-calendar-view.c:1033
 msgid "Pasting iCalendar data"
 msgstr "Pasting iCalendar data"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
+#. Translators: It will display
+#. * "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1830 ../calendar/gui/e-memo-table.c:495
-#: ../calendar/gui/e-task-table.c:794
+#: ../src/calendar/gui/e-calendar-view.c:1831
+#: ../src/calendar/gui/e-memo-table.c:493
+#: ../src/calendar/gui/e-task-table.c:818
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organiser: %s <%s>"
@@ -3376,29 +7050,34 @@ msgstr "Organiser: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1834 ../calendar/gui/e-memo-table.c:500
-#: ../calendar/gui/e-task-table.c:798
+#: ../src/calendar/gui/e-calendar-view.c:1835
+#: ../src/calendar/gui/e-memo-table.c:498
+#: ../src/calendar/gui/e-task-table.c:822
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organiser: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1850
-#: ../calendar/gui/e-meeting-time-sel.c:2727 ../calendar/gui/print.c:3533
+#. Translators: It will display "Location: LocationOfTheAppointment"
+#: ../src/calendar/gui/e-calendar-view.c:1851
+#: ../src/calendar/gui/e-meeting-time-sel.c:2731
+#: ../src/calendar/gui/e-to-do-pane.c:343 ../src/calendar/gui/print.c:3531
 #, c-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1890
+#. Translators: It will display "Time: StartDateAndTime (Duration)"
+#: ../src/calendar/gui/e-calendar-view.c:1891
+#: ../src/calendar/gui/e-to-do-pane.c:411
 #, c-format
 msgid "Time: %s %s"
 msgstr "Time: %s %s"
 
-#: ../calendar/gui/e-calendar-view.c:2276
-#: ../calendar/gui/e-calendar-view.c:2283
-#: ../calendar/gui/e-calendar-view.c:2290
-#: ../calendar/gui/e-calendar-view.c:2293
+#: ../src/calendar/gui/e-calendar-view.c:2277
+#: ../src/calendar/gui/e-calendar-view.c:2284
+#: ../src/calendar/gui/e-calendar-view.c:2291
+#: ../src/calendar/gui/e-calendar-view.c:2294
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -3407,13 +7086,14 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2281 ../calendar/gui/e-day-view.c:3080
-#: ../calendar/gui/e-day-view-top-item.c:851
-#: ../calendar/gui/e-week-view-main-item.c:230
+#: ../src/calendar/gui/e-calendar-view.c:2282
+#: ../src/calendar/gui/e-day-view.c:3078
+#: ../src/calendar/gui/e-day-view-top-item.c:849
+#: ../src/calendar/gui/e-week-view-main-item.c:228
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../calendar/gui/e-calendar-view.c:2303
+#: ../src/calendar/gui/e-calendar-view.c:2304
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -3423,150 +7103,168 @@ 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.
-#: ../calendar/gui/e-calendar-view.c:2307 ../calendar/gui/e-day-view.c:3064
-#: ../calendar/gui/e-day-view-top-item.c:847
-#: ../calendar/gui/e-week-view-main-item.c:216
+#: ../src/calendar/gui/e-calendar-view.c:2308
+#: ../src/calendar/gui/e-day-view.c:3062
+#: ../src/calendar/gui/e-day-view-top-item.c:845
+#: ../src/calendar/gui/e-week-view-main-item.c:214
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/e-calendar-view.c:2310
-#: ../calendar/gui/e-calendar-view.c:2316
-#: ../calendar/gui/e-calendar-view.c:2319
+#: ../src/calendar/gui/e-calendar-view.c:2311
+#: ../src/calendar/gui/e-calendar-view.c:2317
+#: ../src/calendar/gui/e-calendar-view.c:2320
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:1
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:1
+#: ../src/calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Start Date"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "End Date"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../calendar/gui/e-task-table.etspec.h:13
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:7
+#: ../src/calendar/gui/e-memo-table.etspec.h:6
+#: ../src/calendar/gui/e-task-table.etspec.h:13
+#: ../src/plugins/save-calendar/csv-format.c:378
 msgid "Created"
 msgstr "Created"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../calendar/gui/e-task-table.etspec.h:14
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:8
+#: ../src/calendar/gui/e-memo-table.etspec.h:7
+#: ../src/calendar/gui/e-task-table.etspec.h:14
 msgid "Last modified"
 msgstr "Last modified"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:9
-#: ../calendar/gui/e-memo-table.etspec.h:8
-#: ../calendar/gui/e-task-table.etspec.h:15
-#: ../em-format/e-mail-formatter-source.c:120
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:9
+#: ../src/calendar/gui/e-memo-table.etspec.h:8
+#: ../src/calendar/gui/e-task-table.etspec.h:15
+#: ../src/em-format/e-mail-formatter-source.c:118
 msgid "Source"
 msgstr "Source"
 
-#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-meeting-list-view.c:185
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1249
-#: ../calendar/gui/print.c:1266 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3318
-#: ../modules/itip-formatter/itip-view.c:5915
-#: ../modules/plugin-manager/evolution-plugin-manager.c:99
+#: ../src/calendar/gui/e-cal-model.c:316
+#: ../src/calendar/gui/e-meeting-list-view.c:183
+#: ../src/calendar/gui/e-meeting-list-view.c:197
+#: ../src/calendar/gui/e-meeting-store.c:132
+#: ../src/calendar/gui/e-meeting-store.c:167
+#: ../src/calendar/gui/e-meeting-store.c:230 ../src/calendar/gui/print.c:1247
+#: ../src/calendar/gui/print.c:1264 ../src/e-util/e-charset.c:49
+#: ../src/modules/itip-formatter/itip-view.c:3412
+#: ../src/modules/itip-formatter/itip-view.c:6082
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../calendar/gui/e-cal-model.c:1404 ../calendar/gui/e-cal-ops.c:615
-#: ../calendar/gui/e-cal-ops.c:1251
-#: ../modules/calendar/e-cal-base-shell-backend.c:291
+#: ../src/calendar/gui/e-cal-model.c:1402 ../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:289
 #, c-format
-msgid "Source with UID '%s' not found"
-msgstr "Source with UID '%s' not found"
+#| msgid "Source with UID '%s' not found"
+msgid "Source with UID “%s” not found"
+msgstr "Source with UID “%s” not found"
 
-#: ../calendar/gui/e-cal-model.c:1507 ../calendar/gui/e-cal-ops.c:187
-#: ../calendar/gui/e-cal-ops.c:1368
+#: ../src/calendar/gui/e-cal-model.c:1507 ../src/calendar/gui/e-cal-ops.c:186
+#: ../src/calendar/gui/e-cal-ops.c:1367
 msgid "Creating an event"
 msgstr "Creating an event"
 
-#: ../calendar/gui/e-cal-model.c:1511 ../calendar/gui/e-cal-ops.c:191
-#: ../calendar/gui/e-cal-ops.c:1372
+#: ../src/calendar/gui/e-cal-model.c:1511 ../src/calendar/gui/e-cal-ops.c:190
+#: ../src/calendar/gui/e-cal-ops.c:1371
 msgid "Creating a memo"
 msgstr "Creating a memo"
 
-#: ../calendar/gui/e-cal-model.c:1515 ../calendar/gui/e-cal-ops.c:195
-#: ../calendar/gui/e-cal-ops.c:1376
+#: ../src/calendar/gui/e-cal-model.c:1515 ../src/calendar/gui/e-cal-ops.c:194
+#: ../src/calendar/gui/e-cal-ops.c:1375
 msgid "Creating a task"
 msgstr "Creating a task"
 
-#: ../calendar/gui/e-cal-model.c:1892
+#: ../src/calendar/gui/e-cal-model.c:1892
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../calendar/gui/e-cal-model.c:1894
+#: ../src/calendar/gui/e-cal-model.c:1894
 msgid "Assigned"
 msgstr "Assigned"
 
-#: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:209
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
-#: ../calendar/gui/e-meeting-store.c:1023
+#: ../src/calendar/gui/e-cal-model.c:1896
+#: ../src/calendar/gui/e-cal-model-tasks.c:1136
+#: ../src/calendar/gui/e-meeting-list-view.c:207
+#: ../src/calendar/gui/e-meeting-store.c:174
+#: ../src/calendar/gui/e-meeting-store.c:184
+#: ../src/calendar/gui/e-meeting-store.c:1021
 msgid "Yes"
 msgstr "Yes"
 
-#: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:210
-#: ../calendar/gui/e-meeting-store.c:188
+#: ../src/calendar/gui/e-cal-model.c:1896
+#: ../src/calendar/gui/e-cal-model-tasks.c:1136
+#: ../src/calendar/gui/e-meeting-list-view.c:208
+#: ../src/calendar/gui/e-meeting-store.c:186
 msgid "No"
 msgstr "No"
 
-#: ../calendar/gui/e-cal-model.c:3820 ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:5903
+#: ../src/calendar/gui/e-cal-model.c:3820
+#: ../src/calendar/gui/e-meeting-list-view.c:219
+#: ../src/calendar/gui/e-meeting-store.c:194
+#: ../src/calendar/gui/e-meeting-store.c:217
+#: ../src/modules/itip-formatter/itip-view.c:6070
 msgid "Accepted"
 msgstr "Accepted"
 
-#: ../calendar/gui/e-cal-model.c:3821 ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:5909
+#: ../src/calendar/gui/e-cal-model.c:3821
+#: ../src/calendar/gui/e-meeting-list-view.c:220
+#: ../src/calendar/gui/e-meeting-store.c:196
+#: ../src/calendar/gui/e-meeting-store.c:219
+#: ../src/modules/itip-formatter/itip-view.c:6076
 msgid "Declined"
 msgstr "Declined"
 
-#: ../calendar/gui/e-cal-model.c:3822 ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../src/calendar/gui/e-cal-model.c:3822
+#: ../src/calendar/gui/e-meeting-list-view.c:221
+#: ../src/calendar/gui/e-meeting-store.c:198
+#: ../src/calendar/gui/e-meeting-store.c:221
+#: ../src/calendar/gui/e-meeting-time-sel.c:533
 msgid "Tentative"
 msgstr "Tentative"
 
-#: ../calendar/gui/e-cal-model.c:3823 ../calendar/gui/e-meeting-list-view.c:224
-#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:5912
+#: ../src/calendar/gui/e-cal-model.c:3823
+#: ../src/calendar/gui/e-meeting-list-view.c:222
+#: ../src/calendar/gui/e-meeting-store.c:200
+#: ../src/calendar/gui/e-meeting-store.c:223
+#: ../src/modules/itip-formatter/itip-view.c:6079
 msgid "Delegated"
 msgstr "Delegated"
 
-#: ../calendar/gui/e-cal-model.c:3824
+#: ../src/calendar/gui/e-cal-model.c:3824
 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   ...
-#: ../calendar/gui/e-cal-model.c:3879 ../calendar/gui/e-meeting-list-view.c:689
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/e-task-table.etspec.h:11 ../calendar/gui/tasktypes.xml.h:8
-#: ../mail/filtertypes.xml.in.h:36 ../mail/message-list.etspec.h:1
-#: ../mail/searchtypes.xml.in.h:38 ../mail/vfoldertypes.xml.in.h:38
+#: ../src/calendar/gui/e-cal-model.c:3879
+#: ../src/calendar/gui/e-meeting-list-view.c:687
+#: ../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"
 
-#: ../calendar/gui/e-cal-model-calendar.c:150
-#: ../calendar/gui/e-task-table.c:582
+#: ../src/calendar/gui/e-cal-model-calendar.c:148
+#: ../src/calendar/gui/e-task-table.c:606
 msgid "Free"
 msgstr "Free"
 
-#: ../calendar/gui/e-cal-model-calendar.c:153
-#: ../calendar/gui/e-meeting-time-sel.c:536 ../calendar/gui/e-task-table.c:583
+#: ../src/calendar/gui/e-cal-model-calendar.c:151
+#: ../src/calendar/gui/e-meeting-time-sel.c:534
+#: ../src/calendar/gui/e-task-table.c:607
 msgid "Busy"
 msgstr "Busy"
 
-#: ../calendar/gui/e-cal-model-tasks.c:498
+#: ../src/calendar/gui/e-cal-model-tasks.c:496
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3577,171 +7275,177 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:550
+#: ../src/calendar/gui/e-cal-model-tasks.c:548
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "None"
 
-#: ../calendar/gui/e-cal-ops.c:306
+#: ../src/calendar/gui/e-cal-ops.c:305
 msgid "Modifying an event"
 msgstr "Modifying an event"
 
-#: ../calendar/gui/e-cal-ops.c:310
+#: ../src/calendar/gui/e-cal-ops.c:309
 msgid "Modifying a memo"
 msgstr "Modifying a memo"
 
-#: ../calendar/gui/e-cal-ops.c:314
+#: ../src/calendar/gui/e-cal-ops.c:313
 msgid "Modifying a task"
 msgstr "Modifying a task"
 
-#: ../calendar/gui/e-cal-ops.c:413
+#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1812
 msgid "Removing an event"
 msgstr "Removing an event"
 
-#: ../calendar/gui/e-cal-ops.c:417
+#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1816
 msgid "Removing a memo"
 msgstr "Removing a memo"
 
-#: ../calendar/gui/e-cal-ops.c:421
+#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1820
 msgid "Removing a task"
 msgstr "Removing a task"
 
-#: ../calendar/gui/e-cal-ops.c:512
+#: ../src/calendar/gui/e-cal-ops.c:511
 #, c-format
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
 msgstr[0] "Deleting an event"
 msgstr[1] "Deleting %d events"
 
-#: ../calendar/gui/e-cal-ops.c:516
+#: ../src/calendar/gui/e-cal-ops.c:515
 #, c-format
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
 msgstr[0] "Deleting a memo"
 msgstr[1] "Deleting %d memos"
 
-#: ../calendar/gui/e-cal-ops.c:520
+#: ../src/calendar/gui/e-cal-ops.c:519
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "Deleting a task"
 msgstr[1] "Deleting %d tasks"
 
-#: ../calendar/gui/e-cal-ops.c:723
+#: ../src/calendar/gui/e-cal-ops.c:722
 #, c-format
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
 msgstr[0] "Pasting an event"
 msgstr[1] "Pasting %d events"
 
-#: ../calendar/gui/e-cal-ops.c:738
+#: ../src/calendar/gui/e-cal-ops.c:737
 #, c-format
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
 msgstr[0] "Pasting a memo"
 msgstr[1] "Pasting %d memos"
 
-#: ../calendar/gui/e-cal-ops.c:753
+#: ../src/calendar/gui/e-cal-ops.c:752
 #, c-format
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
 msgstr[0] "Pasting a task"
 msgstr[1] "Pasting %d tasks"
 
-#: ../calendar/gui/e-cal-ops.c:852
+#: ../src/calendar/gui/e-cal-ops.c:851
 msgid "Updating an event"
 msgstr "Updating an event"
 
-#: ../calendar/gui/e-cal-ops.c:856
+#: ../src/calendar/gui/e-cal-ops.c:855
 msgid "Updating a memo"
 msgstr "Updating a memo"
 
-#: ../calendar/gui/e-cal-ops.c:860
+#: ../src/calendar/gui/e-cal-ops.c:859
 msgid "Updating a task"
 msgstr "Updating a task"
 
-#: ../calendar/gui/e-cal-ops.c:968
+#: ../src/calendar/gui/e-cal-ops.c:967
 #, c-format
-msgid "Getting events to purge in the calendar '%s'"
-msgstr "Getting events to purge in the calendar '%s'"
+#| msgid "Getting events to purge in the calendar '%s'"
+msgid "Getting events to purge in the calendar “%s”"
+msgstr "Getting events to purge in the calendar “%s”"
 
-#: ../calendar/gui/e-cal-ops.c:972
+#: ../src/calendar/gui/e-cal-ops.c:971
 #, c-format
-msgid "Getting memos to purge in the memo list '%s'"
-msgstr "Getting memos to purge in the memo list '%s'"
+#| msgid "Getting memos to purge in the memo list '%s'"
+msgid "Getting memos to purge in the memo list “%s”"
+msgstr "Getting memos to purge in the memo list “%s”"
 
-#: ../calendar/gui/e-cal-ops.c:976
+#: ../src/calendar/gui/e-cal-ops.c:975
 #, c-format
-msgid "Getting tasks to purge in the task list '%s'"
-msgstr "Getting tasks to purge in the task list '%s'"
+#| msgid "Getting tasks to purge in the task list '%s'"
+msgid "Getting tasks to purge in the task list “%s”"
+msgstr "Getting tasks to purge in the task list “%s”"
 
-#: ../calendar/gui/e-cal-ops.c:1002
+#: ../src/calendar/gui/e-cal-ops.c:1001
 #, c-format
-msgid "Purging events in the calendar '%s'"
-msgstr "Purging events in the calendar '%s'"
+#| msgid "Purging events in the calendar '%s'"
+msgid "Purging events in the calendar “%s”"
+msgstr "Purging events in the calendar “%s”"
 
-#: ../calendar/gui/e-cal-ops.c:1006
+#: ../src/calendar/gui/e-cal-ops.c:1005
 #, c-format
-msgid "Purging memos in the memo list '%s'"
-msgstr "Purging memos in the memo list '%s'"
+#| msgid "Purging memos in the memo list '%s'"
+msgid "Purging memos in the memo list “%s”"
+msgstr "Purging memos in the memo list “%s”"
 
-#: ../calendar/gui/e-cal-ops.c:1010
+#: ../src/calendar/gui/e-cal-ops.c:1009
 #, c-format
-msgid "Purging tasks in the task list '%s'"
-msgstr "Purging tasks in the task list '%s'"
+#| msgid "Purging tasks in the task list '%s'"
+msgid "Purging tasks in the task list “%s”"
+msgstr "Purging tasks in the task list “%s”"
 
-#: ../calendar/gui/e-cal-ops.c:1110
+#: ../src/calendar/gui/e-cal-ops.c:1109
 msgid "Purging events"
 msgstr "Purging events"
 
-#: ../calendar/gui/e-cal-ops.c:1114
+#: ../src/calendar/gui/e-cal-ops.c:1113
 msgid "Purging memos"
 msgstr "Purging memos"
 
-#: ../calendar/gui/e-cal-ops.c:1118
+#: ../src/calendar/gui/e-cal-ops.c:1117
 msgid "Purging tasks"
 msgstr "Purging tasks"
 
-#: ../calendar/gui/e-cal-ops.c:1220
+#: ../src/calendar/gui/e-cal-ops.c:1219
 msgid "Expunging completed tasks"
 msgstr "Expunging completed tasks"
 
-#: ../calendar/gui/e-cal-ops.c:2051
+#: ../src/calendar/gui/e-cal-ops.c:2060
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] "Moving an event"
 msgstr[1] "Moving %d events"
 
-#: ../calendar/gui/e-cal-ops.c:2052
+#: ../src/calendar/gui/e-cal-ops.c:2061
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "Copying an event"
 msgstr[1] "Copying %d events"
 
-#: ../calendar/gui/e-cal-ops.c:2058
+#: ../src/calendar/gui/e-cal-ops.c:2067
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "Moving a memo"
 msgstr[1] "Moving %d memos"
 
-#: ../calendar/gui/e-cal-ops.c:2059
+#: ../src/calendar/gui/e-cal-ops.c:2068
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "Copying a memo"
 msgstr[1] "Copying %d memos"
 
-#: ../calendar/gui/e-cal-ops.c:2065
+#: ../src/calendar/gui/e-cal-ops.c:2074
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "Moving a task"
 msgstr[1] "Moving %d tasks"
 
-#: ../calendar/gui/e-cal-ops.c:2066
+#: ../src/calendar/gui/e-cal-ops.c:2075
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -3749,16 +7453,16 @@ msgstr[0] "Copying a task"
 msgstr[1] "Copying %d tasks"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:165
+#: ../src/calendar/gui/e-cell-date-edit-text.c:163
 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.
-#: ../calendar/gui/e-cell-date-edit-text.c:168
+#: ../src/calendar/gui/e-cell-date-edit-text.c:166
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:176
+#: ../src/calendar/gui/e-cell-date-edit-text.c:174
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3767,226 +7471,236 @@ msgstr ""
 "The date must be entered in the format: \n"
 "%s"
 
-#: ../calendar/gui/e-comp-editor-event.c:101
-msgid "Event's time is in the past"
-msgstr "Event's time is in the past"
+#: ../src/calendar/gui/e-comp-editor-event.c:99
+#| msgid "Event's time is in the past"
+msgid "Event’s time is in the past"
+msgstr "Event’s time is in the past"
 
-#: ../calendar/gui/e-comp-editor-event.c:202
+#: ../src/calendar/gui/e-comp-editor-event.c:200
 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"
 
-#: ../calendar/gui/e-comp-editor-event.c:204
+#: ../src/calendar/gui/e-comp-editor-event.c:202
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "Event cannot be edited, because the selected calendar is read only"
 
-#: ../calendar/gui/e-comp-editor-event.c:206
+#: ../src/calendar/gui/e-comp-editor-event.c:204
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Event cannot be fully edited, because you are not the organiser"
 
-#: ../calendar/gui/e-comp-editor-event.c:438
-#: ../calendar/gui/e-comp-editor-task.c:348
+#: ../src/calendar/gui/e-comp-editor-event.c:436
+#: ../src/calendar/gui/e-comp-editor-task.c:522
 msgid "Start date is not a valid date"
 msgstr "Start date is not a valid date"
 
-#: ../calendar/gui/e-comp-editor-event.c:440
+#: ../src/calendar/gui/e-comp-editor-event.c:438
 msgid "Start time is not a valid time"
 msgstr "Start time is not a valid time"
 
-#: ../calendar/gui/e-comp-editor-event.c:444
-#: ../calendar/gui/e-comp-editor-event.c:460
-#: ../calendar/gui/e-comp-editor-page-attachments.c:201
-#: ../calendar/gui/e-comp-editor.c:340 ../mail/e-mail-display.c:2021
-#: ../mail/e-mail-reader-utils.c:648 ../mail/mail-send-recv.c:489
-#: ../mail/mail-send-recv.c:1289 ../plugins/face/face.c:176
-#: ../shell/e-shell.c:992 ../shell/e-shell.c:1014
-#: ../smime/gui/certificate-manager.c:359
+#: ../src/calendar/gui/e-comp-editor-event.c:442
+#: ../src/calendar/gui/e-comp-editor-event.c:458
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
+#: ../src/calendar/gui/e-comp-editor.c:338
+#: ../src/em-format/e-mail-part-secure-button.c:93
+#: ../src/mail/e-mail-display.c:2116 ../src/mail/e-mail-reader-utils.c:806
+#: ../src/mail/mail-send-recv.c:490 ../src/mail/mail-send-recv.c:1288
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:172
+#: ../src/plugins/face/face.c:174 ../src/shell/e-shell.c:1073
+#: ../src/shell/e-shell.c:1097 ../src/smime/gui/certificate-manager.c:357
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../calendar/gui/e-comp-editor-event.c:454
+#: ../src/calendar/gui/e-comp-editor-event.c:452
 msgid "End date is not a valid date"
 msgstr "End date is not a valid date"
 
-#: ../calendar/gui/e-comp-editor-event.c:456
+#: ../src/calendar/gui/e-comp-editor-event.c:454
 msgid "End time is not a valid time"
 msgstr "End time is not a valid time"
 
-#: ../calendar/gui/e-comp-editor-event.c:588
-#: ../calendar/gui/e-comp-editor-memo.c:106
-#: ../calendar/gui/e-comp-editor-task.c:406
+#: ../src/calendar/gui/e-comp-editor-event.c:586
+#: ../src/calendar/gui/e-comp-editor-memo.c:126
+#: ../src/calendar/gui/e-comp-editor-task.c:591
 msgid "_Categories"
 msgstr "_Categories"
 
-#: ../calendar/gui/e-comp-editor-event.c:590
-#: ../calendar/gui/e-comp-editor-memo.c:108
-#: ../calendar/gui/e-comp-editor-task.c:408
+#: ../src/calendar/gui/e-comp-editor-event.c:588
+#: ../src/calendar/gui/e-comp-editor-memo.c:128
+#: ../src/calendar/gui/e-comp-editor-task.c:593
 msgid "Toggles whether to display categories"
 msgstr "Toggles whether to display categories"
 
-#: ../calendar/gui/e-comp-editor-event.c:596
+#: ../src/calendar/gui/e-comp-editor-event.c:594
+#: ../src/calendar/gui/e-comp-editor-task.c:599
 msgid "Time _Zone"
 msgstr "Time _Zone"
 
-#: ../calendar/gui/e-comp-editor-event.c:598
+#: ../src/calendar/gui/e-comp-editor-event.c:596
+#: ../src/calendar/gui/e-comp-editor-task.c:601
 msgid "Toggles whether the time zone is displayed"
 msgstr "Toggles whether the time zone is displayed"
 
-#: ../calendar/gui/e-comp-editor-event.c:604
+#: ../src/calendar/gui/e-comp-editor-event.c:602
 msgid "All _Day Event"
 msgstr "All _Day Event"
 
-#: ../calendar/gui/e-comp-editor-event.c:606
+#: ../src/calendar/gui/e-comp-editor-event.c:604
 msgid "Toggles whether to have All Day Event"
 msgstr "Toggles whether to have All Day Event"
 
-#: ../calendar/gui/e-comp-editor-event.c:612
+#: ../src/calendar/gui/e-comp-editor-event.c:610
 msgid "Show Time as _Busy"
 msgstr "Show Time as _Busy"
 
-#: ../calendar/gui/e-comp-editor-event.c:614
+#: ../src/calendar/gui/e-comp-editor-event.c:612
 msgid "Toggles whether to show time as busy"
 msgstr "Toggles whether to show time as busy"
 
-#: ../calendar/gui/e-comp-editor-event.c:623
+#: ../src/calendar/gui/e-comp-editor-event.c:621
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../calendar/gui/e-comp-editor-event.c:625
+#: ../src/calendar/gui/e-comp-editor-event.c:623
 msgid "Classify as public"
 msgstr "Classify as public"
 
-#: ../calendar/gui/e-comp-editor-event.c:630
+#: ../src/calendar/gui/e-comp-editor-event.c:628
 msgid "_Private"
 msgstr "_Private"
 
-#: ../calendar/gui/e-comp-editor-event.c:632
+#: ../src/calendar/gui/e-comp-editor-event.c:630
 msgid "Classify as private"
 msgstr "Classify as private"
 
-#: ../calendar/gui/e-comp-editor-event.c:637
+#: ../src/calendar/gui/e-comp-editor-event.c:635
 msgid "_Confidential"
 msgstr "_Confidential"
 
-#: ../calendar/gui/e-comp-editor-event.c:639
+#: ../src/calendar/gui/e-comp-editor-event.c:637
 msgid "Classify as confidential"
 msgstr "Classify as confidential"
 
-#: ../calendar/gui/e-comp-editor-event.c:740
+#: ../src/calendar/gui/e-comp-editor-event.c:738
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Start time:"
 
-#: ../calendar/gui/e-comp-editor-event.c:745
+#: ../src/calendar/gui/e-comp-editor-event.c:743
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "_End time:"
 
-#: ../calendar/gui/e-comp-editor-event.c:755
+#: ../src/calendar/gui/e-comp-editor-event.c:753
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "All da_y event"
 
-#: ../calendar/gui/e-comp-editor-event.c:808
-#: ../calendar/gui/e-comp-editor-memo.c:192
-#: ../calendar/gui/e-comp-editor-task.c:529
+#: ../src/calendar/gui/e-comp-editor-event.c:806
+#: ../src/calendar/gui/e-comp-editor-memo.c:213
+#: ../src/calendar/gui/e-comp-editor-task.c:765
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "General"
 
-#: ../calendar/gui/e-comp-editor-event.c:811
-#: ../calendar/gui/e-comp-editor-task.c:535
+#: ../src/calendar/gui/e-comp-editor-event.c:809
+#: ../src/calendar/gui/e-comp-editor-task.c:782
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Reminders"
 
-#: ../calendar/gui/e-comp-editor-event.c:814
+#: ../src/calendar/gui/e-comp-editor-event.c:812
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Recurrence"
 
-#: ../calendar/gui/e-comp-editor-event.c:817
-#: ../calendar/gui/e-comp-editor-memo.c:195
-#: ../calendar/gui/e-comp-editor-task.c:538
+#: ../src/calendar/gui/e-comp-editor-event.c:815
+#: ../src/calendar/gui/e-comp-editor-memo.c:216
+#: ../src/calendar/gui/e-comp-editor-task.c:785
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Attachments"
 
-#: ../calendar/gui/e-comp-editor-event.c:827
+#: ../src/calendar/gui/e-comp-editor-event.c:825
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "Schedule"
 
-#: ../calendar/gui/e-comp-editor-event.c:859
+#: ../src/calendar/gui/e-comp-editor-event.c:857
 #, c-format
-msgid "Meeting - %s"
-msgstr "Meeting - %s"
+#| msgid "Meeting - %s"
+msgid "Meeting — %s"
+msgstr "Meeting — %s"
 
-#: ../calendar/gui/e-comp-editor-event.c:860
+#: ../src/calendar/gui/e-comp-editor-event.c:858
 #, c-format
-msgid "Appointment - %s"
-msgstr "Appointment - %s"
+#| msgid "Appointment - %s"
+msgid "Appointment — %s"
+msgstr "Appointment — %s"
 
-#: ../calendar/gui/e-comp-editor-memo.c:68
+#: ../src/calendar/gui/e-comp-editor-memo.c:88
 msgid ""
 "Memo cannot be edited, because the selected memo list could not be opened"
 msgstr ""
 "Memo cannot be edited, because the selected memo list could not be opened"
 
-#: ../calendar/gui/e-comp-editor-memo.c:70
+#: ../src/calendar/gui/e-comp-editor-memo.c:90
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Memo cannot be edited, because the selected memo list is read only"
 
-#: ../calendar/gui/e-comp-editor-memo.c:72
+#: ../src/calendar/gui/e-comp-editor-memo.c:92
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Memo cannot be fully edited, because you are not the organiser"
 
-#: ../calendar/gui/e-comp-editor-memo.c:168
-#: ../calendar/gui/e-comp-editor-task.c:468
+#: ../src/calendar/gui/e-comp-editor-memo.c:188
+#: ../src/calendar/gui/e-comp-editor-task.c:700
 msgid "_List:"
 msgstr "_List:"
 
-#: ../calendar/gui/e-comp-editor-memo.c:175
-#: ../calendar/gui/e-comp-editor-task.c:475
+#: ../src/calendar/gui/e-comp-editor-memo.c:195
+#: ../src/calendar/gui/e-comp-editor-task.c:707
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "Sta_rt date:"
 
-#: ../calendar/gui/e-comp-editor-memo.c:223
+#: ../src/calendar/gui/e-comp-editor-memo.c:247
 #, c-format
-msgid "Assigned Memo - %s"
-msgstr "Assigned Memo - %s"
+#| msgid "Assigned Memo - %s"
+msgid "Assigned Memo — %s"
+msgstr "Assigned Memo — %s"
 
-#: ../calendar/gui/e-comp-editor-memo.c:224
+#: ../src/calendar/gui/e-comp-editor-memo.c:248
 #, c-format
-msgid "Memo - %s"
+#| msgid "Memo - %s"
+msgid "Memo — %s"
 msgstr "Memo — %s"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:125
-#: ../calendar/gui/e-comp-editor-page-attachments.c:130
-#: ../em-format/e-mail-formatter-attachment.c:337
-#: ../e-util/e-attachment-bar.c:103 ../e-util/e-attachment-bar.c:108
-#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
-#: ../mail/message-list.etspec.h:4
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:123
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:128
+#: ../src/em-format/e-mail-formatter-attachment.c:333
+#: ../src/e-util/e-attachment-bar.c:101 ../src/e-util/e-attachment-bar.c:106
+#: ../src/e-util/e-attachment-paned.c:175
+#: ../src/e-util/e-attachment-paned.c:180 ../src/mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Attachment"
 msgstr[1] "Attachments"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:196
-#: ../e-util/e-attachment.c:2424
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:201
+#: ../src/e-util/e-attachment.c:2442
 #, c-format
-msgid "Could not load '%s'"
-msgstr "Could not load '%s'"
+#| msgid "Could not load '%s'"
+msgid "Could not load “%s”"
+msgstr "Could not load “%s”"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:198
-#: ../e-util/e-attachment.c:2427
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:203
+#: ../src/e-util/e-attachment.c:2445
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Could not load the attachment"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:403
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:422
 msgid ""
 "Some attachments are still being downloaded. Please wait until the download "
 "is finished."
@@ -3994,130 +7708,136 @@ msgstr ""
 "Some attachments are still being downloaded. Please wait until the download "
 "is finished."
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:430
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:452
 #, 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"
+#| msgid "Attachment '%s' cannot be found, remove it from the list, please"
+msgid "Attachment “%s” cannot be found, remove it from the list, please"
+msgstr "Attachment “%s” cannot be found, remove it from the list, please"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:447
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:469
 #, c-format
-msgid "Attachment '%s' doesn't have valid URI, remove it from the list, please"
+#| msgid ""
+#| "Attachment '%s' doesn't have valid URI, remove it from the list, please"
+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"
+"Attachment “%s” doesn’t have valid URI, remove it from the list, please"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:608
-#: ../composer/e-composer-actions.c:319
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:647
+#: ../src/composer/e-composer-actions.c:320
 msgid "_Attachment..."
 msgstr "_Attachment…"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:610
-#: ../composer/e-composer-actions.c:321 ../e-util/e-attachment-view.c:345
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:649
+#: ../src/composer/e-composer-actions.c:322
+#: ../src/e-util/e-attachment-view.c:344
 msgid "Attach a file"
 msgstr "Attach a file"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:617
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:656
 msgid "_Attachments"
 msgstr "_Attachments"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:619
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:658
 msgid "Show attachments"
 msgstr "Show attachments"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:772
-#: ../e-util/e-attachment-bar.c:766 ../e-util/e-attachment-paned.c:735
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:811
+#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:725
 msgid "Icon View"
 msgstr "Icon View"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:774
-#: ../e-util/e-attachment-bar.c:768 ../e-util/e-attachment-paned.c:737
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:813
+#: ../src/e-util/e-attachment-bar.c:768 ../src/e-util/e-attachment-paned.c:727
 msgid "List View"
 msgstr "List View"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:313
+#: ../src/calendar/gui/e-comp-editor-page-general.c:311
 #, c-format
-msgid "Cannot find attendee '%s' in the list of attendees"
-msgstr "Cannot find attendee '%s' in the list of attendees"
+#| msgid "Cannot find attendee '%s' in the list of attendees"
+msgid "Cannot find attendee “%s” in the list of attendees"
+msgstr "Cannot find attendee “%s” in the list of attendees"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:320
+#: ../src/calendar/gui/e-comp-editor-page-general.c:318
 #, c-format
-msgid "Not enough rights to delete attendee '%s'"
-msgstr "Not enough rights to delete attendee '%s'"
+#| msgid "Not enough rights to delete attendee '%s'"
+msgid "Not enough rights to delete attendee “%s”"
+msgstr "Not enough rights to delete attendee “%s”"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:350
+#: ../src/calendar/gui/e-comp-editor-page-general.c:348
 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"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:583
+#: ../src/calendar/gui/e-comp-editor-page-general.c:581
 msgid "A_ttendees"
 msgstr "A_ttendees"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:585
+#: ../src/calendar/gui/e-comp-editor-page-general.c:583
 msgid "Toggles whether the Attendees are displayed"
 msgstr "Toggles whether the Attendees are displayed"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:594
+#: ../src/calendar/gui/e-comp-editor-page-general.c:592
 msgid "R_ole Field"
 msgstr "R_ole Field"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:596
+#: ../src/calendar/gui/e-comp-editor-page-general.c:594
 msgid "Toggles whether the Role field is displayed"
 msgstr "Toggles whether the Role field is displayed"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:602
+#: ../src/calendar/gui/e-comp-editor-page-general.c:600
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:604
+#: ../src/calendar/gui/e-comp-editor-page-general.c:602
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Toggles whether the RSVP field is displayed"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:610
+#: ../src/calendar/gui/e-comp-editor-page-general.c:608
 msgid "_Status Field"
 msgstr "_Status Field"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:612
+#: ../src/calendar/gui/e-comp-editor-page-general.c:610
 msgid "Toggles whether the Status field is displayed"
 msgstr "Toggles whether the Status field is displayed"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:618
+#: ../src/calendar/gui/e-comp-editor-page-general.c:616
 msgid "_Type Field"
 msgstr "_Type Field"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:620
+#: ../src/calendar/gui/e-comp-editor-page-general.c:618
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Toggles whether the Attendee Type is displayed"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:945
+#: ../src/calendar/gui/e-comp-editor-page-general.c:943
 msgid "An organizer is required."
 msgstr "An organiser is required."
 
-#: ../calendar/gui/e-comp-editor-page-general.c:955
-#: ../calendar/gui/e-comp-editor-page-general.c:1086
+#: ../src/calendar/gui/e-comp-editor-page-general.c:953
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1084
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: ../calendar/gui/e-comp-editor-page-general.c:1209
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1207
 msgid "Or_ganizer:"
 msgstr "Or_ganiser:"
 
-#: ../calendar/gui/e-comp-editor-page-general.c:1288
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1286
 msgctxt "ECompEditor"
 msgid "Atte_ndees..."
 msgstr "Atte_ndees..."
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:327
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:325
 msgid "Add exception"
 msgstr "Add exception"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:365
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:363
 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.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:490
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:488
 msgid "on"
 msgstr "on"
 
@@ -4125,7 +7845,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.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:571
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:569
 msgctxt "ECompEditorPageRecur"
 msgid "first"
 msgstr "first"
@@ -4135,7 +7855,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.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:577
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:575
 msgctxt "ECompEditorPageRecur"
 msgid "second"
 msgstr "second"
@@ -4144,7 +7864,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.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:582
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:580
 msgctxt "ECompEditorPageRecur"
 msgid "third"
 msgstr "third"
@@ -4153,7 +7873,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.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:587
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:585
 msgctxt "ECompEditorPageRecur"
 msgid "fourth"
 msgstr "fourth"
@@ -4162,7 +7882,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.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:592
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:590
 msgctxt "ECompEditorPageRecur"
 msgid "fifth"
 msgstr "fifth"
@@ -4171,14 +7891,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.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:597
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:595
 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]).
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:624
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:622
 msgctxt "ECompEditorPageRecur"
 msgid "Other Date"
 msgstr "Other Date"
@@ -4187,7 +7907,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]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:630
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:628
 msgctxt "ECompEditorPageRecur"
 msgid "1st to 10th"
 msgstr "1st to 10th"
@@ -4196,7 +7916,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]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:636
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:634
 msgctxt "ECompEditorPageRecur"
 msgid "11th to 20th"
 msgstr "11th to 20th"
@@ -4205,7 +7925,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]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:642
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:640
 msgctxt "ECompEditorPageRecur"
 msgid "21st to 31st"
 msgstr "21st to 31st"
@@ -4213,42 +7933,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.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:666
 msgctxt "ECompEditorPageRecur"
 msgid "day"
 msgstr "day"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:667
 msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "Monday"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:668
 msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:669
 msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:670
 msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "Thursday"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:671
 msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "Friday"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:672
 msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "Saturday"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:675
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:673
 msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
 msgstr "Sunday"
@@ -4256,165 +7976,166 @@ 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])."
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:804
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:802
 msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "on the"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:994
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:992
 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1487
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2017
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1485
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2015
 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1492
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1490
 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1497
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1495
 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1502
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1500
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "This component rec_urs"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1863
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1861
 msgid "Recurrence exception date is invalid"
 msgstr "Recurrence exception date is invalid"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1911
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1909
 msgid "End time of the recurrence is before the start"
 msgstr "End time of the recurrence is before the start"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1954
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1952
 msgid "R_ecurrence"
 msgstr "R_ecurrence"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1956
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1954
 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2057
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2055
 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2092
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2090
 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2094
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2092
 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2096
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2094
 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2098
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2096
 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2127
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2125
 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2129
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2127
 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])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2131
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2129
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "forever"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2147
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2145
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2164
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2162
 msgid "Exceptions"
 msgstr "Exceptions"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2233
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1779
-#: ../mail/mail-config.ui.h:62
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1777
+#: ../src/mail/e-mail-config-identity-page.c:853
+#: ../src/mail/mail-config.ui.h:65
 msgid "A_dd"
 msgstr "A_dd"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2249
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1787
-#: ../mail/mail-config.ui.h:64
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2247
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1785
+#: ../src/mail/mail-config.ui.h:67
 msgid "Re_move"
 msgstr "Re_move"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2257
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2255
 msgid "Preview"
 msgstr "Preview"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:41
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:39
 msgid "Send To"
 msgstr "Send To"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1556
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1554
 msgid "_Reminders"
 msgstr "_Reminders"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1558
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1556
 msgid "Set or unset reminders"
 msgstr "Set or unset reminders"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1611
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1609
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Reminders"
 msgstr "Reminders"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1640
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1638
 msgid "_Reminder"
 msgstr "_Reminder"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1673
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1671
 #, c-format
 msgid "%d day before"
 msgid_plural "%d days before"
 msgstr[0] "%d day before"
 msgstr[1] "%d days before"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1680
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1678
 #, c-format
 msgid "%d hour before"
 msgid_plural "%d hours before"
 msgstr[0] "%d hour before"
 msgstr[1] "%d hours before"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1687
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1685
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
@@ -4422,469 +8143,495 @@ msgstr[0] "%d minute before"
 msgstr[1] "%d minutes before"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1695
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1693
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "None"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1697
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
 msgctxt "cal-reminders"
 msgid "15 minutes before"
 msgstr "15 minutes before"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1699
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1697
 msgctxt "cal-reminders"
 msgid "1 hour before"
 msgstr "1 hour before"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1701
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1699
 msgctxt "cal-reminders"
 msgid "1 day before"
 msgstr "1 day before"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1713
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1711
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "Custom"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1864
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1862
 msgctxt "cal-reminders"
 msgid "minute(s)"
 msgstr "minute(s)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1866
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1864
 msgctxt "cal-reminders"
 msgid "hour(s)"
 msgstr "hour(s)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1868
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1866
 msgctxt "cal-reminders"
 msgid "day(s)"
 msgstr "day(s)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1885
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1883
 msgctxt "cal-reminders"
 msgid "before"
 msgstr "before"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1887
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1885
 msgctxt "cal-reminders"
 msgid "after"
 msgstr "after"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1903
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1901
 msgctxt "cal-reminders"
 msgid "start"
 msgstr "start"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1905
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1903
 msgctxt "cal-reminders"
 msgid "end"
 msgstr "end"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1928
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1926
 msgid "Re_peat the reminder"
 msgstr "Re_peat the reminder"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1953
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1951
 msgctxt "cal-reminders"
 msgid "extra times every"
 msgstr "extra times every"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1990
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1988
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "minutes"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1992
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1990
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "hours"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1994
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1992
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "days"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2035
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2192
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2033
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2190
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "Custom _message"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2079
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2077
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "Custom reminder _sound"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2090
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2088
 msgid "Select a sound file"
 msgstr "Select a sound file"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2118
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2116
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2143
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2141
 msgid "_Arguments:"
 msgstr "_Arguments:"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2175
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2173
 msgid "_Send To:"
 msgstr "_Send To:"
 
-#: ../calendar/gui/e-comp-editor-page-schedule.c:427
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:443
 msgid "_Schedule"
 msgstr "_Schedule"
 
-#: ../calendar/gui/e-comp-editor-page-schedule.c:429
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:445
 msgid "Query free / busy information for the attendees"
 msgstr "Query free / busy information for the attendees"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:81
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:79
 msgctxt "ECompEditor"
 msgid "_Summary:"
 msgstr "_Summary:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:325
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:323
 msgctxt "ECompEditor"
 msgid "_Location:"
 msgstr "_Location:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:458
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:456
 msgctxt "ECompEditor"
 msgid "_Categories..."
 msgstr "_Categories..."
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:555
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:555
 msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "_Description:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:686
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:686
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "_Web page:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1057
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1057
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "D_ue date:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1117
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1117
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "Date _completed:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1133
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1133
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "Public"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1134
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1134
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "Private"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1135
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1135
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "Confidential"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1151
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1151
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "C_lassification:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1170
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1170
 msgctxt "ECompEditor"
 msgid "Not Started"
 msgstr "Not Started"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1171
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
 msgctxt "ECompEditor"
 msgid "In Progress"
 msgstr "In Progress"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1172
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1172
 msgctxt "ECompEditor"
 msgid "Completed"
 msgstr "Completed"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1173
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1173
 msgctxt "ECompEditor"
 msgid "Cancelled"
 msgstr "Cancelled"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1182
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1182
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1212
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1212
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "Undefined"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1213
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1213
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "High"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1214
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1214
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1215
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1215
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "Low"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1224
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1224
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "Priorit_y:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1278
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1278
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "Percent complete:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1359
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1359
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "Time _zone:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1484
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1484
 msgctxt "ECompEditor"
 msgid "Show time as _busy"
 msgstr "Show time as _busy"
 
-#: ../calendar/gui/e-comp-editor-task.c:75
-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:224
+#| msgid "Task's start date is in the past"
+msgid "Task’s start date is in the past"
+msgstr "Task’s start date is in the past"
 
-#: ../calendar/gui/e-comp-editor-task.c:83
-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:232
+#| msgid "Task's due date is in the past"
+msgid "Task’s due date is in the past"
+msgstr "Task’s due date is in the past"
 
-#: ../calendar/gui/e-comp-editor-task.c:308
+#: ../src/calendar/gui/e-comp-editor-task.c:461
 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"
 
-#: ../calendar/gui/e-comp-editor-task.c:310
+#: ../src/calendar/gui/e-comp-editor-task.c:463
 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"
 
-#: ../calendar/gui/e-comp-editor-task.c:312
+#: ../src/calendar/gui/e-comp-editor-task.c:465
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Task cannot be fully edited, because you are not the organiser"
 
-#: ../calendar/gui/e-comp-editor-task.c:359
+#: ../src/calendar/gui/e-comp-editor-task.c:533
 msgid "Due date is not a valid date"
 msgstr "Due date is not a valid date"
 
-#: ../calendar/gui/e-comp-editor-task.c:370
+#: ../src/calendar/gui/e-comp-editor-task.c:544
 msgid "Completed date is not a valid date"
 msgstr "Completed date is not a valid date"
 
-#: ../calendar/gui/e-comp-editor-task.c:381
+#: ../src/calendar/gui/e-comp-editor-task.c:555
 msgid "Completed date cannot be in the future"
 msgstr "Completed date cannot be in the future"
 
-#: ../calendar/gui/e-comp-editor-task.c:566
+#: ../src/calendar/gui/e-comp-editor-task.c:607
+#| msgid "All _Day Event"
+msgid "All _Day Task"
+msgstr "All _Day Task"
+
+#: ../src/calendar/gui/e-comp-editor-task.c:609
+#| msgid "Toggles whether to have All Day Event"
+msgid "Toggles whether to have All Day Task"
+msgstr "Toggles whether to have All Day Task"
+
+#: ../src/calendar/gui/e-comp-editor-task.c:818
 #, c-format
-msgid "Assigned Task - %s"
-msgstr "Assigned Task - %s"
+#| msgid "Assigned Task - %s"
+msgid "Assigned Task — %s"
+msgstr "Assigned Task — %s"
 
-#: ../calendar/gui/e-comp-editor-task.c:567
+#: ../src/calendar/gui/e-comp-editor-task.c:819
 #, c-format
-msgid "Task - %s"
+#| msgid "Task - %s"
+msgid "Task — %s"
 msgstr "Task — %s"
 
-#: ../calendar/gui/e-comp-editor.c:255
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:127
+#: ../src/calendar/gui/e-comp-editor.c:253
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:125
 msgid "attachment"
 msgstr "attachment"
 
-#: ../calendar/gui/e-comp-editor.c:610
+#: ../src/calendar/gui/e-comp-editor.c:608
 msgid "Sending notifications to attendees..."
 msgstr "Sending notifications to attendees..."
 
-#: ../calendar/gui/e-comp-editor.c:995
+#: ../src/calendar/gui/e-comp-editor.c:997
 msgid "Saving changes..."
 msgstr "Saving changes..."
 
-#: ../calendar/gui/e-comp-editor.c:1251
+#: ../src/calendar/gui/e-comp-editor.c:1257
 msgid "No Summary"
 msgstr "No Summary"
 
 #. == Button box ==
-#: ../calendar/gui/e-comp-editor.c:1976 ../composer/e-composer-actions.c:326
-#: ../e-util/e-html-editor-dialog.c:196 ../e-util/e-mail-signature-editor.c:308
-#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:391
-#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:129
-#: ../mail/e-mail-notes.c:931 ../mail/em-folder-properties.c:786
-#: ../mail/em-subscription-editor.c:1765
-#: ../modules/plugin-manager/evolution-plugin-manager.c:256
-#: ../shell/e-shell-window-actions.c:280 ../shell/e-shell-window-actions.c:778
-#: ../smime/gui/certificate-manager.c:2214
+#: ../src/calendar/gui/e-comp-editor.c:1984
+#: ../src/composer/e-composer-actions.c:327
+#: ../src/e-util/e-accounts-window.c:1743
+#: ../src/e-util/e-html-editor-dialog.c:194
+#: ../src/e-util/e-mail-signature-editor.c:309
+#: ../src/e-util/e-name-selector-dialog.c:548
+#: ../src/e-util/e-preferences-window.c:399
+#: ../src/e-util/e-table-field-chooser-dialog.c:205
+#: ../src/mail/e-mail-browser.c:127 ../src/mail/e-mail-notes.c:931
+#: ../src/mail/em-folder-properties.c:1158
+#: ../src/mail/em-subscription-editor.c:1765
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:254
+#: ../src/shell/e-shell-window-actions.c:296
+#: ../src/shell/e-shell-window-actions.c:817
+#: ../src/smime/gui/certificate-manager.c:2212
 msgid "_Close"
 msgstr "_Close"
 
-#: ../calendar/gui/e-comp-editor.c:1978
+#: ../src/calendar/gui/e-comp-editor.c:1986
 msgid "Close the current window"
 msgstr "Close the current window"
 
 #. copy menu item
-#: ../calendar/gui/e-comp-editor.c:1983 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:864 ../e-util/e-text.c:2109
-#: ../e-util/e-web-view.c:398 ../mail/e-mail-browser.c:136
-#: ../mail/mail.error.xml.h:146 ../shell/e-shell-window-actions.c:799
+#: ../src/calendar/gui/e-comp-editor.c:1991 ../src/e-util/e-focus-tracker.c:773
+#: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2110
+#: ../src/e-util/e-web-view.c:407 ../src/mail/e-mail-browser.c:134
+#: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:838
 msgid "_Copy"
 msgstr "_Copy"
 
-#: ../calendar/gui/e-comp-editor.c:1985 ../e-util/e-focus-tracker.c:175
-#: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
-#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:400
-#: ../e-util/e-web-view.c:1811 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:801
+#: ../src/calendar/gui/e-comp-editor.c:1993 ../src/e-util/e-focus-tracker.c:173
+#: ../src/e-util/e-focus-tracker.c:229 ../src/e-util/e-focus-tracker.c:282
+#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:409
+#: ../src/e-util/e-web-view.c:1977 ../src/mail/e-mail-browser.c:136
+#: ../src/shell/e-shell-window-actions.c:840
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
 #. cut menu item
-#: ../calendar/gui/e-comp-editor.c:1990 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:871 ../e-util/e-text.c:2095
-#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:806
+#: ../src/calendar/gui/e-comp-editor.c:1998 ../src/e-util/e-focus-tracker.c:768
+#: ../src/e-util/e-html-editor-actions.c:885 ../src/e-util/e-text.c:2096
+#: ../src/mail/e-mail-browser.c:141 ../src/shell/e-shell-window-actions.c:845
 msgid "Cu_t"
 msgstr "Cu_t"
 
-#: ../calendar/gui/e-comp-editor.c:1992 ../e-util/e-focus-tracker.c:168
-#: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
-#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1801
-#: ../mail/e-mail-browser.c:145 ../shell/e-shell-window-actions.c:808
+#: ../src/calendar/gui/e-comp-editor.c:2000 ../src/e-util/e-focus-tracker.c:166
+#: ../src/e-util/e-focus-tracker.c:222 ../src/e-util/e-focus-tracker.c:276
+#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:1986
+#: ../src/mail/e-mail-browser.c:143 ../src/shell/e-shell-window-actions.c:847
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
-#: ../calendar/gui/e-comp-editor.c:1999 ../e-util/e-focus-tracker.c:189
-#: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
-#: ../shell/e-shell-window-actions.c:815
+#: ../src/calendar/gui/e-comp-editor.c:2007 ../src/e-util/e-focus-tracker.c:187
+#: ../src/e-util/e-focus-tracker.c:243 ../src/e-util/e-focus-tracker.c:784
+#: ../src/shell/e-shell-window-actions.c:854
 msgid "Delete the selection"
 msgstr "Delete the selection"
 
-#: ../calendar/gui/e-comp-editor.c:2006
+#: ../src/calendar/gui/e-comp-editor.c:2014
 msgid "View help"
 msgstr "View help"
 
 #. paste menu item
-#: ../calendar/gui/e-comp-editor.c:2011 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:878 ../e-util/e-text.c:2121
-#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:834
+#: ../src/calendar/gui/e-comp-editor.c:2019 ../src/e-util/e-focus-tracker.c:778
+#: ../src/e-util/e-html-editor-actions.c:892 ../src/e-util/e-text.c:2122
+#: ../src/mail/e-mail-browser.c:148 ../src/shell/e-shell-window-actions.c:873
 msgid "_Paste"
 msgstr "_Paste"
 
-#: ../calendar/gui/e-comp-editor.c:2013 ../e-util/e-focus-tracker.c:182
-#: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
-#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1821
-#: ../mail/e-mail-browser.c:152 ../shell/e-shell-window-actions.c:836
+#: ../src/calendar/gui/e-comp-editor.c:2021 ../src/e-util/e-focus-tracker.c:180
+#: ../src/e-util/e-focus-tracker.c:236 ../src/e-util/e-focus-tracker.c:288
+#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:1995
+#: ../src/mail/e-mail-browser.c:150 ../src/shell/e-shell-window-actions.c:875
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
-#: ../calendar/gui/e-comp-editor.c:2018 ../composer/e-composer-actions.c:380
-#: ../mail/e-mail-reader.c:2326
-#: ../modules/addressbook/e-book-shell-view-actions.c:1231
-#: ../modules/addressbook/e-book-shell-view-actions.c:1245
+#: ../src/calendar/gui/e-comp-editor.c:2026
+#: ../src/composer/e-composer-actions.c:381 ../src/mail/e-mail-reader.c:2317
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1235
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1249
 msgid "_Print..."
 msgstr "_Print…"
 
-#: ../calendar/gui/e-comp-editor.c:2025 ../mail/e-mail-reader.c:2333
-#: ../modules/addressbook/e-book-shell-view-actions.c:1238
-#: ../modules/calendar/e-cal-shell-view-actions.c:1695
-#: ../modules/calendar/e-memo-shell-view-actions.c:815
-#: ../modules/calendar/e-task-shell-view-actions.c:1016
+#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2324
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1242
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1744
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:813
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1014
 msgid "Pre_view..."
 msgstr "Pre_view..."
 
-#: ../calendar/gui/e-comp-editor.c:2032 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:892 ../e-util/e-web-view.c:408
-#: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:911
+#: ../src/calendar/gui/e-comp-editor.c:2040 ../src/e-util/e-focus-tracker.c:788
+#: ../src/e-util/e-html-editor-actions.c:906 ../src/e-util/e-web-view.c:417
+#: ../src/mail/e-mail-browser.c:155 ../src/shell/e-shell-window-actions.c:950
 msgid "Select _All"
 msgstr "Select _All"
 
-#: ../calendar/gui/e-comp-editor.c:2034 ../e-util/e-focus-tracker.c:196
-#: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
-#: ../mail/e-mail-browser.c:159 ../shell/e-shell-window-actions.c:913
+#: ../src/calendar/gui/e-comp-editor.c:2042 ../src/e-util/e-focus-tracker.c:194
+#: ../src/e-util/e-focus-tracker.c:250 ../src/e-util/e-focus-tracker.c:789
+#: ../src/mail/e-mail-browser.c:157 ../src/shell/e-shell-window-actions.c:952
 msgid "Select all text"
 msgstr "Select all text"
 
-#: ../calendar/gui/e-comp-editor.c:2055
+#: ../src/calendar/gui/e-comp-editor.c:2063
 msgid "_Classification"
 msgstr "_Classification"
 
-#: ../calendar/gui/e-comp-editor.c:2069 ../e-util/e-html-editor-actions.c:915
-#: ../e-util/e-mail-signature-editor.c:322 ../mail/e-mail-browser.c:166
-#: ../mail/e-mail-notes.c:945 ../shell/e-shell-window-actions.c:948
+#: ../src/calendar/gui/e-comp-editor.c:2077
+#: ../src/e-util/e-html-editor-actions.c:929
+#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:164
+#: ../src/mail/e-mail-notes.c:945 ../src/shell/e-shell-window-actions.c:987
 msgid "_File"
 msgstr "_File"
 
-#: ../calendar/gui/e-comp-editor.c:2083 ../e-util/e-html-editor-actions.c:936
+#: ../src/calendar/gui/e-comp-editor.c:2091
+#: ../src/e-util/e-html-editor-actions.c:950
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../calendar/gui/e-comp-editor.c:2090 ../composer/e-composer-actions.c:370
+#: ../src/calendar/gui/e-comp-editor.c:2098
+#: ../src/composer/e-composer-actions.c:371
 msgid "_Options"
 msgstr "_Options"
 
-#: ../calendar/gui/e-comp-editor.c:2097 ../e-util/e-html-editor-actions.c:957
-#: ../mail/e-mail-browser.c:180 ../shell/e-shell-window-actions.c:991
-#: ../smime/gui/certificate-manager.c:1664 ../smime/gui/smime-ui.ui.h:5
+#: ../src/calendar/gui/e-comp-editor.c:2105
+#: ../src/e-util/e-html-editor-actions.c:971 ../src/mail/e-mail-browser.c:178
+#: ../src/shell/e-shell-window-actions.c:1030
+#: ../src/smime/gui/certificate-manager.c:1662 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "_View"
 
-#: ../calendar/gui/e-comp-editor.c:2109
+#: ../src/calendar/gui/e-comp-editor.c:2117
 msgid "Save current changes"
 msgstr "Save current changes"
 
-#: ../calendar/gui/e-comp-editor.c:2114 ../e-util/e-mail-signature-editor.c:317
-#: ../mail/e-mail-notes.c:940
+#: ../src/calendar/gui/e-comp-editor.c:2122
+#: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:940
 msgid "Save and Close"
 msgstr "Save and Close"
 
-#: ../calendar/gui/e-comp-editor.c:2116
+#: ../src/calendar/gui/e-comp-editor.c:2124
 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.
-#: ../calendar/gui/e-day-view.c:2132 ../calendar/gui/e-week-view.c:1728
-#: ../calendar/gui/print.c:1072 ../calendar/gui/print.c:1091
-#: ../calendar/gui/print.c:2628 ../calendar/gui/print.c:2648
+#: ../src/calendar/gui/e-day-view.c:2130 ../src/calendar/gui/e-to-do-pane.c:239
+#: ../src/calendar/gui/e-week-view.c:1726 ../src/calendar/gui/print.c:1070
+#: ../src/calendar/gui/print.c:1089 ../src/calendar/gui/print.c:2626
+#: ../src/calendar/gui/print.c:2646
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:2135 ../calendar/gui/e-week-view.c:1731
-#: ../calendar/gui/print.c:1077 ../calendar/gui/print.c:1093
-#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2650
+#: ../src/calendar/gui/e-day-view.c:2133 ../src/calendar/gui/e-to-do-pane.c:243
+#: ../src/calendar/gui/e-week-view.c:1729 ../src/calendar/gui/print.c:1075
+#: ../src/calendar/gui/print.c:1091 ../src/calendar/gui/print.c:2631
+#: ../src/calendar/gui/print.c:2648
 msgid "pm"
 msgstr "pm"
 
@@ -4894,13 +8641,15 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:3047 ../calendar/gui/e-day-view-top-item.c:843
-#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2095
+#: ../src/calendar/gui/e-day-view.c:3045
+#: ../src/calendar/gui/e-day-view-top-item.c:841
+#: ../src/calendar/gui/e-week-view-main-item.c:205
+#: ../src/calendar/gui/print.c:2093
 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
-#: ../calendar/gui/e-day-view.c:3772
+#: ../src/calendar/gui/e-day-view.c:3770
 #, c-format
 msgid "Week %d"
 msgstr "Week %d"
@@ -4911,207 +8660,215 @@ msgstr "Week %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:806
+#: ../src/calendar/gui/e-day-view-time-item.c:804
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minute divisions"
 
-#: ../calendar/gui/e-day-view-time-item.c:831
+#: ../src/calendar/gui/e-day-view-time-item.c:829
 msgid "Show the second time zone"
 msgstr "Show the second time zone"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:848
-#: ../modules/calendar/e-calendar-preferences.c:303
-#: ../modules/calendar/e-calendar-preferences.c:355
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../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/modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "None"
 
-#: ../calendar/gui/e-day-view-time-item.c:882
-#: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:386
+#: ../src/calendar/gui/e-day-view-time-item.c:880
+#: ../src/calendar/gui/e-timezone-entry.c:322
+#: ../src/modules/calendar/e-calendar-preferences.c:396
 msgid "Select..."
 msgstr "Select…"
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../src/calendar/gui/e-meeting-list-view.c:62
 msgid "Chair Persons"
 msgstr "Chair Persons"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../src/calendar/gui/e-meeting-list-view.c:63
 msgid "Required Participants"
 msgstr "Required Participants"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../src/calendar/gui/e-meeting-list-view.c:64
 msgid "Optional Participants"
 msgstr "Optional Participants"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../src/calendar/gui/e-meeting-list-view.c:65
 msgid "Resources"
 msgstr "Resources"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../src/calendar/gui/e-meeting-list-view.c:163
 msgid "Attendees"
 msgstr "Attendees"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
-#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1245
+#: ../src/calendar/gui/e-meeting-list-view.c:179
+#: ../src/calendar/gui/e-meeting-store.c:107
+#: ../src/calendar/gui/e-meeting-store.c:124
+#: ../src/calendar/gui/e-meeting-store.c:1015 ../src/calendar/gui/print.c:1243
 msgid "Individual"
 msgstr "Individual"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/print.c:1246 ../e-util/e-table-config.ui.h:8
+#: ../src/calendar/gui/e-meeting-list-view.c:180
+#: ../src/calendar/gui/e-meeting-store.c:109
+#: ../src/calendar/gui/e-meeting-store.c:126 ../src/calendar/gui/print.c:1244
+#: ../src/e-util/e-table-config.ui.h:1
 msgid "Group"
 msgstr "Group"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1247
+#: ../src/calendar/gui/e-meeting-list-view.c:181
+#: ../src/calendar/gui/e-meeting-store.c:111
+#: ../src/calendar/gui/e-meeting-store.c:128 ../src/calendar/gui/print.c:1245
 msgid "Resource"
 msgstr "Resource"
 
-#: ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1248
+#: ../src/calendar/gui/e-meeting-list-view.c:182
+#: ../src/calendar/gui/e-meeting-store.c:113
+#: ../src/calendar/gui/e-meeting-store.c:130 ../src/calendar/gui/print.c:1246
 msgid "Room"
 msgstr "Room"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/print.c:1262
+#: ../src/calendar/gui/e-meeting-list-view.c:193
+#: ../src/calendar/gui/e-meeting-store.c:142
+#: ../src/calendar/gui/e-meeting-store.c:159 ../src/calendar/gui/print.c:1260
 msgid "Chair"
 msgstr "Chair"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1263
+#: ../src/calendar/gui/e-meeting-list-view.c:194
+#: ../src/calendar/gui/e-meeting-store.c:144
+#: ../src/calendar/gui/e-meeting-store.c:161
+#: ../src/calendar/gui/e-meeting-store.c:1018 ../src/calendar/gui/print.c:1261
 msgid "Required Participant"
 msgstr "Required Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/print.c:1264
+#: ../src/calendar/gui/e-meeting-list-view.c:195
+#: ../src/calendar/gui/e-meeting-store.c:146
+#: ../src/calendar/gui/e-meeting-store.c:163 ../src/calendar/gui/print.c:1262
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1265
+#: ../src/calendar/gui/e-meeting-list-view.c:196
+#: ../src/calendar/gui/e-meeting-store.c:148
+#: ../src/calendar/gui/e-meeting-store.c:165 ../src/calendar/gui/print.c:1263
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/e-meeting-store.c:1030
+#: ../src/calendar/gui/e-meeting-list-view.c:218
+#: ../src/calendar/gui/e-meeting-store.c:192
+#: ../src/calendar/gui/e-meeting-store.c:215
+#: ../src/calendar/gui/e-meeting-store.c:1028
 msgid "Needs Action"
 msgstr "Needs Action"
 
-#: ../calendar/gui/e-meeting-list-view.c:620
+#: ../src/calendar/gui/e-meeting-list-view.c:618
 msgid "Attendee                          "
 msgstr "Attendee                          "
 
-#: ../calendar/gui/e-meeting-list-view.c:646
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../calendar/gui/e-task-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:207
-#: ../mail/e-mail-account-tree-view.c:157
+#: ../src/calendar/gui/e-meeting-list-view.c:644
+#: ../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:1370
+#: ../src/e-util/e-attachment-tree-view.c:205
+#: ../src/e-util/e-webdav-browser.c:2381
+#: ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "Type"
 
-#: ../calendar/gui/e-meeting-list-view.c:675
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+#. To translators: RSVP means "please reply"
+#: ../src/calendar/gui/e-meeting-list-view.c:673
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../src/calendar/gui/e-meeting-store.c:204
+#: ../src/calendar/gui/e-meeting-store.c:227
 msgid "In Process"
 msgstr "In Process"
 
-#: ../calendar/gui/e-meeting-store.c:1881
+#: ../src/calendar/gui/e-meeting-store.c:1899
 #, 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"
 
-#: ../calendar/gui/e-meeting-store.c:1891
+#: ../src/calendar/gui/e-meeting-store.c:1909
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Failure reason: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1896
-#: ../plugins/publish-calendar/publish-calendar.c:351
-#: ../smime/gui/component.c:63
+#: ../src/calendar/gui/e-meeting-store.c:1914
+#: ../src/plugins/publish-calendar/publish-calendar.c:349
+#: ../src/smime/gui/component.c:61
 msgid "Enter password"
 msgstr "Enter password"
 
-#: ../calendar/gui/e-meeting-time-sel.c:537
+#: ../src/calendar/gui/e-meeting-time-sel.c:535
 msgid "Out of Office"
 msgstr "Out of Office"
 
-#: ../calendar/gui/e-meeting-time-sel.c:539
+#: ../src/calendar/gui/e-meeting-time-sel.c:537
 msgid "No Information"
 msgstr "No Information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:555
+#: ../src/calendar/gui/e-meeting-time-sel.c:553
 msgid "Atte_ndees..."
 msgstr "Atte_ndees…"
 
-#: ../calendar/gui/e-meeting-time-sel.c:574
+#: ../src/calendar/gui/e-meeting-time-sel.c:572
 msgid "O_ptions"
 msgstr "O_ptions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:595
+#: ../src/calendar/gui/e-meeting-time-sel.c:593
 msgid "Show _only working hours"
 msgstr "Show _only working hours"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../src/calendar/gui/e-meeting-time-sel.c:606
 msgid "Show _zoomed out"
 msgstr "Show _zoomed out"
 
-#: ../calendar/gui/e-meeting-time-sel.c:626
+#: ../src/calendar/gui/e-meeting-time-sel.c:624
 msgid "_Update free/busy"
 msgstr "_Update free/busy"
 
-#: ../calendar/gui/e-meeting-time-sel.c:643
+#: ../src/calendar/gui/e-meeting-time-sel.c:641
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:663
+#: ../src/calendar/gui/e-meeting-time-sel.c:661
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: ../calendar/gui/e-meeting-time-sel.c:680
+#: ../src/calendar/gui/e-meeting-time-sel.c:678
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:702
+#: ../src/calendar/gui/e-meeting-time-sel.c:700
 msgid "_All people and resources"
 msgstr "_All people and resources"
 
-#: ../calendar/gui/e-meeting-time-sel.c:713
+#: ../src/calendar/gui/e-meeting-time-sel.c:711
 msgid "All _people and one resource"
 msgstr "All _people and one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:724
+#: ../src/calendar/gui/e-meeting-time-sel.c:722
 msgid "_Required people"
 msgstr "_Required people"
 
-#: ../calendar/gui/e-meeting-time-sel.c:734
+#: ../src/calendar/gui/e-meeting-time-sel.c:732
 msgid "Required people and _one resource"
 msgstr "Required people and _one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:773
+#: ../src/calendar/gui/e-meeting-time-sel.c:771
 msgid "_Start time:"
 msgstr "_Start time:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:802
+#: ../src/calendar/gui/e-meeting-time-sel.c:800
 msgid "_End time:"
 msgstr "_End time:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2723
+#: ../src/calendar/gui/e-meeting-time-sel.c:2727
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -5120,84 +8877,81 @@ msgstr ""
 "Summary: %s\n"
 "Location: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3522
+#: ../src/calendar/gui/e-meeting-time-sel.c:2729
+#: ../src/calendar/gui/print.c:3520
 #, c-format
 msgid "Summary: %s"
 msgstr "Summary: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Click here to add an attendee"
 msgstr "Click here to add an attendee"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Member"
 msgstr "Member"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Delegated To"
 msgstr "Delegated To"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Delegated From"
 msgstr "Delegated From"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:10
 msgid "Common Name"
 msgstr "Common Name"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Language"
 msgstr "Language"
 
-#: ../calendar/gui/e-memo-table.c:370 ../data/evolution.desktop.in.in.h:11
-#: ../modules/calendar/e-cal-shell-content.c:1667
-#: ../modules/calendar/e-memo-shell-view-actions.c:196
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view.c:315
-msgid "Memos"
-msgstr "Memos"
-
-#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:757
+#: ../src/calendar/gui/e-memo-table.c:455
+#: ../src/calendar/gui/e-task-table.c:781
 msgid "* No Summary *"
 msgstr "* No Summary *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:542 ../calendar/gui/e-task-table.c:839
+#: ../src/calendar/gui/e-memo-table.c:540
+#: ../src/calendar/gui/e-task-table.c:863
 msgid "Start: "
 msgstr "Start: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:562 ../calendar/gui/e-task-table.c:858
+#: ../src/calendar/gui/e-memo-table.c:560
+#: ../src/calendar/gui/e-task-table.c:882
 msgid "Due: "
 msgstr "Due: "
 
-#: ../calendar/gui/e-memo-table.c:720
+#: ../src/calendar/gui/e-memo-table.c:745
 msgid "Cut selected memos to the clipboard"
 msgstr "Cut selected memos to the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:726
+#: ../src/calendar/gui/e-memo-table.c:751
 msgid "Copy selected memos to the clipboard"
 msgstr "Copy selected memos to the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:732
+#: ../src/calendar/gui/e-memo-table.c:757
 msgid "Paste memos from the clipboard"
 msgstr "Paste memos from the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:738
-#: ../modules/calendar/e-memo-shell-view-actions.c:560
+#: ../src/calendar/gui/e-memo-table.c:763
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:558
 msgid "Delete selected memos"
 msgstr "Delete selected memos"
 
-#: ../calendar/gui/e-memo-table.c:744
+#: ../src/calendar/gui/e-memo-table.c:769
 msgid "Select all visible memos"
 msgstr "Select all visible memos"
 
-#: ../calendar/gui/e-memo-table.etspec.h:1
+#: ../src/calendar/gui/e-memo-table.etspec.h:1
 msgid "Click to add a memo"
 msgstr "Click to add a memo"
 
-#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
-#: ../e-util/e-send-options.ui.h:1
+#: ../src/calendar/gui/e-task-table.c:551
+#: ../src/calendar/gui/tasktypes.xml.in.h:22
+#: ../src/e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Undefined"
 
@@ -5205,111 +8959,173 @@ msgstr "Undefined"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:555
+#: ../src/calendar/gui/e-task-table.c:579
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2410
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:1116
-#: ../data/evolution.desktop.in.in.h:12
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
-#: ../modules/calendar/e-cal-shell-content.c:1627
-#: ../modules/calendar/e-task-shell-view-actions.c:220
-#: ../modules/calendar/e-task-shell-view-actions.c:235
-#: ../modules/calendar/e-task-shell-view.c:473
-msgid "Tasks"
-msgstr "Tasks"
-
-#: ../calendar/gui/e-task-table.c:1033
+#: ../src/calendar/gui/e-task-table.c:1084
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cut selected tasks to the clipboard"
 
-#: ../calendar/gui/e-task-table.c:1039
+#: ../src/calendar/gui/e-task-table.c:1090
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copy selected tasks to the clipboard"
 
-#: ../calendar/gui/e-task-table.c:1045
+#: ../src/calendar/gui/e-task-table.c:1096
 msgid "Paste tasks from the clipboard"
 msgstr "Paste tasks from the clipboard"
 
-#: ../calendar/gui/e-task-table.c:1051
-#: ../modules/calendar/e-task-shell-view-actions.c:686
+#: ../src/calendar/gui/e-task-table.c:1102
+#: ../src/modules/calendar/e-task-shell-view-actions.c:684
 msgid "Delete selected tasks"
 msgstr "Delete selected tasks"
 
-#: ../calendar/gui/e-task-table.c:1057
+#: ../src/calendar/gui/e-task-table.c:1108
 msgid "Select all visible tasks"
 msgstr "Select all visible tasks"
 
-#: ../calendar/gui/e-task-table.etspec.h:1
+#: ../src/calendar/gui/e-task-table.etspec.h:1
 msgid "Click to add a task"
 msgstr "Click to add a task"
 
-#: ../calendar/gui/e-task-table.etspec.h:2
+#: ../src/calendar/gui/e-task-table.etspec.h:2
 msgid "Start date"
 msgstr "Start date"
 
-#: ../calendar/gui/e-task-table.etspec.h:5
+#: ../src/calendar/gui/e-task-table.etspec.h:5
 msgid "Completion date"
 msgstr "Completion date"
 
-#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:969
+#: ../src/calendar/gui/e-task-table.etspec.h:6 ../src/mail/mail-send-recv.c:968
 msgid "Complete"
 msgstr "Complete"
 
-#: ../calendar/gui/e-task-table.etspec.h:7
+#: ../src/calendar/gui/e-task-table.etspec.h:7
 msgid "Due date"
 msgstr "Due date"
 
-#: ../calendar/gui/e-task-table.etspec.h:9
+#: ../src/calendar/gui/e-task-table.etspec.h:9
 #, no-c-format
 msgid "% Complete"
 msgstr "% Complete"
 
-#: ../calendar/gui/e-task-table.etspec.h:10 ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../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
 msgid "Priority"
 msgstr "Priority"
 
-#: ../calendar/gui/e-timezone-entry.c:335
+#: ../src/calendar/gui/e-timezone-entry.c:333
 msgid "Select Timezone"
 msgstr "Select Timezone"
 
+#. Translators: It will display "Due: DueDateAndTime"
+#: ../src/calendar/gui/e-to-do-pane.c:365
+#, c-format
+#| msgid "Due: "
+msgid "Due: %s"
+msgstr "Due: %s"
+
+#. Translators: It will display "Completed: DateAndTimeWhenCompleted"
+#: ../src/calendar/gui/e-to-do-pane.c:377
+#, c-format
+#| msgid "Completed: "
+msgid "Completed: %s"
+msgstr "Completed: %s"
+
+#. strftime format of a weekday and a date.
+#: ../src/calendar/gui/e-to-do-pane.c:1328 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/e-util/e-datetime-format.c:206
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1842
+#: ../src/modules/itip-formatter/itip-view.c:253
+msgid "Today"
+msgstr "Today"
+
+#. strftime format of a weekday and a date.
+#: ../src/calendar/gui/e-to-do-pane.c:1330
+#: ../src/e-util/e-datetime-format.c:217
+#: ../src/modules/itip-formatter/itip-view.c:281
+msgid "Tomorrow"
+msgstr "Tomorrow"
+
+#: ../src/calendar/gui/e-to-do-pane.c:1892
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1449
+msgid "New _Appointment..."
+msgstr "New _Appointment…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:1900
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1435
+msgid "New _Meeting..."
+msgstr "New _Meeting…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:1908
+#| msgid "New _Task"
+msgid "New _Task..."
+msgstr "New _Task..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1916
+#| msgid "New assigned task"
+msgid "_New Assigned Task..."
+msgstr "_New Assigned Task..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1929
+msgid "_Open..."
+msgstr "_Open..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1943
+#| msgid "Delete This _Occurrence"
+msgid "_Delete This Instance..."
+msgstr "_Delete This Instance..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1951
+#| msgid "All Instances"
+msgid "D_elete All Instances..."
+msgstr "D_elete All Instances..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1959
+#| msgid "_Delete"
+msgid "_Delete..."
+msgstr "_Delete..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:2249
+msgid "To Do"
+msgstr "To Do"
+
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2074
+#: ../src/calendar/gui/e-week-view-main-item.c:222
+#: ../src/calendar/gui/print.c:2072
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:715
-#: ../calendar/gui/itip-utils.c:849
+#: ../src/calendar/gui/itip-utils.c:793 ../src/calendar/gui/itip-utils.c:855
+#: ../src/calendar/gui/itip-utils.c:989
 msgid "An organizer must be set."
 msgstr "An organiser must be set."
 
-#: ../calendar/gui/itip-utils.c:706
+#: ../src/calendar/gui/itip-utils.c:846
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: ../calendar/gui/itip-utils.c:937 ../calendar/gui/itip-utils.c:1098
+#: ../src/calendar/gui/itip-utils.c:1077 ../src/calendar/gui/itip-utils.c:1238
 msgid "Event information"
 msgstr "Event information"
 
-#: ../calendar/gui/itip-utils.c:940 ../calendar/gui/itip-utils.c:1101
+#: ../src/calendar/gui/itip-utils.c:1080 ../src/calendar/gui/itip-utils.c:1241
 msgid "Task information"
 msgstr "Task information"
 
-#: ../calendar/gui/itip-utils.c:943 ../calendar/gui/itip-utils.c:1104
+#: ../src/calendar/gui/itip-utils.c:1083 ../src/calendar/gui/itip-utils.c:1244
 msgid "Memo information"
 msgstr "Memo information"
 
-#: ../calendar/gui/itip-utils.c:946 ../calendar/gui/itip-utils.c:1122
+#: ../src/calendar/gui/itip-utils.c:1086 ../src/calendar/gui/itip-utils.c:1262
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
-#: ../calendar/gui/itip-utils.c:949
+#: ../src/calendar/gui/itip-utils.c:1089
 msgid "Calendar information"
 msgstr "Calendar information"
 
@@ -5317,7 +9133,7 @@ msgstr "Calendar information"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:986
+#: ../src/calendar/gui/itip-utils.c:1126
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Accepted"
@@ -5326,7 +9142,7 @@ msgstr "Accepted"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:993
+#: ../src/calendar/gui/itip-utils.c:1133
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
@@ -5338,7 +9154,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".
-#: ../calendar/gui/itip-utils.c:1000 ../calendar/gui/itip-utils.c:1048
+#: ../src/calendar/gui/itip-utils.c:1140 ../src/calendar/gui/itip-utils.c:1188
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Declined"
@@ -5347,7 +9163,7 @@ msgstr "Declined"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1007
+#: ../src/calendar/gui/itip-utils.c:1147
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegated"
@@ -5355,7 +9171,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".
-#: ../calendar/gui/itip-utils.c:1020
+#: ../src/calendar/gui/itip-utils.c:1160
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Updated"
@@ -5363,7 +9179,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".
-#: ../calendar/gui/itip-utils.c:1027
+#: ../src/calendar/gui/itip-utils.c:1167
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancel"
@@ -5371,7 +9187,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".
-#: ../calendar/gui/itip-utils.c:1034
+#: ../src/calendar/gui/itip-utils.c:1174
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Refresh"
@@ -5379,502 +9195,509 @@ 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".
-#: ../calendar/gui/itip-utils.c:1041
+#: ../src/calendar/gui/itip-utils.c:1181
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
 
-#: ../calendar/gui/itip-utils.c:1119
+#: ../src/calendar/gui/itip-utils.c:1259
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy information (%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:1127
+#: ../src/calendar/gui/itip-utils.c:1267
 msgid "iCalendar information"
 msgstr "iCalendar information"
 
-#: ../calendar/gui/itip-utils.c:1156
+#: ../src/calendar/gui/itip-utils.c:1296
 #, 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."
 
-#: ../calendar/gui/itip-utils.c:1161
+#: ../src/calendar/gui/itip-utils.c:1301
 msgid "Unable to book a resource, error: "
 msgstr "Unable to book a resource, error: "
 
-#: ../calendar/gui/itip-utils.c:1332
+#: ../src/calendar/gui/itip-utils.c:1472
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
-#: ../calendar/gui/itip-utils.c:1986
+#: ../src/calendar/gui/itip-utils.c:2153
 msgid "Sending an event"
 msgstr "Sending an event"
 
-#: ../calendar/gui/itip-utils.c:1990
+#: ../src/calendar/gui/itip-utils.c:2157
 msgid "Sending a memo"
 msgstr "Sending a memo"
 
-#: ../calendar/gui/itip-utils.c:1994
+#: ../src/calendar/gui/itip-utils.c:2161
 msgid "Sending a task"
 msgstr "Sending a task"
 
-#: ../calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:661
 msgid "1st"
 msgstr "1st"
 
-#: ../calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:661
 msgid "2nd"
 msgstr "2nd"
 
-#: ../calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:661
 msgid "3rd"
 msgstr "3rd"
 
-#: ../calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:661
 msgid "4th"
 msgstr "4th"
 
-#: ../calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:661
 msgid "5th"
 msgstr "5th"
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:662
 msgid "6th"
 msgstr "6th"
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:662
 msgid "7th"
 msgstr "7th"
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:662
 msgid "8th"
 msgstr "8th"
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:662
 msgid "9th"
 msgstr "9th"
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:662
 msgid "10th"
 msgstr "10th"
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:663
 msgid "11th"
 msgstr "11th"
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:663
 msgid "12th"
 msgstr "12th"
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:663
 msgid "13th"
 msgstr "13th"
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:663
 msgid "14th"
 msgstr "14th"
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:663
 msgid "15th"
 msgstr "15th"
 
-#: ../calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:664
 msgid "16th"
 msgstr "16th"
 
-#: ../calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:664
 msgid "17th"
 msgstr "17th"
 
-#: ../calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:664
 msgid "18th"
 msgstr "18th"
 
-#: ../calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:664
 msgid "19th"
 msgstr "19th"
 
-#: ../calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:664
 msgid "20th"
 msgstr "20th"
 
-#: ../calendar/gui/print.c:667
+#: ../src/calendar/gui/print.c:665
 msgid "21st"
 msgstr "21st"
 
-#: ../calendar/gui/print.c:667
+#: ../src/calendar/gui/print.c:665
 msgid "22nd"
 msgstr "22nd"
 
-#: ../calendar/gui/print.c:667
+#: ../src/calendar/gui/print.c:665
 msgid "23rd"
 msgstr "23rd"
 
-#: ../calendar/gui/print.c:667
+#: ../src/calendar/gui/print.c:665
 msgid "24th"
 msgstr "24th"
 
-#: ../calendar/gui/print.c:667
+#: ../src/calendar/gui/print.c:665
 msgid "25th"
 msgstr "25th"
 
-#: ../calendar/gui/print.c:668
+#: ../src/calendar/gui/print.c:666
 msgid "26th"
 msgstr "26th"
 
-#: ../calendar/gui/print.c:668
+#: ../src/calendar/gui/print.c:666
 msgid "27th"
 msgstr "27th"
 
-#: ../calendar/gui/print.c:668
+#: ../src/calendar/gui/print.c:666
 msgid "28th"
 msgstr "28th"
 
-#: ../calendar/gui/print.c:668
+#: ../src/calendar/gui/print.c:666
 msgid "29th"
 msgstr "29th"
 
-#: ../calendar/gui/print.c:668
+#: ../src/calendar/gui/print.c:666
 msgid "30th"
 msgstr "30th"
 
-#: ../calendar/gui/print.c:669
+#: ../src/calendar/gui/print.c:667
 msgid "31st"
 msgstr "31st"
 
+#. G_DATE_BAD_WEEKDAY
 #. Translators: These are workday abbreviations,
 #. * e.g. Su=Sunday and Th=thursday
-#. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:729
+#: ../src/calendar/gui/print.c:727
 msgid "Mo"
 msgstr "Mo"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:730
+#: ../src/calendar/gui/print.c:728
 msgid "Tu"
 msgstr "Tu"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:731
+#: ../src/calendar/gui/print.c:729
 msgid "We"
 msgstr "We"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:732
+#: ../src/calendar/gui/print.c:730
 msgid "Th"
 msgstr "Th"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:733
+#: ../src/calendar/gui/print.c:731
 msgid "Fr"
 msgstr "Fr"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:734
+#: ../src/calendar/gui/print.c:732
 msgid "Sa"
 msgstr "Sa"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:735
+#: ../src/calendar/gui/print.c:733
 msgid "Su"
 msgstr "Su"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3315
+#: ../src/calendar/gui/print.c:3313
 msgid " to "
 msgstr " to "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3325
+#: ../src/calendar/gui/print.c:3323
 msgid " (Completed "
 msgstr " (Completed "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3331
+#: ../src/calendar/gui/print.c:3329
 msgid "Completed "
 msgstr "Completed "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3341
+#: ../src/calendar/gui/print.c:3339
 msgid " (Due "
 msgstr " (Due "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3348
+#: ../src/calendar/gui/print.c:3346
 msgid "Due "
 msgstr "Due "
 
-#: ../calendar/gui/print.c:3492
+#: ../src/calendar/gui/print.c:3490
 msgid "Appointment"
 msgstr "Appointment"
 
-#: ../calendar/gui/print.c:3494 ../e-util/e-send-options.c:553
+#: ../src/calendar/gui/print.c:3492 ../src/e-util/e-send-options.c:551
 msgid "Task"
 msgstr "Task"
 
-#: ../calendar/gui/print.c:3496
+#: ../src/calendar/gui/print.c:3494
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/print.c:3552
+#: ../src/calendar/gui/print.c:3550
 msgid "Attendees: "
 msgstr "Attendees: "
 
-#: ../calendar/gui/print.c:3596
+#: ../src/calendar/gui/print.c:3594
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:3612
+#: ../src/calendar/gui/print.c:3610
 #, c-format
 msgid "Priority: %s"
 msgstr "Priority: %s"
 
-#: ../calendar/gui/print.c:3630
+#: ../src/calendar/gui/print.c:3628
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percent Complete: %i"
 
-#: ../calendar/gui/print.c:3644
+#: ../src/calendar/gui/print.c:3642
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3658
+#: ../src/calendar/gui/print.c:3656
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: ../calendar/gui/print.c:3669
+#: ../src/calendar/gui/print.c:3667
 msgid "Contacts: "
 msgstr "Contacts: "
 
-#: ../calendar/gui/tasktypes.xml.h:12
+#: ../src/calendar/gui/tasktypes.xml.in.h:12
 msgid "In progress"
 msgstr "In progress"
 
-#: ../calendar/gui/tasktypes.xml.h:25
+#: ../src/calendar/gui/tasktypes.xml.in.h:25
 #, no-c-format
 msgid "% Completed"
 msgstr "% Completed"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:31
-#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
+#: ../src/calendar/gui/tasktypes.xml.in.h:26
+#: ../src/mail/filtertypes.xml.in.h:31 ../src/mail/searchtypes.xml.in.h:33
+#: ../src/mail/vfoldertypes.xml.in.h:33
 msgid "is greater than"
 msgstr "is greater than"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:32
-#: ../mail/searchtypes.xml.in.h:34 ../mail/vfoldertypes.xml.in.h:34
+#: ../src/calendar/gui/tasktypes.xml.in.h:27
+#: ../src/mail/filtertypes.xml.in.h:32 ../src/mail/searchtypes.xml.in.h:34
+#: ../src/mail/vfoldertypes.xml.in.h:34
 msgid "is less than"
 msgstr "is less than"
 
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../src/calendar/importers/icalendar-importer.c:76
 msgid "Appointments and Meetings"
 msgstr "Appointments and Meetings"
 
-#: ../calendar/importers/icalendar-importer.c:308
-#: ../modules/calendar/e-cal-base-shell-backend.c:183
-#: ../modules/calendar/e-cal-shell-view-actions.c:180
+#: ../src/calendar/importers/icalendar-importer.c:306
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:432
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:181
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:178
 msgid "New Calendar"
 msgstr "New Calendar"
 
-#: ../calendar/importers/icalendar-importer.c:311
-#: ../modules/calendar/e-cal-base-shell-backend.c:191
-#: ../modules/calendar/e-task-shell-view-actions.c:204
+#: ../src/calendar/importers/icalendar-importer.c:309
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:440
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:189
+#: ../src/modules/calendar/e-task-shell-view-actions.c:202
 msgid "New Task List"
 msgstr "New Task List"
 
-#: ../calendar/importers/icalendar-importer.c:353
+#: ../src/calendar/importers/icalendar-importer.c:351
 msgid "Cre_ate new calendar"
 msgstr "Cre_ate new calendar"
 
-#: ../calendar/importers/icalendar-importer.c:357
+#: ../src/calendar/importers/icalendar-importer.c:355
 msgid "Cre_ate new task list"
 msgstr "Cre_ate new task list"
 
-#: ../calendar/importers/icalendar-importer.c:503
-#: ../calendar/importers/icalendar-importer.c:946
+#: ../src/calendar/importers/icalendar-importer.c:501
+#: ../src/calendar/importers/icalendar-importer.c:944
 msgid "Opening calendar"
 msgstr "Opening calendar"
 
-#: ../calendar/importers/icalendar-importer.c:654
+#: ../src/calendar/importers/icalendar-importer.c:652
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar files (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:655
+#: ../src/calendar/importers/icalendar-importer.c:653
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:747
+#: ../src/calendar/importers/icalendar-importer.c:745
 msgid "Reminder!"
 msgstr "Reminder!"
 
-#: ../calendar/importers/icalendar-importer.c:832
+#: ../src/calendar/importers/icalendar-importer.c:830
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar files (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:833
+#: ../src/calendar/importers/icalendar-importer.c:831
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:1109
+#: ../src/calendar/importers/icalendar-importer.c:1107
 msgid "Calendar Events"
 msgstr "Calendar Events"
 
-#: ../calendar/importers/icalendar-importer.c:1152
+#: ../src/calendar/importers/icalendar-importer.c:1150
 msgid "GNOME Calendar"
 msgstr "GNOME Calendar"
 
-#: ../calendar/importers/icalendar-importer.c:1153
+#: ../src/calendar/importers/icalendar-importer.c:1151
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution Calendar intelligent importer"
 
-#: ../calendar/importers/icalendar-importer.c:1224
-#: ../calendar/importers/icalendar-importer.c:1538
+#: ../src/calendar/importers/icalendar-importer.c:1222
+#: ../src/calendar/importers/icalendar-importer.c:1536
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Meeting"
 
-#: ../calendar/importers/icalendar-importer.c:1224
-#: ../calendar/importers/icalendar-importer.c:1538
+#: ../src/calendar/importers/icalendar-importer.c:1222
+#: ../src/calendar/importers/icalendar-importer.c:1536
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Event"
 
-#: ../calendar/importers/icalendar-importer.c:1227
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../src/calendar/importers/icalendar-importer.c:1225
+#: ../src/calendar/importers/icalendar-importer.c:1537
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Task"
 
-#: ../calendar/importers/icalendar-importer.c:1230
-#: ../calendar/importers/icalendar-importer.c:1540
+#: ../src/calendar/importers/icalendar-importer.c:1228
+#: ../src/calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/importers/icalendar-importer.c:1239
+#: ../src/calendar/importers/icalendar-importer.c:1237
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "has recurrences"
 
-#: ../calendar/importers/icalendar-importer.c:1244
+#: ../src/calendar/importers/icalendar-importer.c:1242
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "is an instance"
 
-#: ../calendar/importers/icalendar-importer.c:1249
+#: ../src/calendar/importers/icalendar-importer.c:1247
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "has reminders"
 
-#: ../calendar/importers/icalendar-importer.c:1254
+#: ../src/calendar/importers/icalendar-importer.c:1252
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "has attachments"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1267
+#: ../src/calendar/importers/icalendar-importer.c:1265
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Public"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1270
+#: ../src/calendar/importers/icalendar-importer.c:1268
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Private"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1273
+#: ../src/calendar/importers/icalendar-importer.c:1271
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Confidential"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1277
+#: ../src/calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Classification"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1282
-#: ../calendar/importers/icalendar-importer.c:1582
+#. Translators: Column header for a component summary
+#: ../src/calendar/importers/icalendar-importer.c:1280
+#: ../src/calendar/importers/icalendar-importer.c:1580
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Summary"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1288
+#: ../src/calendar/importers/icalendar-importer.c:1286
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Location"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1296
-#: ../calendar/importers/icalendar-importer.c:1577
+#. Translators: Column header for a component start date/time
+#: ../src/calendar/importers/icalendar-importer.c:1294
+#: ../src/calendar/importers/icalendar-importer.c:1575
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Start"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1307
+#: ../src/calendar/importers/icalendar-importer.c:1305
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Due"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1319
+#: ../src/calendar/importers/icalendar-importer.c:1317
 msgctxt "iCalImp"
 msgid "End"
 msgstr "End"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1329
+#: ../src/calendar/importers/icalendar-importer.c:1327
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Categories"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1353
+#: ../src/calendar/importers/icalendar-importer.c:1351
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Completed"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1361
+#: ../src/calendar/importers/icalendar-importer.c:1359
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1372
-#: ../calendar/importers/icalendar-importer.c:1375
+#: ../src/calendar/importers/icalendar-importer.c:1370
+#: ../src/calendar/importers/icalendar-importer.c:1373
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organiser"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1395
-#: ../calendar/importers/icalendar-importer.c:1398
+#: ../src/calendar/importers/icalendar-importer.c:1393
+#: ../src/calendar/importers/icalendar-importer.c:1396
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Attendees"
 
-#: ../calendar/importers/icalendar-importer.c:1412
+#: ../src/calendar/importers/icalendar-importer.c:1410
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Description"
 
-#: ../calendar/importers/icalendar-importer.c:1572
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../src/calendar/importers/icalendar-importer.c:1570
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Type"
@@ -5902,1668 +9725,1669 @@ msgstr "Type"
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:25
+#: ../src/calendar/zones.h:25
 msgid "Africa/Abidjan"
 msgstr "Africa/Abidjan"
 
-#: ../calendar/zones.h:26
+#: ../src/calendar/zones.h:26
 msgid "Africa/Accra"
 msgstr "Africa/Accra"
 
-#: ../calendar/zones.h:27
+#: ../src/calendar/zones.h:27
 msgid "Africa/Addis_Ababa"
 msgstr "Africa/Addis_Ababa"
 
-#: ../calendar/zones.h:28
+#: ../src/calendar/zones.h:28
 msgid "Africa/Algiers"
 msgstr "Africa/Algiers"
 
-#: ../calendar/zones.h:29
+#: ../src/calendar/zones.h:29
 msgid "Africa/Asmera"
 msgstr "Africa/Asmera"
 
-#: ../calendar/zones.h:30
+#: ../src/calendar/zones.h:30
 msgid "Africa/Bamako"
 msgstr "Africa/Bamako"
 
-#: ../calendar/zones.h:31
+#: ../src/calendar/zones.h:31
 msgid "Africa/Bangui"
 msgstr "Africa/Bangui"
 
-#: ../calendar/zones.h:32
+#: ../src/calendar/zones.h:32
 msgid "Africa/Banjul"
 msgstr "Africa/Banjul"
 
-#: ../calendar/zones.h:33
+#: ../src/calendar/zones.h:33
 msgid "Africa/Bissau"
 msgstr "Africa/Bissau"
 
-#: ../calendar/zones.h:34
+#: ../src/calendar/zones.h:34
 msgid "Africa/Blantyre"
 msgstr "Africa/Blantyre"
 
-#: ../calendar/zones.h:35
+#: ../src/calendar/zones.h:35
 msgid "Africa/Brazzaville"
 msgstr "Africa/Brazzaville"
 
-#: ../calendar/zones.h:36
+#: ../src/calendar/zones.h:36
 msgid "Africa/Bujumbura"
 msgstr "Africa/Bujumbura"
 
-#: ../calendar/zones.h:37
+#: ../src/calendar/zones.h:37
 msgid "Africa/Cairo"
 msgstr "Africa/Cairo"
 
-#: ../calendar/zones.h:38
+#: ../src/calendar/zones.h:38
 msgid "Africa/Casablanca"
 msgstr "Africa/Casablanca"
 
-#: ../calendar/zones.h:39
+#: ../src/calendar/zones.h:39
 msgid "Africa/Ceuta"
 msgstr "Africa/Ceuta"
 
-#: ../calendar/zones.h:40
+#: ../src/calendar/zones.h:40
 msgid "Africa/Conakry"
 msgstr "Africa/Conakry"
 
-#: ../calendar/zones.h:41
+#: ../src/calendar/zones.h:41
 msgid "Africa/Dakar"
 msgstr "Africa/Dakar"
 
-#: ../calendar/zones.h:42
+#: ../src/calendar/zones.h:42
 msgid "Africa/Dar_es_Salaam"
 msgstr "Africa/Dar_es_Salaam"
 
-#: ../calendar/zones.h:43
+#: ../src/calendar/zones.h:43
 msgid "Africa/Djibouti"
 msgstr "Africa/Djibouti"
 
-#: ../calendar/zones.h:44
+#: ../src/calendar/zones.h:44
 msgid "Africa/Douala"
 msgstr "Africa/Douala"
 
-#: ../calendar/zones.h:45
+#: ../src/calendar/zones.h:45
 msgid "Africa/El_Aaiun"
 msgstr "Africa/El_Aaiun"
 
-#: ../calendar/zones.h:46
+#: ../src/calendar/zones.h:46
 msgid "Africa/Freetown"
 msgstr "Africa/Freetown"
 
-#: ../calendar/zones.h:47
+#: ../src/calendar/zones.h:47
 msgid "Africa/Gaborone"
 msgstr "Africa/Gaborone"
 
-#: ../calendar/zones.h:48
+#: ../src/calendar/zones.h:48
 msgid "Africa/Harare"
 msgstr "Africa/Harare"
 
-#: ../calendar/zones.h:49
+#: ../src/calendar/zones.h:49
 msgid "Africa/Johannesburg"
 msgstr "Africa/Johannesburg"
 
-#: ../calendar/zones.h:50
+#: ../src/calendar/zones.h:50
 msgid "Africa/Kampala"
 msgstr "Africa/Kampala"
 
-#: ../calendar/zones.h:51
+#: ../src/calendar/zones.h:51
 msgid "Africa/Khartoum"
 msgstr "Africa/Khartoum"
 
-#: ../calendar/zones.h:52
+#: ../src/calendar/zones.h:52
 msgid "Africa/Kigali"
 msgstr "Africa/Kigali"
 
-#: ../calendar/zones.h:53
+#: ../src/calendar/zones.h:53
 msgid "Africa/Kinshasa"
 msgstr "Africa/Kinshasa"
 
-#: ../calendar/zones.h:54
+#: ../src/calendar/zones.h:54
 msgid "Africa/Lagos"
 msgstr "Africa/Lagos"
 
-#: ../calendar/zones.h:55
+#: ../src/calendar/zones.h:55
 msgid "Africa/Libreville"
 msgstr "Africa/Libreville"
 
-#: ../calendar/zones.h:56
+#: ../src/calendar/zones.h:56
 msgid "Africa/Lome"
 msgstr "Africa/Lome"
 
-#: ../calendar/zones.h:57
+#: ../src/calendar/zones.h:57
 msgid "Africa/Luanda"
 msgstr "Africa/Luanda"
 
-#: ../calendar/zones.h:58
+#: ../src/calendar/zones.h:58
 msgid "Africa/Lubumbashi"
 msgstr "Africa/Lubumbashi"
 
-#: ../calendar/zones.h:59
+#: ../src/calendar/zones.h:59
 msgid "Africa/Lusaka"
 msgstr "Africa/Lusaka"
 
-#: ../calendar/zones.h:60
+#: ../src/calendar/zones.h:60
 msgid "Africa/Malabo"
 msgstr "Africa/Malabo"
 
-#: ../calendar/zones.h:61
+#: ../src/calendar/zones.h:61
 msgid "Africa/Maputo"
 msgstr "Africa/Maputo"
 
-#: ../calendar/zones.h:62
+#: ../src/calendar/zones.h:62
 msgid "Africa/Maseru"
 msgstr "Africa/Maseru"
 
-#: ../calendar/zones.h:63
+#: ../src/calendar/zones.h:63
 msgid "Africa/Mbabane"
 msgstr "Africa/Mbabane"
 
-#: ../calendar/zones.h:64
+#: ../src/calendar/zones.h:64
 msgid "Africa/Mogadishu"
 msgstr "Africa/Mogadishu"
 
-#: ../calendar/zones.h:65
+#: ../src/calendar/zones.h:65
 msgid "Africa/Monrovia"
 msgstr "Africa/Monrovia"
 
-#: ../calendar/zones.h:66
+#: ../src/calendar/zones.h:66
 msgid "Africa/Nairobi"
 msgstr "Africa/Nairobi"
 
-#: ../calendar/zones.h:67
+#: ../src/calendar/zones.h:67
 msgid "Africa/Ndjamena"
 msgstr "Africa/Ndjamena"
 
-#: ../calendar/zones.h:68
+#: ../src/calendar/zones.h:68
 msgid "Africa/Niamey"
 msgstr "Africa/Niamey"
 
-#: ../calendar/zones.h:69
+#: ../src/calendar/zones.h:69
 msgid "Africa/Nouakchott"
 msgstr "Africa/Nouakchott"
 
-#: ../calendar/zones.h:70
+#: ../src/calendar/zones.h:70
 msgid "Africa/Ouagadougou"
 msgstr "Africa/Ouagadougou"
 
-#: ../calendar/zones.h:71
+#: ../src/calendar/zones.h:71
 msgid "Africa/Porto-Novo"
 msgstr "Africa/Porto-Novo"
 
-#: ../calendar/zones.h:72
+#: ../src/calendar/zones.h:72
 msgid "Africa/Sao_Tome"
 msgstr "Africa/Sao_Tome"
 
-#: ../calendar/zones.h:73
+#: ../src/calendar/zones.h:73
 msgid "Africa/Timbuktu"
 msgstr "Africa/Timbuktu"
 
-#: ../calendar/zones.h:74
+#: ../src/calendar/zones.h:74
 msgid "Africa/Tripoli"
 msgstr "Africa/Tripoli"
 
-#: ../calendar/zones.h:75
+#: ../src/calendar/zones.h:75
 msgid "Africa/Tunis"
 msgstr "Africa/Tunis"
 
-#: ../calendar/zones.h:76
+#: ../src/calendar/zones.h:76
 msgid "Africa/Windhoek"
 msgstr "Africa/Windhoek"
 
-#: ../calendar/zones.h:77
+#: ../src/calendar/zones.h:77
 msgid "America/Adak"
 msgstr "America/Adak"
 
-#: ../calendar/zones.h:78
+#: ../src/calendar/zones.h:78
 msgid "America/Anchorage"
 msgstr "America/Anchorage"
 
-#: ../calendar/zones.h:79
+#: ../src/calendar/zones.h:79
 msgid "America/Anguilla"
 msgstr "America/Anguilla"
 
-#: ../calendar/zones.h:80
+#: ../src/calendar/zones.h:80
 msgid "America/Antigua"
 msgstr "America/Antigua"
 
-#: ../calendar/zones.h:81
+#: ../src/calendar/zones.h:81
 msgid "America/Araguaina"
 msgstr "America/Araguaina"
 
-#: ../calendar/zones.h:82
+#: ../src/calendar/zones.h:82
 msgid "America/Aruba"
 msgstr "America/Aruba"
 
-#: ../calendar/zones.h:83
+#: ../src/calendar/zones.h:83
 msgid "America/Asuncion"
 msgstr "America/Asuncion"
 
-#: ../calendar/zones.h:84
+#: ../src/calendar/zones.h:84
 msgid "America/Barbados"
 msgstr "America/Barbados"
 
-#: ../calendar/zones.h:85
+#: ../src/calendar/zones.h:85
 msgid "America/Belem"
 msgstr "America/Belem"
 
-#: ../calendar/zones.h:86
+#: ../src/calendar/zones.h:86
 msgid "America/Belize"
 msgstr "America/Belize"
 
-#: ../calendar/zones.h:87
+#: ../src/calendar/zones.h:87
 msgid "America/Boa_Vista"
 msgstr "America/Boa_Vista"
 
-#: ../calendar/zones.h:88
+#: ../src/calendar/zones.h:88
 msgid "America/Bogota"
 msgstr "America/Bogota"
 
-#: ../calendar/zones.h:89
+#: ../src/calendar/zones.h:89
 msgid "America/Boise"
 msgstr "America/Boise"
 
-#: ../calendar/zones.h:90
+#: ../src/calendar/zones.h:90
 msgid "America/Buenos_Aires"
 msgstr "America/Buenos_Aires"
 
-#: ../calendar/zones.h:91
+#: ../src/calendar/zones.h:91
 msgid "America/Cambridge_Bay"
 msgstr "America/Cambridge_Bay"
 
-#: ../calendar/zones.h:92
+#: ../src/calendar/zones.h:92
 msgid "America/Cancun"
 msgstr "America/Cancun"
 
-#: ../calendar/zones.h:93
+#: ../src/calendar/zones.h:93
 msgid "America/Caracas"
 msgstr "America/Caracas"
 
-#: ../calendar/zones.h:94
+#: ../src/calendar/zones.h:94
 msgid "America/Catamarca"
 msgstr "America/Catamarca"
 
-#: ../calendar/zones.h:95
+#: ../src/calendar/zones.h:95
 msgid "America/Cayenne"
 msgstr "America/Cayenne"
 
-#: ../calendar/zones.h:96
+#: ../src/calendar/zones.h:96
 msgid "America/Cayman"
 msgstr "America/Cayman"
 
-#: ../calendar/zones.h:97
+#: ../src/calendar/zones.h:97
 msgid "America/Chicago"
 msgstr "America/Chicago"
 
-#: ../calendar/zones.h:98
+#: ../src/calendar/zones.h:98
 msgid "America/Chihuahua"
 msgstr "America/Chihuahua"
 
-#: ../calendar/zones.h:99
+#: ../src/calendar/zones.h:99
 msgid "America/Cordoba"
 msgstr "America/Cordoba"
 
-#: ../calendar/zones.h:100
+#: ../src/calendar/zones.h:100
 msgid "America/Costa_Rica"
 msgstr "America/Costa_Rica"
 
-#: ../calendar/zones.h:101
+#: ../src/calendar/zones.h:101
 msgid "America/Cuiaba"
 msgstr "America/Cuiaba"
 
-#: ../calendar/zones.h:102
+#: ../src/calendar/zones.h:102
 msgid "America/Curacao"
 msgstr "America/Curacao"
 
-#: ../calendar/zones.h:103
+#: ../src/calendar/zones.h:103
 msgid "America/Danmarkshavn"
 msgstr "America/Danmarkshavn"
 
-#: ../calendar/zones.h:104
+#: ../src/calendar/zones.h:104
 msgid "America/Dawson"
 msgstr "America/Dawson"
 
-#: ../calendar/zones.h:105
+#: ../src/calendar/zones.h:105
 msgid "America/Dawson_Creek"
 msgstr "America/Dawson_Creek"
 
-#: ../calendar/zones.h:106
+#: ../src/calendar/zones.h:106
 msgid "America/Denver"
 msgstr "America/Denver"
 
-#: ../calendar/zones.h:107
+#: ../src/calendar/zones.h:107
 msgid "America/Detroit"
 msgstr "America/Detroit"
 
-#: ../calendar/zones.h:108
+#: ../src/calendar/zones.h:108
 msgid "America/Dominica"
 msgstr "America/Dominica"
 
-#: ../calendar/zones.h:109
+#: ../src/calendar/zones.h:109
 msgid "America/Edmonton"
 msgstr "America/Edmonton"
 
-#: ../calendar/zones.h:110
+#: ../src/calendar/zones.h:110
 msgid "America/Eirunepe"
 msgstr "America/Eirunepe"
 
-#: ../calendar/zones.h:111
+#: ../src/calendar/zones.h:111
 msgid "America/El_Salvador"
 msgstr "America/El_Salvador"
 
-#: ../calendar/zones.h:112
+#: ../src/calendar/zones.h:112
 msgid "America/Fortaleza"
 msgstr "America/Fortaleza"
 
-#: ../calendar/zones.h:113
+#: ../src/calendar/zones.h:113
 msgid "America/Glace_Bay"
 msgstr "America/Glace_Bay"
 
-#: ../calendar/zones.h:114
+#: ../src/calendar/zones.h:114
 msgid "America/Godthab"
 msgstr "America/Godthab"
 
-#: ../calendar/zones.h:115
+#: ../src/calendar/zones.h:115
 msgid "America/Goose_Bay"
 msgstr "America/Goose_Bay"
 
-#: ../calendar/zones.h:116
+#: ../src/calendar/zones.h:116
 msgid "America/Grand_Turk"
 msgstr "America/Grand_Turk"
 
-#: ../calendar/zones.h:117
+#: ../src/calendar/zones.h:117
 msgid "America/Grenada"
 msgstr "America/Grenada"
 
-#: ../calendar/zones.h:118
+#: ../src/calendar/zones.h:118
 msgid "America/Guadeloupe"
 msgstr "America/Guadeloupe"
 
-#: ../calendar/zones.h:119
+#: ../src/calendar/zones.h:119
 msgid "America/Guatemala"
 msgstr "America/Guatemala"
 
-#: ../calendar/zones.h:120
+#: ../src/calendar/zones.h:120
 msgid "America/Guayaquil"
 msgstr "America/Guayaquil"
 
-#: ../calendar/zones.h:121
+#: ../src/calendar/zones.h:121
 msgid "America/Guyana"
 msgstr "America/Guyana"
 
-#: ../calendar/zones.h:122
+#: ../src/calendar/zones.h:122
 msgid "America/Halifax"
 msgstr "America/Halifax"
 
-#: ../calendar/zones.h:123
+#: ../src/calendar/zones.h:123
 msgid "America/Havana"
 msgstr "America/Havana"
 
-#: ../calendar/zones.h:124
+#: ../src/calendar/zones.h:124
 msgid "America/Hermosillo"
 msgstr "America/Hermosillo"
 
-#: ../calendar/zones.h:125
+#: ../src/calendar/zones.h:125
 msgid "America/Indiana/Indianapolis"
 msgstr "America/Indiana/Indianapolis"
 
-#: ../calendar/zones.h:126
+#: ../src/calendar/zones.h:126
 msgid "America/Indiana/Knox"
 msgstr "America/Indiana/Knox"
 
-#: ../calendar/zones.h:127
+#: ../src/calendar/zones.h:127
 msgid "America/Indiana/Marengo"
 msgstr "America/Indiana/Marengo"
 
-#: ../calendar/zones.h:128
+#: ../src/calendar/zones.h:128
 msgid "America/Indiana/Vevay"
 msgstr "America/Indiana/Vevay"
 
-#: ../calendar/zones.h:129
+#: ../src/calendar/zones.h:129
 msgid "America/Indianapolis"
 msgstr "America/Indianapolis"
 
-#: ../calendar/zones.h:130
+#: ../src/calendar/zones.h:130
 msgid "America/Inuvik"
 msgstr "America/Inuvik"
 
-#: ../calendar/zones.h:131
+#: ../src/calendar/zones.h:131
 msgid "America/Iqaluit"
 msgstr "America/Iqaluit"
 
-#: ../calendar/zones.h:132
+#: ../src/calendar/zones.h:132
 msgid "America/Jamaica"
 msgstr "America/Jamaica"
 
-#: ../calendar/zones.h:133
+#: ../src/calendar/zones.h:133
 msgid "America/Jujuy"
 msgstr "America/Jujuy"
 
-#: ../calendar/zones.h:134
+#: ../src/calendar/zones.h:134
 msgid "America/Juneau"
 msgstr "America/Juneau"
 
-#: ../calendar/zones.h:135
+#: ../src/calendar/zones.h:135
 msgid "America/Kentucky/Louisville"
 msgstr "America/Kentucky/Louisville"
 
-#: ../calendar/zones.h:136
+#: ../src/calendar/zones.h:136
 msgid "America/Kentucky/Monticello"
 msgstr "America/Kentucky/Monticello"
 
-#: ../calendar/zones.h:137
+#: ../src/calendar/zones.h:137
 msgid "America/La_Paz"
 msgstr "America/La_Paz"
 
-#: ../calendar/zones.h:138
+#: ../src/calendar/zones.h:138
 msgid "America/Lima"
 msgstr "America/Lima"
 
-#: ../calendar/zones.h:139
+#: ../src/calendar/zones.h:139
 msgid "America/Los_Angeles"
 msgstr "America/Los_Angeles"
 
-#: ../calendar/zones.h:140
+#: ../src/calendar/zones.h:140
 msgid "America/Louisville"
 msgstr "America/Louisville"
 
-#: ../calendar/zones.h:141
+#: ../src/calendar/zones.h:141
 msgid "America/Maceio"
 msgstr "America/Maceio"
 
-#: ../calendar/zones.h:142
+#: ../src/calendar/zones.h:142
 msgid "America/Managua"
 msgstr "America/Managua"
 
-#: ../calendar/zones.h:143
+#: ../src/calendar/zones.h:143
 msgid "America/Manaus"
 msgstr "America/Manaus"
 
-#: ../calendar/zones.h:144
+#: ../src/calendar/zones.h:144
 msgid "America/Martinique"
 msgstr "America/Martinique"
 
-#: ../calendar/zones.h:145
+#: ../src/calendar/zones.h:145
 msgid "America/Mazatlan"
 msgstr "America/Mazatlan"
 
-#: ../calendar/zones.h:146
+#: ../src/calendar/zones.h:146
 msgid "America/Mendoza"
 msgstr "America/Mendoza"
 
-#: ../calendar/zones.h:147
+#: ../src/calendar/zones.h:147
 msgid "America/Menominee"
 msgstr "America/Menominee"
 
-#: ../calendar/zones.h:148
+#: ../src/calendar/zones.h:148
 msgid "America/Merida"
 msgstr "America/Merida"
 
-#: ../calendar/zones.h:149
+#: ../src/calendar/zones.h:149
 msgid "America/Mexico_City"
 msgstr "America/Mexico_City"
 
-#: ../calendar/zones.h:150
+#: ../src/calendar/zones.h:150
 msgid "America/Miquelon"
 msgstr "America/Miquelon"
 
-#: ../calendar/zones.h:151
+#: ../src/calendar/zones.h:151
 msgid "America/Monterrey"
 msgstr "America/Monterrey"
 
-#: ../calendar/zones.h:152
+#: ../src/calendar/zones.h:152
 msgid "America/Montevideo"
 msgstr "America/Montevideo"
 
-#: ../calendar/zones.h:153
+#: ../src/calendar/zones.h:153
 msgid "America/Montreal"
 msgstr "America/Montreal"
 
-#: ../calendar/zones.h:154
+#: ../src/calendar/zones.h:154
 msgid "America/Montserrat"
 msgstr "America/Montserrat"
 
-#: ../calendar/zones.h:155
+#: ../src/calendar/zones.h:155
 msgid "America/Nassau"
 msgstr "America/Nassau"
 
-#: ../calendar/zones.h:156
+#: ../src/calendar/zones.h:156
 msgid "America/New_York"
 msgstr "America/New_York"
 
-#: ../calendar/zones.h:157
+#: ../src/calendar/zones.h:157
 msgid "America/Nipigon"
 msgstr "America/Nipigon"
 
-#: ../calendar/zones.h:158
+#: ../src/calendar/zones.h:158
 msgid "America/Nome"
 msgstr "America/Nome"
 
-#: ../calendar/zones.h:159
+#: ../src/calendar/zones.h:159
 msgid "America/Noronha"
 msgstr "America/Noronha"
 
-#: ../calendar/zones.h:160
+#: ../src/calendar/zones.h:160
 msgid "America/North_Dakota/Center"
 msgstr "America/North_Dakota/Centre"
 
-#: ../calendar/zones.h:161
+#: ../src/calendar/zones.h:161
 msgid "America/Panama"
 msgstr "America/Panama"
 
-#: ../calendar/zones.h:162
+#: ../src/calendar/zones.h:162
 msgid "America/Pangnirtung"
 msgstr "America/Pangnirtung"
 
-#: ../calendar/zones.h:163
+#: ../src/calendar/zones.h:163
 msgid "America/Paramaribo"
 msgstr "America/Paramaribo"
 
-#: ../calendar/zones.h:164
+#: ../src/calendar/zones.h:164
 msgid "America/Phoenix"
 msgstr "America/Phoenix"
 
-#: ../calendar/zones.h:165
+#: ../src/calendar/zones.h:165
 msgid "America/Port-au-Prince"
 msgstr "America/Port-au-Prince"
 
-#: ../calendar/zones.h:166
+#: ../src/calendar/zones.h:166
 msgid "America/Port_of_Spain"
 msgstr "America/Port_of_Spain"
 
-#: ../calendar/zones.h:167
+#: ../src/calendar/zones.h:167
 msgid "America/Porto_Velho"
 msgstr "America/Porto_Velho"
 
-#: ../calendar/zones.h:168
+#: ../src/calendar/zones.h:168
 msgid "America/Puerto_Rico"
 msgstr "America/Puerto_Rico"
 
-#: ../calendar/zones.h:169
+#: ../src/calendar/zones.h:169
 msgid "America/Rainy_River"
 msgstr "America/Rainy_River"
 
-#: ../calendar/zones.h:170
+#: ../src/calendar/zones.h:170
 msgid "America/Rankin_Inlet"
 msgstr "America/Rankin_Inlet"
 
-#: ../calendar/zones.h:171
+#: ../src/calendar/zones.h:171
 msgid "America/Recife"
 msgstr "America/Recife"
 
-#: ../calendar/zones.h:172
+#: ../src/calendar/zones.h:172
 msgid "America/Regina"
 msgstr "America/Regina"
 
-#: ../calendar/zones.h:173
+#: ../src/calendar/zones.h:173
 msgid "America/Rio_Branco"
 msgstr "America/Rio_Branco"
 
-#: ../calendar/zones.h:174
+#: ../src/calendar/zones.h:174
 msgid "America/Rosario"
 msgstr "America/Rosario"
 
-#: ../calendar/zones.h:175
+#: ../src/calendar/zones.h:175
 msgid "America/Santiago"
 msgstr "America/Santiago"
 
-#: ../calendar/zones.h:176
+#: ../src/calendar/zones.h:176
 msgid "America/Santo_Domingo"
 msgstr "America/Santo_Domingo"
 
-#: ../calendar/zones.h:177
+#: ../src/calendar/zones.h:177
 msgid "America/Sao_Paulo"
 msgstr "America/Sao_Paulo"
 
-#: ../calendar/zones.h:178
+#: ../src/calendar/zones.h:178
 msgid "America/Scoresbysund"
 msgstr "America/Scoresbysund"
 
-#: ../calendar/zones.h:179
+#: ../src/calendar/zones.h:179
 msgid "America/Shiprock"
 msgstr "America/Shiprock"
 
-#: ../calendar/zones.h:180
+#: ../src/calendar/zones.h:180
 msgid "America/St_Johns"
 msgstr "America/St_Johns"
 
-#: ../calendar/zones.h:181
+#: ../src/calendar/zones.h:181
 msgid "America/St_Kitts"
 msgstr "America/St_Kitts"
 
-#: ../calendar/zones.h:182
+#: ../src/calendar/zones.h:182
 msgid "America/St_Lucia"
 msgstr "America/St_Lucia"
 
-#: ../calendar/zones.h:183
+#: ../src/calendar/zones.h:183
 msgid "America/St_Thomas"
 msgstr "America/St_Thomas"
 
-#: ../calendar/zones.h:184
+#: ../src/calendar/zones.h:184
 msgid "America/St_Vincent"
 msgstr "America/St_Vincent"
 
-#: ../calendar/zones.h:185
+#: ../src/calendar/zones.h:185
 msgid "America/Swift_Current"
 msgstr "America/Swift_Current"
 
-#: ../calendar/zones.h:186
+#: ../src/calendar/zones.h:186
 msgid "America/Tegucigalpa"
 msgstr "America/Tegucigalpa"
 
-#: ../calendar/zones.h:187
+#: ../src/calendar/zones.h:187
 msgid "America/Thule"
 msgstr "America/Thule"
 
-#: ../calendar/zones.h:188
+#: ../src/calendar/zones.h:188
 msgid "America/Thunder_Bay"
 msgstr "America/Thunder_Bay"
 
-#: ../calendar/zones.h:189
+#: ../src/calendar/zones.h:189
 msgid "America/Tijuana"
 msgstr "America/Tijuana"
 
-#: ../calendar/zones.h:190
+#: ../src/calendar/zones.h:190
 msgid "America/Tortola"
 msgstr "America/Tortola"
 
-#: ../calendar/zones.h:191
+#: ../src/calendar/zones.h:191
 msgid "America/Vancouver"
 msgstr "America/Vancouver"
 
-#: ../calendar/zones.h:192
+#: ../src/calendar/zones.h:192
 msgid "America/Whitehorse"
 msgstr "America/Whitehorse"
 
-#: ../calendar/zones.h:193
+#: ../src/calendar/zones.h:193
 msgid "America/Winnipeg"
 msgstr "America/Winnipeg"
 
-#: ../calendar/zones.h:194
+#: ../src/calendar/zones.h:194
 msgid "America/Yakutat"
 msgstr "America/Yakutat"
 
-#: ../calendar/zones.h:195
+#: ../src/calendar/zones.h:195
 msgid "America/Yellowknife"
 msgstr "America/Yellowknife"
 
-#: ../calendar/zones.h:196
+#: ../src/calendar/zones.h:196
 msgid "Antarctica/Casey"
 msgstr "Antarctica/Casey"
 
-#: ../calendar/zones.h:197
+#: ../src/calendar/zones.h:197
 msgid "Antarctica/Davis"
 msgstr "Antarctica/Davis"
 
-#: ../calendar/zones.h:198
+#: ../src/calendar/zones.h:198
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarctica/DumontDUrville"
 
-#: ../calendar/zones.h:199
+#: ../src/calendar/zones.h:199
 msgid "Antarctica/Mawson"
 msgstr "Antarctica/Mawson"
 
-#: ../calendar/zones.h:200
+#: ../src/calendar/zones.h:200
 msgid "Antarctica/McMurdo"
 msgstr "Antarctica/McMurdo"
 
-#: ../calendar/zones.h:201
+#: ../src/calendar/zones.h:201
 msgid "Antarctica/Palmer"
 msgstr "Antarctica/Palmer"
 
-#: ../calendar/zones.h:202
+#: ../src/calendar/zones.h:202
 msgid "Antarctica/South_Pole"
 msgstr "Antarctica/South_Pole"
 
-#: ../calendar/zones.h:203
+#: ../src/calendar/zones.h:203
 msgid "Antarctica/Syowa"
 msgstr "Antarctica/Syowa"
 
-#: ../calendar/zones.h:204
+#: ../src/calendar/zones.h:204
 msgid "Antarctica/Vostok"
 msgstr "Antarctica/Vostok"
 
-#: ../calendar/zones.h:205
+#: ../src/calendar/zones.h:205
 msgid "Arctic/Longyearbyen"
 msgstr "Arctic/Longyearbyen"
 
-#: ../calendar/zones.h:206
+#: ../src/calendar/zones.h:206
 msgid "Asia/Aden"
 msgstr "Asia/Aden"
 
-#: ../calendar/zones.h:207
+#: ../src/calendar/zones.h:207
 msgid "Asia/Almaty"
 msgstr "Asia/Almaty"
 
-#: ../calendar/zones.h:208
+#: ../src/calendar/zones.h:208
 msgid "Asia/Amman"
 msgstr "Asia/Amman"
 
-#: ../calendar/zones.h:209
+#: ../src/calendar/zones.h:209
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadyr"
 
-#: ../calendar/zones.h:210
+#: ../src/calendar/zones.h:210
 msgid "Asia/Aqtau"
 msgstr "Asia/Aqtau"
 
-#: ../calendar/zones.h:211
+#: ../src/calendar/zones.h:211
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aqtobe"
 
-#: ../calendar/zones.h:212
+#: ../src/calendar/zones.h:212
 msgid "Asia/Ashgabat"
 msgstr "Asia/Ashgabat"
 
-#: ../calendar/zones.h:213
+#: ../src/calendar/zones.h:213
 msgid "Asia/Baghdad"
 msgstr "Asia/Baghdad"
 
-#: ../calendar/zones.h:214
+#: ../src/calendar/zones.h:214
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahrain"
 
-#: ../calendar/zones.h:215
+#: ../src/calendar/zones.h:215
 msgid "Asia/Baku"
 msgstr "Asia/Baku"
 
-#: ../calendar/zones.h:216
+#: ../src/calendar/zones.h:216
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: ../calendar/zones.h:217
+#: ../src/calendar/zones.h:217
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: ../calendar/zones.h:218
+#: ../src/calendar/zones.h:218
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: ../calendar/zones.h:219
+#: ../src/calendar/zones.h:219
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: ../calendar/zones.h:220
+#: ../src/calendar/zones.h:220
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcutta"
 
-#: ../calendar/zones.h:221
+#: ../src/calendar/zones.h:221
 msgid "Asia/Choibalsan"
 msgstr "Asia/Choibalsan"
 
-#: ../calendar/zones.h:222
+#: ../src/calendar/zones.h:222
 msgid "Asia/Chongqing"
 msgstr "Asia/Chongqing"
 
-#: ../calendar/zones.h:223
+#: ../src/calendar/zones.h:223
 msgid "Asia/Colombo"
 msgstr "Asia/Colombo"
 
-#: ../calendar/zones.h:224
+#: ../src/calendar/zones.h:224
 msgid "Asia/Damascus"
 msgstr "Asia/Damascus"
 
-#: ../calendar/zones.h:225
+#: ../src/calendar/zones.h:225
 msgid "Asia/Dhaka"
 msgstr "Asia/Dhaka"
 
-#: ../calendar/zones.h:226
+#: ../src/calendar/zones.h:226
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: ../calendar/zones.h:227
+#: ../src/calendar/zones.h:227
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: ../calendar/zones.h:228
+#: ../src/calendar/zones.h:228
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dushanbe"
 
-#: ../calendar/zones.h:229
+#: ../src/calendar/zones.h:229
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: ../calendar/zones.h:230
+#: ../src/calendar/zones.h:230
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: ../calendar/zones.h:231
+#: ../src/calendar/zones.h:231
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong_Kong"
 
-#: ../calendar/zones.h:232
+#: ../src/calendar/zones.h:232
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: ../calendar/zones.h:233
+#: ../src/calendar/zones.h:233
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: ../calendar/zones.h:234
+#: ../src/calendar/zones.h:234
 msgid "Asia/Istanbul"
 msgstr "Asia/Istanbul"
 
-#: ../calendar/zones.h:235
+#: ../src/calendar/zones.h:235
 msgid "Asia/Jakarta"
 msgstr "Asia/Jakarta"
 
-#: ../calendar/zones.h:236
+#: ../src/calendar/zones.h:236
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: ../calendar/zones.h:237
+#: ../src/calendar/zones.h:237
 msgid "Asia/Jerusalem"
 msgstr "Asia/Jerusalem"
 
-#: ../calendar/zones.h:238
+#: ../src/calendar/zones.h:238
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: ../calendar/zones.h:239
+#: ../src/calendar/zones.h:239
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: ../calendar/zones.h:240
+#: ../src/calendar/zones.h:240
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: ../calendar/zones.h:241
+#: ../src/calendar/zones.h:241
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: ../calendar/zones.h:242
+#: ../src/calendar/zones.h:242
 msgid "Asia/Kathmandu"
 msgstr "Asia/Kathmandu"
 
-#: ../calendar/zones.h:243
+#: ../src/calendar/zones.h:243
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoyarsk"
 
-#: ../calendar/zones.h:244
+#: ../src/calendar/zones.h:244
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala_Lumpur"
 
-#: ../calendar/zones.h:245
+#: ../src/calendar/zones.h:245
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: ../calendar/zones.h:246
+#: ../src/calendar/zones.h:246
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: ../calendar/zones.h:247
+#: ../src/calendar/zones.h:247
 msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
-#: ../calendar/zones.h:248
+#: ../src/calendar/zones.h:248
 msgid "Asia/Macau"
 msgstr "Asia/Macau"
 
-#: ../calendar/zones.h:249
+#: ../src/calendar/zones.h:249
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: ../calendar/zones.h:250
+#: ../src/calendar/zones.h:250
 msgid "Asia/Makassar"
 msgstr "Asia/Makassar"
 
-#: ../calendar/zones.h:251
+#: ../src/calendar/zones.h:251
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: ../calendar/zones.h:252
+#: ../src/calendar/zones.h:252
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: ../calendar/zones.h:253
+#: ../src/calendar/zones.h:253
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: ../calendar/zones.h:254
+#: ../src/calendar/zones.h:254
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: ../calendar/zones.h:255
+#: ../src/calendar/zones.h:255
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: ../calendar/zones.h:256
+#: ../src/calendar/zones.h:256
 msgid "Asia/Oral"
 msgstr "Asia/Oral"
 
-#: ../calendar/zones.h:257
+#: ../src/calendar/zones.h:257
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: ../calendar/zones.h:258
+#: ../src/calendar/zones.h:258
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: ../calendar/zones.h:259
+#: ../src/calendar/zones.h:259
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: ../calendar/zones.h:260
+#: ../src/calendar/zones.h:260
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: ../calendar/zones.h:261
+#: ../src/calendar/zones.h:261
 msgid "Asia/Qyzylorda"
 msgstr "Asia/Qyzylorda"
 
-#: ../calendar/zones.h:262
+#: ../src/calendar/zones.h:262
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangoon"
 
-#: ../calendar/zones.h:263
+#: ../src/calendar/zones.h:263
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: ../calendar/zones.h:264
+#: ../src/calendar/zones.h:264
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: ../calendar/zones.h:265
+#: ../src/calendar/zones.h:265
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: ../calendar/zones.h:266
+#: ../src/calendar/zones.h:266
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkand"
 
-#: ../calendar/zones.h:267
+#: ../src/calendar/zones.h:267
 msgid "Asia/Seoul"
 msgstr "Asia/Seoul"
 
-#: ../calendar/zones.h:268
+#: ../src/calendar/zones.h:268
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: ../calendar/zones.h:269
+#: ../src/calendar/zones.h:269
 msgid "Asia/Singapore"
 msgstr "Asia/Singapore"
 
-#: ../calendar/zones.h:270
+#: ../src/calendar/zones.h:270
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: ../calendar/zones.h:271
+#: ../src/calendar/zones.h:271
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: ../calendar/zones.h:272
+#: ../src/calendar/zones.h:272
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: ../calendar/zones.h:273
+#: ../src/calendar/zones.h:273
 msgid "Asia/Tehran"
 msgstr "Asia/Tehran"
 
-#: ../calendar/zones.h:274
+#: ../src/calendar/zones.h:274
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: ../calendar/zones.h:275
+#: ../src/calendar/zones.h:275
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: ../calendar/zones.h:276
+#: ../src/calendar/zones.h:276
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: ../calendar/zones.h:277
+#: ../src/calendar/zones.h:277
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: ../calendar/zones.h:278
+#: ../src/calendar/zones.h:278
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: ../calendar/zones.h:279
+#: ../src/calendar/zones.h:279
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: ../calendar/zones.h:280
+#: ../src/calendar/zones.h:280
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: ../calendar/zones.h:281
+#: ../src/calendar/zones.h:281
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: ../calendar/zones.h:282
+#: ../src/calendar/zones.h:282
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: ../calendar/zones.h:283
+#: ../src/calendar/zones.h:283
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: ../calendar/zones.h:284
+#: ../src/calendar/zones.h:284
 msgid "Atlantic/Azores"
 msgstr "Atlantic/Azores"
 
-#: ../calendar/zones.h:285
+#: ../src/calendar/zones.h:285
 msgid "Atlantic/Bermuda"
 msgstr "Atlantic/Bermuda"
 
-#: ../calendar/zones.h:286
+#: ../src/calendar/zones.h:286
 msgid "Atlantic/Canary"
 msgstr "Atlantic/Canary"
 
-#: ../calendar/zones.h:287
+#: ../src/calendar/zones.h:287
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantic/Cape_Verde"
 
-#: ../calendar/zones.h:288
+#: ../src/calendar/zones.h:288
 msgid "Atlantic/Faeroe"
 msgstr "Atlantic/Faeroe"
 
-#: ../calendar/zones.h:289
+#: ../src/calendar/zones.h:289
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantic/Jan_Mayen"
 
-#: ../calendar/zones.h:290
+#: ../src/calendar/zones.h:290
 msgid "Atlantic/Madeira"
 msgstr "Atlantic/Madeira"
 
-#: ../calendar/zones.h:291
+#: ../src/calendar/zones.h:291
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantic/Reykjavik"
 
-#: ../calendar/zones.h:292
+#: ../src/calendar/zones.h:292
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantic/South_Georgia"
 
-#: ../calendar/zones.h:293
+#: ../src/calendar/zones.h:293
 msgid "Atlantic/St_Helena"
 msgstr "Atlantic/St_Helena"
 
-#: ../calendar/zones.h:294
+#: ../src/calendar/zones.h:294
 msgid "Atlantic/Stanley"
 msgstr "Atlantic/Stanley"
 
-#: ../calendar/zones.h:295
+#: ../src/calendar/zones.h:295
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: ../calendar/zones.h:296
+#: ../src/calendar/zones.h:296
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: ../calendar/zones.h:297
+#: ../src/calendar/zones.h:297
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: ../calendar/zones.h:298
+#: ../src/calendar/zones.h:298
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: ../calendar/zones.h:299
+#: ../src/calendar/zones.h:299
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: ../calendar/zones.h:300
+#: ../src/calendar/zones.h:300
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: ../calendar/zones.h:301
+#: ../src/calendar/zones.h:301
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: ../calendar/zones.h:302
+#: ../src/calendar/zones.h:302
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: ../calendar/zones.h:303
+#: ../src/calendar/zones.h:303
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: ../calendar/zones.h:304
+#: ../src/calendar/zones.h:304
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: ../calendar/zones.h:305
+#: ../src/calendar/zones.h:305
 msgid "Europe/Amsterdam"
 msgstr "Europe/Amsterdam"
 
-#: ../calendar/zones.h:306
+#: ../src/calendar/zones.h:306
 msgid "Europe/Andorra"
 msgstr "Europe/Andorra"
 
-#: ../calendar/zones.h:307
+#: ../src/calendar/zones.h:307
 msgid "Europe/Athens"
 msgstr "Europe/Athens"
 
-#: ../calendar/zones.h:308
+#: ../src/calendar/zones.h:308
 msgid "Europe/Belfast"
 msgstr "Europe/Belfast"
 
-#: ../calendar/zones.h:309
+#: ../src/calendar/zones.h:309
 msgid "Europe/Belgrade"
 msgstr "Europe/Belgrade"
 
-#: ../calendar/zones.h:310
+#: ../src/calendar/zones.h:310
 msgid "Europe/Berlin"
 msgstr "Europe/Berlin"
 
-#: ../calendar/zones.h:311
+#: ../src/calendar/zones.h:311
 msgid "Europe/Bratislava"
 msgstr "Europe/Bratislava"
 
-#: ../calendar/zones.h:312
+#: ../src/calendar/zones.h:312
 msgid "Europe/Brussels"
 msgstr "Europe/Brussels"
 
-#: ../calendar/zones.h:313
+#: ../src/calendar/zones.h:313
 msgid "Europe/Bucharest"
 msgstr "Europe/Bucharest"
 
-#: ../calendar/zones.h:314
+#: ../src/calendar/zones.h:314
 msgid "Europe/Budapest"
 msgstr "Europe/Budapest"
 
-#: ../calendar/zones.h:315
+#: ../src/calendar/zones.h:315
 msgid "Europe/Chisinau"
 msgstr "Europe/Chisinau"
 
-#: ../calendar/zones.h:316
+#: ../src/calendar/zones.h:316
 msgid "Europe/Copenhagen"
 msgstr "Europe/Copenhagen"
 
-#: ../calendar/zones.h:317
+#: ../src/calendar/zones.h:317
 msgid "Europe/Dublin"
 msgstr "Europe/Dublin"
 
-#: ../calendar/zones.h:318
+#: ../src/calendar/zones.h:318
 msgid "Europe/Gibraltar"
 msgstr "Europe/Gibraltar"
 
-#: ../calendar/zones.h:319
+#: ../src/calendar/zones.h:319
 msgid "Europe/Helsinki"
 msgstr "Europe/Helsinki"
 
-#: ../calendar/zones.h:320
+#: ../src/calendar/zones.h:320
 msgid "Europe/Istanbul"
 msgstr "Europe/Istanbul"
 
-#: ../calendar/zones.h:321
+#: ../src/calendar/zones.h:321
 msgid "Europe/Kaliningrad"
 msgstr "Europe/Kaliningrad"
 
-#: ../calendar/zones.h:322
+#: ../src/calendar/zones.h:322
 msgid "Europe/Kiev"
 msgstr "Europe/Kiev"
 
-#: ../calendar/zones.h:323
+#: ../src/calendar/zones.h:323
 msgid "Europe/Lisbon"
 msgstr "Europe/Lisbon"
 
-#: ../calendar/zones.h:324
+#: ../src/calendar/zones.h:324
 msgid "Europe/Ljubljana"
 msgstr "Europe/Ljubljana"
 
-#: ../calendar/zones.h:325
+#: ../src/calendar/zones.h:325
 msgid "Europe/London"
 msgstr "Europe/London"
 
-#: ../calendar/zones.h:326
+#: ../src/calendar/zones.h:326
 msgid "Europe/Luxembourg"
 msgstr "Europe/Luxembourg"
 
-#: ../calendar/zones.h:327
+#: ../src/calendar/zones.h:327
 msgid "Europe/Madrid"
 msgstr "Europe/Madrid"
 
-#: ../calendar/zones.h:328
+#: ../src/calendar/zones.h:328
 msgid "Europe/Malta"
 msgstr "Europe/Malta"
 
-#: ../calendar/zones.h:329
+#: ../src/calendar/zones.h:329
 msgid "Europe/Minsk"
 msgstr "Europe/Minsk"
 
-#: ../calendar/zones.h:330
+#: ../src/calendar/zones.h:330
 msgid "Europe/Monaco"
 msgstr "Europe/Monaco"
 
-#: ../calendar/zones.h:331
+#: ../src/calendar/zones.h:331
 msgid "Europe/Moscow"
 msgstr "Europe/Moscow"
 
-#: ../calendar/zones.h:332
+#: ../src/calendar/zones.h:332
 msgid "Europe/Nicosia"
 msgstr "Europe/Nicosia"
 
-#: ../calendar/zones.h:333
+#: ../src/calendar/zones.h:333
 msgid "Europe/Oslo"
 msgstr "Europe/Oslo"
 
-#: ../calendar/zones.h:334
+#: ../src/calendar/zones.h:334
 msgid "Europe/Paris"
 msgstr "Europe/Paris"
 
-#: ../calendar/zones.h:335
+#: ../src/calendar/zones.h:335
 msgid "Europe/Prague"
 msgstr "Europe/Prague"
 
-#: ../calendar/zones.h:336
+#: ../src/calendar/zones.h:336
 msgid "Europe/Riga"
 msgstr "Europe/Riga"
 
-#: ../calendar/zones.h:337
+#: ../src/calendar/zones.h:337
 msgid "Europe/Rome"
 msgstr "Europe/Rome"
 
-#: ../calendar/zones.h:338
+#: ../src/calendar/zones.h:338
 msgid "Europe/Samara"
 msgstr "Europe/Samara"
 
-#: ../calendar/zones.h:339
+#: ../src/calendar/zones.h:339
 msgid "Europe/San_Marino"
 msgstr "Europe/San_Marino"
 
-#: ../calendar/zones.h:340
+#: ../src/calendar/zones.h:340
 msgid "Europe/Sarajevo"
 msgstr "Europe/Sarajevo"
 
-#: ../calendar/zones.h:341
+#: ../src/calendar/zones.h:341
 msgid "Europe/Simferopol"
 msgstr "Europe/Simferopol"
 
-#: ../calendar/zones.h:342
+#: ../src/calendar/zones.h:342
 msgid "Europe/Skopje"
 msgstr "Europe/Skopje"
 
-#: ../calendar/zones.h:343
+#: ../src/calendar/zones.h:343
 msgid "Europe/Sofia"
 msgstr "Europe/Sofia"
 
-#: ../calendar/zones.h:344
+#: ../src/calendar/zones.h:344
 msgid "Europe/Stockholm"
 msgstr "Europe/Stockholm"
 
-#: ../calendar/zones.h:345
+#: ../src/calendar/zones.h:345
 msgid "Europe/Tallinn"
 msgstr "Europe/Tallinn"
 
-#: ../calendar/zones.h:346
+#: ../src/calendar/zones.h:346
 msgid "Europe/Tirane"
 msgstr "Europe/Tirane"
 
-#: ../calendar/zones.h:347
+#: ../src/calendar/zones.h:347
 msgid "Europe/Uzhgorod"
 msgstr "Europe/Uzhgorod"
 
-#: ../calendar/zones.h:348
+#: ../src/calendar/zones.h:348
 msgid "Europe/Vaduz"
 msgstr "Europe/Vaduz"
 
-#: ../calendar/zones.h:349
+#: ../src/calendar/zones.h:349
 msgid "Europe/Vatican"
 msgstr "Europe/Vatican"
 
-#: ../calendar/zones.h:350
+#: ../src/calendar/zones.h:350
 msgid "Europe/Vienna"
 msgstr "Europe/Vienna"
 
-#: ../calendar/zones.h:351
+#: ../src/calendar/zones.h:351
 msgid "Europe/Vilnius"
 msgstr "Europe/Vilnius"
 
-#: ../calendar/zones.h:352
+#: ../src/calendar/zones.h:352
 msgid "Europe/Warsaw"
 msgstr "Europe/Warsaw"
 
-#: ../calendar/zones.h:353
+#: ../src/calendar/zones.h:353
 msgid "Europe/Zagreb"
 msgstr "Europe/Zagreb"
 
-#: ../calendar/zones.h:354
+#: ../src/calendar/zones.h:354
 msgid "Europe/Zaporozhye"
 msgstr "Europe/Zaporozhye"
 
-#: ../calendar/zones.h:355
+#: ../src/calendar/zones.h:355
 msgid "Europe/Zurich"
 msgstr "Europe/Zurich"
 
-#: ../calendar/zones.h:356
+#: ../src/calendar/zones.h:356
 msgid "Indian/Antananarivo"
 msgstr "Indian/Antananarivo"
 
-#: ../calendar/zones.h:357
+#: ../src/calendar/zones.h:357
 msgid "Indian/Chagos"
 msgstr "Indian/Chagos"
 
-#: ../calendar/zones.h:358
+#: ../src/calendar/zones.h:358
 msgid "Indian/Christmas"
 msgstr "Indian/Christmas"
 
-#: ../calendar/zones.h:359
+#: ../src/calendar/zones.h:359
 msgid "Indian/Cocos"
 msgstr "Indian/Cocos"
 
-#: ../calendar/zones.h:360
+#: ../src/calendar/zones.h:360
 msgid "Indian/Comoro"
 msgstr "Indian/Comoro"
 
-#: ../calendar/zones.h:361
+#: ../src/calendar/zones.h:361
 msgid "Indian/Kerguelen"
 msgstr "Indian/Kerguelen"
 
-#: ../calendar/zones.h:362
+#: ../src/calendar/zones.h:362
 msgid "Indian/Mahe"
 msgstr "Indian/Mahe"
 
-#: ../calendar/zones.h:363
+#: ../src/calendar/zones.h:363
 msgid "Indian/Maldives"
 msgstr "Indian/Maldives"
 
-#: ../calendar/zones.h:364
+#: ../src/calendar/zones.h:364
 msgid "Indian/Mauritius"
 msgstr "Indian/Mauritius"
 
-#: ../calendar/zones.h:365
+#: ../src/calendar/zones.h:365
 msgid "Indian/Mayotte"
 msgstr "Indian/Mayotte"
 
-#: ../calendar/zones.h:366
+#: ../src/calendar/zones.h:366
 msgid "Indian/Reunion"
 msgstr "Indian/Reunion"
 
-#: ../calendar/zones.h:367
+#: ../src/calendar/zones.h:367
 msgid "Pacific/Apia"
 msgstr "Pacific/Apia"
 
-#: ../calendar/zones.h:368
+#: ../src/calendar/zones.h:368
 msgid "Pacific/Auckland"
 msgstr "Pacific/Auckland"
 
-#: ../calendar/zones.h:369
+#: ../src/calendar/zones.h:369
 msgid "Pacific/Chatham"
 msgstr "Pacific/Chatham"
 
-#: ../calendar/zones.h:370
+#: ../src/calendar/zones.h:370
 msgid "Pacific/Easter"
 msgstr "Pacific/Easter"
 
-#: ../calendar/zones.h:371
+#: ../src/calendar/zones.h:371
 msgid "Pacific/Efate"
 msgstr "Pacific/Efate"
 
-#: ../calendar/zones.h:372
+#: ../src/calendar/zones.h:372
 msgid "Pacific/Enderbury"
 msgstr "Pacific/Enderbury"
 
-#: ../calendar/zones.h:373
+#: ../src/calendar/zones.h:373
 msgid "Pacific/Fakaofo"
 msgstr "Pacific/Fakaofo"
 
-#: ../calendar/zones.h:374
+#: ../src/calendar/zones.h:374
 msgid "Pacific/Fiji"
 msgstr "Pacific/Fiji"
 
-#: ../calendar/zones.h:375
+#: ../src/calendar/zones.h:375
 msgid "Pacific/Funafuti"
 msgstr "Pacific/Funafuti"
 
-#: ../calendar/zones.h:376
+#: ../src/calendar/zones.h:376
 msgid "Pacific/Galapagos"
 msgstr "Pacific/Galapagos"
 
-#: ../calendar/zones.h:377
+#: ../src/calendar/zones.h:377
 msgid "Pacific/Gambier"
 msgstr "Pacific/Gambier"
 
-#: ../calendar/zones.h:378
+#: ../src/calendar/zones.h:378
 msgid "Pacific/Guadalcanal"
 msgstr "Pacific/Guadalcanal"
 
-#: ../calendar/zones.h:379
+#: ../src/calendar/zones.h:379
 msgid "Pacific/Guam"
 msgstr "Pacific/Guam"
 
-#: ../calendar/zones.h:380
+#: ../src/calendar/zones.h:380
 msgid "Pacific/Honolulu"
 msgstr "Pacific/Honolulu"
 
-#: ../calendar/zones.h:381
+#: ../src/calendar/zones.h:381
 msgid "Pacific/Johnston"
 msgstr "Pacific/Johnston"
 
-#: ../calendar/zones.h:382
+#: ../src/calendar/zones.h:382
 msgid "Pacific/Kiritimati"
 msgstr "Pacific/Kiritimati"
 
-#: ../calendar/zones.h:383
+#: ../src/calendar/zones.h:383
 msgid "Pacific/Kosrae"
 msgstr "Pacific/Kosrae"
 
-#: ../calendar/zones.h:384
+#: ../src/calendar/zones.h:384
 msgid "Pacific/Kwajalein"
 msgstr "Pacific/Kwajalein"
 
-#: ../calendar/zones.h:385
+#: ../src/calendar/zones.h:385
 msgid "Pacific/Majuro"
 msgstr "Pacific/Majuro"
 
-#: ../calendar/zones.h:386
+#: ../src/calendar/zones.h:386
 msgid "Pacific/Marquesas"
 msgstr "Pacific/Marquesas"
 
-#: ../calendar/zones.h:387
+#: ../src/calendar/zones.h:387
 msgid "Pacific/Midway"
 msgstr "Pacific/Midway"
 
-#: ../calendar/zones.h:388
+#: ../src/calendar/zones.h:388
 msgid "Pacific/Nauru"
 msgstr "Pacific/Nauru"
 
-#: ../calendar/zones.h:389
+#: ../src/calendar/zones.h:389
 msgid "Pacific/Niue"
 msgstr "Pacific/Niue"
 
-#: ../calendar/zones.h:390
+#: ../src/calendar/zones.h:390
 msgid "Pacific/Norfolk"
 msgstr "Pacific/Norfolk"
 
-#: ../calendar/zones.h:391
+#: ../src/calendar/zones.h:391
 msgid "Pacific/Noumea"
 msgstr "Pacific/Noumea"
 
-#: ../calendar/zones.h:392
+#: ../src/calendar/zones.h:392
 msgid "Pacific/Pago_Pago"
 msgstr "Pacific/Pago_Pago"
 
-#: ../calendar/zones.h:393
+#: ../src/calendar/zones.h:393
 msgid "Pacific/Palau"
 msgstr "Pacific/Palau"
 
-#: ../calendar/zones.h:394
+#: ../src/calendar/zones.h:394
 msgid "Pacific/Pitcairn"
 msgstr "Pacific/Pitcairn"
 
-#: ../calendar/zones.h:395
+#: ../src/calendar/zones.h:395
 msgid "Pacific/Ponape"
 msgstr "Pacific/Ponape"
 
-#: ../calendar/zones.h:396
+#: ../src/calendar/zones.h:396
 msgid "Pacific/Port_Moresby"
 msgstr "Pacific/Port_Moresby"
 
-#: ../calendar/zones.h:397
+#: ../src/calendar/zones.h:397
 msgid "Pacific/Rarotonga"
 msgstr "Pacific/Rarotonga"
 
-#: ../calendar/zones.h:398
+#: ../src/calendar/zones.h:398
 msgid "Pacific/Saipan"
 msgstr "Pacific/Saipan"
 
-#: ../calendar/zones.h:399
+#: ../src/calendar/zones.h:399
 msgid "Pacific/Tahiti"
 msgstr "Pacific/Tahiti"
 
-#: ../calendar/zones.h:400
+#: ../src/calendar/zones.h:400
 msgid "Pacific/Tarawa"
 msgstr "Pacific/Tarawa"
 
-#: ../calendar/zones.h:401
+#: ../src/calendar/zones.h:401
 msgid "Pacific/Tongatapu"
 msgstr "Pacific/Tongatapu"
 
-#: ../calendar/zones.h:402
+#: ../src/calendar/zones.h:402
 msgid "Pacific/Truk"
 msgstr "Pacific/Truk"
 
-#: ../calendar/zones.h:403
+#: ../src/calendar/zones.h:403
 msgid "Pacific/Wake"
 msgstr "Pacific/Wake"
 
-#: ../calendar/zones.h:404
+#: ../src/calendar/zones.h:404
 msgid "Pacific/Wallis"
 msgstr "Pacific/Wallis"
 
-#: ../calendar/zones.h:405
+#: ../src/calendar/zones.h:405
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: ../composer/e-composer-actions.c:227
+#: ../src/composer/e-composer-actions.c:225
 msgid "Save as..."
 msgstr "Save as…"
 
-#: ../composer/e-composer-actions.c:328
+#: ../src/composer/e-composer-actions.c:329
 msgid "Close the current file"
 msgstr "Close the current file"
 
-#: ../composer/e-composer-actions.c:333
+#: ../src/composer/e-composer-actions.c:334
 msgid "New _Message"
 msgstr "New _Message"
 
-#: ../composer/e-composer-actions.c:335
+#: ../src/composer/e-composer-actions.c:336
 msgid "Open New Message window"
 msgstr "Open New Message window"
 
-#: ../composer/e-composer-actions.c:340 ../shell/e-shell.c:1217
-#: ../shell/e-shell-window-actions.c:848
+#: ../src/composer/e-composer-actions.c:341 ../src/shell/e-shell.c:1302
+#: ../src/shell/e-shell-window-actions.c:887
 msgid "_Preferences"
 msgstr "_Preferences"
 
-#: ../composer/e-composer-actions.c:342 ../shell/e-shell-window-actions.c:850
+#: ../src/composer/e-composer-actions.c:343
+#: ../src/shell/e-shell-window-actions.c:889
 msgid "Configure Evolution"
 msgstr "Configure Evolution"
 
-#: ../composer/e-composer-actions.c:349
+#: ../src/composer/e-composer-actions.c:350
 msgid "Save the current file"
 msgstr "Save the current file"
 
-#: ../composer/e-composer-actions.c:354
+#: ../src/composer/e-composer-actions.c:355
 msgid "Save _As..."
 msgstr "Save _As…"
 
-#: ../composer/e-composer-actions.c:356
+#: ../src/composer/e-composer-actions.c:357
 msgid "Save the current file with a different name"
 msgstr "Save the current file with a different name"
 
-#: ../composer/e-composer-actions.c:363
+#: ../src/composer/e-composer-actions.c:364
 msgid "Character _Encoding"
 msgstr "Character _Encoding"
 
-#: ../composer/e-composer-actions.c:387
+#: ../src/composer/e-composer-actions.c:388
 msgid "Print Pre_view"
 msgstr "Print Pre_view"
 
-#: ../composer/e-composer-actions.c:394
+#: ../src/composer/e-composer-actions.c:395
 msgid "Save as _Draft"
 msgstr "Save as _Draft"
 
-#: ../composer/e-composer-actions.c:396
+#: ../src/composer/e-composer-actions.c:397
 msgid "Save as draft"
 msgstr "Save as draft"
 
-#: ../composer/e-composer-actions.c:401
+#: ../src/composer/e-composer-actions.c:402
 msgid "S_end"
 msgstr "S_end"
 
-#: ../composer/e-composer-actions.c:403
+#: ../src/composer/e-composer-actions.c:404
 msgid "Send this message"
 msgstr "Send this message"
 
-#: ../composer/e-composer-actions.c:411
+#: ../src/composer/e-composer-actions.c:412
 msgid "PGP _Encrypt"
 msgstr "PGP _Encrypt"
 
-#: ../composer/e-composer-actions.c:413
+#: ../src/composer/e-composer-actions.c:414
 msgid "Encrypt this message with PGP"
 msgstr "Encrypt this message with PGP"
 
-#: ../composer/e-composer-actions.c:419
+#: ../src/composer/e-composer-actions.c:420
 msgid "PGP _Sign"
 msgstr "PGP _Sign"
 
-#: ../composer/e-composer-actions.c:421
+#: ../src/composer/e-composer-actions.c:422
 msgid "Sign this message with your PGP key"
 msgstr "Sign this message with your PGP key"
 
-#: ../composer/e-composer-actions.c:427
+#: ../src/composer/e-composer-actions.c:428
 msgid "_Picture Gallery"
 msgstr "_Picture Gallery"
 
-#: ../composer/e-composer-actions.c:429
+#: ../src/composer/e-composer-actions.c:430
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Show a collection of pictures that you can drag to your message"
 
-#: ../composer/e-composer-actions.c:435
+#: ../src/composer/e-composer-actions.c:436
 msgid "_Prioritize Message"
 msgstr "_Prioritise Message"
 
-#: ../composer/e-composer-actions.c:437
+#: ../src/composer/e-composer-actions.c:438
 msgid "Set the message priority to high"
 msgstr "Set the message priority to high"
 
-#: ../composer/e-composer-actions.c:443
+#: ../src/composer/e-composer-actions.c:444
 msgid "Re_quest Read Receipt"
 msgstr "Re_quest Read Receipt"
 
-#: ../composer/e-composer-actions.c:445
+#: ../src/composer/e-composer-actions.c:446
 msgid "Get delivery notification when your message is read"
 msgstr "Get delivery notification when your message is read"
 
-#: ../composer/e-composer-actions.c:451
+#: ../src/composer/e-composer-actions.c:452
 msgid "S/MIME En_crypt"
 msgstr "S/MIME En_crypt"
 
-#: ../composer/e-composer-actions.c:453
+#: ../src/composer/e-composer-actions.c:454
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Encrypt this message with your S/MIME Encryption Certificate"
 
-#: ../composer/e-composer-actions.c:459
+#: ../src/composer/e-composer-actions.c:460
 msgid "S/MIME Sig_n"
 msgstr "S/MIME Sig_n"
 
-#: ../composer/e-composer-actions.c:461
+#: ../src/composer/e-composer-actions.c:462
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sign this message with your S/MIME Signature Certificate"
 
-#: ../composer/e-composer-actions.c:515
+#: ../src/composer/e-composer-actions.c:516
 msgid "_Bcc Field"
 msgstr "_Bcc Field"
 
-#: ../composer/e-composer-actions.c:517
+#: ../src/composer/e-composer-actions.c:518
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Toggles whether the Bcc field is displayed"
 
-#: ../composer/e-composer-actions.c:523
+#: ../src/composer/e-composer-actions.c:524
 msgid "_Cc Field"
 msgstr "_Cc Field"
 
-#: ../composer/e-composer-actions.c:525
+#: ../src/composer/e-composer-actions.c:526
 msgid "Toggles whether the CC field is displayed"
 msgstr "Toggles whether the Cc field is displayed"
 
-#: ../composer/e-composer-actions.c:531
+#: ../src/composer/e-composer-actions.c:532
 msgid "_From Override Field"
 msgstr "_From Override Field"
 
-#: ../composer/e-composer-actions.c:533
+#: ../src/composer/e-composer-actions.c:534
 msgid ""
 "Toggles whether the From override field to change name or email address is "
 "displayed"
@@ -7571,39 +11395,41 @@ msgstr ""
 "Toggles whether the From override field to change name or e-mail address is "
 "displayed"
 
-#: ../composer/e-composer-actions.c:539
+#: ../src/composer/e-composer-actions.c:540
 msgid "_Reply-To Field"
 msgstr "_Reply-To Field"
 
-#: ../composer/e-composer-actions.c:541
+#: ../src/composer/e-composer-actions.c:542
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Toggles whether the Reply-To field is displayed"
 
-#: ../composer/e-composer-actions.c:596
+#: ../src/composer/e-composer-actions.c:597
 msgid "Attach"
 msgstr "Attach"
 
-#: ../composer/e-composer-actions.c:602
+#: ../src/composer/e-composer-actions.c:603
 msgid "Save Draft"
 msgstr "Save Draft"
 
-#: ../composer/e-composer-from-header.c:109
-#: ../e-util/e-mail-signature-script-dialog.c:415
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../mail/e-mail-config-identity-page.c:341
-#: ../mail/e-mail-config-summary-page.c:332
+#: ../src/composer/e-composer-from-header.c:108
+#: ../src/e-util/e-mail-signature-script-dialog.c:416
+#: ../src/e-util/e-webdav-browser.c:2408
+#: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../src/mail/e-mail-config-identity-page.c:550
+#: ../src/mail/e-mail-config-summary-page.c:332
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:297
 msgid "_Name:"
 msgstr "_Name:"
 
-#: ../composer/e-composer-header-table.c:38
+#: ../src/composer/e-composer-header-table.c:36
 msgid "Enter the recipients of the message"
 msgstr "Enter the recipients of the message"
 
-#: ../composer/e-composer-header-table.c:40
+#: ../src/composer/e-composer-header-table.c:38
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Enter the addresses that will receive a carbon copy of the message"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../src/composer/e-composer-header-table.c:41
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -7611,55 +11437,55 @@ msgstr ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 
-#: ../composer/e-composer-header-table.c:829
+#: ../src/composer/e-composer-header-table.c:840
 msgid "Fr_om:"
 msgstr "Fr_om:"
 
-#: ../composer/e-composer-header-table.c:836
+#: ../src/composer/e-composer-header-table.c:847
 msgid "_Reply-To:"
 msgstr "_Reply-To:"
 
-#: ../composer/e-composer-header-table.c:841
+#: ../src/composer/e-composer-header-table.c:852
 msgid "_To:"
 msgstr "_To:"
 
-#: ../composer/e-composer-header-table.c:847
+#: ../src/composer/e-composer-header-table.c:858
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:853
+#: ../src/composer/e-composer-header-table.c:864
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:858
+#: ../src/composer/e-composer-header-table.c:869
 msgid "_Post To:"
 msgstr "_Post To:"
 
-#: ../composer/e-composer-header-table.c:862
+#: ../src/composer/e-composer-header-table.c:873
 msgid "S_ubject:"
 msgstr "S_ubject:"
 
-#: ../composer/e-composer-header-table.c:870
-#: ../mail/e-mail-config-identity-page.c:534
+#: ../src/composer/e-composer-header-table.c:883
+#: ../src/mail/e-mail-config-identity-page.c:743
 msgid "Si_gnature:"
 msgstr "Si_gnature:"
 
-#: ../composer/e-composer-name-header.c:233
+#: ../src/composer/e-composer-name-header.c:237
 msgid "Click here for the address book"
 msgstr "Click here for the address book"
 
-#: ../composer/e-composer-post-header.c:182
+#: ../src/composer/e-composer-post-header.c:180
 msgid "Click here to select folders to post to"
 msgstr "Click here to select folders to post to"
 
-#: ../composer/e-msg-composer.c:876
+#: ../src/composer/e-msg-composer.c:854
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 
-#: ../composer/e-msg-composer.c:885
+#: ../src/composer/e-msg-composer.c:863
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7668,36 +11494,40 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
-#: ../composer/e-msg-composer.c:1621 ../composer/e-msg-composer.c:2403
-#: ../data/evolution.desktop.in.in.h:7
+#: ../src/composer/e-msg-composer.c:1622 ../src/composer/e-msg-composer.c:2294
 msgid "Compose Message"
 msgstr "Compose Message"
 
-#: ../composer/e-msg-composer.c:4728
+#: ../src/composer/e-msg-composer.c:4657
 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."
 
-#: ../composer/mail-composer.error.xml.h:1
-msgid "You cannot attach the file &quot;{0}&quot; to this message."
-msgstr "You cannot attach the file &quot;{0}&quot; to this message."
+#: ../src/composer/mail-composer.error.xml.h:1
+#| msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgid "You cannot attach the file “{0}” to this message."
+msgstr "You cannot attach the file “{0}” to this message."
 
-#: ../composer/mail-composer.error.xml.h:2
-msgid "The file '{0}' is not a regular file and cannot be sent in a message."
-msgstr "The file '{0}' is not a regular file and cannot be sent in a message."
+#: ../src/composer/mail-composer.error.xml.h:2
+#| msgid ""
+#| "The file '{0}' is not a regular file and cannot be sent in a message."
+msgid "The file “{0}” is not a regular file and cannot be sent in a message."
+msgstr "The file “{0}” is not a regular file and cannot be sent in a message."
 
-#: ../composer/mail-composer.error.xml.h:3
+#: ../src/composer/mail-composer.error.xml.h:3
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "Could not retrieve messages to attach from {0}."
 
-#: ../composer/mail-composer.error.xml.h:4
-msgid "Because &quot;{1}&quot;."
-msgstr "Because &quot;{1}&quot;."
+#: ../src/composer/mail-composer.error.xml.h:4
+#: ../src/e-util/e-system.error.xml.h:5
+#| msgid "Because \"{1}\"."
+msgid "Because “{1}”."
+msgstr "Because “{1}”."
 
-#: ../composer/mail-composer.error.xml.h:5
+#: ../src/composer/mail-composer.error.xml.h:5
 msgid "Do you want to recover unfinished messages?"
 msgstr "Do you want to recover unfinished messages?"
 
-#: ../composer/mail-composer.error.xml.h:6
+#: ../src/composer/mail-composer.error.xml.h:6
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -7705,31 +11535,36 @@ msgstr ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 
-#: ../composer/mail-composer.error.xml.h:7
+#: ../src/composer/mail-composer.error.xml.h:7
 msgid "_Do not Recover"
 msgstr "_Do not Recover"
 
-#: ../composer/mail-composer.error.xml.h:8
+#: ../src/composer/mail-composer.error.xml.h:8
 msgid "_Recover"
 msgstr "_Recover"
 
-#: ../composer/mail-composer.error.xml.h:9
-msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr "Could not save to autosave file &quot;{0}&quot;."
+#: ../src/composer/mail-composer.error.xml.h:9
+#| msgid "Could not save to autosave file &quot;{0}&quot;."
+msgid "Could not save to autosave file “{0}”."
+msgstr "Could not save to autosave file “{0}”."
 
-#: ../composer/mail-composer.error.xml.h:10
-msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr "Error saving to autosave because &quot;{1}&quot;."
+#: ../src/composer/mail-composer.error.xml.h:10
+#| msgid "Error saving to autosave because &quot;{1}&quot;."
+msgid "Error saving to autosave because “{1}”."
+msgstr "Error saving to autosave because “{1}”."
 
-#: ../composer/mail-composer.error.xml.h:11
+#: ../src/composer/mail-composer.error.xml.h:11
+#| msgid ""
+#| "Are you sure you want to discard the message, titled '{0}', you are "
+#| "composing?"
 msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
+"Are you sure you want to discard the message, titled “{0}”, you are "
 "composing?"
 msgstr ""
-"Are you sure you want to discard the message, titled '{0}', you are "
+"Are you sure you want to discard the message, titled “{0}”, you are "
 "composing?"
 
-#: ../composer/mail-composer.error.xml.h:12
+#: ../src/composer/mail-composer.error.xml.h:12
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -7740,98 +11575,115 @@ msgstr ""
 "continue the message at a later date."
 
 #. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:15
+#: ../src/composer/mail-composer.error.xml.h:15
 msgid "_Continue Editing"
 msgstr "_Continue Editing"
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../src/composer/mail-composer.error.xml.h:16
 msgid "_Save Draft"
 msgstr "_Save Draft"
 
-#: ../composer/mail-composer.error.xml.h:17
+#: ../src/composer/mail-composer.error.xml.h:17
 msgid "Are you sure you want to discard the message you are composing?"
 msgstr "Are you sure you want to discard the message you are composing?"
 
-#: ../composer/mail-composer.error.xml.h:18
+#: ../src/composer/mail-composer.error.xml.h:18
 msgid "Could not create message."
 msgstr "Could not create message."
 
-#: ../composer/mail-composer.error.xml.h:19
-msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+#: ../src/composer/mail-composer.error.xml.h:19
+#| msgid ""
+#| "Because &quot;{0}&quot;, you may need to select different mail options."
+msgid ""
+"You may need to select different mail options.\n"
+"\n"
+"Detailed error: {0}"
 msgstr ""
-"Because &quot;{0}&quot;, you may need to select different mail options."
+"You may need to select different mail options.\n"
+"\n"
+"Detailed error: {0}"
 
-#: ../composer/mail-composer.error.xml.h:20
-msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "Could not read signature file &quot;{0}&quot;."
+#: ../src/composer/mail-composer.error.xml.h:22
+#| msgid "Could not read signature file &quot;{0}&quot;."
+msgid "Could not read signature file “{0}”."
+msgstr "Could not read signature file “{0}”."
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../src/composer/mail-composer.error.xml.h:23
 msgid "All accounts have been removed."
 msgstr "All accounts have been removed."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../src/composer/mail-composer.error.xml.h:24
 msgid "You need to configure an account before you can compose mail."
 msgstr "You need to configure an account before you can compose mail."
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../src/composer/mail-composer.error.xml.h:25
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "An error occurred while saving to your Outbox folder."
 
-#: ../composer/mail-composer.error.xml.h:24
-msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
-msgstr "The reported error was &quot;{0}&quot;. The message has not been sent."
+#: ../src/composer/mail-composer.error.xml.h:26
+#| msgid ""
+#| "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgid "The reported error was “{0}”. The message has not been sent."
+msgstr "The reported error was “{0}”. The message has not been sent."
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../src/composer/mail-composer.error.xml.h:27
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "An error occurred while saving to your Drafts folder."
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../src/composer/mail-composer.error.xml.h:28
+#| msgid ""
+#| "The reported error was &quot;{0}&quot;. The message has most likely not "
+#| "been saved."
 msgid ""
-"The reported error was &quot;{0}&quot;. The message has most likely not been "
-"saved."
+"The reported error was “{0}”. The message has most likely not been saved."
 msgstr ""
-"The reported error was &quot;{0}&quot;. The message has most likely not been "
-"saved."
+"The reported error was “{0}”. The message has most likely not been saved."
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../src/composer/mail-composer.error.xml.h:29
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "An error occurred while sending. How do you want to proceed?"
 
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:175
-msgid "The reported error was &quot;{0}&quot;."
-msgstr "The reported error was &quot;{0}&quot;."
+#: ../src/composer/mail-composer.error.xml.h:30
+#: ../src/mail/mail.error.xml.h:177
+#| msgid "The reported error was &quot;{0}&quot;."
+msgid "The reported error was “{0}”."
+msgstr "The reported error was “{0}”."
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../src/composer/mail-composer.error.xml.h:31
 msgid "_Save to Outbox"
 msgstr "_Save to Outbox"
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../src/composer/mail-composer.error.xml.h:32
 msgid "_Try Again"
 msgstr "_Try Again"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../src/composer/mail-composer.error.xml.h:33
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr "Your message was sent, but an error occurred during post-processing."
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../src/composer/mail-composer.error.xml.h:34
 msgid "Saving message to Outbox."
 msgstr "Saving message to Outbox."
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../src/composer/mail-composer.error.xml.h:35
+#| msgid ""
+#| "The message will be saved to your local Outbox folder, because the "
+#| "destination service is currently unavailable. You can send the message by "
+#| "clicking the Send/Receive button in Evolution's toolbar."
 msgid ""
 "The message will be saved to your local Outbox folder, because the "
 "destination service is currently unavailable. You can send the message by "
-"clicking the Send/Receive button in Evolution's toolbar."
+"clicking the Send/Receive button in Evolution’s toolbar."
 msgstr ""
 "The message will be saved to your local Outbox folder, because the "
 "destination service is currently unavailable. You can send the message by "
-"clicking the Send/Receive button in Evolution's toolbar."
+"clicking the Send/Receive button in Evolution’s toolbar."
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../src/composer/mail-composer.error.xml.h:36
 msgid "Are you sure you want to send the message?"
 msgstr "Are you sure you want to send the message?"
 
-#: ../composer/mail-composer.error.xml.h:35
+#: ../src/composer/mail-composer.error.xml.h:37
 msgid ""
 "A keyboard accelerator to send the message has been pressed. Either cancel "
 "sending the message, if it was done by an accident, or send the message."
@@ -7839,2986 +11691,225 @@ msgstr ""
 "A keyboard accelerator to send the message has been pressed. Either cancel "
 "sending the message, if it was done by an accident, or send the message."
 
-#: ../composer/mail-composer.error.xml.h:37
-msgid "Are you sure you want to change the composer mode?"
-msgstr "Are you sure you want to change the composer mode?"
+#: ../src/composer/mail-composer.error.xml.h:39
+#| msgid "Are you sure you want to change the composer mode?"
+msgid "Are you sure you want to change the composer format?"
+msgstr "Are you sure you want to change the composer format?"
 
-#: ../composer/mail-composer.error.xml.h:38
+#: ../src/composer/mail-composer.error.xml.h:40
+#| msgid ""
+#| "Turning HTML mode off will cause the text to lose all formatting. Do you "
+#| "want to continue?"
 msgid ""
-"Turning HTML mode off will cause the text to lose all formatting. Do you "
-"want to continue?"
+"Switching to Plain Text format will cause the text to lose all the HTML "
+"formatting. Do you want to continue?"
 msgstr ""
-"Turning HTML mode off will cause the text to lose all formatting. Do you "
-"want to continue?"
+"Switching to Plain Text format will cause the text to lose all the HTML "
+"formatting. Do you want to continue?"
 
-#: ../composer/mail-composer.error.xml.h:39
-msgid "_Don't lose formatting"
-msgstr "_Don't lose formatting"
+#: ../src/composer/mail-composer.error.xml.h:41
+#| msgid "_Don't lose formatting"
+msgid "_Don’t lose formatting"
+msgstr "_Don’t lose formatting"
 
-#: ../composer/mail-composer.error.xml.h:40
+#: ../src/composer/mail-composer.error.xml.h:42
 msgid "Lose _formatting"
 msgstr "Lose _formatting"
 
-#: ../composer/mail-composer.error.xml.h:41
+#: ../src/composer/mail-composer.error.xml.h:43
 msgid "An error occurred while saving to your Templates folder."
 msgstr "An error occurred while saving to your Templates folder."
 
-#: ../data/evolution-alarm-notify.desktop.in.in.h:1
-msgid "Evolution Alarm Notify"
-msgstr "Evolution Alarm Notify"
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:2
-msgid "Calendar event notifications"
-msgstr "Calendar event notifications"
-
-#: ../data/evolution.desktop.in.in.h:1 ../evolution.appdata.xml.in.h:1
-#: ../mail/e-mail-browser.c:1101
-#: ../modules/mailto-handler/evolution-mailto-handler.c:210
-#: ../shell/e-shell-window-private.c:242
-msgid "Evolution"
-msgstr "Evolution"
-
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-utils.c:418
-msgid "Groupware Suite"
-msgstr "Groupware Suite"
-
-#: ../data/evolution.desktop.in.in.h:3
-msgid "Evolution Mail and Calendar"
-msgstr "Evolution Mail and Calendar"
-
-#: ../data/evolution.desktop.in.in.h:4 ../evolution.appdata.xml.in.h:2
-msgid "Manage your email, contacts and schedule"
-msgstr "Manage your e-mail, contacts and schedule"
-
-#: ../data/evolution.desktop.in.in.h:5
-msgid "email;calendar;contact;addressbook;task;"
-msgstr "email;calendar;contact;addressbook;task;"
-
-#: ../data/evolution.desktop.in.in.h:6
-msgid "New Window"
-msgstr "New Window"
-
-#: ../data/evolution.desktop.in.in.h:8 ../e-util/e-name-selector-dialog.c:451
-#: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:373
-msgid "Contacts"
-msgstr "Contacts"
-
-#: ../data/evolution.desktop.in.in.h:10 ../e-util/e-send-options.c:538
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/kmail-importer.c:253
-#: ../mail/importers/pine-importer.c:422
-#: ../modules/mail/e-mail-shell-view.c:1242
-#: ../smime/gui/certificate-manager.c:1684
-msgid "Mail"
-msgstr "Mail"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
-msgid "Enable address formatting"
-msgstr "Enable address formatting"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
-msgid ""
-"Whether addresses should be formatted according to standard in their "
-"destination country"
-msgstr ""
-"Whether addresses should be formatted according to standard in their "
-"destination country"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
-msgid "Autocomplete length"
-msgstr "Autocomplete length"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
-msgid "Show autocompleted name with an address"
-msgstr "Show autocompleted name with an address"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr ""
-"Whether to force showing the e-mail address with the name of the "
-"autocompleted contact in the entry."
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
-msgid "URI for the folder last used in the select names dialog"
-msgstr "URI for the folder last used in the select names dialogue"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
-msgid "URI for the folder last used in the select names dialog."
-msgstr "URI for the folder last used in the select names dialogue."
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
-msgid "Contact layout style"
-msgstr "Contact layout style"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the contact list. \"0\" (Classic View) places the preview pane below the "
-"contact list. \"1\" (Vertical View) places the preview pane next to the "
-"contact list."
-msgstr ""
-"The layout style determines where to place the preview pane in relation to "
-"the contact list. \"0\" (Classic View) places the preview pane below the "
-"contact list. \"1\" (Vertical View) places the preview pane next to the "
-"contact list."
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
-msgid "Contact preview pane position (horizontal)"
-msgstr "Contact preview pane position (horizontal)"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
-msgid "Position of the contact preview pane when oriented horizontally."
-msgstr "Position of the contact preview pane when oriented horizontally."
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
-msgid "Contact preview pane position (vertical)"
-msgstr "Contact preview pane position (vertical)"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
-msgid "Position of the contact preview pane when oriented vertically."
-msgstr "Position of the contact preview pane when oriented vertically."
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
-msgid "Show maps"
-msgstr "Show maps"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
-msgid "Whether to show maps in preview pane"
-msgstr "Whether to show maps in preview pane"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
-msgid "Primary address book"
-msgstr "Primary address book"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
-msgid ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view"
-msgstr ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
-msgid "Show preview pane"
-msgstr "Show preview pane"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
-msgid "Whether to show the preview pane."
-msgstr "Whether to show the preview pane."
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
-msgid "true"
-msgstr "true"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
-msgid "Whether to show phone numbers in the editor"
-msgstr "Whether to show phone numbers in the editor"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
-msgid "Whether to show SIP addresses in the editor"
-msgstr "Whether to show SIP addresses in the editor"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
-msgid "Whether to show IM addresses in the editor"
-msgstr "Whether to show IM addresses in the editor"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
-msgid "Whether to show mailing Home addresses in the editor"
-msgstr "Whether to show mailing Home addresses in the editor"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
-msgid "Whether to show mailing addresses Work in the editor"
-msgstr "Whether to show mailing addresses Work in the editor"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
-msgid "Whether to show mailing addresses Other in the editor"
-msgstr "Whether to show mailing addresses Other in the editor"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
-msgid "Whether to show Web Addresses in the editor"
-msgstr "Whether to show Web Addresses in the editor"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
-msgid "Whether to show job information in the editor"
-msgstr "Whether to show job information in the editor"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
-msgid "Whether to show Miscellaneous information in the editor"
-msgstr "Whether to show Miscellaneous information in the editor"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
-msgid "Whether to show notes in the editor"
-msgstr "Whether to show notes in the editor"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:32
-msgid "Whether to show Certificates tab in the editor"
-msgstr "Whether to show Certificates tab in the editor"
-
-#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "Convert mail messages to Unicode"
-
-#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-
-#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:3
-msgid "Full path command to run Bogofilter"
-msgstr "Full path command to run Bogofilter"
-
-#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
-msgid ""
-"Full path to a Bogofilter command. If not set, then a compile-time path is "
-"used, usually /usr/bin/bogofilter. The command should not contain any other "
-"arguments."
-msgstr ""
-"Full path to a Bogofilter command. If not set, then a compile-time path is "
-"used, usually /usr/bin/bogofilter. The command should not contain any other "
-"arguments."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
-msgid "Save directory for reminder audio"
-msgstr "Save directory for reminder audio"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
-msgid "Directory for saving reminder audio files"
-msgstr "Directory for saving reminder audio files"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
-msgid "Birthday and anniversary reminder value"
-msgstr "Birthday and anniversary reminder value"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
-msgid "Number of units for determining a birthday or anniversary reminder"
-msgstr "Number of units for determining a birthday or anniversary reminder"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
-msgid "Birthday and anniversary reminder units"
-msgstr "Birthday and anniversary reminder units"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\""
-msgstr ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
-msgid "Compress weekends in month view"
-msgstr "Compress weekends in month view"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday"
-msgstr ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
-msgid "Ask for confirmation when deleting items"
-msgstr "Ask for confirmation when deleting items"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
-msgid "Whether to ask for confirmation when deleting an appointment or task"
-msgstr "Whether to ask for confirmation when deleting an appointment or task"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
-msgid "Confirm expunge"
-msgstr "Confirm expunge"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
-msgid "Whether to ask for confirmation when expunging appointments and tasks"
-msgstr "Whether to ask for confirmation when expunging appointments and tasks"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
-msgid "Month view vertical pane position"
-msgstr "Month view vertical pane position"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar"
-msgstr ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
-msgid "Workday end hour"
-msgstr "Workday end hour"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
-msgstr "Hour the workday ends on, in twenty four hour format, 0 to 23"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
-msgid "Workday end minute"
-msgstr "Workday end minute"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
-msgid "Minute the workday ends on, 0 to 59."
-msgstr "Minute the workday ends on, 0 to 59."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
-msgid "Workday start hour"
-msgstr "Workday start hour"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
-msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr "Hour the workday starts on, in twenty four hour format, 0 to 23."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
-msgid "Workday start minute"
-msgstr "Workday start minute"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
-msgid "Minute the workday starts on, 0 to 59."
-msgstr "Minute the workday starts on, 0 to 59."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-msgid "Workday start time for Monday"
-msgstr "Workday start time for Monday"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
-msgid ""
-"Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, "
-"or -1 to use day-start-hour and day-start-minute"
-msgstr ""
-"Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, "
-"or -1 to use day-start-hour and day-start-minute"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-msgid "Workday end time for Monday"
-msgstr "Workday end time for Monday"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
-msgid ""
-"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
-"-1 to use day-end-hour and day-end-minute"
-msgstr ""
-"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
-"-1 to use day-end-hour and day-end-minute"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
-msgid "Workday start time for Tuesday"
-msgstr "Workday start time for Tuesday"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
-msgid ""
-"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
-"-1 to use day-start-hour and day-start-minute"
-msgstr ""
-"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
-"-1 to use day-start-hour and day-start-minute"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
-msgid "Workday end time for Tuesday"
-msgstr "Workday end time for Tuesday"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
-msgid "Workday start time for Wednesday"
-msgstr "Workday start time for Wednesday"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-msgid "Workday end time for Wednesday"
-msgstr "Workday end time for Wednesday"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
-msgid "Workday start time for Thursday"
-msgstr "Workday start time for Thursday"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-msgid "Workday end time for Thursday"
-msgstr "Workday end time for Thursday"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-msgid "Workday start time for Friday"
-msgstr "Workday start time for Friday"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-msgid "Workday end time for Friday"
-msgstr "Workday end time for Friday"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-msgid "Workday start time for Saturday"
-msgstr "Workday start time for Saturday"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-msgid "Workday end time for Saturday"
-msgstr "Workday end time for Saturday"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-msgid "Workday start time for Sunday"
-msgstr "Workday start time for Sunday"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-msgid "Workday end time for Sunday"
-msgstr "Workday end time for Sunday"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
-msgid "The second timezone for a Day View"
-msgstr "The second timezone for a Day View"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key"
-msgstr ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
-msgid "Recently used second time zones in a Day View"
-msgstr "Recently used second time zones in a Day View"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
-msgid "List of recently used second time zones in a Day View"
-msgstr "List of recently used second time zones in a Day View"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
-msgid "Maximum number of recently used timezones to remember"
-msgstr "Maximum number of recently used timezones to remember"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
-msgid ""
-"Maximum number of recently used timezones to remember in a 'day-second-"
-"zones' list"
-msgstr ""
-"Maximum number of recently used timezones to remember in a 'day-second-"
-"zones' list"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
-msgid "Default reminder value"
-msgstr "Default reminder value"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
-msgid "Number of units for determining a default reminder"
-msgstr "Number of units for determining a default reminder"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
-msgid "Default reminder units"
-msgstr "Default reminder units"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
-msgstr "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
-msgid "Default reminder snooze interval, in minutes"
-msgstr "Default reminder snooze interval, in minutes"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
-msgid ""
-"Default reminder snooze interval, in minutes, to be filled in the reminder "
-"notification dialog"
-msgstr ""
-"Default reminder snooze interval, in minutes, to be filled in the reminder "
-"notification dialogue"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
-msgid "Show categories field in the event/meeting/task editor"
-msgstr "Show categories field in the event/meeting/task editor"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr "Whether to show categories field in the event/meeting editor"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
-msgid "Show Role field in the event/task/meeting editor"
-msgstr "Show Role field in the event/task/meeting editor"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
-msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "Whether to show role field in the event/task/meeting editor"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Show RSVP field in the event/task/meeting editor"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
-msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "Whether to show RSVP field in the event/task/meeting editor"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
-msgid "Show status field in the event/task/meeting editor"
-msgstr "Show status field in the event/task/meeting editor"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "Whether to show status field in the event/task/meeting editor"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
-msgid "Show timezone field in the event/meeting editor"
-msgstr "Show timezone field in the event/meeting editor"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "Whether to show timezone field in the event/meeting editor"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
-msgid "Show type field in the event/task/meeting editor"
-msgstr "Show type field in the event/task/meeting editor"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
-msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "Whether to show type field in the event/task/meeting editor"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
-msgid "Hide completed tasks"
-msgstr "Hide completed tasks"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
-msgid "Whether to hide completed tasks in the tasks view"
-msgstr "Whether to hide completed tasks in the tasks view"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
-msgid "Hide task units"
-msgstr "Hide task units"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
-msgstr ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
-msgid "Hide task value"
-msgstr "Hide task value"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
-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:70
-msgid "Horizontal pane position"
-msgstr "Horizontal pane position"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels"
-msgstr ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
-msgid "Last reminder time"
-msgstr "Last reminder time"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
-msgid "Time the last reminder ran, in time_t"
-msgstr "Time the last reminder ran, in time_t"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
-msgid "Marcus Bains Line Color - Day View"
-msgstr "Marcus Bains Line Colour — Day View"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
-msgid "Color to draw the Marcus Bains line in the Day View"
-msgstr "Colour to draw the Marcus Bains line in the Day View"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
-msgid "Marcus Bains Line Color - Time bar"
-msgstr "Marcus Bains Line Colour — Time bar"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
-msgstr ""
-"Colour to draw the Marcus Bains Line in the Time bar (empty for default)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
-msgid "Marcus Bains Line"
-msgstr "Marcus Bains Line"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
-msgstr ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
-msgid "Memo preview pane position (horizontal)"
-msgstr "Memo preview pane position (horizontal)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
-msgid "Position of the task preview pane when oriented horizontally"
-msgstr "Position of the task preview pane when oriented horizontally"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
-msgid "Memo layout style"
-msgstr "Memo layout style"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list"
-msgstr ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
-msgid "Memo preview pane position (vertical)"
-msgstr "Memo preview pane position (vertical)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
-msgid "Position of the memo preview pane when oriented vertically"
-msgstr "Position of the memo preview pane when oriented vertically"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
-msgid "Month view horizontal pane position"
-msgstr "Month view horizontal pane position"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels"
-msgstr ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
-msgid "Scroll Month View by a week, not by a month"
-msgstr "Scroll Month View by a week, not by a month"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
-msgid "Whether to scroll a Month View by a week, not by a month"
-msgstr "Whether to scroll a Month View by a week, not by a month"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
-msgid "Reminder programs"
-msgstr "Reminder programs"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
-msgid "Programs that are allowed to be run by reminders"
-msgstr "Programs that are allowed to be run by reminders"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
-msgid "Show display reminders in notification tray"
-msgstr "Show display reminders in notification tray"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
-msgid "Whether or not to use the notification tray for display reminders"
-msgstr "Whether or not to use the notification tray for display reminders"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
-msgid "Preferred New button item"
-msgstr "Preferred New button item"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
-msgid "Name of the preferred New toolbar button item"
-msgstr "Name of the preferred New toolbar button item"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
-msgid "Primary calendar"
-msgstr "Primary calendar"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view"
-msgstr ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
-msgid "Primary memo list"
-msgstr "Primary memo list"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
-msgid ""
-"The UID of the selected (or \"primary\") memo list in the sidebar of the "
-"\"Memos\" view"
-msgstr ""
-"The UID of the selected (or \"primary\") memo list in the sidebar of the "
-"\"Memos\" view"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
-msgid "Primary task list"
-msgstr "Primary task list"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
-msgid ""
-"The UID of the selected (or \"primary\") task list in the sidebar of the "
-"\"Tasks\" view"
-msgstr ""
-"The UID of the selected (or \"primary\") task list in the sidebar of the "
-"\"Tasks\" view"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
-msgid "Free/busy template URL"
-msgstr "Free/busy template URL"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
-#, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain"
-msgstr ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
-msgid "Recurrent Events in Italic"
-msgstr "Recurrent Events in Italic"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
-msgid "Show days with recurrent events in italic font in bottom left calendar"
-msgstr "Show days with recurrent events in italic font in bottom left calendar"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
-msgid "Search range for time-based searching in years"
-msgstr "Search range for time-based searching in years"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
-msgid ""
-"How many years can the time-based search go forward or backward from "
-"currently selected day when searching for another occurrence; default is ten "
-"years"
-msgstr ""
-"How many years can the time-based search go forward or backward from "
-"currently selected day when searching for another occurrence; default is ten "
-"years"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
-msgid "Show appointment end times in week and month views"
-msgstr "Show appointment end times in week and month views"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
-msgid "Whether to display the end time of events in the week and month views"
-msgstr "Whether to display the end time of events in the week and month views"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
-msgid "Show appointment icons in the month view"
-msgstr "Show appointment icons in the month view"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
-msgid "Whether to show icons of events in the month view"
-msgstr "Whether to show icons of events in the month view"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
-msgid "Show the memo preview pane"
-msgstr "Show the memo preview pane"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
-msgid "If \"true\", show the memo preview pane in the main window"
-msgstr "If \"true\", show the memo preview pane in the main window"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
-msgid "Show the task preview pane"
-msgstr "Show the task preview pane"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
-msgid "If \"true\", show the task preview pane in the main window"
-msgstr "If \"true\", show the task preview pane in the main window"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
-msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
-msgstr "Show week numbers in Day View, Work Week View, and Date Navigator"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
-msgid "Whether to show week numbers in various places in the Calendar"
-msgstr "Whether to show week numbers in various places in the Calendar"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
-msgid "Vertical position for the tag pane"
-msgstr "Vertical position for the tag pane"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
-msgid "Highlight tasks due today"
-msgstr "Highlight tasks due today"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
-msgid ""
-"Whether highlight tasks due today with a special color (task-due-today-color)"
-msgstr ""
-"Whether highlight tasks due today with a special colour (task-due-today-"
-"color)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
-msgid "Tasks due today color"
-msgstr "Tasks due today colour"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
-msgid ""
-"Background color of tasks that are due today, in \"#rrggbb\" format. Used "
-"together with task-due-today-highlight"
-msgstr ""
-"Background colour of tasks that are due today, in \"#rrggbb\" format. Used "
-"together with task-due-today-highlight"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-msgid "Task preview pane position (horizontal)"
-msgstr "Task preview pane position (horizontal)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-msgid "Task layout style"
-msgstr "Task layout style"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list"
-msgstr ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
-msgid "Task preview pane position (vertical)"
-msgstr "Task preview pane position (vertical)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
-msgid "Position of the task preview pane when oriented vertically"
-msgstr "Position of the task preview pane when oriented vertically"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
-msgid "Show reminders for completed tasks"
-msgstr "Show reminders for completed tasks"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
-msgid ""
-"Whether to show reminders for completed tasks. When set to false, reminders "
-"for completed tasks are suppressed."
-msgstr ""
-"Whether to show reminders for completed tasks. When set to false, reminders "
-"for completed tasks are suppressed."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
-msgid "Highlight overdue tasks"
-msgstr "Highlight overdue tasks"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
-msgid ""
-"Whether highlight overdue tasks with a special color (task-overdue-color)"
-msgstr ""
-"Whether highlight overdue tasks with a special colour (task-overdue-color)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
-msgid "Overdue tasks color"
-msgstr "Overdue tasks colour"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
-msgid ""
-"Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
-"together with task-overdue-highlight."
-msgstr ""
-"Background colour of tasks that are overdue, in \"#rrggbb\" format. Used "
-"together with task-overdue-highlight."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
-msgid "Time divisions"
-msgstr "Time divisions"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
-msgid "Intervals shown in Day and Work Week views, in minutes"
-msgstr "Intervals shown in Day and Work Week views, in minutes"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
-msgid "Timezone"
-msgstr "Timezone"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olson timezone database location like \"America/New York\""
-msgstr ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olson timezone database location like \"America/New York\""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
-msgid "Twenty four hour time format"
-msgstr "Twenty four hour time format"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
-msgid "Whether to show times in twenty four hour format instead of using am/pm"
-msgstr ""
-"Whether to show times in twenty four hour format instead of using am/pm"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
-msgid "Birthday and anniversary reminder"
-msgstr "Birthday and anniversary reminder"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
-msgid "Whether to set a reminder for birthdays and anniversaries"
-msgstr "Whether to set a reminder for birthdays and anniversaries"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
-msgid "Default appointment reminder"
-msgstr "Default appointment reminder"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
-msgid "Whether to set a default reminder for appointments"
-msgstr "Whether to set a default reminder for appointments"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
-msgid "Use system timezone"
-msgstr "Use system timezone"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
-msgid "Use the system timezone instead of the timezone selected in Evolution"
-msgstr "Use the system timezone instead of the timezone selected in Evolution"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
-msgid "First day of the week"
-msgstr "First day of the week"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
-msgid "Monday is a work day"
-msgstr "Monday is a work day"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
-msgid "Tuesday is a work day"
-msgstr "Tuesday is a work day"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
-msgid "Wednesday is a work day"
-msgstr "Wednesday is a work day"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
-msgid "Thursday is a work day"
-msgstr "Thursday is a work day"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
-msgid "Friday is a work day"
-msgstr "Friday is a work day"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
-msgid "Saturday is a work day"
-msgstr "Saturday is a work day"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
-msgid "Sunday is a work day"
-msgstr "Sunday is a work day"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
-msgid "Create events, memos and tasks as Private by default"
-msgstr "Create events, memos and tasks as Private by default"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h: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:157
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"week-start-day-name\" instead."
-msgstr ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"week-start-day-name\" instead."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
-msgid "(Deprecated) Work days"
-msgstr "(Deprecated) Work days"
-
-#: ../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-"
-"day-monday\", \"work-day-tuesday\", etc. keys instead.)"
-msgstr ""
-"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-"
-"day-monday\", \"work-day-tuesday\", etc. keys instead.)"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:1
-msgid "Previous Evolution version"
-msgstr "Previous Evolution version"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:2
-msgid ""
-"The most recently used version of Evolution, expressed as \"major.minor.micro"
-"\". This is used for data and settings migration from older to newer "
-"versions."
-msgstr ""
-"The most recently used version of Evolution, expressed as \"major.minor.micro"
-"\". This is used for data and settings migration from older to newer "
-"versions."
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:3
-msgid "List of disabled plugins"
-msgstr "List of disabled plugins"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:4
-msgid "The list of disabled plugins in Evolution"
-msgstr "The list of disabled plugins in Evolution"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:5
-msgid "The window's X coordinate"
-msgstr "The window's X coordinate"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:6
-msgid "The window's Y coordinate"
-msgstr "The window's Y coordinate"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:7
-msgid "The window's width in pixels"
-msgstr "The window's width in pixels"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:8
-msgid "The window's height in pixels"
-msgstr "The window's height in pixels"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:9
-msgid "Whether the window is maximized"
-msgstr "Whether the window is maximised"
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
-msgid "Gnome Calendar's calendar import done"
-msgstr "Gnome Calendar's calendar import done"
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
-msgid "Whether calendar from Gnome Calendar has been imported or not"
-msgstr "Whether calendar from Gnome Calendar has been imported or not"
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
-msgid "Gnome Calendar's tasks import done"
-msgstr "Gnome Calendar's tasks import done"
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
-msgid "Whether tasks from Gnome Calendar have been imported or not"
-msgstr "Whether tasks from Gnome Calendar have been imported or not"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "Check whether Evolution is the default mailer"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "Every time Evolution starts, check whether it is the default mailer."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
-msgid "Default charset in which to compose messages"
-msgstr "Default charset in which to compose messages"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-msgid "Default charset in which to compose messages. Uses UTF-8, if not set."
-msgstr "Default charset in which to compose messages. Uses UTF-8, if not set."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
-msgid "Name of the editor to prefer in the message composer"
-msgstr "Name of the editor to prefer in the message composer"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
-msgid ""
-"If the name doesn't correspond to any known editor, then the built-in WebKit "
-"editor is used."
-msgstr ""
-"If the name doesn't correspond to any known editor, then the built-in WebKit "
-"editor is used."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
-msgid "Path where picture gallery should search for its content"
-msgstr "Path where picture gallery should search for its content"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
-msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder"
-msgstr ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
-msgid "Spell check inline"
-msgstr "Spell check inline"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
-msgid "Draw spelling error indicators on words as you type."
-msgstr "Draw spelling error indicators on words as you type."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
-msgid "Automatic link recognition"
-msgstr "Automatic link recognition"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-msgid "Recognize links in text and replace them."
-msgstr "Recognise links in text and replace them."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-msgid "Automatic emoticon recognition"
-msgstr "Automatic emoticon recognition"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-msgid ""
-"Recognize emoticons in text and replace them with images or Unicode "
-"characters."
-msgstr ""
-"Recognise emoticons in text and replace them with images or Unicode "
-"characters."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
-msgid "Unicode emoticons"
-msgstr "Unicode emoticons"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
-msgid "Use Unicode characters for emoticons."
-msgstr "Use Unicode characters for emoticons."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
-msgid "Attribute message"
-msgstr "Attribute message"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author"
-msgstr ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
-msgid "Forward message"
-msgstr "Forward message"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows"
-msgstr ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
-msgid "Original message"
-msgstr "Original message"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows"
-msgstr ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
-msgid "Group Reply replies to list"
-msgstr "Group Reply replies to list"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-msgid ""
-"Instead of the normal \"Reply to All\" behaviour, this option will make the "
-"'Group Reply' toolbar button try to reply only to the mailing list through "
-"which you happened to receive the copy of the message to which you're "
-"replying."
-msgstr ""
-"Instead of the normal \"Reply to All\" behaviour, this option will make the "
-"'Group Reply' toolbar button try to reply only to the mailing list through "
-"which you happened to receive the copy of the message to which you're "
-"replying."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
-msgid "Put the cursor at the bottom of replies"
-msgstr "Put the cursor at the bottom of replies"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
-msgid ""
-"Users get all up in arms over where the cursor should go when replying to a "
-"message. This determines whether the cursor is placed at the top of the "
-"message or the bottom."
-msgstr ""
-"Users get all up in arms over where the cursor should go when replying to a "
-"message. This determines whether the cursor is placed at the top of the "
-"message or the bottom."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-msgid "Always request read receipt"
-msgstr "Always request read receipt"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-msgid "Whether a read receipt request gets added to every message by default."
-msgstr "Whether a read receipt request gets added to every message by default."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
-msgid "Send HTML mail by default"
-msgstr "Send HTML mail by default"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
-msgid "Send HTML mail by default."
-msgstr "Send HTML mail by default."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
-msgid "Spell checking languages"
-msgstr "Spell checking languages"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
-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 "Show \"Bcc\" field when sending a mail message"
-msgstr "Show \"Bcc\" field when sending a mail message"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-msgid ""
-"Show the \"Bcc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"Show the \"Bcc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-msgid "Show \"Cc\" field when sending a mail message"
-msgstr "Show \"Cc\" field when sending a mail message"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
-msgid ""
-"Show the \"Cc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"Show the \"Cc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-msgid "Show \"From\" override field when sending a mail message"
-msgstr "Show \"From\" override field when sending a mail message"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-msgid ""
-"Show the \"From\" override field when sending a mail message. This is "
-"controlled from the View menu when a mail account is chosen."
-msgstr ""
-"Show the \"From\" override field when sending a mail message. This is "
-"controlled from the View menu when a mail account is chosen."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-msgid "Show \"Reply To\" field when sending a mail message"
-msgstr "Show \"Reply To\" field when sending a mail message"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-msgid ""
-"Show the \"Reply To\" field when sending a mail message. This is controlled "
-"from the View menu when a mail account is chosen."
-msgstr ""
-"Show the \"Reply To\" field when sending a mail message. This is controlled "
-"from the View menu when a mail account is chosen."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
-msgid "Show \"From\" field when posting to a newsgroup"
-msgstr "Show \"From\" field when posting to a newsgroup"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
-msgid ""
-"Show the \"From\" field when posting to a newsgroup. This is controlled from "
-"the View menu when a news account is chosen."
-msgstr ""
-"Show the \"From\" field when posting to a newsgroup. This is controlled from "
-"the View menu when a news account is chosen."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr "Show \"Reply To\" field when posting to a newsgroup"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
-msgid ""
-"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
-"from the View menu when a news account is chosen."
-msgstr ""
-"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
-"from the View menu when a news account is chosen."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
-msgid "Digitally sign replies when the original message is signed"
-msgstr "Digitally sign replies when the original message is signed"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
-msgid ""
-"Automatically enable PGP or S/MIME signatures when replying to a message "
-"which is also PGP or S/MIME signed."
-msgstr ""
-"Automatically enable PGP or S/MIME signatures when replying to a message "
-"which is also PGP or S/MIME signed."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
-msgid "Encode filenames in an Outlook/GMail way"
-msgstr "Encode filenames in an Outlook/GMail way"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
-msgid ""
-"Encode filenames in the mail headers same as Outlook or GMail do, to let "
-"them display correctly filenames with UTF-8 letters sent by Evolution, "
-"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
-"standard."
-msgstr ""
-"Encode filenames in the mail headers same as Outlook or GMail do, to let "
-"them display correctly filenames with UTF-8 letters sent by Evolution, "
-"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
-"standard."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
-msgid "Send messages through Outbox folder"
-msgstr "Send messages through Outbox folder"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
-msgid ""
-"Always save messages to Outbox folder when sending, to let a user choose "
-"when the messages should be sent."
-msgstr ""
-"Always save messages to Outbox folder when sending, to let a user choose "
-"when the messages should be sent."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
-msgid "Put personalized signatures at the top of replies"
-msgstr "Put personalised signatures at the top of replies"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
-msgid ""
-"Users get all up in arms over where their signature should go when replying "
-"to a message. This determines whether the signature is placed at the top of "
-"the message or the bottom."
-msgstr ""
-"Users get all up in arms over where their signature should go when replying "
-"to a message. This determines whether the signature is placed at the top of "
-"the message or the bottom."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
-msgid "Do not add signature delimiter"
-msgstr "Do not add signature delimiter"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
-msgid ""
-"Set to TRUE in case you do not want to add signature delimiter before your "
-"signature when composing a mail."
-msgstr ""
-"Set to TRUE in case you do not want to add signature delimiter before your "
-"signature when composing a mail."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-msgid "Ignore list Reply-To:"
-msgstr "Ignore list Reply-To:"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-msgid ""
-"Some mailing lists set a Reply-To: header to trick users into sending "
-"replies to the list, even when they ask Evolution to make a private reply. "
-"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
-"so that Evolution will do as you ask it. If you use the private reply "
-"action, it will reply privately, while if you use the 'Reply to List' action "
-"it will do that. It works by comparing the Reply-To: header with a List-"
-"Post: header, if there is one."
-msgstr ""
-"Some mailing lists set a Reply-To: header to trick users into sending "
-"replies to the list, even when they ask Evolution to make a private reply. "
-"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
-"so that Evolution will do as you ask it. If you use the private reply "
-"action, it will reply privately, while if you use the 'Reply to List' action "
-"it will do that. It works by comparing the Reply-To: header with a List-"
-"Post: header, if there is one."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-msgid "List of localized 'Re'"
-msgstr "List of localised 'Re'"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-msgid ""
-"Comma-separated list of localized 'Re' abbreviations to skip in a subject "
-"text when replying to a message, as an addition to the standard \"Re\" "
-"prefix. An example is 'SV,AV'."
-msgstr ""
-"Comma-separated list of localised 'Re' abbreviations to skip in a subject "
-"text when replying to a message, as an addition to the standard \"Re\" "
-"prefix. An example is 'SV,AV'."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
-msgid "Number of characters for wrapping"
-msgstr "Number of characters for wrapping"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-msgid "Will autowrap lines after given number of characters."
-msgstr "Will autowrap lines after given number of characters."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-msgid ""
-"Number of To and CC recipients to ask 'prompt-on-many-to-cc-recips' from"
-msgstr ""
-"Number of To and CC recipients to ask 'prompt-on-many-to-cc-recips' from"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-msgid ""
-"When to ask, when the number of To and CC recipients reaches this value."
-msgstr ""
-"When to ask, when the number of To and CC recipients reaches this value."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
-msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
-msgstr "Whether to always show Sign and Encrypt buttons on the toolbar"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
-msgid ""
-"If set to 'true', the Sign and Encrypt buttons for either PGP or S/MIME are "
-"always shown in the composer's toolbar. Otherwise they are shown only when "
-"being used."
-msgstr ""
-"If set to 'true', the Sign and Encrypt buttons for either PGP or S/MIME are "
-"always shown in the composer's toolbar. Otherwise they are shown only when "
-"being used."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
-msgid "Wrap quoted text in replies"
-msgstr "Wrap quoted text in replies"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
-msgid "If set to 'true' quoted text in replies will be wrapped."
-msgstr "If set to 'true' quoted text in replies will be wrapped."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
-msgid "Whether to obey Content-Disposition:inline message header hint"
-msgstr "Whether to obey Content-Disposition:inline message header hint"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
-msgid ""
-"Set to 'false' to block automatic display of attachments with Content-"
-"Disposition: inline."
-msgstr ""
-"Set to 'false' to block automatic display of attachments with Content-"
-"Disposition: inline."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
-msgid "Save file format for drag-and-drop operation"
-msgstr "Save file format for drag-and-drop operation"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
-msgid "Can be either 'mbox' or 'pdf'."
-msgstr "Can be either 'mbox' or 'pdf'."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
-msgid "Show image animations"
-msgstr "Show image animations"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
-msgstr ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
-msgid "Enable or disable type ahead search feature"
-msgstr "Enable or disable type ahead search feature"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
-msgid ""
-"Enable the side bar search feature to allow interactive searching of folder "
-"names."
-msgstr ""
-"Enable the side bar search feature to allow interactive searching of folder "
-"names."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-msgid "Enable or disable magic space bar"
-msgstr "Enable or disable magic space bar"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
-msgstr ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
-msgid "Enable to use a similar message list view settings for all folders"
-msgstr "Enable use of a similar message list view settings for all folders"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
-msgid "Enable to use a similar message list view settings for all folders."
-msgstr "Enable use of a similar message list view settings for all folders."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
-msgid "Mark citations in the message \"Preview\""
-msgstr "Mark citations in the message \"Preview\""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
-msgid "Mark citations in the message \"Preview\"."
-msgstr "Mark citations in the message \"Preview\"."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-msgid "Citation highlight color"
-msgstr "Citation highlight colour"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
-msgid "Citation highlight color."
-msgstr "Citation highlight colour."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
-msgid "Enable/disable caret mode"
-msgstr "Enable/disable caret mode"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr "Enable caret mode, so that you can see a cursor when reading mail."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-msgid "Default charset in which to display messages"
-msgstr "Default charset in which to display messages"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
-msgid "Default charset in which to display messages."
-msgstr "Default charset in which to display messages."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-msgid "Automatically load images for HTML messages over HTTP"
-msgstr "Automatically load images for HTML messages over HTTP"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
-msgid "Show notification about missing remote content"
-msgstr "Show notification about missing remote content"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
-msgid ""
-"When the message preview shows a message which requires to download remote "
-"content, while the download is not allowed for the user or the site, then "
-"show a notification about it on top of the preview panel."
-msgstr ""
-"When the message preview shows a message which requires to download remote "
-"content, while the download is not allowed for the user or the site, then "
-"show a notification about it on top of the preview panel."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
-msgid "Show Animations"
-msgstr "Show Animations"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
-msgid "Show animated images as animations."
-msgstr "Show animated images as animations."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
-msgid "Show all message headers"
-msgstr "Show all message headers"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
-msgid "Show all the headers when viewing a messages."
-msgstr "Show all the headers when viewing a messages."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
-msgid "List of headers to show when viewing a message."
-msgstr "List of headers to show when viewing a message."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
-msgid ""
-"Each header is represented as a pair: the header name, and a boolean "
-"indicating whether the header is enabled. Disabled headers are not shown "
-"when viewing a message, but are still listed in Preferences."
-msgstr ""
-"Each header is represented as a pair: the header name, and a boolean "
-"indicating whether the header is enabled. Disabled headers are not shown "
-"when viewing a message, but are still listed in Preferences."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
-msgid "Show photo of the sender"
-msgstr "Show photo of the sender"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
-msgid "Show the photo of the sender in the message reading pane."
-msgstr "Show the photo of the sender in the message reading pane."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
-msgid "Search gravatar.com for photo of the sender"
-msgstr "Search gravatar.com for photo of the sender"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
-msgid "Allow searching also at gravatar.com for photo of the sender."
-msgstr "Allow searching also at gravatar.com for photo of the sender."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
-msgid "Mark as Seen after specified timeout"
-msgstr "Mark as Seen after specified timeout"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
-msgid "Mark as Seen after specified timeout."
-msgstr "Mark as Seen after specified timeout."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
-msgid "Mark as Seen always after specified timeout"
-msgstr "Mark as Seen always after specified timeout"
+#: ../src/composer/mail-composer.error.xml.h:44
+#| msgid "Are you sure you want to discard the message you are composing?"
+msgid "Are you sure you want to convert the message into a meeting?"
+msgstr "Are you sure you want to convert the message into a meeting?"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../src/composer/mail-composer.error.xml.h:45
 msgid ""
-"If set to true, the selected message will be set as unread after the timeout "
-"also after the folder change."
-msgstr ""
-"If set to true, the selected message will be set as unread after the timeout "
-"also after the folder change."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
-msgid "Timeout for marking messages as seen"
-msgstr "Timeout for marking messages as seen"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
-msgid "Timeout in milliseconds for marking messages as seen."
-msgstr "Timeout in milliseconds for marking messages as seen."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
-msgid "Show Attachment Bar"
-msgstr "Show Attachment Bar"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
-msgid ""
-"Show Attachment Bar below the message preview pane when the message has "
-"attachments."
-msgstr ""
-"Show Attachment Bar below the message preview pane when the message has "
-"attachments."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
-msgid "Sender email-address column in the message list"
-msgstr "Sender e-mail address column in the message list"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
-msgstr ""
-"Show the e-mail address of the sender in a separate column in the message "
-"list."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
-msgid "Show deleted messages in the message-list"
-msgstr "Show deleted messages in the message-list"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
-msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "Show deleted messages (with a strike-through) in the message-list."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
-msgid "Show junk messages in the message-list"
-msgstr "Show junk messages in the message-list"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
-msgid "Show junk messages (with a red strike-through) in the message-list."
-msgstr "Show junk messages (with a red strike-through) in the message-list."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
-msgid "Enable Unmatched search folder"
-msgstr "Enable Unmatched search folder"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
-msgid ""
-"Enable Unmatched search folder within Search Folders. It does nothing if "
-"Search Folders are disabled."
-msgstr ""
-"Enable Unmatched search folder within Search Folders. It does nothing if "
-"Search Folders are disabled."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
-msgid "Hides the per-folder preview and removes the selection"
-msgstr "Hides the per-folder preview and removes the selection"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
-msgid ""
-"This key is read only once and reset to \"false\" after read. This unselects "
-"the mail in the list and removes the preview for that folder."
+"By converting the message into the meeting the composed message will be "
+"closed and the changes being done discarded."
 msgstr ""
-"This key is read only once and reset to \"false\" after read. This unselects "
-"the mail in the list and removes the preview for that folder."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
-msgid "Height of the message-list pane"
-msgstr "Height of the message-list pane"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
-msgid "Height of the message-list pane."
-msgstr "Height of the message-list pane."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
-msgid "Whether message headers are collapsed in the user interface"
-msgstr "Whether message headers are collapsed in the user interface"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
-msgid "Width of the message-list pane"
-msgstr "Width of the message-list pane"
+"By converting the message into the meeting the composed message will be "
+"closed and the changes being done discarded."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
-msgid "Width of the message-list pane."
-msgstr "Width of the message-list pane."
+#: ../src/composer/mail-composer.error.xml.h:46
+#| msgid "Con_vert to Meeting"
+msgid "Convert to _Meeting"
+msgstr "Convert to _Meeting"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
-msgid "Layout style"
-msgstr "Layout style"
+#: ../src/composer/mail-composer.error.xml.h:47
+#| msgid "Are you sure you want to send the message?"
+msgid "Are you sure you want to convert the event into a message?"
+msgstr "Are you sure you want to convert the event into a message?"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../src/composer/mail-composer.error.xml.h:48
 msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the message list. \"0\" (Classic View) places the preview pane below the "
-"message list. \"1\" (Vertical View) places the preview pane next to the "
-"message list."
+"By converting the event into the message the editing window will be closed "
+"and the changes being done discarded."
 msgstr ""
-"The layout style determines where to place the preview pane in relation to "
-"the message list. \"0\" (Classic View) places the preview pane below the "
-"message list. \"1\" (Vertical View) places the preview pane next to the "
-"message list."
+"By converting the event into the message the editing window will be closed "
+"and the changes being done discarded."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
-msgid "Variable width font"
-msgstr "Variable width font"
+#: ../src/composer/mail-composer.error.xml.h:49
+#| msgid "Con_vert to Meeting"
+msgid "Convert to _Message"
+msgstr "Convert to _Message"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
-msgid "The variable width font for mail display."
-msgstr "The variable width font for mail display."
+#: ../src/composer/mail-composer.error.xml.h:50
+#| msgid "Are you sure you want to save the memo without a summary?"
+msgid "Are you sure you want to convert the memo into a message?"
+msgstr "Are you sure you want to convert the memo into a message?"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
-msgid "Terminal font"
-msgstr "Terminal font"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
-msgid "The terminal font for mail display."
-msgstr "The terminal font for mail display."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
-msgid "Use custom fonts"
-msgstr "Use custom fonts"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
-msgid "Use custom fonts for displaying mail."
-msgstr "Use custom fonts for displaying mail."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Compress display of addresses in To/Cc/Bcc"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../src/composer/mail-composer.error.xml.h:51
 msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
+"By converting the memo into the message the editing window will be closed "
+"and the changes being done discarded."
 msgstr ""
-"Compress display of addresses in To/Cc/Bcc to the number specified in "
-"address_count."
+"By converting the memo into the message the editing window will be closed "
+"and the changes being done discarded."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Number of addresses to display in To/Cc/Bcc"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '…' is shown."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
-msgid "Thread the message-list based on Subject"
-msgstr "Thread the message-list based on Subject"
+#: ../src/composer/mail-composer.error.xml.h:52
+#| msgid "Are you sure you want to save the task without a summary?"
+msgid "Are you sure you want to convert the task into a message?"
+msgstr "Are you sure you want to convert the task into a message?"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../src/composer/mail-composer.error.xml.h:53
 msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+"By converting the task into the message the editing window will be closed "
+"and the changes being done discarded."
 msgstr ""
-"Whether to fall back on threading by subjects when the messages do not "
-"contain In-Reply-To or References headers."
+"By converting the task into the message the editing window will be closed "
+"and the changes being done discarded."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
-msgid "Default value for thread expand state"
-msgstr "Default value for thread expand state"
+#: ../src/composer/mail-composer.error.xml.h:54
+msgid "Something has gone wrong when editing the message"
+msgstr "Something has gone wrong when editing the message"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../src/composer/mail-composer.error.xml.h:55
 msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
+"A WebKitWebProcess crashed when editing the message. You can try again by "
+"closing the composer window and opening a new one. If the issue persists, "
+"please file a bug report in the GNOME bugzilla."
 msgstr ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
+"A WebKitWebProcess crashed when editing the message. You can try again by "
+"closing the composer window and opening a new one. If the issue persists, "
+"please file a bug report in the GNOME bugzilla."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
-msgid "Whether sort threads based on latest message in that thread"
-msgstr "Whether sort threads based on latest message in that thread"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
-msgid ""
-"This setting specifies whether the threads should be sorted based on latest "
-"message in each thread, rather than by message's date. Evolution requires a "
-"restart."
-msgstr ""
-"This setting specifies whether the threads should be sorted based on latest "
-"message in each thread, rather than by message's date. Evolution requires a "
-"restart."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
-msgid "Whether sort thread children always ascending"
-msgstr "Whether sort thread children always ascending"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
-msgid ""
-"This setting specifies whether the thread children should be sorted always "
-"ascending, rather than using the same sort order as in the thread root level."
-msgstr ""
-"This setting specifies whether the thread children should be sorted always "
-"ascending, rather than using the same sort order as in the thread root level."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
-msgid "Sort accounts alphabetically in a folder tree"
-msgstr "Sort accounts alphabetically in a folder tree"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
-msgid ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user"
-msgstr ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
-msgid "Log filter actions"
-msgstr "Log filter actions"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
-msgid "Log filter actions to the specified log file."
-msgstr "Log filter actions to the specified log file."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
-msgid "Logfile to log filter actions"
-msgstr "Logfile to log filter actions"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
-msgid "Logfile to log filter actions."
-msgstr "Logfile to log filter actions."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
-msgid "Flush Outbox after filtering"
-msgstr "Flush Outbox after filtering"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
-msgid ""
-"Whether to flush Outbox after filtering is done. Outbox flush will happen "
-"only when there was used any 'Forward to' filter action and approximately "
-"one minute after the last action invocation."
-msgstr ""
-"Whether to flush Outbox after filtering is done. Outbox flush will happen "
-"only when a 'Forward to' filter action is used and approximately one minute "
-"after the last action invocation."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
-msgid "Default forward style"
-msgstr "Default forward style"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
-msgid "Default reply style"
-msgstr "Default reply style"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
-msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
-msgstr "Prompt on send when using key accelerator (Ctrl+Enter)"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
-msgid ""
-"Prompt the user when he or she tries to send a message with a key "
-"accelerator."
-msgstr ""
-"Prompt the user when he or she tries to send a message with a key "
-"accelerator."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
-msgid "Prompt on empty subject"
-msgstr "Prompt on empty subject"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
-msgstr ""
-"Prompt the user when he or she tries to send a message without a Subject."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
-msgid "Prompt when emptying the trash"
-msgstr "Prompt when emptying the wastebasket"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
-msgid "Prompt the user when he or she tries to empty the trash."
-msgstr "Prompt the user when he or she tries to empty the wastebasket."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
-msgid "Prompt when user expunges"
-msgstr "Prompt when user expunges"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
-msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr "Prompt the user when he or she tries to expunge a folder."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
-msgid "Prompt before sending to recipients not entered as mail addresses"
-msgstr "Prompt before sending to recipients not entered as mail addresses"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a message to recipients not entered as mail addresses"
-msgstr ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a message to recipients not entered as mail addresses"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
-msgid "Prompt when user only fills Bcc"
-msgstr "Prompt when user only fills Bcc"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
-msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "Prompt when user tries to send a message with no To or Cc recipients."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr "Prompt when user tries to send unwanted HTML"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
-msgstr ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
-msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr "Prompt when user tries to open 10 or more messages at once"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
-msgstr ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
-msgid "Prompt while marking multiple messages"
-msgstr "Prompt while marking multiple messages"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
-msgid "Enable or disable the prompt whilst marking multiple messages."
-msgstr "Enable or disable the prompt whilst marking multiple messages."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
-msgid "Prompt when deleting messages in search folder"
-msgstr "Prompt when deleting messages in search folder"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
-msgid ""
-"It disables/enables the repeated prompts to warn that deleting messages from "
-"a search folder permanently deletes the message, not simply removing it from "
-"the search results."
-msgstr ""
-"It disables/enables the repeated prompts to warn that deleting messages from "
-"a search folder permanently deletes the message, not simply removing it from "
-"the search results."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
-msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
-msgstr "Asks whether to copy a folder by drag &amp; drop in the folder tree"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
-msgid ""
-"Possible values are: 'never' - do not allow copy with drag &amp; drop of "
-"folders in folder tree, 'always' - allow copy with drag &amp; drop of "
-"folders in folder tree without asking, or 'ask' - (or any other value) will "
-"ask user."
-msgstr ""
-"Possible values are: 'never' - do not allow copy with drag &amp; drop of "
-"folders in folder tree, 'always' - allow copy with drag &amp; drop of "
-"folders in folder tree without asking, or 'ask' - (or any other value) will "
-"ask user."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
-msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
-msgstr "Asks whether to move a folder by drag &amp; drop in the folder tree"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
-msgid ""
-"Possible values are: 'never' - do not allow move with drag &amp; drop of "
-"folders in folder tree, 'always' - allow move with drag &amp; drop of "
-"folders in folder tree without asking, or 'ask' - (or any other value) will "
-"ask user."
-msgstr ""
-"Possible values are: 'never' - do not allow move with drag &amp; drop of "
-"folders in folder tree, 'always' - allow move with drag &amp; drop of "
-"folders in folder tree without asking, or 'ask' - (or any other value) will "
-"ask user."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
-msgid "Prompt when replying privately to list messages"
-msgstr "Prompt when replying privately to list messages"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"private reply to a message which arrived via a mailing list."
-msgstr ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"private reply to a message which arrived via a mailing list."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
-msgid "Prompt when mailing list hijacks private replies"
-msgstr "Prompt when mailing list hijacks private replies"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying sending "
-"a private reply to a message which arrived via a mailing list, but the list "
-"sets a Reply-To: header which redirects your reply back to the list"
-msgstr ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a private reply to a message which arrived via a mailing list, but the list "
-"sets a Reply-To: header which redirects your reply back to the list."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
-msgid "Prompt when replying to many recipients"
-msgstr "Prompt when replying to many recipients"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
-msgstr ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
-msgid ""
-"Prompt when switching composer mode and the content needs to lose its "
-"formatting"
-msgstr ""
-"Prompt when switching composer mode and the content needs to lose its "
-"formatting"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
-msgid ""
-"It disables/enables the repeated prompts to warn that you are switching "
-"composer mode and the content needs to lose its formatting."
-msgstr ""
-"It disables/enables the repeated prompts to warn that you are switching "
-"composer mode and the content needs to lose its formatting."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
-msgid "Prompt when sending to many To and CC recipients"
-msgstr "Prompt when sending to many To and CC recipients"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
-msgid ""
-"Enable or disable the prompt when sending to many To and CC recipients. The "
-"'composer-many-to-cc-recips-num' defines the threshold."
-msgstr ""
-"Enable or disable the prompt when sending to many To and CC recipients. The "
-"'composer-many-to-cc-recips-num' defines the threshold."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
-msgid ""
-"Policy for automatically closing the message browser window when forwarding "
-"or replying to the displayed message."
-msgstr ""
-"Policy for automatically closing the message browser window when forwarding "
-"or replying to the displayed message."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
-msgid "Empty Trash folders on exit"
-msgstr "Empty Wastebasket folders on exit"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
-msgid "Empty all Trash folders when exiting Evolution."
-msgstr "Empty all Wastebasket folders when exiting Evolution."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
-msgid "Minimum days between emptying the trash on exit"
-msgstr "Minimum number of days between emptying the wastebasket on exit"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
-msgid "Minimum time between emptying the trash on exit, in days."
-msgstr "Minimum time between emptying the wastebasket on exit, in days."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
-msgid "Last time Empty Trash was run"
-msgstr "Last time Empty Wastebasket was run"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
-msgid ""
-"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
-msgstr ""
-"The last time Empty Wastebasket was run, in days since January 1st, 1970 "
-"(Epoch)."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "Amount of time in seconds the error should be shown on the status bar."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
-msgid "Level beyond which the message should be logged."
-msgstr "Level beyond which the message should be logged."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
-msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
-msgstr ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
-msgid "Show original \"Date\" header value."
-msgstr "Show original \"Date\" header value."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
-msgid ""
-"Show the original \"Date\" header (with a local time only if the time zone "
-"differs). Otherwise always show \"Date\" header value in a user preferred "
-"format and local time zone."
-msgstr ""
-"Show the original \"Date\" header (with a local time only if the time zone "
-"differs). Otherwise always show \"Date\" header value in a user preferred "
-"format and local time zone."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
-msgid "List of Labels and their associated colors"
-msgstr "List of Labels and their associated colours"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
-msgid ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:color where color uses the HTML hex encoding."
-msgstr ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
-msgid "Check incoming mail being junk"
-msgstr "Check incoming mail being junk"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
-msgid "Run junk test on incoming mail."
-msgstr "Run junk test on incoming mail."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
-msgid "Empty Junk folders on exit"
-msgstr "Empty Junk folders on exit"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
-msgid "Empty all Junk folders when exiting Evolution."
-msgstr "Empty all Junk folders when exiting Evolution."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
-msgid "Minimum days between emptying the junk on exit"
-msgstr "Minimum days between emptying the junk on exit"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
-msgid "Minimum time between emptying the junk on exit, in days."
-msgstr "Minimum time between emptying the junk on exit, in days."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
-msgid "Last time Empty Junk was run"
-msgstr "Last time Empty Junk was run"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
-msgid ""
-"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
-msgstr ""
-"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
-msgid "The default plugin for Junk hook"
-msgstr "The default plugin for Junk hook"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
-msgid ""
-"This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won't fall back "
-"to the other available plugins."
-msgstr ""
-"This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won't fall back "
-"to the other available plugins."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
-msgid "Determines whether to lookup in address book for sender email"
-msgstr "Determines whether to look up in address book for sender e-mail"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
-msgid ""
-"Determines whether to lookup the sender email in address book. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
-msgstr ""
-"Determines whether to look up the sender e-mail in the address book. If "
-"found, it shouldn't be a spam. It looks up in the books marked for "
-"autocompletion. It can be slow, if remote address books (like LDAP) are "
-"marked for autocompletion."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
-msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
-msgstr ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
-msgid ""
-"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local address book only to exclude "
-"mail sent by known contacts from junk filtering."
-msgstr ""
-"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local address book only to exclude "
-"mail sent by known contacts from junk filtering."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
-msgid "Determines whether to use custom headers to check for junk"
-msgstr "Determines whether to use custom headers to check for junk"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
-msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
-msgstr ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
-msgid "Custom headers to use while checking for junk."
-msgstr "Custom headers to use while checking for junk."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
-msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format \"headername=value\"."
-msgstr ""
-"Custom headers to use while checking for junk. The list elements are strings "
-"in the format \"headername=value\"."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
-msgid "UID string of the default account."
-msgstr "UID string of the default account."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
-msgid "Save directory"
-msgstr "Save directory"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
-msgid "Directory for saving mail component files."
-msgstr "Directory for saving mail component files."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
-msgid "Composer load/attach directory"
-msgstr "Composer load/attach directory"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
-msgid "Directory for loading/attaching files to composer."
-msgstr "Directory for loading/attaching files to composer."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
-msgid "Check for new messages on start"
-msgstr "Check for new messages on start"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
-msgid ""
-"Whether to check for new messages when Evolution is started. This includes "
-"also sending messages from Outbox."
-msgstr ""
-"Whether to check for new messages when Evolution is started. This includes "
-"also sending messages from Outbox."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
-msgid "Check for new messages in all active accounts"
-msgstr "Check for new messages in all active accounts"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
-msgid ""
-"Whether to check for new messages in all active accounts regardless of the "
-"account \"Check for new messages every X minutes\" option when Evolution is "
-"started. This option is used only together with 'send_recv_on_start' option."
-msgstr ""
-"Whether to check for new messages in all active accounts regardless of the "
-"account \"Check for new messages every X minutes\" option when Evolution is "
-"started. This option is used only together with 'send_recv_on_start' option."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
-msgid "Server synchronization interval"
-msgstr "Server synchronisation interval"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
-msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
-msgstr ""
-"Controls how frequently local changes are synchronised with the remote mail "
-"server. The interval must be at least 30 seconds."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
-msgid "Allow expunge in virtual folders"
-msgstr "Allow expunge in virtual folders"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
-msgid ""
-"Enables Expunge in virtual folders, which means that the Folder->Expunge "
-"will be callable in virtual folders, while the expunge itself will be done "
-"in all folders for all deleted messages within the virtual folder, not only "
-"for deleted messages belonging to the virtual folder."
-msgstr ""
-"Enables Expunge in virtual folders, which means that the Folder->Expunge "
-"will be callable in virtual folders, while the expunge itself will be done "
-"in all folders for all deleted messages within the virtual folder, not only "
-"for deleted messages belonging to the virtual folder."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
-#: ../mail/mail-config.ui.h:9
-msgid "Inherit theme colors in HTML mode"
-msgstr "Inherit theme colours in HTML mode"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
-msgid ""
-"When enabled the theme colors for background, text and links are sent in "
-"resulting HTML formatted message."
-msgstr ""
-"When enabled the theme colours for background, text and links are sent in "
-"resulting HTML formatted message."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
-msgid "An Archive folder for On This Computer folders."
-msgstr "An Archive folder for On This Computer folders."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
-msgid ""
-"An Archive folder to use for Messages|Archive... feature when in an On This "
-"Computer folder."
-msgstr ""
-"An Archive folder to use for Messages|Archive... feature when in an On This "
-"Computer folder."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
-msgid "(Deprecated) Default forward style"
-msgstr "(Deprecated) Default forward style"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"forward-style-name\" instead."
-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:238
-msgid "(Deprecated) Default reply style"
-msgstr "(Deprecated) Default reply style"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"reply-style-name\" instead."
-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:240
-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:241
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"show-headers\" instead."
-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:242
-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:243
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"image-loading-policy\" instead."
-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:244
-msgid ""
-"(Deprecated) Asks whether to close the message window when the user forwards "
-"or replies to the message shown in the window"
-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:245
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"browser-close-on-reply-policy\" instead."
-msgstr ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"browser-close-on-reply-policy\" instead."
-
-#. Translators: This is the a list of words for the attach reminder plugin to look
-#. for in a message body. Please use any number of words here in your language that might
-#. indicate that an attachment should have been attached to the message.
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
-msgid "['attachment','attaching','attached','enclosed']"
-msgstr "['attachment','attaching','attached','enclosed']"
-
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
-msgstr ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
-
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:6
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:1
-msgid "Address book source"
-msgstr "Address book source"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
-msgid "Address book to use for storing automatically synced contacts."
-msgstr "Address book to use for storing automatically synced contacts."
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
-msgid "Auto sync Pidgin contacts"
-msgstr "Auto sync Pidgin contacts"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
-msgid "Whether Pidgin contacts should be automatically synced."
-msgstr "Whether Pidgin contacts should be automatically synced."
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
-msgid "Enable autocontacts"
-msgstr "Enable autocontacts"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
-msgid ""
-"Whether contacts should be automatically added to the user's address book."
-msgstr ""
-"Whether contacts should be automatically added to the user's address book."
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
-msgid "Pidgin address book source"
-msgstr "Pidgin address book source"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
-msgid ""
-"Address book to use for storing automatically synced contacts from Pidgin."
-msgstr ""
-"Address book to use for storing automatically synced contacts from Pidgin."
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
-msgid "Pidgin check interval"
-msgstr "Pidgin check interval"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
-msgid "Check interval for Pidgin syncing of contacts."
-msgstr "Check interval for Pidgin syncing of contacts."
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
-msgid "Pidgin last sync MD5"
-msgstr "Pidgin last sync MD5"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
-msgid "Pidgin last sync MD5."
-msgstr "Pidgin last sync MD5."
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
-msgid "Pidgin last sync time"
-msgstr "Pidgin last sync time"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
-msgid "Pidgin last sync time."
-msgstr "Pidgin last sync time."
-
-#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
-msgid "List of Custom Headers"
-msgstr "List of Custom Headers"
-
-#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-
-#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
-msgid "Default External Editor"
-msgstr "Default External Editor"
-
-#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
-msgid "The default command that must be used as the editor."
-msgstr "The default command that must be used as the editor."
-
-#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
-msgid "Automatically launch when a new mail is edited"
-msgstr "Automatically launch when a new mail is edited"
-
-#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
-msgid "Automatically launch editor when key is pressed in the mail composer."
-msgstr "Automatically launch editor when key is pressed in the mail composer."
-
-#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
-msgid "Insert Face picture by default"
-msgstr "Insert Face picture by default"
-
-#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
-msgid ""
-"Whether insert Face picture to outgoing messages by default. The picture "
-"should be set before checking this, otherwise nothing happens."
-msgstr ""
-"Whether insert Face picture to outgoing messages by default. The picture "
-"should be set before checking this, otherwise nothing happens."
-
-#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
-msgid "Delete processed"
-msgstr "Delete processed"
-
-#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:2
-msgid "Whether to delete processed iTip objects"
-msgstr "Whether to delete processed iTip objects"
-
-#: ../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."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
-msgid "Whether to notify new messages in Inbox folder only."
-msgstr "Whether to notify new messages in Inbox folder only."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:3
-msgid "Enable D-Bus messages."
-msgstr "Enable D-Bus messages."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
-msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "Generates a D-Bus message when new mail messages arrive."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
-msgid "Enable icon in notification area."
-msgstr "Enable icon in notification area."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
-msgid "Show new mail icon in notification area when new messages arrive."
-msgstr "Show new mail icon in notification area when new messages arrive."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:7
-msgid "Popup message together with the icon."
-msgstr "Popup message together with the icon."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:8
-msgid "Whether show message over the icon when new messages arrive."
-msgstr "Whether show message over the icon when new messages arrive."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
-msgid "Enable audible notifications when new messages arrive."
-msgstr "Enable audible notifications when new messages arrive."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
-msgid ""
-"Whether to make a sound of any kind when new messages arrive. If \"false\", "
-"the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-file\" "
-"and \"notify-sound-use-theme\" keys are disregarded."
-msgstr ""
-"Whether to make a sound of any kind when new messages arrive. If \"false\", "
-"the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-file\" "
-"and \"notify-sound-use-theme\" keys are disregarded."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
-msgid "Whether to emit a beep."
-msgstr "Whether to emit a beep."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
-msgid "Whether to emit a beep when new messages arrive."
-msgstr "Whether to emit a beep when new messages arrive."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
-msgid "Sound filename to be played."
-msgstr "Sound filename to be played."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-msgid ""
-"Sound file to be played when new messages arrive, if \"notify-sound-play-file"
-"\" is \"true\"."
-msgstr ""
-"Sound file to be played when new messages arrive, if \"notify-sound-play-file"
-"\" is \"true\"."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
-msgid "Whether to play a sound file."
-msgstr "Whether to play a sound file."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
-msgid ""
-"Whether to play a sound file when new messages arrive. The name of the sound "
-"file is given by the 'notify-sound-file' key."
-msgstr ""
-"Whether to play a sound file when new messages arrive. The name of the sound "
-"file is given by the 'notify-sound-file' key."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
-msgid "Use sound theme"
-msgstr "Use sound theme"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
-msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr "Play themed sound when new messages arrive, if not in beep mode."
-
-#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
-msgid "Mode to use when displaying mails"
-msgstr "Mode to use when displaying mails"
-
-#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
-msgid ""
-"The mode to use for displaying mails. \"normal\" makes Evolution choose the "
-"best part to show, \"prefer_plain\" makes it use the text part, if present, "
-"\"prefer_source\" makes it use the text part, if present, otherwise shows "
-"HTML source, and \"only_plain\" forces Evolution to only show plain text"
-msgstr ""
-"The mode to use for displaying mails. \"normal\" makes Evolution choose the "
-"best part to show, \"prefer_plain\" makes it use the text part, if present, "
-"\"prefer_source\" makes it use the text part, if present, otherwise shows "
-"HTML source, and \"only_plain\" forces Evolution to only show plain text"
-
-#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
-msgid "Whether to show suppressed HTML output"
-msgstr "Whether to show suppressed HTML output"
-
-#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
-msgid "List of Destinations for publishing"
-msgstr "List of Destinations for publishing"
-
-#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
-msgid ""
-"The key specifies the list of destinations to where publish calendars. Each "
-"values specifies an XML with setup for publishing to one destination."
-msgstr ""
-"The key specifies the list of destinations to where publish calendars. Each "
-"values specifies an XML with setup for publishing to one destination."
-
-#: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
-msgid ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
-msgstr ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
-msgid "Skip development warning dialog"
-msgstr "Skip development warning dialogue"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
-"Whether the warning dialogue in development versions of Evolution is skipped."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
-msgid "Initial attachment view"
-msgstr "Initial attachment view"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-msgid ""
-"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
-"View."
-msgstr ""
-"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
-"View."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
-msgid "Initial file chooser folder"
-msgstr "Initial file chooser folder"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
-msgid "Initial folder for GtkFileChooser dialogs."
-msgstr "Initial folder for GtkFileChooser dialogues."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
-msgid "Compression format used by autoar"
-msgstr "Compression format used by autoar"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
-msgid ""
-"Compression format used when compressing attached directories with autoar."
-msgstr ""
-"Compression format used when compressing attached directories with autoar."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
-msgid "Compression filter used by autoar"
-msgstr "Compression filter used by autoar"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
-msgid ""
-"Compression filter used when compressing attached directories with autoar."
-msgstr ""
-"Compression filter used when compressing attached directories with autoar."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11 ../shell/main.c:320
-msgid "Start in offline mode"
-msgstr "Start in offline mode"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
-msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"Whether Evolution will start up in offline mode instead of online mode."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
-msgid "Offline folder paths"
-msgstr "Offline folder paths"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage."
-msgstr ""
-"List of paths for the folders to be synchronised to disk for offline usage."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
-msgid "Enable express mode"
-msgstr "Enable express mode"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
-msgid "Flag that enables a much simplified user interface."
-msgstr "Flag that enables a much simplified user interface."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
-msgid "List of button names to hide in the window switcher"
-msgstr "List of button names to hide in the window switcher"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
-msgid ""
-"Valid values are 'mail', 'addressbook', 'calendar', 'tasks' and 'memos'. "
-"Change of this requires restart of the application."
-msgstr ""
-"Valid values are 'mail', 'addressbook', 'calendar', 'tasks' and 'memos'. "
-"Change of this requires restart of the application."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
-msgid "Window buttons are visible"
-msgstr "Window buttons are visible"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
-msgid "Whether the window buttons should be visible."
-msgstr "Whether the window buttons should be visible."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
-msgid "Window button style"
-msgstr "Window button style"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-msgid ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
-msgstr ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-msgid "Toolbar is visible"
-msgstr "Toolbar is visible"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-msgid "Whether the toolbar should be visible."
-msgstr "Whether the toolbar should be visible."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
-msgid "Sidebar is visible"
-msgstr "Sidebar is visible"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
-msgid "Whether the sidebar should be visible."
-msgstr "Whether the sidebar should be visible."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
-msgid "Statusbar is visible"
-msgstr "Statusbar is visible"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:28
-msgid "Whether the status bar should be visible."
-msgstr "Whether the status bar should be visible."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:29
-msgid "ID or alias of the component to be shown by default at start-up."
-msgstr "ID or alias of the component to be shown by default at start-up."
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:30
-msgid "Default sidebar width"
-msgstr "Default sidebar width"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:31
-msgid "The default width for the sidebar, in pixels."
-msgstr "The default width for the sidebar, in pixels."
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
-msgid "Use only local spam tests."
-msgstr "Use only local spam tests."
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
-msgid "Use only the local spam tests (no DNS)."
-msgstr "Use only the local spam tests (no DNS)."
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
-msgid "Full path command to run spamassassin"
-msgstr "Full path command to run spamassassin"
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
-msgid ""
-"Full path to a spamassassin command. If not set, then a compile-time path is "
-"used, usually /usr/bin/spamassassin. The command should not contain any "
-"other arguments."
-msgstr ""
-"Full path to a spamassassin command. If not set, then a compile-time path is "
-"used, usually /usr/bin/spamassassin. The command should not contain any "
-"other arguments."
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-msgid "Full path command to run sa-learn"
-msgstr "Full path command to run sa-learn"
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
-msgid ""
-"Full path to a sa-learn command. If not set, then a compile-time path is "
-"used, usually /usr/bin/sa-learn. The command should not contain any other "
-"arguments."
-msgstr ""
-"Full path to a sa-learn command. If not set, then a compile-time path is "
-"used, usually /usr/bin/sa-learn. The command should not contain any other "
-"arguments."
-
-#: ../em-format/e-mail-formatter-attachment.c:338
+#: ../src/em-format/e-mail-formatter-attachment.c:334
 msgid "Display as attachment"
 msgstr "Display as attachment"
 
-#: ../em-format/e-mail-formatter-audio.c:152
+#: ../src/em-format/e-mail-formatter-audio.c:151
 msgid "Audio Player"
 msgstr "Audio Player"
 
-#: ../em-format/e-mail-formatter-audio.c:153
+#: ../src/em-format/e-mail-formatter-audio.c:152
 msgid "Play the attachment in embedded audio player"
 msgstr "Play the attachment in embedded audio player"
 
-#: ../em-format/e-mail-formatter-headers.c:102
-#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:277
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:62
+#: ../src/em-format/e-mail-formatter-headers.c:107
+#: ../src/em-format/e-mail-part-headers.c:46
+#: ../src/mail/e-mail-tag-editor.c:203 ../src/mail/message-list.etspec.h:5
+#: ../src/modules/mail/em-mailer-prefs.c:60
 msgid "From"
 msgstr "From"
 
-#: ../em-format/e-mail-formatter-headers.c:128
+#: ../src/em-format/e-mail-formatter-headers.c:132
 msgid "(no subject)"
 msgstr "(no subject)"
 
-#: ../em-format/e-mail-formatter-headers.c:329
+#. 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
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "This message was sent by %s on behalf of %s"
 
-#: ../em-format/e-mail-formatter-image.c:170
+#: ../src/em-format/e-mail-formatter-image.c:168
 msgid "Regular Image"
 msgstr "Regular Image"
 
-#: ../em-format/e-mail-formatter-image.c:171
+#: ../src/em-format/e-mail-formatter-image.c:169
 msgid "Display part as an image"
 msgstr "Display part as an image"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:250
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:249
 msgid "RFC822 message"
 msgstr "RFC822 message"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:251
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:250
 msgid "Format part as an RFC822 message"
 msgstr "Format part as an RFC822 message"
 
-#: ../em-format/e-mail-formatter-print.c:51
-#: ../e-util/gal-view-instance-save-as-dialog.c:94
-#: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/plugin-manager/evolution-plugin-manager.c:66
+#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/e-util/e-webdav-browser.c:2352
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:92
+#: ../src/mail/e-mail-label-tree-view.c:96
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:64
 msgid "Name"
 msgstr "Name"
 
-#: ../em-format/e-mail-formatter-print.c:51
-#: ../e-util/e-attachment-tree-view.c:195 ../mail/message-list.etspec.h:10
+#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/e-util/e-attachment-tree-view.c:193
+#: ../src/mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Size"
 
-#: ../em-format/e-mail-formatter-quote-headers.c:180
-#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
-#: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
-#: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
-#: ../modules/mail/em-mailer-prefs.c:67 ../smime/gui/certificate-manager.c:1645
+#: ../src/em-format/e-mail-formatter-quote-headers.c:178
+#: ../src/em-format/e-mail-part-headers.c:51
+#: ../src/mail/e-mail-tag-editor.c:208 ../src/mail/filtertypes.xml.in.h:16
+#: ../src/mail/message-list.etspec.h:6 ../src/mail/searchtypes.xml.in.h:17
+#: ../src/mail/vfoldertypes.xml.in.h:17
+#: ../src/modules/mail/em-mailer-prefs.c:65
+#: ../src/smime/gui/certificate-manager.c:1643
 msgid "Subject"
 msgstr "Subject"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:199
-#: ../em-format/e-mail-formatter-utils.c:343
-#: ../modules/mail/em-mailer-prefs.c:1490
+#: ../src/em-format/e-mail-formatter-quote-headers.c:197
+#: ../src/em-format/e-mail-formatter-utils.c:341
+#: ../src/modules/mail/em-mailer-prefs.c:1494
 msgid "Mailer"
 msgstr "Mailer"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:94
-#: ../em-format/e-mail-formatter-text-enriched.c:102
+#: ../src/em-format/e-mail-formatter-quote-text-enriched.c:92
+#: ../src/em-format/e-mail-formatter-text-enriched.c:100
 msgid "Richtext"
 msgstr "Richtext"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:95
-#: ../em-format/e-mail-formatter-text-enriched.c:103
+#: ../src/em-format/e-mail-formatter-quote-text-enriched.c:93
+#: ../src/em-format/e-mail-formatter-text-enriched.c:101
 msgid "Display part as enriched text"
 msgstr "Display part as enriched text"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:95
-#: ../em-format/e-mail-formatter-text-html.c:387
+#: ../src/em-format/e-mail-formatter-quote-text-html.c:93
+#: ../src/em-format/e-mail-formatter-text-html.c:385
 msgid "HTML"
 msgstr "HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:96
-#: ../em-format/e-mail-formatter-text-html.c:388
+#: ../src/em-format/e-mail-formatter-quote-text-html.c:94
+#: ../src/em-format/e-mail-formatter-text-html.c:386
 msgid "Format part as HTML"
 msgstr "Format part as HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:123
-#: ../em-format/e-mail-formatter-text-plain.c:198
-#: ../e-util/e-html-editor-actions.c:1300
+#: ../src/em-format/e-mail-formatter-quote-text-plain.c:121
+#: ../src/em-format/e-mail-formatter-text-plain.c:196
+#: ../src/e-util/e-html-editor-actions.c:1314
 msgid "Plain Text"
 msgstr "Plain Text"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:124
-#: ../em-format/e-mail-formatter-text-plain.c:199
+#: ../src/em-format/e-mail-formatter-quote-text-plain.c:122
+#: ../src/em-format/e-mail-formatter-text-plain.c:197
 msgid "Format part as plain text"
 msgstr "Format part as plain text"
 
-#: ../em-format/e-mail-formatter-secure-button.c:46
+#: ../src/em-format/e-mail-formatter-secure-button.c:45
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: ../em-format/e-mail-formatter-secure-button.c:46
+#: ../src/em-format/e-mail-formatter-secure-button.c:47
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10826,11 +11917,15 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: ../em-format/e-mail-formatter-secure-button.c:47
+#: ../src/em-format/e-mail-formatter-secure-button.c:49
 msgid "Valid signature"
 msgstr "Valid signature"
 
-#: ../em-format/e-mail-formatter-secure-button.c:47
+#: ../src/em-format/e-mail-formatter-secure-button.c:50
+msgid "Valid signature, but sender address and signer address do not match"
+msgstr "Valid signature, but sender address and signer address do not match"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:51
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10838,11 +11933,11 @@ msgstr ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 
-#: ../em-format/e-mail-formatter-secure-button.c:48
+#: ../src/em-format/e-mail-formatter-secure-button.c:53
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
-#: ../em-format/e-mail-formatter-secure-button.c:48
+#: ../src/em-format/e-mail-formatter-secure-button.c:55
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10850,11 +11945,11 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: ../em-format/e-mail-formatter-secure-button.c:49
+#: ../src/em-format/e-mail-formatter-secure-button.c:57
 msgid "Valid signature, but cannot verify sender"
 msgstr "Valid signature, but cannot verify sender"
 
-#: ../em-format/e-mail-formatter-secure-button.c:49
+#: ../src/em-format/e-mail-formatter-secure-button.c:59
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10862,11 +11957,11 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: ../em-format/e-mail-formatter-secure-button.c:50
+#: ../src/em-format/e-mail-formatter-secure-button.c:61
 msgid "This message is signed, but the public key is not in your keyring"
 msgstr "This message is signed, but the public key is not in your keyring"
 
-#: ../em-format/e-mail-formatter-secure-button.c:50
+#: ../src/em-format/e-mail-formatter-secure-button.c:63
 msgid ""
 "This message was digitally signed, but the corresponding public key is not "
 "present in your keyring. If you want to be able to verify the authenticity "
@@ -10880,11 +11975,11 @@ msgstr ""
 "trusted method and add it to your keyring. Until then, there is no guarantee "
 "that this message truly came from that person and that it arrived unaltered."
 
-#: ../em-format/e-mail-formatter-secure-button.c:59
+#: ../src/em-format/e-mail-formatter-secure-button.c:72
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
-#: ../em-format/e-mail-formatter-secure-button.c:59
+#: ../src/em-format/e-mail-formatter-secure-button.c:72
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10892,11 +11987,11 @@ msgstr ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 
-#: ../em-format/e-mail-formatter-secure-button.c:60
+#: ../src/em-format/e-mail-formatter-secure-button.c:73
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
-#: ../em-format/e-mail-formatter-secure-button.c:60
+#: ../src/em-format/e-mail-formatter-secure-button.c:73
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -10906,11 +12001,11 @@ msgstr ""
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 
-#: ../em-format/e-mail-formatter-secure-button.c:61
+#: ../src/em-format/e-mail-formatter-secure-button.c:74
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: ../em-format/e-mail-formatter-secure-button.c:61
+#: ../src/em-format/e-mail-formatter-secure-button.c:74
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -10918,11 +12013,11 @@ msgstr ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 
-#: ../em-format/e-mail-formatter-secure-button.c:62
+#: ../src/em-format/e-mail-formatter-secure-button.c:75
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
-#: ../em-format/e-mail-formatter-secure-button.c:62
+#: ../src/em-format/e-mail-formatter-secure-button.c:75
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -10932,215 +12027,316 @@ msgstr ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 
-#: ../em-format/e-mail-formatter-source.c:121
+#: ../src/em-format/e-mail-formatter-source.c:119
 msgid "Display source of a MIME part"
 msgstr "Display source of a MIME part"
 
-#: ../em-format/e-mail-formatter-utils.c:202
-#: ../em-format/e-mail-formatter-utils.c:219
-#: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
-#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
-#: ../modules/mail/em-mailer-prefs.c:64
+#: ../src/em-format/e-mail-formatter-utils.c:200
+#: ../src/em-format/e-mail-formatter-utils.c:217
+#: ../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
+#: ../src/modules/mail/em-mailer-prefs.c:62
 msgid "To"
 msgstr "To"
 
-#: ../em-format/e-mail-formatter-utils.c:203
-#: ../em-format/e-mail-formatter-utils.c:220
-#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
+#: ../src/em-format/e-mail-formatter-utils.c:201
+#: ../src/em-format/e-mail-formatter-utils.c:218
+#: ../src/em-format/e-mail-part-headers.c:49
+#: ../src/modules/mail/em-mailer-prefs.c:63
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/e-mail-formatter-utils.c:204
-#: ../em-format/e-mail-formatter-utils.c:221
-#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:66
+#: ../src/em-format/e-mail-formatter-utils.c:202
+#: ../src/em-format/e-mail-formatter-utils.c:219
+#: ../src/em-format/e-mail-part-headers.c:50
+#: ../src/modules/mail/em-mailer-prefs.c:64
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/e-mail-formatter-utils.c:566
+#: ../src/em-format/e-mail-formatter-utils.c:582
 msgid "GPG signed"
 msgstr "GPG signed"
 
-#: ../em-format/e-mail-formatter-utils.c:572
+#: ../src/em-format/e-mail-formatter-utils.c:588
 msgid "GPG encrypted"
 msgstr "GPG encrypted"
 
-#: ../em-format/e-mail-formatter-utils.c:578
+#: ../src/em-format/e-mail-formatter-utils.c:594
 msgid "S/MIME signed"
 msgstr "S/MIME signed"
 
-#: ../em-format/e-mail-formatter-utils.c:584
+#: ../src/em-format/e-mail-formatter-utils.c:600
 msgid "S/MIME encrypted"
 msgstr "S/MIME encrypted"
 
-#: ../em-format/e-mail-formatter-utils.c:593
-#: ../mail/e-mail-config-security-page.c:760
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:271
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:214
+#: ../src/em-format/e-mail-formatter-utils.c:609
+#: ../src/mail/e-mail-config-security-page.c:716
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:272
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:215
 msgid "Security"
 msgstr "Security"
 
-#: ../em-format/e-mail-parser-application-mbox.c:87
+#: ../src/em-format/e-mail-parser-application-mbox.c:85
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr "Error parsing MBOX part: %s"
 
-#: ../em-format/e-mail-parser-application-smime.c:83
+#: ../src/em-format/e-mail-parser-application-smime.c:81
 #, c-format
 msgid "Could not parse S/MIME message: %s"
 msgstr "Could not parse S/MIME message: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:77
+#: ../src/em-format/e-mail-parser-inlinepgp-encrypted.c:75
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "Could not parse PGP message: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:80
-#: ../em-format/e-mail-parser-multipart-signed.c:135
+#: ../src/em-format/e-mail-parser-inlinepgp-signed.c:78
+#: ../src/em-format/e-mail-parser-multipart-signed.c:133
 #, c-format
 msgid "Error verifying signature: %s"
 msgstr "Error verifying signature: %s"
 
-#: ../em-format/e-mail-parser-message-external.c:68
+#: ../src/em-format/e-mail-parser-message-external.c:66
 msgid "Malformed external-body part"
 msgstr "Malformed external-body part"
 
-#: ../em-format/e-mail-parser-message-external.c:101
+#: ../src/em-format/e-mail-parser-message-external.c:99
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointer to FTP site (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:112
+#: ../src/em-format/e-mail-parser-message-external.c:110
 #, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Pointer to local file (%s) valid at site \"%s\""
+#| msgid "Pointer to local file (%s) valid at site \"%s\""
+msgid "Pointer to local file (%s) valid at site “%s”"
+msgstr "Pointer to local file (%s) valid at site “%s”"
 
-#: ../em-format/e-mail-parser-message-external.c:114
+#: ../src/em-format/e-mail-parser-message-external.c:112
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointer to local file (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:133
+#: ../src/em-format/e-mail-parser-message-external.c:131
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointer to remote data (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:151
+#: ../src/em-format/e-mail-parser-message-external.c:149
 #, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pointer to unknown external data (\"%s\" type)"
+#| msgid "Pointer to unknown external data (\"%s\" type)"
+msgid "Pointer to unknown external data (“%s” type)"
+msgstr "Pointer to unknown external data (“%s” type)"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:66
-#: ../em-format/e-mail-parser-multipart-signed.c:83
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:64
+#: ../src/em-format/e-mail-parser-multipart-signed.c:81
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Could not parse MIME message. Displaying as source."
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:82
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:79
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:101
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:98
 #, c-format
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "Could not parse PGP/MIME message: %s"
 
-#: ../em-format/e-mail-parser-multipart-signed.c:121
+#: ../src/em-format/e-mail-parser-multipart-signed.c:119
 msgid "Unsupported signature format"
 msgstr "Unsupported signature format"
 
-#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:63
+#: ../src/em-format/e-mail-part-headers.c:47
+#: ../src/modules/mail/em-mailer-prefs.c:61
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:552
-#: ../e-util/e-dateedit.c:575 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:68
+#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:550
+#: ../src/e-util/e-dateedit.c:573 ../src/mail/message-list.etspec.h:7
+#: ../src/modules/mail/em-mailer-prefs.c:66
 msgid "Date"
 msgstr "Date"
 
-#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:69
+#: ../src/em-format/e-mail-part-headers.c:53
+#: ../src/modules/mail/em-mailer-prefs.c:67
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:70
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#: ../src/em-format/e-mail-part-headers.c:54
+#: ../src/modules/mail/em-mailer-prefs.c:68
+#: ../src/plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Face"
 
-#: ../em-format/e-mail-part-secure-button.c:118 ../shell/shell.error.xml.h:28
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../src/em-format/e-mail-part-secure-button.c:92
+#, c-format
+#| msgid "Failed to import certificate"
+msgid "Failed to import certificate: %s"
+msgstr "Failed to import certificate: %s"
+
+#: ../src/em-format/e-mail-part-secure-button.c:185
+#: ../src/shell/shell.error.xml.h:28 ../src/smime/gui/smime-ui.ui.h:16
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: ../em-format/e-mail-part-secure-button.c:133
+#: ../src/em-format/e-mail-part-secure-button.c:198
+#| msgid "Imported Certificate"
+msgid "_Import Certificate"
+msgstr "_Import Certificate"
+
+#: ../src/em-format/e-mail-part-secure-button.c:207
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: ../em-format/e-mail-part-utils.c:552
+#: ../src/em-format/e-mail-part-utils.c:556
 #, c-format
 msgid "%s attachment"
 msgstr "%s attachment"
 
-#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
+#: ../src/e-util/ea-calendar-item.c:312 ../src/e-util/ea-calendar-item.c:321
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../e-util/ea-calendar-item.c:326
+#: ../src/e-util/ea-calendar-item.c:324
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Calendar: from %s to %s"
 
-#: ../e-util/ea-calendar-item.c:363
+#: ../src/e-util/ea-calendar-item.c:361
 msgid "evolution calendar item"
 msgstr "evolution calendar item"
 
+#: ../src/e-util/e-accounts-window.c:509 ../src/e-util/e-accounts-window.c:624
+#: ../src/e-util/e-accounts-window.c:827
+#: ../src/modules/mail/e-mail-shell-backend.c:840
+msgid "Mail Accounts"
+msgstr "Mail Accounts"
+
+#: ../src/e-util/e-accounts-window.c:516 ../src/e-util/e-accounts-window.c:653
+#: ../src/e-util/e-accounts-window.c:841
+#| msgid "Address Book"
+msgid "Address Books"
+msgstr "Address Books"
+
+#: ../src/e-util/e-accounts-window.c:522 ../src/e-util/e-accounts-window.c:654
+#: ../src/e-util/e-accounts-window.c:842
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
+#| msgid "_Calendars"
+msgid "Calendars"
+msgstr "Calendars"
+
+#: ../src/e-util/e-accounts-window.c:528 ../src/e-util/e-accounts-window.c:655
+#: ../src/e-util/e-accounts-window.c:843
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
+#| msgctxt "New"
+#| msgid "Memo Li_st"
+msgid "Memo Lists"
+msgstr "Memo Lists"
+
+#: ../src/e-util/e-accounts-window.c:534 ../src/e-util/e-accounts-window.c:656
+#: ../src/e-util/e-accounts-window.c:844
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
+#| msgid "Task List"
+msgid "Task Lists"
+msgstr "Task Lists"
+
+#: ../src/e-util/e-accounts-window.c:1326
+#: ../src/mail/e-mail-account-tree-view.c:84
+#: ../src/modules/mail/em-composer-prefs.c:1305
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:355
+#: ../src/plugins/publish-calendar/publish-calendar.c:853
+msgid "Enabled"
+msgstr "Enabled"
+
+#: ../src/e-util/e-accounts-window.c:1342
+#: ../src/mail/e-mail-account-tree-view.c:108
+msgid "Account Name"
+msgstr "Account Name"
+
+#. { "collection",     N_("Collection _Account"),      "evolution" },
+#: ../src/e-util/e-accounts-window.c:1463
+#| msgid "Mail Accounts"
+msgid "_Mail Account"
+msgstr "_Mail Account"
+
+#: ../src/e-util/e-accounts-window.c:1464
+#| msgctxt "New"
+#| msgid "Address _Book"
+msgid "Address _Book"
+msgstr "Address _Book"
+
+#: ../src/e-util/e-accounts-window.c:1465
+#| msgid "_Calendar:"
+msgid "_Calendar"
+msgstr "_Calendar"
+
+#: ../src/e-util/e-accounts-window.c:1466
+#| msgctxt "New"
+#| msgid "Memo Li_st"
+msgid "M_emo List"
+msgstr "M_emo List"
+
+#: ../src/e-util/e-accounts-window.c:1467
+#| msgid "Task List"
+msgid "_Task List"
+msgstr "_Task List"
+
+#: ../src/e-util/e-accounts-window.c:1659
+#| msgid "Evolution Account Assistant"
+msgid "Evolution Accounts"
+msgstr "Evolution Accounts"
+
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:258
+#: ../src/e-util/e-activity.c:256
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (cancelled)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:261
+#: ../src/e-util/e-activity.c:259
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (completed)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:264
+#: ../src/e-util/e-activity.c:262
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (waiting)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:268
+#: ../src/e-util/e-activity.c:266
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (cancelling)"
 
-#: ../e-util/e-activity.c:270
+#: ../src/e-util/e-activity.c:268
 #, c-format
 msgid "%s"
 msgstr "%s"
 
+#. Translators: This is a running activity whose
+#. *              percent complete is known.
 #. Translators: This is a running activity whose percent complete is known.
-#: ../e-util/e-activity.c:275
-#: ../modules/calendar/e-cal-base-shell-content.c:144
+#: ../src/e-util/e-activity.c:273
+#: ../src/modules/calendar/e-cal-base-shell-content.c:142
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
-#: ../e-util/e-activity-proxy.c:352
-#: ../modules/mail/e-mail-shell-view-actions.c:1923
+#: ../src/e-util/e-activity-proxy.c:350
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
 msgid "Cancel"
 msgstr "Cancel"
 
 #. Translators: Escape is a keyboard binding.
-#: ../e-util/e-alert-bar.c:124
+#: ../src/e-util/e-alert-bar.c:125
 msgid "Close this message (Escape)"
 msgstr "Close this message (Escape)"
 
-#: ../e-util/e-alert-sink.c:246
+#: ../src/e-util/e-alert-sink.c:244
 msgid "Failed to create a thread: "
 msgstr "Failed to create a thread: "
 
@@ -11148,684 +12344,687 @@ msgstr "Failed to create a thread: "
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1140
+#: ../src/e-util/e-attachment.c:1138
 msgid "Attached message"
 msgstr "Attached message"
 
-#: ../e-util/e-attachment.c:2042 ../e-util/e-attachment.c:3098
+#: ../src/e-util/e-attachment.c:2063 ../src/e-util/e-attachment.c:3116
 msgid "Operation was cancelled"
 msgstr "Operation was cancelled"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment.c:2226 ../e-util/e-attachment.c:2945
-#: ../e-util/e-attachment.c:3388 ../e-util/e-attachment-store.c:884
+#: ../src/e-util/e-attachment.c:2247 ../src/e-util/e-attachment.c:2963
+#: ../src/e-util/e-attachment.c:3406 ../src/e-util/e-attachment-store.c:886
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../e-util/e-attachment.c:2307 ../e-util/e-attachment.c:3448
+#: ../src/e-util/e-attachment.c:2325 ../src/e-util/e-attachment.c:3466
 msgid "A load operation is already in progress"
 msgstr "A load operation is already in progress"
 
-#: ../e-util/e-attachment.c:2315 ../e-util/e-attachment.c:3456
+#: ../src/e-util/e-attachment.c:2333 ../src/e-util/e-attachment.c:3474
 msgid "A save operation is already in progress"
 msgstr "A save operation is already in progress"
 
-#: ../e-util/e-attachment.c:2712
+#: ../src/e-util/e-attachment.c:2730
 #, c-format
-msgid "Could not open '%s'"
-msgstr "Could not open '%s'"
+#| msgid "Could not open %s:"
+msgid "Could not open “%s”"
+msgstr "Could not open “%s”"
 
-#: ../e-util/e-attachment.c:2715
+#: ../src/e-util/e-attachment.c:2733
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Could not open the attachment"
 
-#: ../e-util/e-attachment.c:3465
+#: ../src/e-util/e-attachment.c:3483
 msgid "Attachment contents not loaded"
 msgstr "Attachment contents not loaded"
 
-#: ../e-util/e-attachment.c:3556
+#: ../src/e-util/e-attachment.c:3574
 #, c-format
-msgid "Could not save '%s'"
-msgstr "Could not save '%s'"
+#| msgid "Could not save '%s'"
+msgid "Could not save “%s”"
+msgstr "Could not save “%s”"
 
-#: ../e-util/e-attachment.c:3559
+#: ../src/e-util/e-attachment.c:3577
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Could not save the attachment"
 
-#: ../e-util/e-attachment-dialog.c:317
+#: ../src/e-util/e-attachment-dialog.c:315
 msgid "Attachment Properties"
 msgstr "Attachment Properties"
 
-#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:278
+#: ../src/e-util/e-attachment-dialog.c:337
+#: ../src/e-util/e-import-assistant.c:276
 msgid "F_ilename:"
 msgstr "F_ilename:"
 
-#: ../e-util/e-attachment-dialog.c:356
-#: ../e-util/e-html-editor-image-dialog.c:510
-#: ../e-util/e-html-editor-link-dialog.c:243
+#: ../src/e-util/e-attachment-dialog.c:354
+#: ../src/e-util/e-html-editor-image-dialog.c:508
+#: ../src/e-util/e-html-editor-link-dialog.c:241
+#: ../src/e-util/e-webdav-browser.c:2447
 msgid "_Description:"
 msgstr "_Description:"
 
-#: ../e-util/e-attachment-dialog.c:374
+#: ../src/e-util/e-attachment-dialog.c:372
 msgid "MIME Type:"
 msgstr "MIME Type:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:696
+#: ../src/e-util/e-attachment-dialog.c:380
+#: ../src/e-util/e-attachment-store.c:694
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggest automatic display of attachment"
 
-#: ../e-util/e-attachment-handler-image.c:98
+#: ../src/e-util/e-attachment-handler-image.c:96
 msgid "Could not set as background"
 msgstr "Could not set as background"
 
-#: ../e-util/e-attachment-handler-image.c:148
+#: ../src/e-util/e-attachment-handler-image.c:146
 msgid "Set as _Background"
 msgstr "Set as _Background"
 
-#: ../e-util/e-attachment-icon-view.c:170
-#: ../e-util/e-attachment-tree-view.c:170
+#: ../src/e-util/e-attachment-icon-view.c:168
+#: ../src/e-util/e-attachment-tree-view.c:168
 msgid "Loading"
 msgstr "Loading"
 
-#: ../e-util/e-attachment-icon-view.c:182
-#: ../e-util/e-attachment-tree-view.c:182
+#: ../src/e-util/e-attachment-icon-view.c:180
+#: ../src/e-util/e-attachment-tree-view.c:180
 msgid "Saving"
 msgstr "Saving"
 
-#: ../e-util/e-attachment-paned.c:107
+#: ../src/e-util/e-attachment-paned.c:103
 msgid "Hide Attachment _Bar"
 msgstr "Hide Attachment _Bar"
 
-#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:751
+#: ../src/e-util/e-attachment-paned.c:105
+#: ../src/e-util/e-attachment-paned.c:741
 msgid "Show Attachment _Bar"
 msgstr "Show Attachment _Bar"
 
-#: ../e-util/e-attachment-store.c:661
+#: ../src/e-util/e-attachment-store.c:659
 msgid "Add Attachment"
 msgstr "Add Attachment"
 
-#: ../e-util/e-attachment-store.c:668 ../e-util/e-attachment-store.c:670
+#: ../src/e-util/e-attachment-store.c:666
+#: ../src/e-util/e-attachment-store.c:668
 msgid "A_ttach"
 msgstr "A_ttach"
 
-#: ../e-util/e-attachment-store.c:717
+#: ../src/e-util/e-attachment-store.c:715
 msgid "Archive selected directories using this format:"
 msgstr "Archive selected directories using this format:"
 
-#: ../e-util/e-attachment-store.c:821
+#: ../src/e-util/e-attachment-store.c:823
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Save Attachment"
 msgstr[1] "Save Attachments"
 
-#: ../e-util/e-attachment-store.c:848
+#: ../src/e-util/e-attachment-store.c:850
 msgid "Do _not extract files from the attachment"
 msgstr "Do _not extract files from the attachment"
 
-#: ../e-util/e-attachment-store.c:853
+#: ../src/e-util/e-attachment-store.c:855
 msgid "Save extracted files _only"
 msgstr "Save extracted files _only"
 
-#: ../e-util/e-attachment-store.c:858
+#: ../src/e-util/e-attachment-store.c:860
 msgid "Save extracted files and the original _archive"
 msgstr "Save extracted files and the original _archive"
 
-#: ../e-util/e-attachment-view.c:310
+#: ../src/e-util/e-attachment-view.c:309
 msgid "Open With Other Application..."
 msgstr "Open With Other Application…"
 
-#: ../e-util/e-attachment-view.c:317
+#: ../src/e-util/e-attachment-view.c:316
 msgid "S_ave All"
 msgstr "S_ave All"
 
-#: ../e-util/e-attachment-view.c:324
+#: ../src/e-util/e-attachment-view.c:323
 msgid "Sa_ve As"
 msgstr "Sa_ve As"
 
-#: ../e-util/e-attachment-view.c:333
-#: ../plugins/save-calendar/save-calendar.c:349
-#: ../plugins/save-calendar/save-calendar.c:380
-#: ../plugins/save-calendar/save-calendar.c:411
+#: ../src/e-util/e-attachment-view.c:332
+#: ../src/plugins/save-calendar/save-calendar.c:351
+#: ../src/plugins/save-calendar/save-calendar.c:382
+#: ../src/plugins/save-calendar/save-calendar.c:413
 msgid "Save _As"
 msgstr "Save _As"
 
-#: ../e-util/e-attachment-view.c:343
+#: ../src/e-util/e-attachment-view.c:342
 msgid "A_dd Attachment..."
 msgstr "A_dd Attachment…"
 
-#: ../e-util/e-attachment-view.c:350
-#: ../modules/addressbook/e-book-shell-view-actions.c:1097
-#: ../modules/calendar/e-cal-shell-view-actions.c:1278
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
-#: ../modules/calendar/e-task-shell-view-actions.c:733
-#: ../modules/mail/e-mail-shell-view-actions.c:1717
-#: ../modules/mail/e-mail-shell-view-actions.c:1788
+#: ../src/e-util/e-attachment-view.c:349
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1316
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:605
+#: ../src/modules/calendar/e-task-shell-view-actions.c:731
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1645
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
 msgid "_Properties"
 msgstr "_Properties"
 
-#: ../e-util/e-attachment-view.c:660
+#: ../src/e-util/e-attachment-view.c:778
 #, c-format
-msgid "Open With \"%s\""
-msgstr "Open With \"%s\""
+#| msgid "Open With \"%s\""
+msgid "Open With “%s”"
+msgstr "Open With “%s”"
 
-#: ../e-util/e-attachment-view.c:663
+#: ../src/e-util/e-attachment-view.c:781
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Open this attachment in %s"
 
-#: ../e-util/e-book-source-config.c:97
+#: ../src/e-util/e-book-source-config.c:98
 msgid "Mark as default address book"
 msgstr "Mark as default address book"
 
-#: ../e-util/e-book-source-config.c:102
+#: ../src/e-util/e-book-source-config.c:103
 msgid "Autocomplete with this address book"
 msgstr "Autocomplete with this address book"
 
-#: ../e-util/e-book-source-config.c:276
+#: ../src/e-util/e-book-source-config.c:277
 msgid "Copy book content locally for offline operation"
 msgstr "Copy book content locally for offline operation"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../e-util/e-buffer-tagger.c:412
+#: ../src/e-util/e-buffer-tagger.c:410
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-click to open a link"
 
-#: ../e-util/e-calendar.c:272
+#: ../src/e-util/e-calendar.c:272
 msgid "Previous month"
 msgstr "Previous month"
 
-#: ../e-util/e-calendar.c:291
+#: ../src/e-util/e-calendar.c:291
 msgid "Next month"
 msgstr "Next month"
 
-#: ../e-util/e-calendar.c:311
+#: ../src/e-util/e-calendar.c:311
 msgid "Previous year"
 msgstr "Previous year"
 
-#: ../e-util/e-calendar.c:330
+#: ../src/e-util/e-calendar.c:330
 msgid "Next year"
 msgstr "Next year"
 
-#: ../e-util/e-calendar.c:354
+#: ../src/e-util/e-calendar.c:354
 msgid "Month Calendar"
 msgstr "Month Calendar"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1340 ../e-util/e-calendar-item.c:2220
+#: ../src/e-util/e-calendar-item.c:1338 ../src/e-util/e-calendar-item.c:2218
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1342
+#: ../src/e-util/e-calendar-item.c:1340
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1379
+#: ../src/e-util/e-calendar-item.c:1377
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../e-util/e-cal-source-config.c:169
+#: ../src/e-util/e-cal-source-config.c:169
 msgid "Mark as default calendar"
 msgstr "Mark as default calendar"
 
-#: ../e-util/e-cal-source-config.c:172
+#: ../src/e-util/e-cal-source-config.c:172
 msgid "Mark as default task list"
 msgstr "Mark as default task list"
 
-#: ../e-util/e-cal-source-config.c:175
+#: ../src/e-util/e-cal-source-config.c:175
 msgid "Mark as default memo list"
 msgstr "Mark as default memo list"
 
-#: ../e-util/e-cal-source-config.c:200
+#: ../src/e-util/e-cal-source-config.c:200
 msgid "Color:"
 msgstr "Colour:"
 
-#: ../e-util/e-cal-source-config.c:428
+#: ../src/e-util/e-cal-source-config.c:428
 msgid "Copy calendar contents locally for offline operation"
 msgstr "Copy calendar contents locally for offline operation"
 
-#: ../e-util/e-cal-source-config.c:432
+#: ../src/e-util/e-cal-source-config.c:432
 msgid "Copy task list contents locally for offline operation"
 msgstr "Copy task list contents locally for offline operation"
 
-#: ../e-util/e-cal-source-config.c:436
+#: ../src/e-util/e-cal-source-config.c:436
 msgid "Copy memo list contents locally for offline operation"
 msgstr "Copy memo list contents locally for offline operation"
 
-#: ../e-util/e-categories-editor.c:223
+#: ../src/e-util/e-categories-editor.c:246
 msgid "Currently _used categories:"
 msgstr "Currently _used categories:"
 
-#: ../e-util/e-categories-editor.c:234
+#: ../src/e-util/e-categories-editor.c:257
 msgid "_Available Categories:"
 msgstr "_Available Categories:"
 
-#: ../e-util/e-categories-editor.c:274
+#: ../src/e-util/e-categories-editor.c:297
 msgctxt "category"
 msgid "_New"
 msgstr "_New"
 
-#: ../e-util/e-categories-editor.c:278
+#: ../src/e-util/e-categories-editor.c:301
 msgctxt "category"
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../e-util/e-categories-editor.c:282
+#: ../src/e-util/e-categories-editor.c:305
 msgctxt "category"
 msgid "_Delete"
 msgstr "_Delete"
 
-#: ../e-util/e-categories-selector.c:322
+#: ../src/e-util/e-categories-selector.c:323
 msgid "Icon"
 msgstr "Icon"
 
-#: ../e-util/e-category-completion.c:307
+#: ../src/e-util/e-category-completion.c:304
 #, c-format
-msgid "Create category \"%s\""
-msgstr "Create category \"%s\""
+#| msgid "Create category \"%s\""
+msgid "Create category “%s”"
+msgstr "Create category “%s”"
 
-#: ../e-util/e-category-editor.c:136
+#: ../src/e-util/e-category-editor.c:138
 msgid "Category Icon"
 msgstr "Category Icon"
 
-#: ../e-util/e-category-editor.c:140
+#: ../src/e-util/e-category-editor.c:142
 msgid "_No Image"
 msgstr "_No Image"
 
-#: ../e-util/e-category-editor.c:173
+#: ../src/e-util/e-category-editor.c:175
 msgid "Category _Name"
 msgstr "Category _Name"
 
-#: ../e-util/e-category-editor.c:185
+#: ../src/e-util/e-category-editor.c:188
 msgid "Category _Icon"
 msgstr "Category _Icon"
 
-#: ../e-util/e-category-editor.c:211
+#: ../src/e-util/e-category-editor.c:214
 msgid "Category Properties"
 msgstr "Category Properties"
 
-#: ../e-util/e-category-editor.c:272
+#: ../src/e-util/e-category-editor.c:275
 #, c-format
+#| msgid ""
+#| "There is already a category '%s' in the configuration. Please use another "
+#| "name"
 msgid ""
-"There is already a category '%s' in the configuration. Please use another "
+"There is already a category “%s” in the configuration. Please use another "
 "name"
 msgstr ""
-"There is already a category '%s' in the configuration. Please use another "
+"There is already a category “%s” in the configuration. Please use another "
 "name"
 
-#: ../e-util/e-cell-combo.c:185
+#: ../src/e-util/e-cell-combo.c:183
 msgid "popup list"
 msgstr "popup list"
 
-#: ../e-util/e-cell-date.c:51 ../e-util/e-cell-date.c:139
-#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2054
+#: ../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:2066
 msgid "?"
 msgstr "?"
 
-#: ../e-util/e-cell-date-edit.c:303
+#: ../src/e-util/e-cell-date-edit.c:320
 msgid "Now"
 msgstr "Now"
 
-#. strftime format of a weekday and a date.
-#: ../e-util/e-cell-date-edit.c:311 ../e-util/e-datetime-format.c:208
-#: ../modules/calendar/e-cal-shell-view-actions.c:1793
-#: ../modules/itip-formatter/itip-view.c:255
-msgid "Today"
-msgstr "Today"
-
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../e-util/e-cell-date-edit.c:321
+#: ../src/e-util/e-cell-date-edit.c:338
 msgctxt "table-date"
 msgid "None"
 msgstr "None"
 
-#: ../e-util/e-cell-date-edit.c:329 ../mail/e-mail-label-dialog.c:200
+#: ../src/e-util/e-cell-date-edit.c:346 ../src/mail/e-mail-label-dialog.c:198
 msgid "OK"
 msgstr "OK"
 
-#: ../e-util/e-cell-date-edit.c:878
+#: ../src/e-util/e-cell-date-edit.c:901
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "The time must be in the format: %s"
 
-#: ../e-util/e-cell-percent.c:81
+#: ../src/e-util/e-cell-percent.c:79
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "The percent value must be between 0 and 100, inclusive"
 
-#: ../e-util/e-charset.c:52
+#: ../src/e-util/e-charset.c:50
 msgid "Arabic"
 msgstr "Arabic"
 
-#: ../e-util/e-charset.c:53
+#: ../src/e-util/e-charset.c:51
 msgid "Baltic"
 msgstr "Baltic"
 
-#: ../e-util/e-charset.c:54
+#: ../src/e-util/e-charset.c:52
 msgid "Central European"
 msgstr "Central European"
 
-#: ../e-util/e-charset.c:55
+#: ../src/e-util/e-charset.c:53
 msgid "Chinese"
 msgstr "Chinese"
 
-#: ../e-util/e-charset.c:56
+#: ../src/e-util/e-charset.c:54
 msgid "Cyrillic"
 msgstr "Cyrillic"
 
-#: ../e-util/e-charset.c:57
+#: ../src/e-util/e-charset.c:55
 msgid "Greek"
 msgstr "Greek"
 
-#: ../e-util/e-charset.c:58
+#: ../src/e-util/e-charset.c:56
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: ../e-util/e-charset.c:59
+#: ../src/e-util/e-charset.c:57
 msgid "Japanese"
 msgstr "Japanese"
 
-#: ../e-util/e-charset.c:60
+#: ../src/e-util/e-charset.c:58
 msgid "Korean"
 msgstr "Korean"
 
-#: ../e-util/e-charset.c:61
+#: ../src/e-util/e-charset.c:59
 msgid "Thai"
 msgstr "Thai"
 
-#: ../e-util/e-charset.c:62
+#: ../src/e-util/e-charset.c:60
 msgid "Turkish"
 msgstr "Turkish"
 
-#: ../e-util/e-charset.c:63
+#: ../src/e-util/e-charset.c:61
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../e-util/e-charset.c:64
+#: ../src/e-util/e-charset.c:62
 msgid "Western European"
 msgstr "Western European"
 
-#: ../e-util/e-charset.c:65
+#: ../src/e-util/e-charset.c:63
 msgid "Western European, New"
 msgstr "Western European, New"
 
 #. Translators: Character set "Chinese, Traditional"
-#: ../e-util/e-charset.c:84 ../e-util/e-charset.c:86 ../e-util/e-charset.c:88
+#: ../src/e-util/e-charset.c:82 ../src/e-util/e-charset.c:84
+#: ../src/e-util/e-charset.c:86
 msgid "Traditional"
 msgstr "Traditional"
 
 #. Translators: Character set "Chinese, Simplified"
-#: ../e-util/e-charset.c:90 ../e-util/e-charset.c:92 ../e-util/e-charset.c:94
-#: ../e-util/e-charset.c:96
+#: ../src/e-util/e-charset.c:88 ../src/e-util/e-charset.c:90
+#: ../src/e-util/e-charset.c:92 ../src/e-util/e-charset.c:94
 msgid "Simplified"
 msgstr "Simplified"
 
 #. Translators: Character set "Cyrillic, Ukrainian"
-#: ../e-util/e-charset.c:100
+#: ../src/e-util/e-charset.c:98
 msgid "Ukrainian"
 msgstr "Ukrainian"
 
 #. Translators: Character set "Hebrew, Visual"
-#: ../e-util/e-charset.c:104
+#: ../src/e-util/e-charset.c:102
 msgid "Visual"
 msgstr "Visual"
 
-#: ../e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-charset-combo-box.c:97
 msgid "Character Encoding"
 msgstr "Character Encoding"
 
-#: ../e-util/e-charset-combo-box.c:119
+#: ../src/e-util/e-charset-combo-box.c:117
 msgid "Enter the character set to use"
 msgstr "Enter the character set to use"
 
-#: ../e-util/e-charset-combo-box.c:365
+#: ../src/e-util/e-charset-combo-box.c:363
 msgid "Other..."
 msgstr "Other…"
 
-#: ../e-util/e-client-cache.c:1148 ../e-util/e-client-cache.c:1279
+#: ../src/e-util/e-client-cache.c:1149 ../src/e-util/e-client-cache.c:1280
 #, c-format
-msgid "Cannot create a client object from extension name '%s'"
-msgstr "Cannot create a client object from extension name '%s'"
+#| msgid "Cannot create a client object from extension name '%s'"
+msgid "Cannot create a client object from extension name “%s”"
+msgstr "Cannot create a client object from extension name “%s”"
 
-#: ../e-util/e-color-chooser-widget.c:124
+#: ../src/e-util/e-color-chooser-widget.c:122
 msgid "Choose custom color"
 msgstr "Choose custom colour"
 
-#: ../e-util/e-color-combo.c:81
+#: ../src/e-util/e-color-combo.c:79
 msgid "black"
 msgstr "black"
 
-#: ../e-util/e-color-combo.c:82
+#: ../src/e-util/e-color-combo.c:80
 msgid "light brown"
 msgstr "light brown"
 
-#: ../e-util/e-color-combo.c:83
+#: ../src/e-util/e-color-combo.c:81
 msgid "brown gold"
 msgstr "brown gold"
 
-#: ../e-util/e-color-combo.c:84
+#: ../src/e-util/e-color-combo.c:82
 msgid "dark green #2"
 msgstr "dark green #2"
 
-#: ../e-util/e-color-combo.c:85
+#: ../src/e-util/e-color-combo.c:83
 msgid "navy"
 msgstr "navy"
 
-#: ../e-util/e-color-combo.c:86
+#: ../src/e-util/e-color-combo.c:84
 msgid "dark blue"
 msgstr "dark blue"
 
-#: ../e-util/e-color-combo.c:87
+#: ../src/e-util/e-color-combo.c:85
 msgid "purple #2"
 msgstr "purple #2"
 
-#: ../e-util/e-color-combo.c:88
+#: ../src/e-util/e-color-combo.c:86
 msgid "very dark gray"
-msgstr "very dark gray"
+msgstr "very dark grey"
 
-#: ../e-util/e-color-combo.c:90
+#: ../src/e-util/e-color-combo.c:88
 msgid "dark red"
 msgstr "dark red"
 
-#: ../e-util/e-color-combo.c:91
+#: ../src/e-util/e-color-combo.c:89
 msgid "red-orange"
 msgstr "red-orange"
 
-#: ../e-util/e-color-combo.c:92
+#: ../src/e-util/e-color-combo.c:90
 msgid "gold"
 msgstr "gold"
 
-#: ../e-util/e-color-combo.c:93
+#: ../src/e-util/e-color-combo.c:91
 msgid "dark green"
 msgstr "dark green"
 
-#: ../e-util/e-color-combo.c:94
+#: ../src/e-util/e-color-combo.c:92
 msgid "dull blue"
 msgstr "dull blue"
 
-#: ../e-util/e-color-combo.c:95
+#: ../src/e-util/e-color-combo.c:93
 msgid "blue"
 msgstr "blue"
 
-#: ../e-util/e-color-combo.c:96
+#: ../src/e-util/e-color-combo.c:94
 msgid "dull purple"
 msgstr "dull purple"
 
-#: ../e-util/e-color-combo.c:97
+#: ../src/e-util/e-color-combo.c:95
 msgid "dark grey"
 msgstr "dark grey"
 
-#: ../e-util/e-color-combo.c:99
+#: ../src/e-util/e-color-combo.c:97
 msgid "red"
 msgstr "red"
 
-#: ../e-util/e-color-combo.c:100
+#: ../src/e-util/e-color-combo.c:98
 msgid "orange"
 msgstr "orange"
 
-#: ../e-util/e-color-combo.c:101
+#: ../src/e-util/e-color-combo.c:99
 msgid "lime"
 msgstr "lime"
 
-#: ../e-util/e-color-combo.c:102
+#: ../src/e-util/e-color-combo.c:100
 msgid "dull green"
 msgstr "dull green"
 
-#: ../e-util/e-color-combo.c:103
+#: ../src/e-util/e-color-combo.c:101
 msgid "dull blue #2"
 msgstr "dull blue #2"
 
-#: ../e-util/e-color-combo.c:104
+#: ../src/e-util/e-color-combo.c:102
 msgid "sky blue #2"
 msgstr "sky blue #2"
 
-#: ../e-util/e-color-combo.c:105
+#: ../src/e-util/e-color-combo.c:103
 msgid "purple"
 msgstr "purple"
 
-#: ../e-util/e-color-combo.c:106
+#: ../src/e-util/e-color-combo.c:104
 msgid "gray"
-msgstr "gray"
+msgstr "grey"
 
-#: ../e-util/e-color-combo.c:108
+#: ../src/e-util/e-color-combo.c:106
 msgid "magenta"
 msgstr "magenta"
 
-#: ../e-util/e-color-combo.c:109
+#: ../src/e-util/e-color-combo.c:107
 msgid "bright orange"
 msgstr "bright orange"
 
-#: ../e-util/e-color-combo.c:110
+#: ../src/e-util/e-color-combo.c:108
 msgid "yellow"
 msgstr "yellow"
 
-#: ../e-util/e-color-combo.c:111
+#: ../src/e-util/e-color-combo.c:109
 msgid "green"
 msgstr "green"
 
-#: ../e-util/e-color-combo.c:112
+#: ../src/e-util/e-color-combo.c:110
 msgid "cyan"
 msgstr "cyan"
 
-#: ../e-util/e-color-combo.c:113
+#: ../src/e-util/e-color-combo.c:111
 msgid "bright blue"
 msgstr "bright blue"
 
-#: ../e-util/e-color-combo.c:114
+#: ../src/e-util/e-color-combo.c:112
 msgid "red purple"
 msgstr "red purple"
 
-#: ../e-util/e-color-combo.c:115
+#: ../src/e-util/e-color-combo.c:113
 msgid "light grey"
 msgstr "light grey"
 
-#: ../e-util/e-color-combo.c:117
+#: ../src/e-util/e-color-combo.c:115
 msgid "pink"
 msgstr "pink"
 
-#: ../e-util/e-color-combo.c:118
+#: ../src/e-util/e-color-combo.c:116
 msgid "light orange"
 msgstr "light orange"
 
-#: ../e-util/e-color-combo.c:119
+#: ../src/e-util/e-color-combo.c:117
 msgid "light yellow"
 msgstr "light yellow"
 
-#: ../e-util/e-color-combo.c:120
+#: ../src/e-util/e-color-combo.c:118
 msgid "light green"
 msgstr "light green"
 
-#: ../e-util/e-color-combo.c:121
+#: ../src/e-util/e-color-combo.c:119
 msgid "light cyan"
 msgstr "light cyan"
 
-#: ../e-util/e-color-combo.c:122
+#: ../src/e-util/e-color-combo.c:120
 msgid "light blue"
 msgstr "light blue"
 
-#: ../e-util/e-color-combo.c:123
+#: ../src/e-util/e-color-combo.c:121
 msgid "light purple"
 msgstr "light purple"
 
-#: ../e-util/e-color-combo.c:124
+#: ../src/e-util/e-color-combo.c:122
 msgid "white"
 msgstr "white"
 
-#: ../e-util/e-color-combo.c:644 ../mail/e-mail-account-tree-view.c:134
-#: ../mail/e-mail-config-security-page.c:426
-#: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4063
-#: ../mail/mail-config.ui.h:73
+#: ../src/e-util/e-color-combo.c:642 ../src/mail/e-mail-account-tree-view.c:135
+#: ../src/mail/e-mail-config-security-page.c:404
+#: ../src/mail/e-mail-config-security-page.c:568
+#: ../src/mail/e-mail-reader.c:4043 ../src/mail/mail-config.ui.h:76
 msgid "Default"
 msgstr "Default"
 
-#: ../e-util/e-dateedit.c:526
+#: ../src/e-util/e-dateedit.c:524
 msgid "Date and Time"
 msgstr "Date and Time"
 
-#: ../e-util/e-dateedit.c:551
+#: ../src/e-util/e-dateedit.c:549
 msgid "Text entry to input date"
 msgstr "Text entry to input date"
 
-#: ../e-util/e-dateedit.c:574
+#: ../src/e-util/e-dateedit.c:572
 msgid "Click this button to show a calendar"
 msgstr "Click this button to show a calendar"
 
-#: ../e-util/e-dateedit.c:628
+#: ../src/e-util/e-dateedit.c:626
 msgid "Drop-down combination box to select time"
 msgstr "Drop-down combination box to select time"
 
-#: ../e-util/e-dateedit.c:629 ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../src/e-util/e-dateedit.c:627
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Time"
 
-#: ../e-util/e-dateedit.c:703
+#: ../src/e-util/e-dateedit.c:701
 msgid "No_w"
 msgstr "No_w"
 
-#: ../e-util/e-dateedit.c:710
+#: ../src/e-util/e-dateedit.c:708
 msgid "_Today"
 msgstr "_Today"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:719
+#: ../src/e-util/e-dateedit.c:717
 msgid "_None"
 msgstr "_None"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1841 ../e-util/e-dateedit.c:2089
+#: ../src/e-util/e-dateedit.c:1846 ../src/e-util/e-dateedit.c:2094
 msgctxt "date"
 msgid "None"
 msgstr "None"
 
-#: ../e-util/e-dateedit.c:1981
+#: ../src/e-util/e-dateedit.c:1986
 msgid "Invalid Date Value"
 msgstr "Invalid Date Value"
 
-#: ../e-util/e-dateedit.c:2026
+#: ../src/e-util/e-dateedit.c:2031
 msgid "Invalid Time Value"
 msgstr "Invalid Time Value"
 
-#. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:283
-msgid "Tomorrow"
-msgstr "Tomorrow"
-
-#: ../e-util/e-datetime-format.c:221
+#: ../src/e-util/e-datetime-format.c:219
 msgid "Yesterday"
 msgstr "Yesterday"
 
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:229
+#: ../src/e-util/e-datetime-format.c:227
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Next Mon"
@@ -11833,7 +13032,7 @@ msgstr "Next Mon"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:235
+#: ../src/e-util/e-datetime-format.c:233
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Next Tue"
@@ -11841,7 +13040,7 @@ msgstr "Next Tue"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:241
+#: ../src/e-util/e-datetime-format.c:239
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Next Wed"
@@ -11849,7 +13048,7 @@ msgstr "Next Wed"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:247
+#: ../src/e-util/e-datetime-format.c:245
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Next Thu"
@@ -11857,7 +13056,7 @@ msgstr "Next Thu"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:253
+#: ../src/e-util/e-datetime-format.c:251
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Next Fri"
@@ -11865,7 +13064,7 @@ msgstr "Next Fri"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:259
+#: ../src/e-util/e-datetime-format.c:257
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Next Sat"
@@ -11873,281 +13072,316 @@ msgstr "Next Sat"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:265
+#: ../src/e-util/e-datetime-format.c:263
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Next Sun"
 
-#: ../e-util/e-datetime-format.c:351 ../e-util/e-datetime-format.c:361
-#: ../e-util/e-datetime-format.c:370
+#: ../src/e-util/e-datetime-format.c:349 ../src/e-util/e-datetime-format.c:359
+#: ../src/e-util/e-datetime-format.c:368
 msgid "Use locale default"
 msgstr "Use locale default"
 
-#: ../e-util/e-datetime-format.c:575
+#: ../src/e-util/e-datetime-format.c:573
 msgid "Format:"
 msgstr "Format:"
 
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ days ]"
+#: ../src/e-util/e-dialog-widgets.c:181
+#| msgid "days"
+msgctxt "time-unit"
+msgid "days"
+msgstr "days"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ weeks ]"
+#: ../src/e-util/e-dialog-widgets.c:183
+#| msgid "weeks"
+msgctxt "time-unit"
+msgid "weeks"
+msgstr "weeks"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ months ]"
+#: ../src/e-util/e-dialog-widgets.c:185
+#| msgid "months"
+msgctxt "time-unit"
+msgid "months"
+msgstr "months"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ years ]"
+#: ../src/e-util/e-dialog-widgets.c:187
+#| msgid "years"
+msgctxt "time-unit"
+msgid "years"
+msgstr "years"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ days ]"
+#: ../src/e-util/e-dialog-widgets.c:245
+msgid "Do not synchronize locally mails older than"
+msgstr "Do not synchronise locally mails older than"
+
 #. Translators: :-)
-#: ../e-util/e-emoticon-chooser.c:40
+#: ../src/e-util/e-emoticon-chooser.c:38
 msgid "_Smile"
 msgstr "_Smile"
 
 #. Translators: :-(
-#: ../e-util/e-emoticon-chooser.c:42
+#: ../src/e-util/e-emoticon-chooser.c:40
 msgid "S_ad"
 msgstr "S_ad"
 
 #. Translators: ;-)
-#: ../e-util/e-emoticon-chooser.c:44
+#: ../src/e-util/e-emoticon-chooser.c:42
 msgid "_Wink"
 msgstr "_Wink"
 
 #. Translators: :-P
-#: ../e-util/e-emoticon-chooser.c:46
+#: ../src/e-util/e-emoticon-chooser.c:44
 msgid "Ton_gue"
 msgstr "Ton_gue"
 
 #. Translators: :-))
-#: ../e-util/e-emoticon-chooser.c:48
+#: ../src/e-util/e-emoticon-chooser.c:46
 msgid "Laug_h"
 msgstr "Laug_h"
 
 #. Translators: :-|
-#: ../e-util/e-emoticon-chooser.c:50
+#: ../src/e-util/e-emoticon-chooser.c:48
 msgid "_Plain"
 msgstr "_Plain"
 
 #. Translators: :-!
-#: ../e-util/e-emoticon-chooser.c:52
+#: ../src/e-util/e-emoticon-chooser.c:50
 msgid "Smi_rk"
 msgstr "Smi_rk"
 
 #. Translators: :"-)
-#: ../e-util/e-emoticon-chooser.c:54
+#: ../src/e-util/e-emoticon-chooser.c:52
 msgid "_Embarrassed"
 msgstr "_Embarrassed"
 
 #. Translators: :-D
-#: ../e-util/e-emoticon-chooser.c:56
+#: ../src/e-util/e-emoticon-chooser.c:54
 msgid "_Big Smile"
 msgstr "_Big Smile"
 
 #. Translators: :-/
-#: ../e-util/e-emoticon-chooser.c:58
+#: ../src/e-util/e-emoticon-chooser.c:56
 msgid "Uncer_tain"
 msgstr "Uncer_tain"
 
 #. Translators: :-O
-#: ../e-util/e-emoticon-chooser.c:60
+#: ../src/e-util/e-emoticon-chooser.c:58
 msgid "S_urprise"
 msgstr "S_urprise"
 
 #. Translators: :-S
-#: ../e-util/e-emoticon-chooser.c:62
+#: ../src/e-util/e-emoticon-chooser.c:60
 msgid "W_orried"
 msgstr "W_orried"
 
 #. Translators: :-*
-#: ../e-util/e-emoticon-chooser.c:64
+#: ../src/e-util/e-emoticon-chooser.c:62
 msgid "_Kiss"
 msgstr "_Kiss"
 
 #. Translators: X-(
-#: ../e-util/e-emoticon-chooser.c:66
+#: ../src/e-util/e-emoticon-chooser.c:64
 msgid "A_ngry"
 msgstr "A_ngry"
 
 #. Translators: B-)
-#: ../e-util/e-emoticon-chooser.c:68
+#: ../src/e-util/e-emoticon-chooser.c:66
 msgid "_Cool"
 msgstr "_Cool"
 
 #. Translators: O:-)
-#: ../e-util/e-emoticon-chooser.c:70
+#: ../src/e-util/e-emoticon-chooser.c:68
 msgid "Ange_l"
 msgstr "Ange_l"
 
 #. Translators: :'(
-#: ../e-util/e-emoticon-chooser.c:72
+#: ../src/e-util/e-emoticon-chooser.c:70
 msgid "Cr_ying"
 msgstr "Cr_ying"
 
 #. Translators: :-Q
-#: ../e-util/e-emoticon-chooser.c:74
+#: ../src/e-util/e-emoticon-chooser.c:72
 msgid "S_ick"
 msgstr "S_ick"
 
 #. Translators: |-)
-#: ../e-util/e-emoticon-chooser.c:76
+#: ../src/e-util/e-emoticon-chooser.c:74
 msgid "Tire_d"
 msgstr "Tire_d"
 
 #. Translators: >:-)
-#: ../e-util/e-emoticon-chooser.c:78
+#: ../src/e-util/e-emoticon-chooser.c:76
 msgid "De_vilish"
 msgstr "De_vilish"
 
 #. Translators: :-(|)
-#: ../e-util/e-emoticon-chooser.c:80
+#: ../src/e-util/e-emoticon-chooser.c:78
 msgid "_Monkey"
 msgstr "_Monkey"
 
-#: ../e-util/e-file-utils.c:120
+#: ../src/e-util/e-file-utils.c:121
 msgid "(Unknown Filename)"
 msgstr "(Unknown Filename)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:124
+#: ../src/e-util/e-file-utils.c:125
 #, c-format
-msgid "Writing \"%s\""
-msgstr "Writing \"%s\""
+#| msgid "Writing \"%s\""
+msgid "Writing “%s”"
+msgstr "Writing “%s”"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:129
+#: ../src/e-util/e-file-utils.c:130
 #, c-format
-msgid "Writing \"%s\" to %s"
-msgstr "Writing \"%s\" to %s"
+#| msgid "Writing \"%s\" to %s"
+msgid "Writing “%s” to %s"
+msgstr "Writing “%s” to %s"
 
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../e-util/e-filter-datespec.c:66
+#: ../src/e-util/e-filter-datespec.c:64
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 second ago"
 msgstr[1] "%d seconds ago"
 
-#: ../e-util/e-filter-datespec.c:67
+#: ../src/e-util/e-filter-datespec.c:65
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 second in the future"
 msgstr[1] "%d seconds in the future"
 
-#: ../e-util/e-filter-datespec.c:68
+#: ../src/e-util/e-filter-datespec.c:66
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minute ago"
 msgstr[1] "%d minutes ago"
 
-#: ../e-util/e-filter-datespec.c:69
+#: ../src/e-util/e-filter-datespec.c:67
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 minute in the future"
 msgstr[1] "%d minutes in the future"
 
-#: ../e-util/e-filter-datespec.c:70
+#: ../src/e-util/e-filter-datespec.c:68
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 hour ago"
 msgstr[1] "%d hours ago"
 
-#: ../e-util/e-filter-datespec.c:71
+#: ../src/e-util/e-filter-datespec.c:69
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 hour in the future"
 msgstr[1] "%d hours in the future"
 
-#: ../e-util/e-filter-datespec.c:72
+#: ../src/e-util/e-filter-datespec.c:70
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 day ago"
 msgstr[1] "%d days ago"
 
-#: ../e-util/e-filter-datespec.c:73
+#: ../src/e-util/e-filter-datespec.c:71
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 day in the future"
 msgstr[1] "%d days in the future"
 
-#: ../e-util/e-filter-datespec.c:74
+#: ../src/e-util/e-filter-datespec.c:72
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 week ago"
 msgstr[1] "%d weeks ago"
 
-#: ../e-util/e-filter-datespec.c:75
+#: ../src/e-util/e-filter-datespec.c:73
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 week in the future"
 msgstr[1] "%d weeks in the future"
 
-#: ../e-util/e-filter-datespec.c:76
+#: ../src/e-util/e-filter-datespec.c:74
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 month ago"
 msgstr[1] "%d months ago"
 
-#: ../e-util/e-filter-datespec.c:77
+#: ../src/e-util/e-filter-datespec.c:75
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 month in the future"
 msgstr[1] "%d months in the future"
 
-#: ../e-util/e-filter-datespec.c:78
+#: ../src/e-util/e-filter-datespec.c:76
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 year ago"
 msgstr[1] "%d years ago"
 
-#: ../e-util/e-filter-datespec.c:79
+#: ../src/e-util/e-filter-datespec.c:77
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 year in the future"
 msgstr[1] "%d years in the future"
 
-#: ../e-util/e-filter-datespec.c:129
+#: ../src/e-util/e-filter-datespec.c:127
 msgid "<click here to select a date>"
 msgstr "<click here to select a date>"
 
-#: ../e-util/e-filter-datespec.c:132 ../e-util/e-filter-datespec.c:143
-#: ../e-util/e-filter-datespec.c:154
+#: ../src/e-util/e-filter-datespec.c:130 ../src/e-util/e-filter-datespec.c:141
+#: ../src/e-util/e-filter-datespec.c:152
 msgid "now"
 msgstr "now"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../e-util/e-filter-datespec.c:139
+#: ../src/e-util/e-filter-datespec.c:137
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../e-util/e-filter-datespec.c:288
+#: ../src/e-util/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "Select a time to compare against"
 
-#: ../e-util/e-filter-file.c:186
+#: ../src/e-util/e-filter-file.c:184
 msgid "Choose a File"
 msgstr "Choose a File"
 
-#: ../e-util/e-filter-rule.c:765
+#: ../src/e-util/e-filter-rule.c:763
 msgid "R_ule name:"
 msgstr "R_ule name:"
 
-#: ../e-util/e-filter-rule.c:815
+#: ../src/e-util/e-filter-rule.c:813
 msgid "all the following conditions"
 msgstr "all the following conditions"
 
-#: ../e-util/e-filter-rule.c:816
+#: ../src/e-util/e-filter-rule.c:814
 msgid "any of the following conditions"
 msgstr "any of the following conditions"
 
-#: ../e-util/e-filter-rule.c:822
+#: ../src/e-util/e-filter-rule.c:820
 msgid "_Find items which match:"
 msgstr "_Find items which match:"
 
-#: ../e-util/e-filter-rule.c:845
+#: ../src/e-util/e-filter-rule.c:843
 msgid "Find items that meet the following conditions"
 msgstr "Find items that meet the following conditions"
 
@@ -12155,1008 +13389,1021 @@ msgstr "Find items that meet the following conditions"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:860 ../e-util/e-html-editor-page-dialog.c:61
-#: ../e-util/e-mail-identity-combo-box.c:479
-#: ../e-util/e-mail-signature-combo-box.c:367
-#: ../libemail-engine/camel-null-store.c:27
-#: ../mail/e-mail-config-summary-page.c:139
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
+#: ../src/e-util/e-filter-rule.c:858
+#: ../src/e-util/e-html-editor-page-dialog.c:59
+#: ../src/e-util/e-mail-identity-combo-box.c:694
+#: ../src/e-util/e-mail-signature-combo-box.c:422
+#: ../src/libemail-engine/camel-null-store.c:29
+#: ../src/mail/e-mail-autoconfig.c:644
+#: ../src/mail/e-mail-config-summary-page.c:141
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:629
 msgid "None"
 msgstr "None"
 
-#: ../e-util/e-filter-rule.c:861
+#: ../src/e-util/e-filter-rule.c:859
 msgid "All related"
 msgstr "All related"
 
-#: ../e-util/e-filter-rule.c:862 ../e-util/e-send-options.ui.h:19
+#: ../src/e-util/e-filter-rule.c:860 ../src/e-util/e-send-options.ui.h:24
 msgid "Replies"
 msgstr "Replies"
 
-#: ../e-util/e-filter-rule.c:863
+#: ../src/e-util/e-filter-rule.c:861
 msgid "Replies and parents"
 msgstr "Replies and parents"
 
-#: ../e-util/e-filter-rule.c:864
+#: ../src/e-util/e-filter-rule.c:862
 msgid "No reply or parent"
 msgstr "No reply or parent"
 
-#: ../e-util/e-filter-rule.c:867
+#: ../src/e-util/e-filter-rule.c:865
 msgid "I_nclude threads:"
 msgstr "I_nclude threads:"
 
-#: ../e-util/e-filter-rule.c:946
+#: ../src/e-util/e-filter-rule.c:944
 msgid "A_dd Condition"
 msgstr "A_dd Condition"
 
-#: ../e-util/e-filter-rule.c:1260 ../e-util/filter.ui.h:1
-#: ../mail/em-utils.c:165
+#: ../src/e-util/e-filter-rule.c:1258 ../src/e-util/filter.ui.h:1
+#: ../src/mail/em-utils.c:166
 msgid "Incoming"
 msgstr "Incoming"
 
-#: ../e-util/e-filter-rule.c:1260 ../mail/em-utils.c:166
+#: ../src/e-util/e-filter-rule.c:1258 ../src/mail/em-utils.c:167
 msgid "Outgoing"
 msgstr "Outgoing"
 
-#: ../e-util/e-html-editor-actions.c:82
+#: ../src/e-util/e-html-editor-actions.c:80
 msgid "Failed to insert HTML file."
 msgstr "Failed to insert HTML file."
 
-#: ../e-util/e-html-editor-actions.c:120
+#: ../src/e-util/e-html-editor-actions.c:118
 msgid "Failed to insert text file."
 msgstr "Failed to insert text file."
 
-#: ../e-util/e-html-editor-actions.c:321
+#: ../src/e-util/e-html-editor-actions.c:319
 msgid "Insert HTML File"
 msgstr "Insert HTML File"
 
-#: ../e-util/e-html-editor-actions.c:327
+#: ../src/e-util/e-html-editor-actions.c:325
 msgid "HTML file"
 msgstr "HTML file"
 
-#: ../e-util/e-html-editor-actions.c:354
+#: ../src/e-util/e-html-editor-actions.c:355
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: ../e-util/e-html-editor-actions.c:412
+#: ../src/e-util/e-html-editor-actions.c:413
 msgid "Insert text file"
 msgstr "Insert text file"
 
-#: ../e-util/e-html-editor-actions.c:418
+#: ../src/e-util/e-html-editor-actions.c:419
 msgid "Text file"
 msgstr "Text file"
 
-#: ../e-util/e-html-editor-actions.c:866
+#: ../src/e-util/e-html-editor-actions.c:880
 msgid "Copy selected text to the clipboard"
 msgstr "Copy selected text to the clipboard"
 
-#: ../e-util/e-html-editor-actions.c:873
+#: ../src/e-util/e-html-editor-actions.c:887
 msgid "Cut selected text to the clipboard"
 msgstr "Cut selected text to the clipboard"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:880
+#: ../src/e-util/e-html-editor-actions.c:894
 msgid "Paste text from the clipboard"
 msgstr "Paste text from the clipboard"
 
-#: ../e-util/e-html-editor-actions.c:887
+#: ../src/e-util/e-html-editor-actions.c:901
 msgid "Redo the last undone action"
 msgstr "Redo the last undone action"
 
-#: ../e-util/e-html-editor-actions.c:901
+#: ../src/e-util/e-html-editor-actions.c:915
 msgid "Undo the last action"
 msgstr "Undo the last action"
 
-#: ../e-util/e-html-editor-actions.c:922
+#: ../src/e-util/e-html-editor-actions.c:936
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ../e-util/e-html-editor-actions.c:929
+#: ../src/e-util/e-html-editor-actions.c:943
 msgid "_Paragraph Style"
 msgstr "_Paragraph Style"
 
-#: ../e-util/e-html-editor-actions.c:943
-#: ../e-util/e-html-editor-image-dialog.c:587
+#: ../src/e-util/e-html-editor-actions.c:957
+#: ../src/e-util/e-html-editor-image-dialog.c:585
 msgid "_Alignment"
 msgstr "_Alignment"
 
-#: ../e-util/e-html-editor-actions.c:950
+#: ../src/e-util/e-html-editor-actions.c:964
 msgid "Current _Languages"
 msgstr "Current _Languages"
 
-#: ../e-util/e-html-editor-actions.c:967
+#: ../src/e-util/e-html-editor-actions.c:981
 msgid "_Increase Indent"
 msgstr "_Increase Indent"
 
-#: ../e-util/e-html-editor-actions.c:969
+#: ../src/e-util/e-html-editor-actions.c:983
 msgid "Increase Indent"
 msgstr "Increase Indent"
 
-#: ../e-util/e-html-editor-actions.c:974
+#: ../src/e-util/e-html-editor-actions.c:988
 msgid "_HTML File..."
 msgstr "_HTML File..."
 
-#: ../e-util/e-html-editor-actions.c:981
+#: ../src/e-util/e-html-editor-actions.c:995
 msgid "Te_xt File..."
 msgstr "Te_xt File..."
 
-#: ../e-util/e-html-editor-actions.c:988
+#: ../src/e-util/e-html-editor-actions.c:1002
 msgid "Paste _Quotation"
 msgstr "Paste _Quotation"
 
-#: ../e-util/e-html-editor-actions.c:995
+#: ../src/e-util/e-html-editor-actions.c:1009
 msgid "_Find..."
 msgstr "_Find..."
 
-#: ../e-util/e-html-editor-actions.c:997
+#: ../src/e-util/e-html-editor-actions.c:1011
 msgid "Search for text"
 msgstr "Search for text"
 
-#: ../e-util/e-html-editor-actions.c:1002
+#: ../src/e-util/e-html-editor-actions.c:1016
 msgid "Find A_gain"
 msgstr "Find A_gain"
 
-#: ../e-util/e-html-editor-actions.c:1009
+#: ../src/e-util/e-html-editor-actions.c:1023
 msgid "Re_place..."
 msgstr "Re_place..."
 
-#: ../e-util/e-html-editor-actions.c:1011
+#: ../src/e-util/e-html-editor-actions.c:1025
 msgid "Search for and replace text"
 msgstr "Search for and replace text"
 
-#: ../e-util/e-html-editor-actions.c:1016
+#: ../src/e-util/e-html-editor-actions.c:1030
 msgid "Check _Spelling..."
 msgstr "Check _Spelling..."
 
-#: ../e-util/e-html-editor-actions.c:1023
+#: ../src/e-util/e-html-editor-actions.c:1037
 msgid "_Decrease Indent"
 msgstr "_Decrease Indent"
 
-#: ../e-util/e-html-editor-actions.c:1025
+#: ../src/e-util/e-html-editor-actions.c:1039
 msgid "Decrease Indent"
 msgstr "Decrease Indent"
 
-#: ../e-util/e-html-editor-actions.c:1030
+#: ../src/e-util/e-html-editor-actions.c:1044
 msgid "_Wrap Lines"
 msgstr "_Wrap Lines"
 
 #. Center
-#: ../e-util/e-html-editor-actions.c:1040
-#: ../e-util/e-html-editor-paragraph-dialog.c:110
+#: ../src/e-util/e-html-editor-actions.c:1054
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:108
 msgid "_Center"
 msgstr "_Centre"
 
-#: ../e-util/e-html-editor-actions.c:1042
+#: ../src/e-util/e-html-editor-actions.c:1056
 msgid "Center Alignment"
 msgstr "Centre Alignment"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1047
-#: ../e-util/e-html-editor-paragraph-dialog.c:101
+#: ../src/e-util/e-html-editor-actions.c:1061
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:99
 msgid "_Left"
 msgstr "_Left"
 
-#: ../e-util/e-html-editor-actions.c:1049
+#: ../src/e-util/e-html-editor-actions.c:1063
 msgid "Left Alignment"
 msgstr "Left Alignment"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1054
-#: ../e-util/e-html-editor-paragraph-dialog.c:119
+#: ../src/e-util/e-html-editor-actions.c:1068
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:117
 msgid "_Right"
 msgstr "_Right"
 
-#: ../e-util/e-html-editor-actions.c:1056
+#: ../src/e-util/e-html-editor-actions.c:1070
 msgid "Right Alignment"
 msgstr "Right Alignment"
 
-#: ../e-util/e-html-editor-actions.c:1064
-#: ../modules/text-highlight/languages.c:72
+#: ../src/e-util/e-html-editor-actions.c:1078
+#: ../src/modules/text-highlight/languages.c:70
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1066
+#: ../src/e-util/e-html-editor-actions.c:1080
 msgid "HTML editing mode"
 msgstr "HTML editing mode"
 
-#: ../e-util/e-html-editor-actions.c:1071
+#: ../src/e-util/e-html-editor-actions.c:1085
 msgid "Plain _Text"
 msgstr "Plain _Text"
 
-#: ../e-util/e-html-editor-actions.c:1073
+#: ../src/e-util/e-html-editor-actions.c:1087
 msgid "Plain text editing mode"
 msgstr "Plain text editing mode"
 
-#: ../e-util/e-html-editor-actions.c:1081
+#: ../src/e-util/e-html-editor-actions.c:1095
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../e-util/e-html-editor-actions.c:1088
-msgid "Header _1"
-msgstr "Header _1"
-
-#: ../e-util/e-html-editor-actions.c:1095
-msgid "Header _2"
-msgstr "Header _2"
-
-#: ../e-util/e-html-editor-actions.c:1102
-msgid "Header _3"
-msgstr "Header _3"
-
-#: ../e-util/e-html-editor-actions.c:1109
-msgid "Header _4"
-msgstr "Header _4"
-
-#: ../e-util/e-html-editor-actions.c:1116
-msgid "Header _5"
-msgstr "Header _5"
-
-#: ../e-util/e-html-editor-actions.c:1123
-msgid "Header _6"
-msgstr "Header _6"
-
-#: ../e-util/e-html-editor-actions.c:1130
+#: ../src/e-util/e-html-editor-actions.c:1102
+#| msgid "Headings"
+msgid "Heading _1"
+msgstr "Heading _1"
+
+#: ../src/e-util/e-html-editor-actions.c:1109
+#| msgid "Headings"
+msgid "Heading _2"
+msgstr "Heading _2"
+
+#: ../src/e-util/e-html-editor-actions.c:1116
+#| msgid "Headings"
+msgid "Heading _3"
+msgstr "Heading _3"
+
+#: ../src/e-util/e-html-editor-actions.c:1123
+#| msgid "Headings"
+msgid "Heading _4"
+msgstr "Heading _4"
+
+#: ../src/e-util/e-html-editor-actions.c:1130
+#| msgid "Headings"
+msgid "Heading _5"
+msgstr "Heading _5"
+
+#: ../src/e-util/e-html-editor-actions.c:1137
+#| msgid "Headings"
+msgid "Heading _6"
+msgstr "Heading _6"
+
+#: ../src/e-util/e-html-editor-actions.c:1144
 msgid "_Preformatted"
 msgstr "_Preformatted"
 
-#: ../e-util/e-html-editor-actions.c:1137
+#: ../src/e-util/e-html-editor-actions.c:1151
 msgid "A_ddress"
 msgstr "A_ddress"
 
-#: ../e-util/e-html-editor-actions.c:1144
+#: ../src/e-util/e-html-editor-actions.c:1158
 msgid "_Bulleted List"
 msgstr "_Bulleted List"
 
-#: ../e-util/e-html-editor-actions.c:1151
+#: ../src/e-util/e-html-editor-actions.c:1165
 msgid "_Roman Numeral List"
 msgstr "_Roman Numeral List"
 
-#: ../e-util/e-html-editor-actions.c:1158
+#: ../src/e-util/e-html-editor-actions.c:1172
 msgid "Numbered _List"
 msgstr "Numbered _List"
 
-#: ../e-util/e-html-editor-actions.c:1165
+#: ../src/e-util/e-html-editor-actions.c:1179
 msgid "_Alphabetical List"
 msgstr "_Alphabetical List"
 
-#: ../e-util/e-html-editor-actions.c:1181
-#: ../e-util/e-html-editor-actions.c:1219
+#: ../src/e-util/e-html-editor-actions.c:1195
+#: ../src/e-util/e-html-editor-actions.c:1233
 msgid "_Image..."
 msgstr "_Image..."
 
 #. Translators: This is an action tooltip
-#: ../e-util/e-html-editor-actions.c:1184
+#: ../src/e-util/e-html-editor-actions.c:1198
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: ../e-util/e-html-editor-actions.c:1189
-#: ../e-util/e-html-editor-actions.c:1226
+#: ../src/e-util/e-html-editor-actions.c:1203
+#: ../src/e-util/e-html-editor-actions.c:1240
 msgid "_Link..."
 msgstr "_Link..."
 
-#: ../e-util/e-html-editor-actions.c:1191
+#: ../src/e-util/e-html-editor-actions.c:1205
 msgid "Insert Link"
 msgstr "Insert Link"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1197
-#: ../e-util/e-html-editor-actions.c:1241
+#: ../src/e-util/e-html-editor-actions.c:1211
+#: ../src/e-util/e-html-editor-actions.c:1255
 msgid "_Rule..."
 msgstr "_Rule..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1200
+#: ../src/e-util/e-html-editor-actions.c:1214
 msgid "Insert Rule"
 msgstr "Insert Rule"
 
-#: ../e-util/e-html-editor-actions.c:1205
-#: ../e-util/e-html-editor-actions.c:1248
+#: ../src/e-util/e-html-editor-actions.c:1219
+#: ../src/e-util/e-html-editor-actions.c:1262
 msgid "_Table..."
 msgstr "_Table..."
 
-#: ../e-util/e-html-editor-actions.c:1207
+#: ../src/e-util/e-html-editor-actions.c:1221
 msgid "Insert Table"
 msgstr "Insert Table"
 
-#: ../e-util/e-html-editor-actions.c:1212
+#: ../src/e-util/e-html-editor-actions.c:1226
 msgid "_Cell..."
 msgstr "_Cell..."
 
-#: ../e-util/e-html-editor-actions.c:1233
+#: ../src/e-util/e-html-editor-actions.c:1247
 msgid "Pa_ge..."
 msgstr "Pa_ge..."
 
-#: ../e-util/e-html-editor-actions.c:1257
+#: ../src/e-util/e-html-editor-actions.c:1271
 msgid "Font _Size"
 msgstr "Font _Size"
 
-#: ../e-util/e-html-editor-actions.c:1264
+#: ../src/e-util/e-html-editor-actions.c:1278
 msgid "_Font Style"
 msgstr "_Font Style"
 
-#: ../e-util/e-html-editor-actions.c:1271
+#: ../src/e-util/e-html-editor-actions.c:1285
 msgid "Paste As _Text"
 msgstr "Paste As _Text"
 
-#: ../e-util/e-html-editor-actions.c:1282
-#: ../e-util/e-html-editor-text-dialog.c:203
+#: ../src/e-util/e-html-editor-actions.c:1296
+#: ../src/e-util/e-html-editor-text-dialog.c:201
 msgid "_Bold"
 msgstr "_Bold"
 
-#: ../e-util/e-html-editor-actions.c:1284
+#: ../src/e-util/e-html-editor-actions.c:1298
 msgid "Bold"
 msgstr "Bold"
 
-#: ../e-util/e-html-editor-actions.c:1290
-#: ../e-util/e-html-editor-text-dialog.c:214
+#: ../src/e-util/e-html-editor-actions.c:1304
+#: ../src/e-util/e-html-editor-text-dialog.c:212
 msgid "_Italic"
 msgstr "_Italic"
 
-#: ../e-util/e-html-editor-actions.c:1292
+#: ../src/e-util/e-html-editor-actions.c:1306
 msgid "Italic"
 msgstr "Italic"
 
-#: ../e-util/e-html-editor-actions.c:1298
+#: ../src/e-util/e-html-editor-actions.c:1312
 msgid "_Plain Text"
 msgstr "_Plain Text"
 
-#: ../e-util/e-html-editor-actions.c:1306
-#: ../e-util/e-html-editor-text-dialog.c:235
+#: ../src/e-util/e-html-editor-actions.c:1320
+#: ../src/e-util/e-html-editor-text-dialog.c:233
 msgid "_Strikethrough"
 msgstr "_Strikethrough"
 
-#: ../e-util/e-html-editor-actions.c:1308
+#: ../src/e-util/e-html-editor-actions.c:1322
 msgid "Strikethrough"
 msgstr "Strikethrough"
 
-#: ../e-util/e-html-editor-actions.c:1314
-#: ../e-util/e-html-editor-text-dialog.c:225
+#: ../src/e-util/e-html-editor-actions.c:1328
+#: ../src/e-util/e-html-editor-text-dialog.c:223
 msgid "_Underline"
 msgstr "_Underline"
 
-#: ../e-util/e-html-editor-actions.c:1316
+#: ../src/e-util/e-html-editor-actions.c:1330
 msgid "Underline"
 msgstr "Underline"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1326
+#: ../src/e-util/e-html-editor-actions.c:1340
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1334
+#: ../src/e-util/e-html-editor-actions.c:1348
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1342
+#: ../src/e-util/e-html-editor-actions.c:1356
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1350
+#: ../src/e-util/e-html-editor-actions.c:1364
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1358
+#: ../src/e-util/e-html-editor-actions.c:1372
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1366
+#: ../src/e-util/e-html-editor-actions.c:1380
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1374
+#: ../src/e-util/e-html-editor-actions.c:1388
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1393
+#: ../src/e-util/e-html-editor-actions.c:1407
 msgid "Cell Contents"
 msgstr "Cell Contents"
 
-#: ../e-util/e-html-editor-actions.c:1400
+#: ../src/e-util/e-html-editor-actions.c:1414
 msgid "Column"
 msgstr "Column"
 
-#: ../e-util/e-html-editor-actions.c:1407
+#: ../src/e-util/e-html-editor-actions.c:1421
 msgid "Row"
 msgstr "Row"
 
-#: ../e-util/e-html-editor-actions.c:1414
+#: ../src/e-util/e-html-editor-actions.c:1428
 msgid "Table"
 msgstr "Table"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1424
+#: ../src/e-util/e-html-editor-actions.c:1438
 msgid "Table Delete"
 msgstr "Table Delete"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1432
+#: ../src/e-util/e-html-editor-actions.c:1446
 msgid "Table Insert"
 msgstr "Table Insert"
 
-#: ../e-util/e-html-editor-actions.c:1439
+#: ../src/e-util/e-html-editor-actions.c:1453
 msgid "Properties"
 msgstr "Properties"
 
-#: ../e-util/e-html-editor-actions.c:1457
+#: ../src/e-util/e-html-editor-actions.c:1471
 msgid "Column After"
 msgstr "Column After"
 
-#: ../e-util/e-html-editor-actions.c:1464
+#: ../src/e-util/e-html-editor-actions.c:1478
 msgid "Column Before"
 msgstr "Column Before"
 
-#: ../e-util/e-html-editor-actions.c:1471
+#: ../src/e-util/e-html-editor-actions.c:1485
 msgid "Insert _Link"
 msgstr "Insert _Link"
 
-#: ../e-util/e-html-editor-actions.c:1478
+#: ../src/e-util/e-html-editor-actions.c:1492
 msgid "Row Above"
 msgstr "Row Above"
 
-#: ../e-util/e-html-editor-actions.c:1485
+#: ../src/e-util/e-html-editor-actions.c:1499
 msgid "Row Below"
 msgstr "Row Below"
 
-#: ../e-util/e-html-editor-actions.c:1492
+#: ../src/e-util/e-html-editor-actions.c:1506
 msgid "Cell..."
 msgstr "Cell..."
 
-#: ../e-util/e-html-editor-actions.c:1499
+#: ../src/e-util/e-html-editor-actions.c:1513
 msgid "Image..."
 msgstr "Image..."
 
-#: ../e-util/e-html-editor-actions.c:1506
+#: ../src/e-util/e-html-editor-actions.c:1520
 msgid "Link..."
 msgstr "Link..."
 
-#: ../e-util/e-html-editor-actions.c:1513
+#: ../src/e-util/e-html-editor-actions.c:1527
 msgid "Page..."
 msgstr "Page..."
 
-#: ../e-util/e-html-editor-actions.c:1520
+#: ../src/e-util/e-html-editor-actions.c:1534
 msgid "Paragraph..."
 msgstr "Paragraph..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1528
+#: ../src/e-util/e-html-editor-actions.c:1542
 msgid "Rule..."
 msgstr "Rule..."
 
-#: ../e-util/e-html-editor-actions.c:1535
+#: ../src/e-util/e-html-editor-actions.c:1549
 msgid "Table..."
 msgstr "Table..."
 
-#: ../e-util/e-html-editor-actions.c:1542
+#: ../src/e-util/e-html-editor-actions.c:1556
 msgid "Text..."
 msgstr "Text..."
 
-#: ../e-util/e-html-editor-actions.c:1549
+#: ../src/e-util/e-html-editor-actions.c:1563
 msgid "Remove Link"
 msgstr "Remove Link"
 
-#: ../e-util/e-html-editor-actions.c:1566
+#: ../src/e-util/e-html-editor-actions.c:1580
 msgid "Add Word to Dictionary"
 msgstr "Add Word to Dictionary"
 
-#: ../e-util/e-html-editor-actions.c:1573
+#: ../src/e-util/e-html-editor-actions.c:1587
 msgid "Ignore Misspelled Word"
 msgstr "Ignore Misspelt Word"
 
-#: ../e-util/e-html-editor-actions.c:1580
+#: ../src/e-util/e-html-editor-actions.c:1594
 msgid "Add Word To"
 msgstr "Add Word To"
 
-#: ../e-util/e-html-editor-actions.c:1589
+#: ../src/e-util/e-html-editor-actions.c:1603
 msgid "More Suggestions"
 msgstr "More Suggestions"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../e-util/e-html-editor-actions.c:1713
+#: ../src/e-util/e-html-editor-actions.c:1727
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s Dictionary"
 
-#: ../e-util/e-html-editor-actions.c:1792
+#: ../src/e-util/e-html-editor-actions.c:1806
 msgid "_Emoticon"
 msgstr "_Emoticon"
 
-#: ../e-util/e-html-editor-actions.c:1793
+#: ../src/e-util/e-html-editor-actions.c:1807
 msgid "Insert Emoticon"
 msgstr "Insert Emoticon"
 
-#: ../e-util/e-html-editor-actions.c:1861
+#: ../src/e-util/e-html-editor-actions.c:1875
 msgid "Re_place"
 msgstr "Re_place"
 
-#: ../e-util/e-html-editor-actions.c:1864
+#: ../src/e-util/e-html-editor-actions.c:1878
 msgid "_Image"
 msgstr "_Image"
 
-#: ../e-util/e-html-editor-actions.c:1867
+#: ../src/e-util/e-html-editor-actions.c:1881
 msgid "_Link"
 msgstr "_Link"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1871
+#: ../src/e-util/e-html-editor-actions.c:1885
 msgid "_Rule"
 msgstr "_Rule"
 
-#: ../e-util/e-html-editor-actions.c:1874
-#: ../e-util/e-html-editor-cell-dialog.c:450
+#: ../src/e-util/e-html-editor-actions.c:1888
+#: ../src/e-util/e-html-editor-cell-dialog.c:448
 msgid "_Table"
 msgstr "_Table"
 
-#: ../e-util/e-html-editor.c:689
+#: ../src/e-util/e-html-editor.c:732
 msgid "Paragraph Style"
 msgstr "Paragraph Style"
 
-#: ../e-util/e-html-editor.c:703
+#: ../src/e-util/e-html-editor.c:746
 msgid "Editing Mode"
 msgstr "Editing Mode"
 
-#: ../e-util/e-html-editor.c:715
+#: ../src/e-util/e-html-editor.c:758
 msgid "Font Color"
 msgstr "Font Colour"
 
-#: ../e-util/e-html-editor.c:725
+#: ../src/e-util/e-html-editor.c:768
 msgid "Font Size"
 msgstr "Font Size"
 
-#: ../e-util/e-html-editor-cell-dialog.c:410
+#: ../src/e-util/e-html-editor-cell-dialog.c:408
 msgid "<b>Scope</b>"
 msgstr "<b>Scope</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:424
+#: ../src/e-util/e-html-editor-cell-dialog.c:422
 msgid "C_ell"
 msgstr "C_ell"
 
-#: ../e-util/e-html-editor-cell-dialog.c:437
+#: ../src/e-util/e-html-editor-cell-dialog.c:435
 msgid "_Row"
 msgstr "_Row"
 
-#: ../e-util/e-html-editor-cell-dialog.c:463
+#: ../src/e-util/e-html-editor-cell-dialog.c:461
 msgid "Col_umn"
 msgstr "Col_umn"
 
-#: ../e-util/e-html-editor-cell-dialog.c:473
+#: ../src/e-util/e-html-editor-cell-dialog.c:471
 msgid "<b>Alignment &amp; Behavior</b>"
 msgstr "<b>Alignment &amp; Behaviour</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:486
-#: ../e-util/e-html-editor-hrule-dialog.c:330
-#: ../e-util/e-html-editor-table-dialog.c:651
+#: ../src/e-util/e-html-editor-cell-dialog.c:484
+#: ../src/e-util/e-html-editor-hrule-dialog.c:328
+#: ../src/e-util/e-html-editor-table-dialog.c:649
 msgid "Left"
 msgstr "Left"
 
-#: ../e-util/e-html-editor-cell-dialog.c:487
-#: ../e-util/e-html-editor-hrule-dialog.c:332
-#: ../e-util/e-html-editor-table-dialog.c:652
+#: ../src/e-util/e-html-editor-cell-dialog.c:485
+#: ../src/e-util/e-html-editor-hrule-dialog.c:330
+#: ../src/e-util/e-html-editor-table-dialog.c:650
 msgid "Center"
 msgstr "Centre"
 
-#: ../e-util/e-html-editor-cell-dialog.c:488
-#: ../e-util/e-html-editor-hrule-dialog.c:334
-#: ../e-util/e-html-editor-table-dialog.c:653
+#: ../src/e-util/e-html-editor-cell-dialog.c:486
+#: ../src/e-util/e-html-editor-hrule-dialog.c:332
+#: ../src/e-util/e-html-editor-table-dialog.c:651
 msgid "Right"
 msgstr "Right"
 
-#: ../e-util/e-html-editor-cell-dialog.c:496
+#: ../src/e-util/e-html-editor-cell-dialog.c:494
 msgid "_Horizontal:"
 msgstr "_Horizontal:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:504
-#: ../e-util/e-html-editor-image-dialog.c:577
+#: ../src/e-util/e-html-editor-cell-dialog.c:502
+#: ../src/e-util/e-html-editor-image-dialog.c:575
 msgid "Top"
 msgstr "Top"
 
-#: ../e-util/e-html-editor-cell-dialog.c:505
-#: ../e-util/e-html-editor-image-dialog.c:578
+#: ../src/e-util/e-html-editor-cell-dialog.c:503
+#: ../src/e-util/e-html-editor-image-dialog.c:576
 msgid "Middle"
 msgstr "Middle"
 
-#: ../e-util/e-html-editor-cell-dialog.c:506
-#: ../e-util/e-html-editor-image-dialog.c:579
+#: ../src/e-util/e-html-editor-cell-dialog.c:504
+#: ../src/e-util/e-html-editor-image-dialog.c:577
 msgid "Bottom"
 msgstr "Bottom"
 
-#: ../e-util/e-html-editor-cell-dialog.c:514
+#: ../src/e-util/e-html-editor-cell-dialog.c:512
 msgid "_Vertical:"
 msgstr "_Vertical:"
 
 #. Wrap Text
-#: ../e-util/e-html-editor-cell-dialog.c:520
+#: ../src/e-util/e-html-editor-cell-dialog.c:518
 msgid "_Wrap Text"
 msgstr "_Wrap Text"
 
 #. Header Style
-#: ../e-util/e-html-editor-cell-dialog.c:528
+#: ../src/e-util/e-html-editor-cell-dialog.c:526
 msgid "_Header Style"
 msgstr "_Header Style"
 
-#: ../e-util/e-html-editor-cell-dialog.c:542
-#: ../e-util/e-html-editor-image-dialog.c:517
-#: ../e-util/e-html-editor-table-dialog.c:563
+#: ../src/e-util/e-html-editor-cell-dialog.c:540
+#: ../src/e-util/e-html-editor-image-dialog.c:515
+#: ../src/e-util/e-html-editor-table-dialog.c:561
 msgid "<b>Layout</b>"
 msgstr "<b>Layout</b>"
 
 #. Width
-#: ../e-util/e-html-editor-cell-dialog.c:553
+#: ../src/e-util/e-html-editor-cell-dialog.c:551
 msgid "_Width"
 msgstr "_Width"
 
-#: ../e-util/e-html-editor-cell-dialog.c:593
+#: ../src/e-util/e-html-editor-cell-dialog.c:591
 msgid "Row S_pan:"
 msgstr "Row S_pan:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:607
+#: ../src/e-util/e-html-editor-cell-dialog.c:605
 msgid "Co_lumn Span:"
 msgstr "Co_lumn Span:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:614
-#: ../e-util/e-html-editor-table-dialog.c:667
+#: ../src/e-util/e-html-editor-cell-dialog.c:612
+#: ../src/e-util/e-html-editor-table-dialog.c:665
 msgid "<b>Background</b>"
 msgstr "<b>Background</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:627
-#: ../e-util/e-html-editor-table-dialog.c:680
+#: ../src/e-util/e-html-editor-cell-dialog.c:625
+#: ../src/e-util/e-html-editor-table-dialog.c:678
 msgid "Transparent"
 msgstr "Transparent"
 
-#: ../e-util/e-html-editor-cell-dialog.c:635
+#: ../src/e-util/e-html-editor-cell-dialog.c:633
 msgid "C_olor:"
 msgstr "C_olour:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:643
-#: ../e-util/e-html-editor-image-dialog.c:479
-#: ../e-util/e-html-editor-table-dialog.c:696
+#: ../src/e-util/e-html-editor-cell-dialog.c:641
+#: ../src/e-util/e-html-editor-image-dialog.c:477
+#: ../src/e-util/e-html-editor-table-dialog.c:694
 msgid "Choose Background Image"
 msgstr "Choose Background Image"
 
-#: ../e-util/e-html-editor-cell-dialog.c:648
-#: ../e-util/e-html-editor-image-dialog.c:485
-#: ../e-util/e-html-editor-table-dialog.c:701
+#: ../src/e-util/e-html-editor-cell-dialog.c:646
+#: ../src/e-util/e-html-editor-image-dialog.c:483
+#: ../src/e-util/e-html-editor-table-dialog.c:699
 msgid "Images"
 msgstr "Images"
 
-#: ../e-util/e-html-editor-cell-dialog.c:661
+#: ../src/e-util/e-html-editor-cell-dialog.c:659
 msgid "_Image:"
 msgstr "_Image:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:668
-#: ../e-util/e-html-editor-page-dialog.c:497
-#: ../e-util/e-html-editor-table-dialog.c:721
+#: ../src/e-util/e-html-editor-cell-dialog.c:666
+#: ../src/e-util/e-html-editor-page-dialog.c:495
+#: ../src/e-util/e-html-editor-table-dialog.c:719
 msgid "_Remove image"
 msgstr "_Remove image"
 
-#: ../e-util/e-html-editor-cell-dialog.c:688
+#: ../src/e-util/e-html-editor-cell-dialog.c:686
 msgid "Cell Properties"
 msgstr "Cell Properties"
 
-#: ../e-util/e-html-editor-find-dialog.c:94
-#: ../e-util/e-html-editor-replace-dialog.c:70
+#: ../src/e-util/e-html-editor-find-dialog.c:92
+#: ../src/e-util/e-html-editor-replace-dialog.c:68
 msgid "No match found"
 msgstr "No match found"
 
-#: ../e-util/e-html-editor-find-dialog.c:217
-#: ../e-util/e-html-editor-replace-dialog.c:297
+#: ../src/e-util/e-html-editor-find-dialog.c:215
+#: ../src/e-util/e-html-editor-replace-dialog.c:295
 msgid "Search _backwards"
 msgstr "Search _backwards"
 
-#: ../e-util/e-html-editor-find-dialog.c:224
+#: ../src/e-util/e-html-editor-find-dialog.c:222
 msgid "Case _Sensitive"
 msgstr "Case _Sensitive"
 
-#: ../e-util/e-html-editor-find-dialog.c:231
+#: ../src/e-util/e-html-editor-find-dialog.c:229
 msgid "_Wrap Search"
 msgstr "_Wrap Search"
 
-#: ../e-util/e-html-editor-find-dialog.c:270
+#: ../src/e-util/e-html-editor-find-dialog.c:268
 msgid "Find"
 msgstr "Find"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:265
+#: ../src/e-util/e-html-editor-hrule-dialog.c:263
 msgid "<b>Size</b>"
 msgstr "<b>Size</b>"
 
 #. Width
-#: ../e-util/e-html-editor-hrule-dialog.c:285
-#: ../e-util/e-html-editor-image-dialog.c:535
-#: ../e-util/e-html-editor-table-dialog.c:574
+#: ../src/e-util/e-html-editor-hrule-dialog.c:283
+#: ../src/e-util/e-html-editor-image-dialog.c:533
+#: ../src/e-util/e-html-editor-table-dialog.c:572
 msgid "_Width:"
 msgstr "_Width:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:310
+#: ../src/e-util/e-html-editor-hrule-dialog.c:308
 msgid "_Size:"
 msgstr "_Size:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:317
+#: ../src/e-util/e-html-editor-hrule-dialog.c:315
 msgid "<b>Style</b>"
 msgstr "<b>Style</b>"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:342
-#: ../e-util/e-html-editor-table-dialog.c:660
+#: ../src/e-util/e-html-editor-hrule-dialog.c:340
+#: ../src/e-util/e-html-editor-table-dialog.c:658
 msgid "_Alignment:"
 msgstr "_Alignment:"
 
 #. Shaded
-#: ../e-util/e-html-editor-hrule-dialog.c:348
+#: ../src/e-util/e-html-editor-hrule-dialog.c:346
 msgid "S_haded"
 msgstr "S_haded"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:365
+#: ../src/e-util/e-html-editor-hrule-dialog.c:363
 msgid "Rule properties"
 msgstr "Rule properties"
 
-#: ../e-util/e-html-editor-image-dialog.c:467
-#: ../e-util/e-html-editor-paragraph-dialog.c:66
-#: ../e-util/e-html-editor-table-dialog.c:517
+#: ../src/e-util/e-html-editor-image-dialog.c:465
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:64
+#: ../src/e-util/e-html-editor-table-dialog.c:515
 msgid "<b>General</b>"
 msgstr "<b>General</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:496
+#: ../src/e-util/e-html-editor-image-dialog.c:494
 msgid "_Source:"
 msgstr "_Source:"
 
-#: ../e-util/e-html-editor-image-dialog.c:559
+#: ../src/e-util/e-html-editor-image-dialog.c:557
 msgid "_Height:"
 msgstr "_Height:"
 
-#: ../e-util/e-html-editor-image-dialog.c:600
+#: ../src/e-util/e-html-editor-image-dialog.c:598
 msgid "_X-Padding:"
 msgstr "_X-Padding:"
 
-#: ../e-util/e-html-editor-image-dialog.c:616
+#: ../src/e-util/e-html-editor-image-dialog.c:614
 msgid "_Y-Padding:"
 msgstr "_Y-Padding:"
 
-#: ../e-util/e-html-editor-image-dialog.c:632
-#: ../e-util/e-html-editor-table-dialog.c:641
+#: ../src/e-util/e-html-editor-image-dialog.c:630
+#: ../src/e-util/e-html-editor-table-dialog.c:639
 msgid "_Border:"
 msgstr "_Border:"
 
-#: ../e-util/e-html-editor-image-dialog.c:642
+#: ../src/e-util/e-html-editor-image-dialog.c:640
 msgid "<b>Link</b>"
 msgstr "<b>Link</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:660
-#: ../e-util/e-html-editor-link-dialog.c:221
+#: ../src/e-util/e-html-editor-image-dialog.c:658
+#: ../src/e-util/e-html-editor-link-dialog.c:219
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../e-util/e-html-editor-image-dialog.c:665
-#: ../e-util/e-html-editor-link-dialog.c:226
+#: ../src/e-util/e-html-editor-image-dialog.c:663
+#: ../src/e-util/e-html-editor-link-dialog.c:224
 msgid "_Test URL..."
 msgstr "_Test URL..."
 
-#: ../e-util/e-html-editor-image-dialog.c:682
+#: ../src/e-util/e-html-editor-image-dialog.c:680
 msgid "Image Properties"
 msgstr "Image Properties"
 
-#: ../e-util/e-html-editor-link-dialog.c:250
+#: ../src/e-util/e-html-editor-link-dialog.c:248
 msgid "_Remove Link"
 msgstr "_Remove Link"
 
-#: ../e-util/e-html-editor-link-dialog.c:275
+#: ../src/e-util/e-html-editor-link-dialog.c:273
 msgid "Link Properties"
 msgstr "Link Properties"
 
-#: ../e-util/e-html-editor-page-dialog.c:70
+#: ../src/e-util/e-html-editor-page-dialog.c:68
 msgid "Perforated Paper"
 msgstr "Perforated Paper"
 
-#: ../e-util/e-html-editor-page-dialog.c:79
+#: ../src/e-util/e-html-editor-page-dialog.c:77
 msgid "Blue Ink"
 msgstr "Blue Ink"
 
-#: ../e-util/e-html-editor-page-dialog.c:88
+#: ../src/e-util/e-html-editor-page-dialog.c:86
 msgid "Paper"
 msgstr "Paper"
 
-#: ../e-util/e-html-editor-page-dialog.c:97
+#: ../src/e-util/e-html-editor-page-dialog.c:95
 msgid "Ribbon"
 msgstr "Ribbon"
 
-#: ../e-util/e-html-editor-page-dialog.c:106
+#: ../src/e-util/e-html-editor-page-dialog.c:104
 msgid "Midnight"
 msgstr "Midnight"
 
-#: ../e-util/e-html-editor-page-dialog.c:124 ../mail/filtertypes.xml.in.h:38
-#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
+#: ../src/e-util/e-html-editor-page-dialog.c:122
+#: ../src/mail/filtertypes.xml.in.h:38 ../src/mail/searchtypes.xml.in.h:41
+#: ../src/mail/vfoldertypes.xml.in.h:41
 msgid "Draft"
 msgstr "Draft"
 
-#: ../e-util/e-html-editor-page-dialog.c:133
+#: ../src/e-util/e-html-editor-page-dialog.c:131
 msgid "Graph Paper"
 msgstr "Graph Paper"
 
-#: ../e-util/e-html-editor-page-dialog.c:381
+#: ../src/e-util/e-html-editor-page-dialog.c:379
 msgid "<b>Colors</b>"
 msgstr "<b>Colours</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:400
+#: ../src/e-util/e-html-editor-page-dialog.c:398
 msgid "_Text:"
 msgstr "_Text:"
 
-#: ../e-util/e-html-editor-page-dialog.c:415
+#: ../src/e-util/e-html-editor-page-dialog.c:413
 msgid "_Link:"
 msgstr "_Link:"
 
-#: ../e-util/e-html-editor-page-dialog.c:430
+#: ../src/e-util/e-html-editor-page-dialog.c:428
 msgid "_Visited Link:"
 msgstr "_Visited Link:"
 
-#: ../e-util/e-html-editor-page-dialog.c:445
+#: ../src/e-util/e-html-editor-page-dialog.c:443
 msgid "_Background:"
 msgstr "_Background:"
 
-#: ../e-util/e-html-editor-page-dialog.c:453
+#: ../src/e-util/e-html-editor-page-dialog.c:451
 msgid "<b>Background Image</b>"
 msgstr "<b>Background Image</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:475
-#: ../modules/calendar/e-calendar-preferences.ui.h:80
+#: ../src/e-util/e-html-editor-page-dialog.c:473
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
 msgid "_Template:"
 msgstr "_Template:"
 
-#: ../e-util/e-html-editor-page-dialog.c:483 ../e-util/e-import-assistant.c:288
+#: ../src/e-util/e-html-editor-page-dialog.c:481
+#: ../src/e-util/e-import-assistant.c:286
 msgid "Select a file"
 msgstr "Select a file"
 
-#: ../e-util/e-html-editor-page-dialog.c:490
+#: ../src/e-util/e-html-editor-page-dialog.c:488
 msgid "_Custom:"
 msgstr "_Custom:"
 
-#: ../e-util/e-html-editor-page-dialog.c:517
+#: ../src/e-util/e-html-editor-page-dialog.c:515
 msgid "Page Properties"
 msgstr "Page Properties"
 
-#: ../e-util/e-html-editor-paragraph-dialog.c:83
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:81
 msgid "_Style:"
 msgstr "_Style:"
 
-#: ../e-util/e-html-editor-paragraph-dialog.c:90
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:88
 msgid "<b>Alignment</b>"
 msgstr "<b>Alignment</b>"
 
-#: ../e-util/e-html-editor-paragraph-dialog.c:155
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:153
 msgid "Paragraph Properties"
 msgstr "Paragraph Properties"
 
-#: ../e-util/e-html-editor-replace-dialog.c:92
+#: ../src/e-util/e-html-editor-replace-dialog.c:90
 #, c-format
 msgid "%d occurrence replaced"
 msgid_plural "%d occurrences replaced"
 msgstr[0] "%d occurrence replaced"
 msgstr[1] "%d occurrences replaced"
 
-#: ../e-util/e-html-editor-replace-dialog.c:280
+#: ../src/e-util/e-html-editor-replace-dialog.c:278
 msgid "R_eplace:"
 msgstr "R_eplace:"
 
-#: ../e-util/e-html-editor-replace-dialog.c:289
+#: ../src/e-util/e-html-editor-replace-dialog.c:287
 msgid "_With:"
 msgstr "_With:"
 
-#: ../e-util/e-html-editor-replace-dialog.c:301
+#: ../src/e-util/e-html-editor-replace-dialog.c:299
 msgid "_Case sensitive"
 msgstr "_Case sensitive"
 
-#: ../e-util/e-html-editor-replace-dialog.c:305
+#: ../src/e-util/e-html-editor-replace-dialog.c:303
 msgid "Wra_p search"
 msgstr "Wra_p search"
 
-#: ../e-util/e-html-editor-replace-dialog.c:315
+#: ../src/e-util/e-html-editor-replace-dialog.c:313
 msgid "_Skip"
 msgstr "_Skip"
 
-#: ../e-util/e-html-editor-replace-dialog.c:323
-#: ../e-util/e-system.error.xml.h:3
+#: ../src/e-util/e-html-editor-replace-dialog.c:321
+#: ../src/e-util/e-system.error.xml.h:3
 msgid "_Replace"
 msgstr "_Replace"
 
-#: ../e-util/e-html-editor-replace-dialog.c:331
+#: ../src/e-util/e-html-editor-replace-dialog.c:329
 msgid "Replace _All"
 msgstr "Replace _All"
 
-#: ../e-util/e-html-editor-replace-dialog.c:351
+#: ../src/e-util/e-html-editor-replace-dialog.c:349
 msgctxt "dialog-title"
 msgid "Replace"
 msgstr "Replace"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:85
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:83
 #, c-format
-msgid "<b>Suggestions for '%s'</b>"
-msgstr "<b>Suggestions for '%s'</b>"
+#| msgid "<b>Suggestions for '%s'</b>"
+msgid "<b>Suggestions for “%s”</b>"
+msgstr "<b>Suggestions for “%s”</b>"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:390
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:388
 msgid "<b>Suggestions</b>"
 msgstr "<b>Suggestions</b>"
 
 #. Replace
-#: ../e-util/e-html-editor-spell-check-dialog.c:425
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:423
 msgid "Replace"
 msgstr "Replace"
 
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:434
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:432
 msgid "Replace All"
 msgstr "Replace All"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:443
-#: ../mail/mail.error.xml.h:116
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:441
+#: ../src/mail/mail.error.xml.h:116
 msgid "Ignore"
 msgstr "Ignore"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:452
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:450
 msgid "Skip"
 msgstr "Skip"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:461
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:459
 msgid "Back"
 msgstr "Back"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:470
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:468
 msgid "<b>Dictionary</b>"
 msgstr "<b>Dictionary</b>"
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:490
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:488
 msgid "Add word"
 msgstr "Add word"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:507 ../mail/mail-config.ui.h:39
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:505
+#: ../src/mail/mail-config.ui.h:40
 msgid "Spell Checking"
 msgstr "Spell Checking"
 
-#: ../e-util/e-html-editor-table-dialog.c:539
+#: ../src/e-util/e-html-editor-table-dialog.c:537
 msgid "_Rows:"
 msgstr "_Rows:"
 
-#: ../e-util/e-html-editor-table-dialog.c:556
+#: ../src/e-util/e-html-editor-table-dialog.c:554
 msgid "C_olumns:"
 msgstr "C_olumns:"
 
-#: ../e-util/e-html-editor-table-dialog.c:607
+#: ../src/e-util/e-html-editor-table-dialog.c:605
 msgid "_Spacing:"
 msgstr "_Spacing:"
 
-#: ../e-util/e-html-editor-table-dialog.c:624
+#: ../src/e-util/e-html-editor-table-dialog.c:622
 msgid "_Padding:"
 msgstr "_Padding:"
 
-#: ../e-util/e-html-editor-table-dialog.c:688
-#: ../e-util/e-html-editor-text-dialog.c:250
+#: ../src/e-util/e-html-editor-table-dialog.c:686
+#: ../src/e-util/e-html-editor-text-dialog.c:248
+#: ../src/e-util/e-webdav-browser.c:2418
 msgid "_Color:"
 msgstr "_Colour:"
 
-#: ../e-util/e-html-editor-table-dialog.c:714
+#: ../src/e-util/e-html-editor-table-dialog.c:712
 msgid "Image:"
 msgstr "Image:"
 
-#: ../e-util/e-html-editor-table-dialog.c:741
+#: ../src/e-util/e-html-editor-table-dialog.c:739
 msgid "Table Properties"
 msgstr "Table Properties"
 
-#: ../e-util/e-html-editor-text-dialog.c:270
+#: ../src/e-util/e-html-editor-text-dialog.c:268
 msgid "Si_ze:"
 msgstr "Si_ze:"
 
-#: ../e-util/e-html-editor-text-dialog.c:285
+#: ../src/e-util/e-html-editor-text-dialog.c:283
 msgid "Text Properties"
 msgstr "Text Properties"
 
-#: ../e-util/e-import-assistant.c:261
+#: ../src/e-util/e-import-assistant.c:259
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -13164,75 +14411,85 @@ msgstr ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 
-#: ../e-util/e-import-assistant.c:302 ../e-util/e-import-assistant.c:477
+#: ../src/e-util/e-import-assistant.c:300
+#: ../src/e-util/e-import-assistant.c:475
 msgid "File _type:"
 msgstr "File _type:"
 
-#: ../e-util/e-import-assistant.c:345 ../e-util/e-import-assistant.c:925
+#: ../src/e-util/e-import-assistant.c:343
+#: ../src/e-util/e-import-assistant.c:923
 msgid "Choose the destination for this import"
 msgstr "Choose the destination for this import"
 
-#: ../e-util/e-import-assistant.c:370
+#: ../src/e-util/e-import-assistant.c:368
 msgid "Choose the type of importer to run:"
 msgstr "Choose the type of importer to run:"
 
-#: ../e-util/e-import-assistant.c:378
+#: ../src/e-util/e-import-assistant.c:376
 msgid "Import data and settings from _older programs"
 msgstr "Import data and settings from _older programs"
 
-#: ../e-util/e-import-assistant.c:386
+#: ../src/e-util/e-import-assistant.c:384
 msgid "Import a _single file"
 msgstr "Import a _single file"
 
-#: ../e-util/e-import-assistant.c:408
-#: ../modules/startup-wizard/e-mail-config-import-page.c:210
+#: ../src/e-util/e-import-assistant.c:406
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:209
 msgid "Please select the information that you would like to import:"
 msgstr "Please select the information that you would like to import:"
 
-#: ../e-util/e-import-assistant.c:538
+#: ../src/e-util/e-import-assistant.c:536
+#| msgid ""
+#| "Evolution checked for settings to import from the following applications: "
+#| "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If "
+#| "you would like to try again, please click the \"Back\" button."
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
-"would like to try again, please click the \"Back\" button."
+"would like to try again, please click the “Back” button."
 msgstr ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
-"would like to try again, please click the \"Back\" button."
+"would like to try again, please click the “Back” button."
 
-#: ../e-util/e-import-assistant.c:564
-#: ../modules/startup-wizard/e-mail-config-import-page.c:239
+#: ../src/e-util/e-import-assistant.c:562
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:238
 #, c-format
 msgid "From %s:"
 msgstr "From %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../e-util/e-import-assistant.c:783
+#: ../src/e-util/e-import-assistant.c:781
 msgid "_Cancel Import"
 msgstr "_Cancel Import"
 
-#: ../e-util/e-import-assistant.c:924
+#: ../src/e-util/e-import-assistant.c:922
 msgid "Preview data to be imported"
 msgstr "Preview data to be imported"
 
-#: ../e-util/e-import-assistant.c:930 ../e-util/e-import-assistant.c:943
-#: ../e-util/e-import-assistant.c:1296 ../e-util/e-import-assistant.c:1372
-#: ../e-util/e-import-assistant.c:1381
+#: ../src/e-util/e-import-assistant.c:928
+#: ../src/e-util/e-import-assistant.c:941
+#: ../src/e-util/e-import-assistant.c:1294
+#: ../src/e-util/e-import-assistant.c:1370
+#: ../src/e-util/e-import-assistant.c:1379
 msgid "Import Data"
 msgstr "Import Data"
 
-#: ../e-util/e-import-assistant.c:938
+#: ../src/e-util/e-import-assistant.c:936
 msgid "Select what type of file you want to import from the list."
 msgstr "Select what type of file you want to import from the list."
 
-#: ../e-util/e-import-assistant.c:1286 ../e-util/e-import-assistant.c:1321
+#: ../src/e-util/e-import-assistant.c:1284
+#: ../src/e-util/e-import-assistant.c:1319
 msgid "Evolution Import Assistant"
 msgstr "Evolution Import Assistant"
 
-#: ../e-util/e-import-assistant.c:1303 ../e-util/e-import-assistant.c:1359
+#: ../src/e-util/e-import-assistant.c:1301
+#: ../src/e-util/e-import-assistant.c:1357
 msgid "Import Location"
 msgstr "Import Location"
 
-#: ../e-util/e-import-assistant.c:1314
+#: ../src/e-util/e-import-assistant.c:1312
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -13242,59 +14499,60 @@ msgstr ""
 "With this assistant you will be guided through the process of importing "
 "external files into Evolution."
 
-#: ../e-util/e-import-assistant.c:1331
+#: ../src/e-util/e-import-assistant.c:1329
 msgid "Importer Type"
 msgstr "Importer Type"
 
-#: ../e-util/e-import-assistant.c:1341
+#: ../src/e-util/e-import-assistant.c:1339
 msgid "Select Information to Import"
 msgstr "Select Information to Import"
 
-#: ../e-util/e-import-assistant.c:1350
+#: ../src/e-util/e-import-assistant.c:1348
 msgid "Select a File"
 msgstr "Select a File"
 
-#: ../e-util/e-import-assistant.c:1367
-msgid "Click \"Apply\" to begin importing the file into Evolution."
-msgstr "Click \"Apply\" to begin importing the file into Evolution."
+#: ../src/e-util/e-import-assistant.c:1365
+#| msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgid "Click “Apply” to begin importing the file into Evolution."
+msgstr "Click “Apply” to begin importing the file into Evolution."
 
-#: ../e-util/e-mail-signature-combo-box.c:376
+#: ../src/e-util/e-mail-signature-combo-box.c:431
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: ../e-util/e-mail-signature-editor.c:310 ../mail/e-mail-notes.c:933
+#: ../src/e-util/e-mail-signature-editor.c:311 ../src/mail/e-mail-notes.c:933
 msgid "Close"
 msgstr "Close"
 
-#: ../e-util/e-mail-signature-editor.c:315 ../mail/e-mail-notes.c:938
+#: ../src/e-util/e-mail-signature-editor.c:316 ../src/mail/e-mail-notes.c:938
 msgid "_Save and Close"
 msgstr "_Save and Close"
 
-#: ../e-util/e-mail-signature-editor.c:558
+#: ../src/e-util/e-mail-signature-editor.c:558
 msgid "Edit Signature"
 msgstr "Edit Signature"
 
-#: ../e-util/e-mail-signature-editor.c:591
+#: ../src/e-util/e-mail-signature-editor.c:591
 msgid "_Signature Name:"
 msgstr "_Signature Name:"
 
-#: ../e-util/e-mail-signature-editor.c:627
+#: ../src/e-util/e-mail-signature-editor.c:627
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: ../e-util/e-mail-signature-manager.c:338
+#: ../src/e-util/e-mail-signature-manager.c:338
 msgid "Add _Script"
 msgstr "Add _Script"
 
-#: ../e-util/e-mail-signature-manager.c:444
+#: ../src/e-util/e-mail-signature-manager.c:444
 msgid "Add Signature Script"
 msgstr "Add Signature Script"
 
-#: ../e-util/e-mail-signature-manager.c:538
+#: ../src/e-util/e-mail-signature-manager.c:538
 msgid "Edit Signature Script"
 msgstr "Edit Signature Script"
 
-#: ../e-util/e-mail-signature-script-dialog.c:393
+#: ../src/e-util/e-mail-signature-script-dialog.c:394
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13304,19 +14562,19 @@ msgstr ""
 "signature. The name you specify will be used\n"
 "for display purposes only."
 
-#: ../e-util/e-mail-signature-script-dialog.c:444
+#: ../src/e-util/e-mail-signature-script-dialog.c:445
 msgid "S_cript:"
 msgstr "S_cript:"
 
-#: ../e-util/e-mail-signature-script-dialog.c:475
+#: ../src/e-util/e-mail-signature-script-dialog.c:476
 msgid "Script file must be executable."
 msgstr "Script file must be executable."
 
-#: ../e-util/e-map.c:885
+#: ../src/e-util/e-map.c:886
 msgid "World Map"
 msgstr "World Map"
 
-#: ../e-util/e-map.c:888
+#: ../src/e-util/e-map.c:889
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -13324,224 +14582,230 @@ msgstr ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
 
-#: ../e-util/e-misc-utils.c:255
+#: ../src/e-util/e-misc-utils.c:253
 msgid "Could not open the link."
 msgstr "Could not open the link."
 
-#: ../e-util/e-misc-utils.c:338
+#: ../src/e-util/e-misc-utils.c:336
 msgid "Could not display help for Evolution."
 msgstr "Could not display help for Evolution."
 
-#: ../e-util/e-misc-utils.c:2503
+#: ../src/e-util/e-misc-utils.c:2501
 #, c-format
-msgid "Opening calendar '%s'"
-msgstr "Opening calendar '%s'"
+#| msgid "Opening calendar '%s'"
+msgid "Opening calendar “%s”"
+msgstr "Opening calendar “%s”"
 
-#: ../e-util/e-misc-utils.c:2506
+#: ../src/e-util/e-misc-utils.c:2504
 #, c-format
-msgid "Opening memo list '%s'"
-msgstr "Opening memo list '%s'"
+#| msgid "Opening memo list '%s'"
+msgid "Opening memo list “%s”"
+msgstr "Opening memo list “%s”"
 
-#: ../e-util/e-misc-utils.c:2509
+#: ../src/e-util/e-misc-utils.c:2507
 #, c-format
-msgid "Opening task list '%s'"
-msgstr "Opening task list '%s'"
+#| msgid "Opening task list '%s'"
+msgid "Opening task list “%s”"
+msgstr "Opening task list “%s”"
 
-#: ../e-util/e-misc-utils.c:2512
+#: ../src/e-util/e-misc-utils.c:2510
 #, c-format
-msgid "Opening address book '%s'"
-msgstr "Opening address book '%s'"
+#| msgid "Opening address book '%s'"
+msgid "Opening address book “%s”"
+msgstr "Opening address book “%s”"
 
-#: ../e-util/e-misc-utils.c:3290
-#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+#: ../src/e-util/e-misc-utils.c:3290
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "_Do not show this message again"
 msgstr "_Do not show this message again"
 
-#: ../e-util/e-name-selector-dialog.c:277
+#: ../src/e-util/e-name-selector-dialog.c:274
 msgid "Show Contacts"
 msgstr "Show Contacts"
 
-#: ../e-util/e-name-selector-dialog.c:309
+#: ../src/e-util/e-name-selector-dialog.c:306
 msgid "Address B_ook:"
 msgstr "Address B_ook:"
 
-#: ../e-util/e-name-selector-dialog.c:316
+#: ../src/e-util/e-name-selector-dialog.c:313
 msgid "Cat_egory:"
 msgstr "Cat_egory:"
 
-#: ../e-util/e-name-selector-dialog.c:340
+#: ../src/e-util/e-name-selector-dialog.c:337
 msgid "_Search:"
 msgstr "_Search:"
 
-#: ../e-util/e-name-selector-dialog.c:366
-#: ../e-util/e-name-selector-dialog.c:1274
-#: ../modules/addressbook/e-book-shell-view-actions.c:1183
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:760
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../src/e-util/e-name-selector-dialog.c:363
+#: ../src/e-util/e-name-selector-dialog.c:1330
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1187
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1675
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:758
+#: ../src/modules/calendar/e-task-shell-view-actions.c:931
 msgid "Any Category"
 msgstr "Any Category"
 
-#: ../e-util/e-name-selector-dialog.c:368
+#: ../src/e-util/e-name-selector-dialog.c:365
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:338
 msgid "Co_ntacts"
 msgstr "Co_ntacts"
 
-#: ../e-util/e-name-selector-dialog.c:445
+#: ../src/e-util/e-name-selector-dialog.c:442
 msgid "Search"
 msgstr "Search"
 
-#: ../e-util/e-name-selector-dialog.c:448 ../mail/importers/pine-importer.c:429
+#: ../src/e-util/e-name-selector-dialog.c:445
+#: ../src/mail/importers/pine-importer.c:430
 msgid "Address Book"
 msgstr "Address Book"
 
-#: ../e-util/e-name-selector-dialog.c:576
+#: ../src/e-util/e-name-selector-dialog.c:573
 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
-#: ../e-util/e-name-selector-entry.c:3186
+#: ../src/e-util/e-name-selector-entry.c:3222
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "E_xpand %s Inline"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3202
+#: ../src/e-util/e-name-selector-entry.c:3238
 #, c-format
 msgid "Cop_y %s"
 msgstr "Cop_y %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3213
+#: ../src/e-util/e-name-selector-entry.c:3249
 #, c-format
 msgid "C_ut %s"
 msgstr "C_ut %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3231
+#: ../src/e-util/e-name-selector-entry.c:3267
 #, c-format
 msgid "_Edit %s"
 msgstr "_Edit %s"
 
-#: ../e-util/e-name-selector-list.c:584
+#: ../src/e-util/e-name-selector-list.c:585
 #, c-format
 msgid "_Delete %s"
 msgstr "_Delete %s"
 
-#: ../e-util/e-online-button.c:32
+#: ../src/e-util/e-online-button.c:30
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr "Evolution is currently online.  Click this button to work offline."
 
-#: ../e-util/e-online-button.c:35
+#: ../src/e-util/e-online-button.c:33
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr "Evolution is currently offline.  Click this button to work online."
 
-#: ../e-util/e-online-button.c:38
+#: ../src/e-util/e-online-button.c:36
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution is currently offline because the network is unavailable."
 
-#: ../e-util/e-passwords.c:127
+#: ../src/e-util/e-passwords.c:125
 msgid "Keyring key is unusable: no user or host name"
 msgstr "Keyring key is unusable: no user or host name"
 
-#: ../e-util/e-passwords.c:447
+#: ../src/e-util/e-passwords.c:445
 msgid "You have the Caps Lock key on."
 msgstr "You have the Caps Lock key on."
 
-#: ../e-util/e-passwords.c:578
+#: ../src/e-util/e-passwords.c:576
 msgid "_Remember this passphrase"
 msgstr "_Remember this passphrase"
 
-#: ../e-util/e-passwords.c:579
+#: ../src/e-util/e-passwords.c:577
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Remember this passphrase for the remainder of this session"
 
-#: ../e-util/e-passwords.c:584
+#: ../src/e-util/e-passwords.c:582
 msgid "_Remember this password"
 msgstr "_Remember this password"
 
-#: ../e-util/e-passwords.c:585
+#: ../src/e-util/e-passwords.c:583
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Remember this password for the remainder of this session"
 
-#: ../e-util/e-preferences-window.c:321
+#: ../src/e-util/e-preferences-window.c:329
 msgid "Evolution Preferences"
 msgstr "Evolution Preferences"
 
-#: ../e-util/e-print.c:160
+#: ../src/e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "An error occurred while printing"
 
-#: ../e-util/e-print.c:167
+#: ../src/e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "The printing system reported the following details about the error:"
 
-#: ../e-util/e-print.c:173
+#: ../src/e-util/e-print.c:171
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
 "The printing system did not report any additional details about the error."
 
-#: ../e-util/e-proxy-editor.c:325
+#: ../src/e-util/e-proxy-editor.c:326
 msgid "_Method:"
 msgstr "_Method:"
 
-#: ../e-util/e-proxy-editor.c:347
+#: ../src/e-util/e-proxy-editor.c:348
 msgid "Defer to Desktop Settings"
 msgstr "Defer to Desktop Settings"
 
-#: ../e-util/e-proxy-editor.c:351
+#: ../src/e-util/e-proxy-editor.c:352
 msgid "_Open Desktop Settings"
 msgstr "_Open Desktop Settings"
 
-#: ../e-util/e-proxy-editor.c:377
+#: ../src/e-util/e-proxy-editor.c:378
 msgid "Manual"
 msgstr "Manual"
 
-#: ../e-util/e-proxy-editor.c:396
+#: ../src/e-util/e-proxy-editor.c:397
 msgid "_HTTP Proxy:"
 msgstr "_HTTP Proxy:"
 
-#: ../e-util/e-proxy-editor.c:427
+#: ../src/e-util/e-proxy-editor.c:428
 msgid "H_TTPS Proxy:"
 msgstr "H_TTPS Proxy:"
 
-#: ../e-util/e-proxy-editor.c:458
+#: ../src/e-util/e-proxy-editor.c:459
 msgid "_Socks Proxy:"
 msgstr "_Socks Proxy:"
 
-#: ../e-util/e-proxy-editor.c:489
+#: ../src/e-util/e-proxy-editor.c:490
 msgid "_Ignore Hosts:"
 msgstr "_Ignore Hosts:"
 
-#: ../e-util/e-proxy-editor.c:515
+#: ../src/e-util/e-proxy-editor.c:516
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../e-util/e-proxy-editor.c:534
+#: ../src/e-util/e-proxy-editor.c:535
 msgid "Configuration _URL:"
 msgstr "Configuration _URL:"
 
-#: ../e-util/e-proxy-editor.c:560
+#: ../src/e-util/e-proxy-editor.c:561
 msgid "No proxy"
 msgstr "No proxy"
 
-#: ../e-util/e-proxy-editor.c:563
+#: ../src/e-util/e-proxy-editor.c:564
 msgid "Use a direct connection, no proxying required."
 msgstr "Use a direct connection, no proxying required."
 
-#: ../e-util/e-proxy-preferences.c:213
+#: ../src/e-util/e-proxy-preferences.c:214
 msgid "Switch to Basic Proxy Preferences"
 msgstr "Switch to Basic Proxy Preferences"
 
-#: ../e-util/e-proxy-preferences.c:215
+#: ../src/e-util/e-proxy-preferences.c:216
 msgid "Switch to Advanced Proxy Preferences"
 msgstr "Switch to Advanced Proxy Preferences"
 
-#: ../e-util/e-proxy-preferences.c:526
+#: ../src/e-util/e-proxy-preferences.c:527
 msgid "Apply custom proxy settings to these accounts:"
 msgstr "Apply custom proxy settings to these accounts:"
 
-#: ../e-util/e-proxy-preferences.c:561
+#: ../src/e-util/e-proxy-preferences.c:562
 msgid ""
 "<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
 "and apply them to specific accounts"
@@ -13549,278 +14813,285 @@ msgstr ""
 "<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
 "and apply them to specific accounts"
 
-#: ../e-util/e-proxy-selector.c:85
+#: ../src/e-util/e-proxy-selector.c:86
 msgid "Custom Proxy"
 msgstr "Custom Proxy"
 
-#: ../e-util/e-proxy-selector.c:487
+#: ../src/e-util/e-proxy-selector.c:488
 msgid "Create a new proxy profile"
 msgstr "Create a new proxy profile"
 
-#: ../e-util/e-proxy-selector.c:492
+#: ../src/e-util/e-proxy-selector.c:493
 msgid "Delete the selected proxy profile"
 msgstr "Delete the selected proxy profile"
 
-#: ../e-util/e-rule-editor.c:184
+#: ../src/e-util/e-rule-editor.c:182
 msgid "Add Rule"
 msgstr "Add Rule"
 
-#: ../e-util/e-rule-editor.c:286
+#: ../src/e-util/e-rule-editor.c:284
 msgid "Edit Rule"
 msgstr "Edit Rule"
 
-#: ../e-util/e-search-bar.c:84
+#: ../src/e-util/e-search-bar.c:82
 #, c-format
 msgid "Matches: %u"
 msgstr "Matches: %u"
 
-#: ../e-util/e-search-bar.c:611
+#: ../src/e-util/e-search-bar.c:609
 msgid "Close the find bar"
 msgstr "Close the find bar"
 
-#: ../e-util/e-search-bar.c:619
+#: ../src/e-util/e-search-bar.c:617
 msgid "Fin_d:"
 msgstr "Fin_d:"
 
-#: ../e-util/e-search-bar.c:631
+#: ../src/e-util/e-search-bar.c:629
 msgid "Clear the search"
 msgstr "Clear the search"
 
-#: ../e-util/e-search-bar.c:655
+#: ../src/e-util/e-search-bar.c:653
 msgid "_Previous"
 msgstr "_Previous"
 
-#: ../e-util/e-search-bar.c:658
+#: ../src/e-util/e-search-bar.c:656
 msgid "Find the previous occurrence of the phrase"
 msgstr "Find the previous occurrence of the phrase"
 
-#: ../e-util/e-search-bar.c:667
+#: ../src/e-util/e-search-bar.c:665
 msgid "_Next"
 msgstr "_Next"
 
-#: ../e-util/e-search-bar.c:670
+#: ../src/e-util/e-search-bar.c:668
 msgid "Find the next occurrence of the phrase"
 msgstr "Find the next occurrence of the phrase"
 
-#: ../e-util/e-search-bar.c:679
+#: ../src/e-util/e-search-bar.c:677
 msgid "Mat_ch case"
 msgstr "Mat_ch case"
 
-#: ../e-util/e-search-bar.c:707
+#: ../src/e-util/e-search-bar.c:705
 msgid "Reached bottom of page, continued from top"
 msgstr "Reached bottom of page, continued from top"
 
-#: ../e-util/e-search-bar.c:729
+#: ../src/e-util/e-search-bar.c:727
 msgid "Reached top of page, continued from bottom"
 msgstr "Reached top of page, continued from bottom"
 
-#: ../e-util/e-send-options.c:570
+#: ../src/e-util/e-send-options.c:568
 msgid "When de_leted:"
 msgstr "When de_leted:"
 
-#: ../e-util/e-send-options.ui.h:3
+#: ../src/e-util/e-send-options.ui.h:3
 msgid "Standard"
 msgstr "Standard"
 
-#: ../e-util/e-send-options.ui.h:6
+#: ../src/e-util/e-send-options.ui.h:6
 msgid "Proprietary"
 msgstr "Proprietary"
 
-#: ../e-util/e-send-options.ui.h:8
+#: ../src/e-util/e-send-options.ui.h:8
 msgid "Secret"
 msgstr "Secret"
 
-#: ../e-util/e-send-options.ui.h:9
+#: ../src/e-util/e-send-options.ui.h:9
 msgid "Top Secret"
 msgstr "Top Secret"
 
-#: ../e-util/e-send-options.ui.h:10
+#: ../src/e-util/e-send-options.ui.h:10
 msgid "For Your Eyes Only"
 msgstr "For Your Eyes Only"
 
 #. Translators: Used in send options dialog
-#: ../e-util/e-send-options.ui.h:12
+#: ../src/e-util/e-send-options.ui.h:12
 msgctxt "send-options"
 msgid "None"
 msgstr "None"
 
-#: ../e-util/e-send-options.ui.h:13
+#: ../src/e-util/e-send-options.ui.h:13
 msgid "Mail Receipt"
 msgstr "Mail Receipt"
 
-#: ../e-util/e-send-options.ui.h:14
+#: ../src/e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "Send Options"
 
-#: ../e-util/e-send-options.ui.h:15
+#: ../src/e-util/e-send-options.ui.h:18
 msgid "R_eply requested"
 msgstr "R_eply requested"
 
-#: ../e-util/e-send-options.ui.h:16
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:20
 msgctxt "ESendOptionsWithin"
 msgid "Wi_thin"
 msgstr "Wi_thin"
 
-#: ../e-util/e-send-options.ui.h:17
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:22
 msgctxt "ESendOptionsWithin"
 msgid "days"
 msgstr "days"
 
-#: ../e-util/e-send-options.ui.h:18
+#: ../src/e-util/e-send-options.ui.h:23
 msgid "_When convenient"
 msgstr "_When convenient"
 
-#: ../e-util/e-send-options.ui.h:20
+#. To translators: This means Delay the message delivery for some time
+#: ../src/e-util/e-send-options.ui.h:26
 msgid "_Delay message delivery"
 msgstr "_Delay message delivery"
 
-#: ../e-util/e-send-options.ui.h:21
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:28
 msgctxt "ESendOptionsAfter"
 msgid "_After"
 msgstr "_After"
 
-#: ../e-util/e-send-options.ui.h:22
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:30
 msgctxt "ESendOptionsAfter"
 msgid "days"
 msgstr "days"
 
-#: ../e-util/e-send-options.ui.h:23
+#: ../src/e-util/e-send-options.ui.h:31
 msgid "_Set expiration date"
 msgstr "_Set expiration date"
 
-#: ../e-util/e-send-options.ui.h:24
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:33
 msgctxt "ESendOptions"
 msgid "_Until"
 msgstr "_Until"
 
-#: ../e-util/e-send-options.ui.h:25
+#: ../src/e-util/e-send-options.ui.h:34
 msgid "Delivery Options"
 msgstr "Delivery Options"
 
-#: ../e-util/e-send-options.ui.h:26
+#: ../src/e-util/e-send-options.ui.h:35
 msgid "_Priority:"
 msgstr "_Priority:"
 
-#: ../e-util/e-send-options.ui.h:27
+#: ../src/e-util/e-send-options.ui.h:36
 msgid "_Classification:"
 msgstr "_Classification:"
 
-#: ../e-util/e-send-options.ui.h:28
+#: ../src/e-util/e-send-options.ui.h:37
 msgid "Gene_ral Options"
 msgstr "Gene_ral Options"
 
-#: ../e-util/e-send-options.ui.h:29
+#: ../src/e-util/e-send-options.ui.h:38
 msgid "Creat_e a sent item to track information"
 msgstr "Creat_e a sent item to track information"
 
-#: ../e-util/e-send-options.ui.h:30
+#: ../src/e-util/e-send-options.ui.h:39
 msgid "_Delivered"
 msgstr "_Delivered"
 
-#: ../e-util/e-send-options.ui.h:31
+#: ../src/e-util/e-send-options.ui.h:40
 msgid "Deli_vered and opened"
 msgstr "Deli_vered and opened"
 
-#: ../e-util/e-send-options.ui.h:32
+#: ../src/e-util/e-send-options.ui.h:41
 msgid "_All information"
 msgstr "_All information"
 
-#: ../e-util/e-send-options.ui.h:33
+#: ../src/e-util/e-send-options.ui.h:42
 msgid "A_uto-delete sent item"
 msgstr "A_uto-delete sent item"
 
-#: ../e-util/e-send-options.ui.h:34
+#: ../src/e-util/e-send-options.ui.h:43
 msgid "Status Tracking"
 msgstr "Status Tracking"
 
-#: ../e-util/e-send-options.ui.h:35
+#: ../src/e-util/e-send-options.ui.h:44
 msgid "_When opened:"
 msgstr "_When opened:"
 
-#: ../e-util/e-send-options.ui.h:36
+#: ../src/e-util/e-send-options.ui.h:45
 msgid "When decli_ned:"
 msgstr "When decli_ned:"
 
-#: ../e-util/e-send-options.ui.h:37
+#: ../src/e-util/e-send-options.ui.h:46
 msgid "When co_mpleted:"
 msgstr "When co_mpleted:"
 
-#: ../e-util/e-send-options.ui.h:38
+#: ../src/e-util/e-send-options.ui.h:47
 msgid "When acce_pted:"
 msgstr "When acce_pted:"
 
-#: ../e-util/e-send-options.ui.h:39
+#: ../src/e-util/e-send-options.ui.h:48
 msgid "Return Notification"
 msgstr "Return Notification"
 
-#: ../e-util/e-send-options.ui.h:40
+#: ../src/e-util/e-send-options.ui.h:49
 msgid "Sta_tus Tracking"
 msgstr "Sta_tus Tracking"
 
-#: ../e-util/e-source-config.c:690 ../e-util/e-source-config.c:694
+#: ../src/e-util/e-source-config.c:691 ../src/e-util/e-source-config.c:695
 msgid "Type:"
 msgstr "Type:"
 
-#: ../e-util/e-source-config.c:702 ../e-util/e-source-config.c:706
+#: ../src/e-util/e-source-config.c:703 ../src/e-util/e-source-config.c:707
 msgid "Name:"
 msgstr "Name:"
 
-#: ../e-util/e-source-config.c:813
+#: ../src/e-util/e-source-config.c:814 ../src/e-util/e-webdav-browser.c:1748
 msgid "Name cannot be empty"
 msgstr "Name cannot be empty"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1313
+#: ../src/e-util/e-source-config.c:1314
 msgid "Refresh every"
 msgstr "Refresh every"
 
-#: ../e-util/e-source-config.c:1343 ../e-util/e-source-config.c:1413
+#: ../src/e-util/e-source-config.c:1344 ../src/e-util/e-source-config.c:1414
 msgid "Use a secure connection"
 msgstr "Use a secure connection"
 
-#: ../e-util/e-source-config.c:1439
+#: ../src/e-util/e-source-config.c:1440
 msgid "Unset _trust for SSL/TLS certificate"
 msgstr "Unset _trust for SSL/TLS certificate"
 
-#: ../e-util/e-source-config.c:1475
+#: ../src/e-util/e-source-config.c:1476
 msgid "User"
 msgstr "User"
 
-#: ../e-util/e-source-selector.c:3214
+#: ../src/e-util/e-source-selector.c:3212
 msgid "Show"
 msgstr "Show"
 
-#: ../e-util/e-source-selector.c:3221
+#: ../src/e-util/e-source-selector.c:3219
 msgid "Group name"
 msgstr "Group name"
 
-#: ../e-util/e-source-selector.c:3376 ../mail/e-mail-display.c:742
+#: ../src/e-util/e-source-selector.c:3374 ../src/mail/e-mail-display.c:796
 msgid "_Hide"
 msgstr "_Hide"
 
-#: ../e-util/e-source-selector.c:3376 ../e-util/e-source-selector.c:3475
+#: ../src/e-util/e-source-selector.c:3374
+#: ../src/e-util/e-source-selector.c:3473
 msgid "_Show"
 msgstr "_Show"
 
-#: ../e-util/e-source-selector.c:3428
+#: ../src/e-util/e-source-selector.c:3426
 msgid "Manage Groups"
 msgstr "Manage Groups"
 
-#: ../e-util/e-source-selector.c:3440
+#: ../src/e-util/e-source-selector.c:3438
 msgid "Available Groups:"
 msgstr "Available Groups:"
 
-#: ../e-util/e-source-selector-dialog.c:236
+#: ../src/e-util/e-source-selector-dialog.c:234
 msgid "_Destination"
 msgstr "_Destination"
 
-#: ../e-util/e-source-selector-dialog.c:364
+#: ../src/e-util/e-source-selector-dialog.c:362
 msgid "Select destination"
 msgstr "Select destination"
 
 #. Translators: %s is the language ISO code.
-#: ../e-util/e-spell-dictionary.c:266
+#: ../src/e-util/e-spell-dictionary.c:264
 #, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
@@ -13828,245 +15099,294 @@ msgstr "Unknown (%s)"
 
 #. Translators: The first %s is the language name, and the
 #. * second is the country name. Example: "French (France)"
-#: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
+#: ../src/e-util/e-spell-dictionary.c:279
+#: ../src/e-util/e-spell-dictionary.c:284
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:478
+#: ../src/e-util/e-spell-entry.c:479
 msgid "(no suggestions)"
 msgstr "(no suggestions)"
 
-#: ../e-util/e-spell-entry.c:502
+#: ../src/e-util/e-spell-entry.c:503
 msgid "More..."
 msgstr "More…"
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:587
+#: ../src/e-util/e-spell-entry.c:588
 #, c-format
-msgid "Add \"%s\" to Dictionary"
-msgstr "Add \"%s\" to Dictionary"
+#| msgid "Add \"%s\" to Dictionary"
+msgid "Add “%s” to Dictionary"
+msgstr "Add “%s” to Dictionary"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:636
+#: ../src/e-util/e-spell-entry.c:637
 msgid "Ignore All"
 msgstr "Ignore All"
 
-#: ../e-util/e-spell-entry.c:668
+#: ../src/e-util/e-spell-entry.c:669
 msgid "Spelling Suggestions"
 msgstr "Spelling Suggestions"
 
-#: ../e-util/e-system.error.xml.h:1
-msgid "A file named \"{0}\" already exists. Do you want to replace it?"
-msgstr "A file named \"{0}\" already exists. Do you want to replace it?"
+#: ../src/e-util/e-system.error.xml.h:1
+#| msgid "A file named \"{0}\" already exists. Do you want to replace it?"
+msgid "A file named “{0}” already exists. Do you want to replace it?"
+msgstr "A file named “{0}” already exists. Do you want to replace it?"
 
-#: ../e-util/e-system.error.xml.h:2
+#: ../src/e-util/e-system.error.xml.h:2
+#| msgid ""
+#| "The file already exists in \"{0}\". Replacing it will overwrite its "
+#| "contents."
 msgid ""
-"The file already exists in \"{0}\". Replacing it will overwrite its contents."
+"The file already exists in “{0}”. Replacing it will overwrite its contents."
 msgstr ""
-"The file already exists in \"{0}\". Replacing it will overwrite its contents."
-
-#: ../e-util/e-system.error.xml.h:4
-msgid "Cannot save file \"{0}\"."
-msgstr "Cannot save file \"{0}\"."
+"The file already exists in “{0}”. Replacing it will overwrite its contents."
 
-#: ../e-util/e-system.error.xml.h:5
-msgid "Because \"{1}\"."
-msgstr "Because \"{1}\"."
+#: ../src/e-util/e-system.error.xml.h:4
+#| msgid "Cannot save file \"{0}\"."
+msgid "Cannot save file “{0}”."
+msgstr "Cannot save file “{0}”."
 
-#: ../e-util/e-system.error.xml.h:6
-msgid "Cannot open file \"{0}\"."
-msgstr "Cannot open file \"{0}\"."
+#: ../src/e-util/e-system.error.xml.h:6
+#| msgid "Cannot open file \"{0}\"."
+msgid "Cannot open file “{0}”."
+msgstr "Cannot open file “{0}”."
 
-#: ../e-util/e-system.error.xml.h:7
-msgid "Failed to remove data source &quot;{0}&quot;."
-msgstr "Failed to remove data source &quot;{0}&quot;."
+#: ../src/e-util/e-system.error.xml.h:7
+#| msgid "Failed to remove data source &quot;{0}&quot;."
+msgid "Failed to remove data source “{0}”."
+msgstr "Failed to remove data source “{0}”."
 
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:64
-msgid "The reported error was &quot;{1}&quot;."
-msgstr "The reported error was &quot;{1}&quot;."
+#: ../src/e-util/e-system.error.xml.h:8 ../src/mail/mail.error.xml.h:64
+#| msgid "The reported error was &quot;{1}&quot;."
+msgid "The reported error was “{1}”."
+msgstr "The reported error was “{1}”."
 
-#: ../e-util/e-system.error.xml.h:9
-msgid "Failed to update data source &quot;{0}&quot;."
-msgstr "Failed to update data source &quot;{0}&quot;."
+#: ../src/e-util/e-system.error.xml.h:9
+#| msgid "Failed to update data source &quot;{0}&quot;."
+msgid "Failed to update data source “{0}”."
+msgstr "Failed to update data source “{0}”."
 
-#: ../e-util/e-system.error.xml.h:10
-msgid "Failed to delete resource &quot;{0}&quot;."
-msgstr "Failed to delete resource &quot;{0}&quot;."
+#: ../src/e-util/e-system.error.xml.h:10
+#| msgid "Failed to delete resource &quot;{0}&quot;."
+msgid "Failed to delete resource “{0}”."
+msgstr "Failed to delete resource “{0}”."
 
-#: ../e-util/e-system.error.xml.h:11
-msgid ""
-"The address book backend servicing &quot;{0}&quot; has quit unexpectedly."
-msgstr ""
-"The address book backend servicing &quot;{0}&quot; has quit unexpectedly."
+#: ../src/e-util/e-system.error.xml.h:11
+#| msgid ""
+#| "The address book backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgid "The address book backend servicing “{0}” has quit unexpectedly."
+msgstr "The address book backend servicing “{0}” has quit unexpectedly."
 
-#: ../e-util/e-system.error.xml.h:12
+#: ../src/e-util/e-system.error.xml.h:12
 msgid ""
 "Some of your contacts may not be available until Evolution is restarted."
 msgstr ""
 "Some of your contacts may not be available until Evolution is restarted."
 
-#: ../e-util/e-system.error.xml.h:13
-msgid "The calendar backend servicing &quot;{0}&quot; has quit unexpectedly."
-msgstr "The calendar backend servicing &quot;{0}&quot; has quit unexpectedly."
+#: ../src/e-util/e-system.error.xml.h:13
+#| msgid ""
+#| "The calendar backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgid "The calendar backend servicing “{0}” has quit unexpectedly."
+msgstr "The calendar backend servicing “{0}” has quit unexpectedly."
 
-#: ../e-util/e-system.error.xml.h:14
+#: ../src/e-util/e-system.error.xml.h:14
 msgid ""
 "Some of your appointments may not be available until Evolution is restarted."
 msgstr ""
 "Some of your appointments may not be available until Evolution is restarted."
 
-#: ../e-util/e-system.error.xml.h:15
-msgid "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
-msgstr "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
+#: ../src/e-util/e-system.error.xml.h:15
+#| msgid ""
+#| "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgid "The memo list backend servicing “{0}” has quit unexpectedly."
+msgstr "The memo list backend servicing “{0}” has quit unexpectedly."
 
-#: ../e-util/e-system.error.xml.h:16
+#: ../src/e-util/e-system.error.xml.h:16
 msgid "Some of your memos may not be available until Evolution is restarted."
 msgstr "Some of your memos may not be available until Evolution is restarted."
 
-#: ../e-util/e-system.error.xml.h:17
-msgid "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
-msgstr "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
+#: ../src/e-util/e-system.error.xml.h:17
+#| msgid ""
+#| "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgid "The task list backend servicing “{0}” has quit unexpectedly."
+msgstr "The task list backend servicing “{0}” has quit unexpectedly."
 
-#: ../e-util/e-system.error.xml.h:18
+#: ../src/e-util/e-system.error.xml.h:18
 msgid "Some of your tasks may not be available until Evolution is restarted."
 msgstr "Some of your tasks may not be available until Evolution is restarted."
 
-#: ../e-util/e-system.error.xml.h:19
-msgid ""
-"The address book backend servicing &quot;{0}&quot; encountered an error."
+#: ../src/e-util/e-system.error.xml.h:19
+#| msgid ""
+#| "The address book backend servicing &quot;{0}&quot; encountered an error."
+msgid "The address book backend servicing “{0}” encountered an error."
+msgstr "The address book backend servicing “{0}” encountered an error."
+
+#: ../src/e-util/e-system.error.xml.h:20
+#| msgid "The calendar backend servicing &quot;{0}&quot; encountered an error."
+msgid "The calendar backend servicing “{0}” encountered an error."
+msgstr "The calendar backend servicing “{0}” encountered an error."
+
+#: ../src/e-util/e-system.error.xml.h:21
+#| msgid ""
+#| "The memo list backend servicing &quot;{0}&quot; encountered an error."
+msgid "The memo list backend servicing “{0}” encountered an error."
+msgstr "The memo list backend servicing “{0}” encountered an error."
+
+#: ../src/e-util/e-system.error.xml.h:22
+#| msgid ""
+#| "The task list backend servicing &quot;{0}&quot; encountered an error."
+msgid "The task list backend servicing “{0}” encountered an error."
+msgstr "The task list backend servicing “{0}” encountered an error."
+
+#: ../src/e-util/e-system.error.xml.h:23
+msgid "Something has gone wrong"
+msgstr "Something has gone wrong"
+
+#: ../src/e-util/e-system.error.xml.h:24
+msgid ""
+"A WebKitWebProcess crashed when displaying the content. You can try again by "
+"reopening the window. If the issue persists, please file a bug report in the "
+"GNOME bugzilla."
+msgstr ""
+"A WebKitWebProcess crashed when displaying the content. You can try again by "
+"reopening the window. If the issue persists, please file a bug report in the "
+"GNOME bugzilla."
+
+#: ../src/e-util/e-system.error.xml.h:25
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete remote collection “{0}”?"
+msgstr "Are you sure you want to delete remote collection “{0}”?"
+
+#: ../src/e-util/e-system.error.xml.h:26
+#| msgid ""
+#| "This will permanently remove the calendar '{0}' from the server. Are you "
+#| "sure you want to proceed?"
+msgid ""
+"This will permanently remove the collection “{0}” from the server. Are you "
+"sure you want to proceed?"
 msgstr ""
-"The address book backend servicing &quot;{0}&quot; encountered an error."
-
-#: ../e-util/e-system.error.xml.h:20
-msgid "The calendar backend servicing &quot;{0}&quot; encountered an error."
-msgstr "The calendar backend servicing &quot;{0}&quot; encountered an error."
-
-#: ../e-util/e-system.error.xml.h:21
-msgid "The memo list backend servicing &quot;{0}&quot; encountered an error."
-msgstr "The memo list backend servicing &quot;{0}&quot; encountered an error."
-
-#: ../e-util/e-system.error.xml.h:22
-msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
-msgstr "The task list backend servicing &quot;{0}&quot; encountered an error."
+"This will permanently remove the collection “{0}” from the server. Are you "
+"sure you want to proceed?"
 
-#: ../e-util/e-table-click-to-add.c:689
-#: ../e-util/gal-a11y-e-table-click-to-add.c:61
-#: ../e-util/gal-a11y-e-table-click-to-add.c:142
+#: ../src/e-util/e-table-click-to-add.c:687
+#: ../src/e-util/gal-a11y-e-table-click-to-add.c:59
+#: ../src/e-util/gal-a11y-e-table-click-to-add.c:140
 msgid "click to add"
 msgstr "click to add"
 
-#: ../e-util/e-table-column-selector.c:264
+#: ../src/e-util/e-table-column-selector.c:264
 msgid "Move selected column names to top"
 msgstr "Move selected column names to top"
 
-#: ../e-util/e-table-column-selector.c:269
+#: ../src/e-util/e-table-column-selector.c:269
 msgid "Move selected column names up one row"
 msgstr "Move selected column names up one row"
 
-#: ../e-util/e-table-column-selector.c:274
+#: ../src/e-util/e-table-column-selector.c:274
 msgid "Move selected column names down one row"
 msgstr "Move selected column names down one row"
 
-#: ../e-util/e-table-column-selector.c:279
+#: ../src/e-util/e-table-column-selector.c:279
 msgid "Move selected column names to bottom"
 msgstr "Move selected column names to bottom"
 
-#: ../e-util/e-table-column-selector.c:284
+#: ../src/e-util/e-table-column-selector.c:284
 msgid "Select all column names"
 msgstr "Select all column names"
 
-#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
 msgid "(Ascending)"
 msgstr "(Ascending)"
 
-#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
 msgid "(Descending)"
 msgstr "(Descending)"
 
-#: ../e-util/e-table-config.c:395
+#: ../src/e-util/e-table-config.c:395
 msgid "Not sorted"
 msgstr "Not sorted"
 
-#: ../e-util/e-table-config.c:440
+#: ../src/e-util/e-table-config.c:440
 msgid "No grouping"
 msgstr "No grouping"
 
-#: ../e-util/e-table-config.c:545
+#: ../src/e-util/e-table-config.c:545
 msgid "Show Fields"
 msgstr "Show Fields"
 
-#: ../e-util/e-table-config.c:559
+#: ../src/e-util/e-table-config.c:559
 msgid "Choose the order of information to appear in the message list."
 msgstr "Choose the order of information to appear in the message list."
 
-#: ../e-util/e-table-config.ui.h:2
-msgid "_Apply"
-msgstr "_Apply"
-
-#: ../e-util/e-table-config.ui.h:4
-msgid "_Sort..."
-msgstr "_Sort…"
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "_Group By..."
-msgstr "_Group By…"
-
-#: ../e-util/e-table-config.ui.h:6
-msgid "_Fields Shown..."
-msgstr "_Fields Shown…"
-
-#: ../e-util/e-table-config.ui.h:9
+#: ../src/e-util/e-table-config.ui.h:2
 msgid "Clear _All"
 msgstr "Clear _All"
 
-#: ../e-util/e-table-config.ui.h:10
+#: ../src/e-util/e-table-config.ui.h:5
 msgid "_Show field in View"
 msgstr "_Show field in View"
 
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1796
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1783
 msgid "Ascending"
 msgstr "Ascending"
 
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1796
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1783
 msgid "Descending"
 msgstr "Descending"
 
-#: ../e-util/e-table-config.ui.h:13
+#: ../src/e-util/e-table-config.ui.h:8
 msgid "Group Items By"
 msgstr "Group Items By"
 
-#: ../e-util/e-table-config.ui.h:14
+#: ../src/e-util/e-table-config.ui.h:9
 msgid "Show _field in View"
 msgstr "Show _field in View"
 
-#: ../e-util/e-table-config.ui.h:15
+#: ../src/e-util/e-table-config.ui.h:10
 msgid "Then By"
 msgstr "Then By"
 
-#: ../e-util/e-table-config.ui.h:16
+#: ../src/e-util/e-table-config.ui.h:11
 msgid "Show field i_n View"
 msgstr "Show field i_n View"
 
-#: ../e-util/e-table-config.ui.h:17
+#: ../src/e-util/e-table-config.ui.h:12
 msgid "Show field in _View"
 msgstr "Show field in _View"
 
-#: ../e-util/e-table-config.ui.h:18
+#: ../src/e-util/e-table-config.ui.h:13
 msgid "Sort"
 msgstr "Sort"
 
-#: ../e-util/e-table-config.ui.h:19
+#: ../src/e-util/e-table-config.ui.h:14
 msgid "Clear All"
 msgstr "Clear All"
 
-#: ../e-util/e-table-config.ui.h:20
+#: ../src/e-util/e-table-config.ui.h:15
 msgid "Sort Items By"
 msgstr "Sort Items By"
 
-#: ../e-util/e-table-field-chooser.c:166
+#: ../src/e-util/e-table-config.ui.h:16
+msgid "_Apply"
+msgstr "_Apply"
+
+#: ../src/e-util/e-table-config.ui.h:17
+msgid "_Sort..."
+msgstr "_Sort…"
+
+#: ../src/e-util/e-table-config.ui.h:18
+msgid "_Group By..."
+msgstr "_Group By…"
+
+#: ../src/e-util/e-table-config.ui.h:19
+msgid "_Fields Shown..."
+msgstr "_Fields Shown…"
+
+#: ../src/e-util/e-table-field-chooser.c:164
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -14074,101 +15394,114 @@ msgstr ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
 
-#: ../e-util/e-table-field-chooser-dialog.c:226
+#: ../src/e-util/e-table-field-chooser-dialog.c:224
 msgid "Add a Column"
 msgstr "Add a Column"
 
-#: ../e-util/e-table-group-container.c:368
+#. Translators: This text is used as a special row when an ETable
+#. * has turned on grouping on a column, which has set a title.
+#. * The first %s is replaced with a column title.
+#. * The second %s is replaced with an actual  group value.
+#. * Finally the %d is replaced with count of items in this group.
+#. * Example: "Family name: Smith (13 items)"
+#.
+#: ../src/e-util/e-table-group-container.c:366
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s: %s (%d item)"
 msgstr[1] "%s: %s (%d items)"
 
-#: ../e-util/e-table-group-container.c:382
+#. Translators: This text is used as a special row when an ETable
+#. * has turned on grouping on a column, which doesn't have set a title.
+#. * The %s is replaced with an actual group value.
+#. * The %d is replaced with count of items in this group.
+#. * Example: "Smith (13 items)"
+#.
+#: ../src/e-util/e-table-group-container.c:380
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d item)"
 msgstr[1] "%s (%d items)"
 
-#: ../e-util/e-table-header-item.c:1619
+#: ../src/e-util/e-table-header-item.c:1606
 msgid "Customize Current View"
 msgstr "Customise Current View"
 
-#: ../e-util/e-table-header-item.c:1642
+#: ../src/e-util/e-table-header-item.c:1629
 msgid "Sort _Ascending"
 msgstr "Sort _Ascending"
 
-#: ../e-util/e-table-header-item.c:1645
+#: ../src/e-util/e-table-header-item.c:1632
 msgid "Sort _Descending"
 msgstr "Sort _Descending"
 
-#: ../e-util/e-table-header-item.c:1648
+#: ../src/e-util/e-table-header-item.c:1635
 msgid "_Reset sort"
 msgstr "_Reset sort"
 
-#: ../e-util/e-table-header-item.c:1651
+#: ../src/e-util/e-table-header-item.c:1638
 msgid "Group By This _Field"
 msgstr "Group By This _Field"
 
-#: ../e-util/e-table-header-item.c:1654
+#: ../src/e-util/e-table-header-item.c:1641
 msgid "Group By _Box"
 msgstr "Group By _Box"
 
-#: ../e-util/e-table-header-item.c:1658
+#: ../src/e-util/e-table-header-item.c:1645
 msgid "Remove This _Column"
 msgstr "Remove This _Column"
 
-#: ../e-util/e-table-header-item.c:1661
+#: ../src/e-util/e-table-header-item.c:1648
 msgid "Add a C_olumn..."
 msgstr "Add a C_olumn…"
 
-#: ../e-util/e-table-header-item.c:1665
+#: ../src/e-util/e-table-header-item.c:1652
 msgid "A_lignment"
 msgstr "A_lignment"
 
-#: ../e-util/e-table-header-item.c:1668
+#: ../src/e-util/e-table-header-item.c:1655
 msgid "B_est Fit"
 msgstr "B_est Fit"
 
-#: ../e-util/e-table-header-item.c:1671
+#: ../src/e-util/e-table-header-item.c:1658
 msgid "Format Column_s..."
 msgstr "Format Column_s…"
 
-#: ../e-util/e-table-header-item.c:1675
+#: ../src/e-util/e-table-header-item.c:1662
 msgid "Custo_mize Current View..."
 msgstr "Custo_mise Current View…"
 
-#: ../e-util/e-table-header-item.c:1746
+#: ../src/e-util/e-table-header-item.c:1733
 msgid "_Sort By"
 msgstr "_Sort By"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1769
+#: ../src/e-util/e-table-header-item.c:1756
 msgid "_Custom"
 msgstr "_Custom"
 
-#: ../e-util/e-text.c:2134
+#: ../src/e-util/e-text.c:2135
 msgid "Select All"
 msgstr "Select All"
 
-#: ../e-util/e-text.c:2147
+#: ../src/e-util/e-text.c:2148
 msgid "Input Methods"
 msgstr "Input Methods"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../e-util/e-timezone-dialog.c:270 ../e-util/e-timezone-dialog.c:510
-#: ../e-util/e-timezone-dialog.c:514 ../e-util/e-timezone-dialog.c:518
-#: ../e-util/e-timezone-dialog.c:901
+#: ../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
 msgid "UTC"
 msgstr "UTC"
 
-#: ../e-util/e-timezone-dialog.ui.h:1
+#: ../src/e-util/e-timezone-dialog.ui.h:1
 msgid "Select a Time Zone"
 msgstr "Select a Time Zone"
 
-#: ../e-util/e-timezone-dialog.ui.h:4
+#: ../src/e-util/e-timezone-dialog.ui.h:4
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -14178,399 +15511,567 @@ msgstr ""
 "zone.\n"
 "Use the right mouse button to zoom out."
 
-#: ../e-util/e-timezone-dialog.ui.h:6
+#: ../src/e-util/e-timezone-dialog.ui.h:6
 msgid "Time Zones"
 msgstr "Time Zones"
 
-#: ../e-util/e-timezone-dialog.ui.h:7
+#: ../src/e-util/e-timezone-dialog.ui.h:7
 msgid "_Selection"
 msgstr "_Selection"
 
-#: ../e-util/e-timezone-dialog.ui.h:8
+#: ../src/e-util/e-timezone-dialog.ui.h:8
 msgid "Timezone drop-down combination box"
 msgstr "Timezone drop-down combination box"
 
-#: ../e-util/e-url-entry.c:108
+#: ../src/e-util/e-url-entry.c:106
 msgid "Click here to open the URL"
 msgstr "Click here to open the URL"
 
-#: ../e-util/e-url-entry.c:110
+#: ../src/e-util/e-url-entry.c:108
 msgid "Enter a URL here"
 msgstr "Enter a URL here"
 
-#: ../e-util/evolution-source-viewer.c:637
+#: ../src/e-util/evolution-source-viewer.c:638
 msgid "Evolution Source Viewer"
 msgstr "Evolution Source Viewer"
 
 #. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:667
+#: ../src/e-util/evolution-source-viewer.c:668
 msgid "Display Name"
 msgstr "Display Name"
 
-#: ../e-util/evolution-source-viewer.c:676
+#: ../src/e-util/evolution-source-viewer.c:677
 msgid "Flags"
 msgstr "Flags"
 
-#: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:779
+#: ../src/e-util/evolution-source-viewer.c:729
+#: ../src/mail/e-mail-config-identity-page.c:1230
 msgid "Identity"
 msgstr "Identity"
 
-#: ../e-util/e-web-view.c:337
+#: ../src/e-util/e-webdav-browser.c:447
+#| msgid "Address Book"
+msgid "Address book"
+msgstr "Address book"
+
+#: ../src/e-util/e-webdav-browser.c:458
+msgid "Events"
+msgstr "Events"
+
+#: ../src/e-util/e-webdav-browser.c:473
+msgid "Collection"
+msgstr "Collection"
+
+#: ../src/e-util/e-webdav-browser.c:514
+#| msgid "Loading"
+msgid "Loading…"
+msgstr "Loading…"
+
+#: ../src/e-util/e-webdav-browser.c:1383
+#| msgid "Searching folder content..."
+msgid "Searching collection children…"
+msgstr "Searching collection children…"
+
+#: ../src/e-util/e-webdav-browser.c:1385
+msgid "Failed to search for collection children"
+msgstr "Failed to search for collection children"
+
+#: ../src/e-util/e-webdav-browser.c:1419
+#| msgid "Searching for user's calendars..."
+msgid "Searching for user home, please wait…"
+msgstr "Searching for user home, please wait…"
+
+#: ../src/e-util/e-webdav-browser.c:1421
+#| msgid "Unable to perform search."
+msgid "Failed to search for user home"
+msgstr "Failed to search for user home"
+
+#: ../src/e-util/e-webdav-browser.c:1763
+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
+#| msgid "Failed to delete selected attendee"
+#| msgid_plural "Failed to delete selected attendees"
+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..."
+msgid "Saving changes…"
+msgstr "Saving changes…"
+
+#: ../src/e-util/e-webdav-browser.c:1813
+#| msgid "Failed to save attachments"
+msgid "Failed to save changes"
+msgstr "Failed to save changes"
+
+#: ../src/e-util/e-webdav-browser.c:1815
+#| msgid "Creating a memo"
+msgid "Creating new book…"
+msgstr "Creating new book…"
+
+#: ../src/e-util/e-webdav-browser.c:1816
+#| msgid "Failed to create pipe: %s"
+msgid "Failed to create new book"
+msgstr "Failed to create new book"
+
+#: ../src/e-util/e-webdav-browser.c:1818
+#| msgid "Cre_ate new calendar"
+msgid "Creating new calendar…"
+msgstr "Creating new calendar…"
+
+#: ../src/e-util/e-webdav-browser.c:1819
+#| msgid "Failed to create an event in the calendar '{0}'"
+msgid "Failed to create new calendar"
+msgstr "Failed to create new calendar"
+
+#: ../src/e-util/e-webdav-browser.c:1821
+#| msgid "Create a new contact"
+msgid "Creating new collection…"
+msgstr "Creating new collection…"
+
+#: ../src/e-util/e-webdav-browser.c:1822
+#| msgid "Failed to create pipe: %s"
+msgid "Failed to create new collection"
+msgstr "Failed to create new collection"
+
+#: ../src/e-util/e-webdav-browser.c:1961
+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"
+
+#: ../src/e-util/e-webdav-browser.c:1963
+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
+#| msgid "Deleting a memo"
+#| msgid_plural "Deleting %d memos"
+msgid "Deleting book…"
+msgstr "Deleting book…"
+
+#: ../src/e-util/e-webdav-browser.c:2190
+#| msgid "Failed to delete contact"
+msgid "Failed to delete book"
+msgstr "Failed to delete book"
+
+#: ../src/e-util/e-webdav-browser.c:2193
+#| msgid "Opening calendar"
+msgid "Deleting calendar…"
+msgstr "Deleting calendar…"
+
+#: ../src/e-util/e-webdav-browser.c:2194
+#| msgid "Failed to delete contact"
+msgid "Failed to delete calendar"
+msgstr "Failed to delete calendar"
+
+#: ../src/e-util/e-webdav-browser.c:2197
+#| msgid "Meeting Cancelation"
+msgid "Deleting collection…"
+msgstr "Deleting collection…"
+
+#: ../src/e-util/e-webdav-browser.c:2198
+#| msgid "Failed to delete contact"
+msgid "Failed to delete collection"
+msgstr "Failed to delete collection"
+
+#: ../src/e-util/e-webdav-browser.c:2429
+#| msgid "Component"
+msgid "For Components:"
+msgstr "For Components:"
+
+#: ../src/e-util/e-webdav-browser.c:2435
+#| msgid "Events"
+msgid "_Events"
+msgstr "_Events"
+
+#: ../src/e-util/e-webdav-browser.c:2625
+#| msgid "LDAP Servers"
+msgid "WebDAV server:"
+msgstr "WebDAV server:"
+
+#: ../src/e-util/e-webdav-browser.c:2660
+#| msgid "Target Book"
+msgid "Create _Book"
+msgstr "Create _Book"
+
+#: ../src/e-util/e-webdav-browser.c:2667
+#| msgid "Weather Calendars"
+msgid "Create _Calendar"
+msgstr "Create _Calendar"
+
+#: ../src/e-util/e-webdav-browser.c:2674
+#| msgid "Collection"
+msgid "Create Collectio_n"
+msgstr "Create Collectio_n"
+
+#. 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-webdav-browser.c:2699
+#: ../src/mail/em-subscription-editor.c:1976
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
+msgid "_Refresh"
+msgstr "_Refresh"
+
+#: ../src/e-util/e-web-view.c:346
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: ../e-util/e-web-view.c:339
+#: ../src/e-util/e-web-view.c:348
 msgid "Copy the link to the clipboard"
 msgstr "Copy the link to the clipboard"
 
-#: ../e-util/e-web-view.c:347
+#: ../src/e-util/e-web-view.c:356
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: ../e-util/e-web-view.c:349
+#: ../src/e-util/e-web-view.c:358
 msgid "Open the link in a web browser"
 msgstr "Open the link in a web browser"
 
-#: ../e-util/e-web-view.c:357
+#: ../src/e-util/e-web-view.c:366
 msgid "_Copy Email Address"
 msgstr "_Copy E-mail Address"
 
-#: ../e-util/e-web-view.c:364
+#: ../src/e-util/e-web-view.c:373
 msgid "Copy _Raw Email Address"
 msgstr "Copy _Raw E-mail Address"
 
-#: ../e-util/e-web-view.c:366
+#: ../src/e-util/e-web-view.c:375
 msgid "Copy the raw email address to the clipboard"
 msgstr "Copy the raw e-mail address to the clipboard"
 
-#: ../e-util/e-web-view.c:381
+#: ../src/e-util/e-web-view.c:390
 msgid "_Copy Image"
 msgstr "_Copy Image"
 
-#: ../e-util/e-web-view.c:383
+#: ../src/e-util/e-web-view.c:392
 msgid "Copy the image to the clipboard"
 msgstr "Copy the image to the clipboard"
 
-#: ../e-util/e-web-view.c:388
+#: ../src/e-util/e-web-view.c:397
 msgid "Save _Image..."
 msgstr "Save _Image…"
 
-#: ../e-util/e-web-view.c:390
+#: ../src/e-util/e-web-view.c:399
 msgid "Save the image to a file"
 msgstr "Save the image to a file"
 
-#: ../e-util/e-web-view.c:410 ../e-util/e-web-view.c:1826
+#: ../src/e-util/e-web-view.c:419 ../src/e-util/e-web-view.c:1999
 msgid "Select all text and images"
 msgstr "Select all text and images"
 
-#: ../e-util/e-web-view.c:1284
+#: ../src/e-util/e-web-view.c:1354
 #, c-format
 msgid "Click to call %s"
 msgstr "Click to call %s"
 
-#: ../e-util/e-web-view.c:1286
+#: ../src/e-util/e-web-view.c:1356
 msgid "Click to hide/unhide addresses"
 msgstr "Click to hide/unhide addresses"
 
-#: ../e-util/e-web-view.c:1297
+#: ../src/e-util/e-web-view.c:1367
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "Go to the section %s of the message"
 
-#: ../e-util/e-web-view.c:1299
+#: ../src/e-util/e-web-view.c:1369
 msgid "Go to the beginning of the message"
 msgstr "Go to the beginning of the message"
 
-#: ../e-util/e-web-view.c:1303
+#: ../src/e-util/e-web-view.c:1373
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
-#: ../e-util/e-web-view.c:3672
+#: ../src/e-util/e-web-view.c:3906
 msgid "Copying image to clipboard"
 msgstr "Copying image to clipboard"
 
-#: ../e-util/e-web-view.c:3860
+#: ../src/e-util/e-web-view.c:4094
 msgid "Save Image"
 msgstr "Save Image"
 
-#: ../e-util/e-web-view.c:3896
+#: ../src/e-util/e-web-view.c:4135
 #, c-format
-msgid "Saving image to '%s'"
-msgstr "Saving image to '%s'"
+#| msgid "Saving image to '%s'"
+msgid "Saving image to “%s”"
+msgstr "Saving image to “%s”"
 
-#: ../e-util/e-web-view.c:3991
+#: ../src/e-util/e-web-view.c:4230
 #, 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."
+#| msgid "Cannot get URI '%s', do not know how to download it."
+msgid "Cannot get URI “%s”, do not know how to download it."
+msgstr "Cannot get URI “%s”, do not know how to download it."
 
-#: ../e-util/e-widget-undo.c:430
-msgid "Undo 'Insert text'"
-msgstr "Undo 'Insert text'"
+#: ../src/e-util/e-widget-undo.c:428
+#| msgid "Undo 'Insert text'"
+msgid "Undo “Insert text”"
+msgstr "Undo “Insert text”"
 
-#: ../e-util/e-widget-undo.c:432
-msgid "Redo 'Insert text'"
-msgstr "Redo 'Insert text'"
+#: ../src/e-util/e-widget-undo.c:430
+#| msgid "Redo 'Insert text'"
+msgid "Redo “Insert text”"
+msgstr "Redo “Insert text”"
 
-#: ../e-util/e-widget-undo.c:446
-msgid "Undo 'Delete text'"
-msgstr "Undo 'Delete text'"
+#: ../src/e-util/e-widget-undo.c:444
+#| msgid "Undo 'Delete text'"
+msgid "Undo “Delete text”"
+msgstr "Undo “Delete text”"
 
-#: ../e-util/e-widget-undo.c:448
-msgid "Redo 'Delete text'"
-msgstr "Redo 'Delete text'"
+#: ../src/e-util/e-widget-undo.c:446
+#| msgid "Redo 'Delete text'"
+msgid "Redo “Delete text”"
+msgstr "Redo “Delete text”"
 
-#: ../e-util/filter.error.xml.h:1
+#: ../src/e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "Missing date."
 
-#: ../e-util/filter.error.xml.h:2
+#: ../src/e-util/filter.error.xml.h:2
 msgid "You must choose a date."
 msgstr "You must choose a date."
 
-#: ../e-util/filter.error.xml.h:3
+#: ../src/e-util/filter.error.xml.h:3
 msgid "Missing filename."
 msgstr "Missing filename."
 
-#: ../e-util/filter.error.xml.h:4
+#: ../src/e-util/filter.error.xml.h:4
 msgid "You must specify a filename."
 msgstr "You must specify a filename."
 
-#: ../e-util/filter.error.xml.h:5
-msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "File &quot;{0}&quot; does not exist or is not a regular file."
+#: ../src/e-util/filter.error.xml.h:5
+#| msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgid "File “{0}” does not exist or is not a regular file."
+msgstr "File “{0}” does not exist or is not a regular file."
 
-#: ../e-util/filter.error.xml.h:6
-msgid "Bad regular expression &quot;{0}&quot;."
-msgstr "Bad regular expression &quot;{0}&quot;."
+#: ../src/e-util/filter.error.xml.h:6
+#| msgid "Bad regular expression &quot;{0}&quot;."
+msgid "Bad regular expression “{0}”."
+msgstr "Bad regular expression “{0}”."
 
-#: ../e-util/filter.error.xml.h:7
-msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr "Could not compile regular expression &quot;{1}&quot;."
+#: ../src/e-util/filter.error.xml.h:7
+#| msgid "Could not compile regular expression &quot;{1}&quot;."
+msgid "Could not compile regular expression “{1}”."
+msgstr "Could not compile regular expression “{1}”."
 
-#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:107
+#: ../src/e-util/filter.error.xml.h:8 ../src/mail/mail.error.xml.h:107
 msgid "Missing name."
 msgstr "Missing name."
 
-#: ../e-util/filter.error.xml.h:9
+#: ../src/e-util/filter.error.xml.h:9
 msgid "You must name this filter."
 msgstr "You must name this filter."
 
-#: ../e-util/filter.error.xml.h:10
-msgid "Name &quot;{0}&quot; already used."
-msgstr "Name &quot;{0}&quot; already used."
+#: ../src/e-util/filter.error.xml.h:10
+#| msgid "Name &quot;{0}&quot; already used."
+msgid "Name “{0}” already used."
+msgstr "Name “{0}” already used."
 
-#: ../e-util/filter.error.xml.h:11
+#: ../src/e-util/filter.error.xml.h:11
 msgid "Please choose another name."
 msgstr "Please choose another name."
 
-#: ../e-util/filter.error.xml.h:12
+#: ../src/e-util/filter.error.xml.h:12
 msgid "Missing condition."
 msgstr "Missing condition."
 
-#: ../e-util/filter.error.xml.h:13
+#: ../src/e-util/filter.error.xml.h:13
 msgid "Filter should have at least one condition."
 msgstr "Filter should have at least one condition."
 
-#: ../e-util/filter.error.xml.h:14
+#: ../src/e-util/filter.error.xml.h:14
 msgid "Missing value."
 msgstr "Missing value."
 
-#: ../e-util/filter.error.xml.h:15
+#: ../src/e-util/filter.error.xml.h:15
 msgid "One or more values cannot be empty."
 msgstr "One or more values cannot be empty."
 
-#: ../e-util/filter.error.xml.h:16
-msgid "Are you sure you want to remove rule '{0}'?"
-msgstr "Are you sure you want to remove rule '{0}'?"
+#: ../src/e-util/filter.error.xml.h:16
+#| msgid "Are you sure you want to remove rule '{0}'?"
+msgid "Are you sure you want to remove rule “{0}”?"
+msgstr "Are you sure you want to remove rule “{0}”?"
 
-#: ../e-util/filter.error.xml.h:17
+#: ../src/e-util/filter.error.xml.h:17
 msgid "_Keep"
 msgstr "_Keep"
 
-#: ../e-util/filter.ui.h:2
+#: ../src/e-util/filter.ui.h:2
 msgid "the current time"
 msgstr "the current time"
 
-#: ../e-util/filter.ui.h:3
+#: ../src/e-util/filter.ui.h:3
 msgid "the time you specify"
 msgstr "the time you specify"
 
-#: ../e-util/filter.ui.h:4
+#: ../src/e-util/filter.ui.h:4
 msgid "a time relative to the current time"
 msgstr "a time relative to the current time"
 
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:90
+#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:93
 msgid "seconds"
 msgstr "seconds"
 
-#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../src/e-util/filter.ui.h:9
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:7
 msgid "weeks"
 msgstr "weeks"
 
-#: ../e-util/filter.ui.h:10 ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../src/e-util/filter.ui.h:10
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "months"
 msgstr "months"
 
-#: ../e-util/filter.ui.h:11
+#: ../src/e-util/filter.ui.h:11
 msgid "years"
 msgstr "years"
 
-#: ../e-util/filter.ui.h:12
+#: ../src/e-util/filter.ui.h:12
 msgid "ago"
 msgstr "ago"
 
-#: ../e-util/filter.ui.h:13
+#: ../src/e-util/filter.ui.h:13
 msgid "in the future"
 msgstr "in the future"
 
-#: ../e-util/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "Show filters for mail:"
-
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
-msgid "_Filter Rules"
-msgstr "_Filter Rules"
-
-#: ../e-util/filter.ui.h:23
+#: ../src/e-util/filter.ui.h:14
 msgid "Compare against"
 msgstr "Compare against"
 
-#: ../e-util/filter.ui.h:24
+#: ../src/e-util/filter.ui.h:15
+#| msgid ""
+#| "The message's date will be compared against\n"
+#| "the current time when filtering occurs."
 msgid ""
-"The message's date will be compared against\n"
+"The message’s date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
-"The message's date will be compared against\n"
+"The message’s date will be compared against\n"
 "the current time when filtering occurs."
 
-#: ../e-util/filter.ui.h:26
+#: ../src/e-util/filter.ui.h:17
+#| msgid ""
+#| "The message's date will be compared against\n"
+#| "12:00am of the date specified."
 msgid ""
-"The message's date will be compared against\n"
+"The message’s date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
+"The message’s date will be compared against\n"
+"00:00 of the date specified."
 
-#: ../e-util/filter.ui.h:28
+#: ../src/e-util/filter.ui.h:19
+#| msgid ""
+#| "The message's date will be compared against\n"
+#| "a time relative to when filtering occurs."
 msgid ""
-"The message's date will be compared against\n"
+"The message’s date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
-"The message's date will be compared against\n"
+"The message’s date will be compared against\n"
 "a time relative to when filtering occurs."
 
-#: ../e-util/gal-a11y-e-cell.c:130
+#: ../src/e-util/filter.ui.h:21
+msgid "Show filters for mail:"
+msgstr "Show filters for mail:"
+
+#: ../src/e-util/filter.ui.h:22 ../src/mail/em-filter-editor.c:163
+msgid "_Filter Rules"
+msgstr "_Filter Rules"
+
+#: ../src/e-util/gal-a11y-e-cell.c:128
 msgid "Table Cell"
 msgstr "Table Cell"
 
 #. Translators: description of a "popup" action
-#: ../e-util/gal-a11y-e-cell-popup.c:127
+#: ../src/e-util/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
 msgstr "pop up a child"
 
 #. Translators: description of an "edit" action
-#: ../e-util/gal-a11y-e-cell-text.c:631
+#: ../src/e-util/gal-a11y-e-cell-text.c:631
 msgid "begin editing this cell"
 msgstr "begin editing this cell"
 
 #. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:185
+#: ../src/e-util/gal-a11y-e-cell-toggle.c:183
 msgid "toggle the cell"
 msgstr "toggle the cell"
 
 #. Translators: description of an "expand" action
-#: ../e-util/gal-a11y-e-cell-tree.c:215
+#: ../src/e-util/gal-a11y-e-cell-tree.c:213
 msgid "expands the row in the ETree containing this cell"
 msgstr "expands the row in the ETree containing this cell"
 
 #. Translators: description of a "collapse" action
-#: ../e-util/gal-a11y-e-cell-tree.c:223
+#: ../src/e-util/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
 msgstr "collapses the row in the ETree containing this cell"
 
-#: ../e-util/gal-a11y-e-table-click-to-add.c:71
+#: ../src/e-util/gal-a11y-e-table-click-to-add.c:69
 msgid "click"
 msgstr "click"
 
-#: ../e-util/gal-a11y-e-table-column-header.c:162
+#: ../src/e-util/gal-a11y-e-table-column-header.c:160
 msgid "sort"
 msgstr "sort"
 
-#: ../e-util/gal-view-instance-save-as-dialog.c:295
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:293
 msgid "Save Current View"
 msgstr "Save Current View"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+#: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "_Create new view"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+#: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:3
 msgid "_Replace existing view"
 msgstr "_Replace existing view"
 
-#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:201
+#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:203
 msgid "Do you wish to save your changes?"
 msgstr "Do you wish to save your changes?"
 
-#: ../e-util/widgets.error.xml.h:2
+#: ../src/e-util/widgets.error.xml.h:2
 msgid "This signature has been changed, but has not been saved."
 msgstr "This signature has been changed, but has not been saved."
 
-#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:203
+#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:205
 msgid "_Discard changes"
 msgstr "_Discard changes"
 
-#: ../e-util/widgets.error.xml.h:4
+#: ../src/e-util/widgets.error.xml.h:4
 msgid "Blank Signature"
 msgstr "Blank Signature"
 
-#: ../e-util/widgets.error.xml.h:5
+#: ../src/e-util/widgets.error.xml.h:5
 msgid "Please provide an unique name to identify this signature."
 msgstr "Please provide an unique name to identify this signature."
 
-#: ../e-util/widgets.error.xml.h:6
+#: ../src/e-util/widgets.error.xml.h:6
 msgid "Unable to copy image to clipboard."
 msgstr "Unable to copy image to clipboard."
 
-#: ../e-util/widgets.error.xml.h:7
+#: ../src/e-util/widgets.error.xml.h:7
 msgid "Unable to save image."
 msgstr "Unable to save image."
 
-#: ../e-util/widgets.error.xml.h:8
+#: ../src/e-util/widgets.error.xml.h:8
 msgid "Could not load signature."
 msgstr "Could not load signature."
 
-#: ../e-util/widgets.error.xml.h:9
+#: ../src/e-util/widgets.error.xml.h:9
 msgid "Could not save signature."
 msgstr "Could not save signature."
 
-#: ../evolution.appdata.xml.in.h:3
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-msgstr ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-
-#: ../evolution.appdata.xml.in.h:4
-msgid ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
-msgstr ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
-
-#: ../libemail-engine/camel-sasl-oauth2-google.c:29
+#: ../src/libemail-engine/camel-sasl-oauth2-google.c:27
 msgid "OAuth2 Google"
 msgstr "OAuth2 Google"
 
-#: ../libemail-engine/camel-sasl-oauth2-google.c:30
+#: ../src/libemail-engine/camel-sasl-oauth2-google.c:28
 msgid ""
 "This option will use an OAuth 2.0 access token to connect to the Google "
 "server"
@@ -14578,110 +16079,120 @@ msgstr ""
 "This option will use an OAuth 2.0 access token to connect to the Google "
 "server"
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:26
+#: ../src/libemail-engine/camel-sasl-xoauth2.c:27
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:27
+#: ../src/libemail-engine/camel-sasl-xoauth2.c:28
 msgid "This option will use an OAuth 2.0 access token to connect to the server"
 msgstr ""
 "This option will use an OAuth 2.0 access token to connect to the server"
 
-#: ../libemail-engine/e-mail-folder-utils.c:115
+#: ../src/libemail-engine/e-mail-folder-utils.c:106
 #, c-format
-msgid "Saving message to folder '%s'"
-msgstr "Saving message to folder '%s'"
+#| msgid "Saving message to folder '%s'"
+msgid "Saving message to folder “%s”"
+msgstr "Saving message to folder “%s”"
 
-#: ../libemail-engine/e-mail-folder-utils.c:574
+#: ../src/libemail-engine/e-mail-folder-utils.c:565
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: ../libemail-engine/e-mail-folder-utils.c:684
-#: ../libemail-engine/e-mail-folder-utils.c:946
+#: ../src/libemail-engine/e-mail-folder-utils.c:675
+#: ../src/libemail-engine/e-mail-folder-utils.c:937
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Retrieving %d message"
 msgstr[1] "Retrieving %d messages"
 
-#: ../libemail-engine/e-mail-folder-utils.c:786
+#: ../src/libemail-engine/e-mail-folder-utils.c:777
 msgid "Scanning messages for duplicates"
 msgstr "Scanning messages for duplicates"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1159
+#: ../src/libemail-engine/e-mail-folder-utils.c:1150
 #, c-format
-msgid "Removing folder '%s'"
-msgstr "Removing folder '%s'"
+#| msgid "Removing folder '%s'"
+msgid "Removing folder “%s”"
+msgstr "Removing folder “%s”"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1340
+#: ../src/libemail-engine/e-mail-folder-utils.c:1331
 #, c-format
-msgid "File \"%s\" has been removed."
-msgstr "File \"%s\" has been removed."
+#| msgid "File \"%s\" has been removed."
+msgid "File “%s” has been removed."
+msgstr "File “%s” has been removed."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1344
+#: ../src/libemail-engine/e-mail-folder-utils.c:1335
 msgid "File has been removed."
 msgstr "File has been removed."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1421
+#: ../src/libemail-engine/e-mail-folder-utils.c:1411
 msgid "Removing attachments"
 msgstr "Removing attachments"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1593
+#: ../src/libemail-engine/e-mail-folder-utils.c:1583
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Saving %d message"
 msgstr[1] "Saving %d messages"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1971
+#: ../src/libemail-engine/e-mail-folder-utils.c:1961
 #, c-format
-msgid "Invalid folder URI '%s'"
-msgstr "Invalid folder URI '%s'"
+#| msgid "Invalid folder URI '%s'"
+msgid "Invalid folder URI “%s”"
+msgstr "Invalid folder URI “%s”"
 
 #. Some local folders
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-properties.c:778
-#: ../mail/em-folder-tree-model.c:1212 ../mail/importers/kmail-libs.c:141
-#: ../modules/mail/e-mail-shell-view-private.c:1053
-#: ../modules/mail/e-mail-shell-view-private.c:1064
+#: ../src/libemail-engine/e-mail-session.c:125
+#: ../src/mail/em-folder-properties.c:1150
+#: ../src/mail/em-folder-tree-model.c:1237
+#: ../src/mail/importers/kmail-libs.c:139
+#: ../src/modules/mail/e-mail-shell-view-private.c:1026
+#: ../src/modules/mail/e-mail-shell-view-private.c:1037
 msgid "Inbox"
 msgstr "Inbox"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1205
-#: ../mail/importers/kmail-libs.c:147
-#: ../modules/mail/e-mail-shell-view-private.c:1051
+#: ../src/libemail-engine/e-mail-session.c:126
+#: ../src/mail/em-folder-tree-model.c:1230
+#: ../src/mail/importers/kmail-libs.c:145
+#: ../src/modules/mail/e-mail-shell-view-private.c:1024
 msgid "Drafts"
 msgstr "Drafts"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1216
-#: ../mail/importers/kmail-libs.c:143
-#: ../modules/mail/e-mail-shell-view-private.c:1055
+#: ../src/libemail-engine/e-mail-session.c:127
+#: ../src/mail/em-folder-tree-model.c:1241
+#: ../src/mail/importers/kmail-libs.c:141
+#: ../src/modules/mail/e-mail-shell-view-private.c:1028
 msgid "Outbox"
 msgstr "Outbox"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:130 ../mail/em-folder-tree-model.c:1220
-#: ../mail/importers/kmail-libs.c:145
-#: ../modules/mail/e-mail-shell-view-private.c:1057
+#: ../src/libemail-engine/e-mail-session.c:128
+#: ../src/mail/em-folder-tree-model.c:1245
+#: ../src/mail/importers/kmail-libs.c:143
+#: ../src/modules/mail/e-mail-shell-view-private.c:1030
 msgid "Sent"
 msgstr "Sent"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:131 ../mail/em-folder-tree-model.c:1208
-#: ../mail/importers/kmail-libs.c:149
-#: ../modules/mail/e-mail-shell-view-private.c:1059
-#: ../plugins/templates/e-templates-store.c:2214
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+#: ../src/libemail-engine/e-mail-session.c:129
+#: ../src/mail/em-folder-tree-model.c:1233
+#: ../src/mail/importers/kmail-libs.c:147
+#: ../src/modules/mail/e-mail-shell-view-private.c:1032
+#: ../src/plugins/templates/e-templates-store.c:2212
+#: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Templates"
 
-#: ../libemail-engine/e-mail-session.c:1305
+#: ../src/libemail-engine/e-mail-session.c:1332
 #, c-format
 msgid "User cancelled operation"
 msgstr "User cancelled operation"
 
-#: ../libemail-engine/e-mail-session.c:1362
+#: ../src/libemail-engine/e-mail-session.c:1389
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
@@ -14690,893 +16201,1036 @@ msgstr ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 
-#: ../libemail-engine/e-mail-session.c:1375
+#: ../src/libemail-engine/e-mail-session.c:1402
 #, 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."
 
-#: ../libemail-engine/e-mail-session.c:2405
+#: ../src/libemail-engine/e-mail-session.c:2444
 #, c-format
-msgid "Waiting for '%s'"
-msgstr "Waiting for '%s'"
+#| msgid "Waiting for '%s'"
+msgid "Waiting for “%s”"
+msgstr "Waiting for “%s”"
 
-#: ../libemail-engine/e-mail-session-utils.c:540
+#: ../src/libemail-engine/e-mail-session-utils.c:526
 msgid "No mail transport service available"
 msgstr "No mail transport service available"
 
-#: ../libemail-engine/e-mail-session-utils.c:630
-#: ../libemail-engine/mail-ops.c:720
+#: ../src/libemail-engine/e-mail-session-utils.c:616
+#: ../src/libemail-engine/mail-ops.c:706
 #, c-format
-msgid "Posting message to '%s'"
-msgstr "Posting message to '%s'"
+#| msgid "Posting message to '%s'"
+msgid "Posting message to “%s”"
+msgstr "Posting message to “%s”"
 
-#: ../libemail-engine/e-mail-session-utils.c:667
-#: ../libemail-engine/mail-ops.c:756
+#: ../src/libemail-engine/e-mail-session-utils.c:653
+#: ../src/libemail-engine/mail-ops.c:742
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Failed to apply outgoing filters: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:697
-#: ../libemail-engine/e-mail-session-utils.c:732
-#: ../libemail-engine/mail-ops.c:780 ../libemail-engine/mail-ops.c:815
+#: ../src/libemail-engine/e-mail-session-utils.c:686
+#: ../src/libemail-engine/e-mail-session-utils.c:721
+#: ../src/libemail-engine/mail-ops.c:770 ../src/libemail-engine/mail-ops.c:805
 #, c-format
-msgid "Storing sent message to '%s'"
-msgstr "Storing sent message to '%s'"
+#| msgid "Storing sent message to '%s'"
+msgid "Storing sent message to “%s”"
+msgstr "Storing sent message to “%s”"
 
-#: ../libemail-engine/e-mail-session-utils.c:721
-#: ../libemail-engine/mail-ops.c:804
+#: ../src/libemail-engine/e-mail-session-utils.c:710
+#: ../src/libemail-engine/mail-ops.c:794
 #, c-format
+#| msgid ""
+#| "Failed to append to %s: %s\n"
+#| "Appending to local 'Sent' folder instead."
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
+"Appending to local “Sent” folder instead."
 msgstr ""
 "Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
+"Appending to local “Sent” folder instead."
 
-#: ../libemail-engine/e-mail-session-utils.c:751
-#: ../libemail-engine/mail-ops.c:832
+#: ../src/libemail-engine/e-mail-session-utils.c:740
+#: ../src/libemail-engine/mail-ops.c:822
 #, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "Failed to append to local 'Sent' folder: %s"
+#| msgid "Failed to append to local 'Sent' folder: %s"
+msgid "Failed to append to local “Sent” folder: %s"
+msgstr "Failed to append to local “Sent” folder: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:953
-#: ../libemail-engine/mail-ops.c:995 ../libemail-engine/mail-ops.c:1097
+#: ../src/libemail-engine/e-mail-session-utils.c:928
+#: ../src/libemail-engine/mail-ops.c:983 ../src/libemail-engine/mail-ops.c:1085
 msgid "Sending message"
 msgstr "Sending message"
 
-#: ../libemail-engine/e-mail-store-utils.c:190
+#: ../src/libemail-engine/e-mail-store-utils.c:188
 #, c-format
-msgid "Disconnecting from '%s'"
-msgstr "Disconnecting from '%s'"
+#| msgid "Disconnecting from '%s'"
+msgid "Disconnecting from “%s”"
+msgstr "Disconnecting from “%s”"
 
-#: ../libemail-engine/e-mail-store-utils.c:266
+#: ../src/libemail-engine/e-mail-store-utils.c:264
 #, c-format
-msgid "Reconnecting to '%s'"
-msgstr "Reconnecting to '%s'"
+#| msgid "Reconnecting to '%s'"
+msgid "Reconnecting to “%s”"
+msgstr "Reconnecting to “%s”"
 
-#: ../libemail-engine/e-mail-store-utils.c:351
+#: ../src/libemail-engine/e-mail-store-utils.c:349
 #, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "Preparing account '%s' for offline"
+#| msgid "Preparing account '%s' for offline"
+msgid "Preparing account “%s” for offline"
+msgstr "Preparing account “%s” for offline"
 
-#: ../libemail-engine/mail-ops.c:90
+#: ../src/libemail-engine/mail-ops.c:88
 msgid "Filtering Selected Messages"
 msgstr "Filtering Selected Messages"
 
-#: ../libemail-engine/mail-ops.c:148
+#: ../src/libemail-engine/mail-ops.c:146
 #, c-format
+#| msgid ""
+#| "Failed to filter selected messages. One reason can be that folder "
+#| "location set in one or more filters is invalid. Please check your filters "
+#| "in Edit->Message Filters.\n"
+#| "Original error was: %s"
 msgid ""
 "Failed to filter selected messages. One reason can be that folder location "
-"set in one or more filters is invalid. Please check your filters in Edit-"
-">Message Filters.\n"
+"set in one or more filters is invalid. Please check your filters in "
+"Edit→Message Filters.\n"
 "Original error was: %s"
 msgstr ""
 "Failed to filter selected messages. One reason can be that folder location "
-"set in one or more filters is invalid. Please check your filters in Edit-"
-">Message Filters.\n"
+"set in one or more filters is invalid. Please check your filters in "
+"Edit→Message Filters.\n"
 "Original error was: %s"
 
-#: ../libemail-engine/mail-ops.c:229
+#: ../src/libemail-engine/mail-ops.c:226
 #, c-format
-msgid "Fetching mail from '%s'"
-msgstr "Fetching mail from '%s'"
+#| msgid "Fetching mail from '%s'"
+msgid "Fetching mail from “%s”"
+msgstr "Fetching mail from “%s”"
 
-#: ../libemail-engine/mail-ops.c:750
+#: ../src/libemail-engine/mail-ops.c:736
 #, c-format
+#| msgid ""
+#| "Failed to apply outgoing filters. One reason can be that folder location "
+#| "set in one or more filters is invalid. Please check your filters in Edit-"
+#| ">Message Filters.\n"
+#| "Original error was: %s"
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
-"in one or more filters is invalid. Please check your filters in Edit-"
-">Message Filters.\n"
+"in one or more filters is invalid. Please check your filters in Edit→Message "
+"Filters.\n"
 "Original error was: %s"
 msgstr ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
-"in one or more filters is invalid. Please check your filters in Edit-"
-">Message Filters.\n"
+"in one or more filters is invalid. Please check your filters in Edit→Message "
+"Filters.\n"
 "Original error was: %s"
 
-#: ../libemail-engine/mail-ops.c:1006
+#: ../src/libemail-engine/mail-ops.c:994
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
 
-#: ../libemail-engine/mail-ops.c:1058
+#. Translators: The string is distinguished by total
+#. * count of messages to be sent.  Failed messages is
+#. * always more than zero.
+#: ../src/libemail-engine/mail-ops.c:1046
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Failed to send a message"
 msgstr[1] "Failed to send %d of %d messages"
 
-#: ../libemail-engine/mail-ops.c:1064
+#: ../src/libemail-engine/mail-ops.c:1052
 msgid "Cancelled."
 msgstr "Cancelled."
 
-#: ../libemail-engine/mail-ops.c:1066
+#: ../src/libemail-engine/mail-ops.c:1054
 msgid "Complete."
 msgstr "Complete."
 
-#: ../libemail-engine/mail-ops.c:1182
+#: ../src/libemail-engine/mail-ops.c:1169
 #, c-format
-msgid "Moving messages to '%s'"
-msgstr "Moving messages to '%s'"
+#| msgid "Moving messages to '%s'"
+msgid "Moving messages to “%s”"
+msgstr "Moving messages to “%s”"
 
-#: ../libemail-engine/mail-ops.c:1183
+#: ../src/libemail-engine/mail-ops.c:1170
 #, c-format
-msgid "Copying messages to '%s'"
-msgstr "Copying messages to '%s'"
+#| msgid "Copying messages to '%s'"
+msgid "Copying messages to “%s”"
+msgstr "Copying messages to “%s”"
 
-#: ../libemail-engine/mail-ops.c:1302
+#: ../src/libemail-engine/mail-ops.c:1289
 #, c-format
-msgid "Storing folder '%s'"
-msgstr "Storing folder '%s'"
+#| msgid "Storing folder '%s'"
+msgid "Storing folder “%s”"
+msgstr "Storing folder “%s”"
 
-#: ../libemail-engine/mail-ops.c:1430
+#: ../src/libemail-engine/mail-ops.c:1417
 #, c-format
-msgid "Expunging and storing account '%s'"
-msgstr "Expunging and storing account '%s'"
+#| msgid "Expunging and storing account '%s'"
+msgid "Expunging and storing account “%s”"
+msgstr "Expunging and storing account “%s”"
 
-#: ../libemail-engine/mail-ops.c:1431
+#: ../src/libemail-engine/mail-ops.c:1418
 #, c-format
-msgid "Storing account '%s'"
-msgstr "Storing account '%s'"
+#| msgid "Storing account '%s'"
+msgid "Storing account “%s”"
+msgstr "Storing account “%s”"
 
-#: ../libemail-engine/mail-ops.c:1506
+#: ../src/libemail-engine/mail-ops.c:1493
 #, c-format
-msgid "Emptying trash in '%s'"
-msgstr "Emptying wastebasket in '%s'"
+#| msgid "Emptying trash in '%s'"
+msgid "Emptying trash in “%s”"
+msgstr "Emptying wastebasket in “%s”"
 
-#: ../libemail-engine/mail-ops.c:1598
+#: ../src/libemail-engine/mail-ops.c:1585
 #, c-format
-msgid "Processing folder changes in '%s'"
-msgstr "Processing folder changes in '%s'"
+#| msgid "Processing folder changes in '%s'"
+msgid "Processing folder changes in “%s”"
+msgstr "Processing folder changes in “%s”"
 
-#: ../libemail-engine/mail-tools.c:70
+#: ../src/libemail-engine/mail-tools.c:68
 #, c-format
-msgid "Could not create spool directory '%s': %s"
-msgstr "Could not create spool directory '%s': %s"
+#| msgid "Could not create spool directory '%s': %s"
+msgid "Could not create spool directory “%s”: %s"
+msgstr "Could not create spool directory “%s”: %s"
 
-#: ../libemail-engine/mail-tools.c:110
+#: ../src/libemail-engine/mail-tools.c:108
 #, c-format
-msgid "Trying to movemail a non-mbox source '%s'"
-msgstr "Trying to movemail a non-mbox source '%s'"
+#| msgid "Trying to movemail a non-mbox source '%s'"
+msgid "Trying to movemail a non-mbox source “%s”"
+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:193
+#, c-format
+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.
+#: ../src/libemail-engine/mail-tools.c:196
+#| msgid "(No Subject)"
+msgid "No Subject"
+msgstr "No Subject"
 
-#: ../libemail-engine/mail-tools.c:236
+#: ../src/libemail-engine/mail-tools.c:271
 #, c-format
-msgid "Forwarded message - %s"
+#| msgid "Forwarded message - %s"
+msgid "Forwarded message — %s"
 msgstr "Forwarded message — %s"
 
-#: ../libemail-engine/mail-tools.c:238
+#: ../src/libemail-engine/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Forwarded message"
 
-#: ../libemail-engine/mail-vfolder.c:151
+#: ../src/libemail-engine/mail-vfolder.c:149
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Setting up Search Folder: %s"
 
-#: ../libemail-engine/mail-vfolder.c:304
+#: ../src/libemail-engine/mail-vfolder.c:302
 #, c-format
-msgid "Updating Search Folders for '%s' - %s"
-msgstr "Updating Search Folders for '%s' - %s"
+#| msgid "Updating Search Folders for '%s' - %s"
+msgid "Updating Search Folders for “%s : %s”"
+msgstr "Updating Search Folders for “%s : %s”"
 
 #. Translators: The first %s is name of the affected
 #. * search folder(s), the second %s is the URI of the
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:668
-#, c-format
-msgid ""
-"The Search Folder \"%s\" has been modified to account for the deleted "
-"folder\n"
-"\"%s\"."
+#: ../src/libemail-engine/mail-vfolder.c:666
+#, c-format
+#| msgid ""
+#| "The Search Folder \"%s\" has been modified to account for the deleted "
+#| "folder\n"
+#| "\"%s\"."
+#| msgid_plural ""
+#| "The following Search Folders\n"
+#| "%s have been modified to account for the deleted folder\n"
+#| "\"%s\"."
+msgid ""
+"The Search Folder “%s” has been modified to account for the deleted folder\n"
+"“%s”."
 msgid_plural ""
 "The following Search Folders\n"
 "%s have been modified to account for the deleted folder\n"
-"\"%s\"."
+"“%s”."
 msgstr[0] ""
-"The Search Folder \"%s\" has been modified to account for the deleted "
-"folder\n"
-"\"%s\"."
+"The Search Folder “%s” has been modified to account for the deleted folder\n"
+"“%s”."
 msgstr[1] ""
 "The following Search Folders\n"
 "%s have been modified to account for the deleted folder\n"
-"\"%s\"."
+"“%s”."
 
-#: ../mail/e-mail-account-manager.c:117 ../mail/e-mail-account-manager.c:204
+#: ../src/mail/e-mail-account-manager.c:118
+#: ../src/mail/e-mail-account-manager.c:205
 msgid "Open _Online Accounts"
 msgstr "Open _Online Accounts"
 
-#: ../mail/e-mail-account-manager.c:143 ../mail/e-mail-account-manager.c:230
+#: ../src/mail/e-mail-account-manager.c:144
+#: ../src/mail/e-mail-account-manager.c:231
 msgid "This account was created through the Online Accounts service."
 msgstr "This account was created through the Online Accounts service."
 
-#: ../mail/e-mail-account-manager.c:689
+#: ../src/mail/e-mail-account-manager.c:690
 msgid "_Reset Order"
 msgstr "_Reset Order"
 
-#: ../mail/e-mail-account-manager.c:702
+#: ../src/mail/e-mail-account-manager.c:703
 msgid "You can drag and drop account names to reorder them."
 msgstr "You can drag and drop account names to reorder them."
 
-#: ../mail/e-mail-account-manager.c:745
+#: ../src/mail/e-mail-account-manager.c:746
 msgid "De_fault"
 msgstr "De_fault"
 
-#: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1281
-#: ../modules/plugin-manager/evolution-plugin-manager.c:357
-#: ../plugins/publish-calendar/publish-calendar.c:855
-msgid "Enabled"
-msgstr "Enabled"
+#: ../src/mail/e-mail-autoconfig.c:634
+#, c-format
+msgid "Host: %s:%d"
+msgstr "Host: %s:%d"
 
-#: ../mail/e-mail-account-tree-view.c:107
-msgid "Account Name"
-msgstr "Account Name"
+#: ../src/mail/e-mail-autoconfig.c:638
+#, c-format
+#| msgid "Users"
+msgid "User: %s"
+msgstr "User: %s"
+
+#: ../src/mail/e-mail-autoconfig.c:642
+#, c-format
+#| msgid "Security:"
+msgid "Security method: %s"
+msgstr "Security method: %s"
+
+#: ../src/mail/e-mail-autoconfig.c:643
+#: ../src/mail/e-mail-config-summary-page.c:144
+msgid "TLS"
+msgstr "TLS"
+
+#: ../src/mail/e-mail-autoconfig.c:644
+#: ../src/mail/e-mail-config-summary-page.c:147
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: ../src/mail/e-mail-autoconfig.c:648
+#, c-format
+#| msgid "Authentication Required"
+msgid "Authentication mechanism: %s"
+msgstr "Authentication mechanism: %s"
 
-#: ../mail/e-mail-autoconfig.c:619
+#: ../src/mail/e-mail-autoconfig.c:783
 msgid "No email address provided"
 msgstr "No e-mail address provided"
 
-#: ../mail/e-mail-autoconfig.c:628
+#: ../src/mail/e-mail-autoconfig.c:792
 msgid "Missing domain in email address"
 msgstr "Missing domain in e-mail address"
 
-#: ../mail/e-mail-browser.c:131 ../shell/e-shell-window-actions.c:773
-#: ../shell/e-shell-window-actions.c:780 ../shell/e-shell-window-actions.c:787
+#: ../src/mail/e-mail-autoconfig.c:1097
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:78
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:79
+#| msgid "IMAP Headers"
+msgid "IMAP server"
+msgstr "IMAP server"
+
+#: ../src/mail/e-mail-autoconfig.c:1104
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:80
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:81
+#| msgid "On LDAP Servers"
+msgid "POP3 server"
+msgstr "POP3 server"
+
+#: ../src/mail/e-mail-autoconfig.c:1111
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
+#| msgid "Server"
+msgid "SMTP server"
+msgstr "SMTP server"
+
+#: ../src/mail/e-mail-browser.c:129 ../src/shell/e-shell-window-actions.c:812
+#: ../src/shell/e-shell-window-actions.c:819
+#: ../src/shell/e-shell-window-actions.c:826
 msgid "Close this window"
 msgstr "Close this window"
 
-#: ../mail/e-mail-browser.c:289
+#: ../src/mail/e-mail-browser.c:287
 msgid "(No Subject)"
 msgstr "(No Subject)"
 
 #. GtkAssistant's back button label.
-#: ../mail/e-mail-config-assistant.c:46
+#: ../src/mail/e-mail-config-assistant.c:48
 msgid "Go _Back"
 msgstr "Go _Back"
 
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:115
+#: ../src/mail/e-mail-config-assistant.c:123
 msgid "_Skip Lookup"
 msgstr "_Skip Lookup"
 
-#: ../mail/e-mail-config-assistant.c:660
+#: ../src/mail/e-mail-config-assistant.c:718
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistant"
 
-#: ../mail/e-mail-config-assistant.c:954
+#: ../src/mail/e-mail-config-assistant.c:1025
 msgid "_Revise Details"
 msgstr "_Revise Details"
 
-#: ../mail/e-mail-config-auth-check.c:177
+#: ../src/mail/e-mail-config-auth-check.c:178
 msgid "Querying authentication types..."
 msgstr "Querying authentication types..."
 
-#: ../mail/e-mail-config-auth-check.c:340
+#: ../src/mail/e-mail-config-auth-check.c:341
 msgid "Check for Supported Types"
 msgstr "Check for Supported Types"
 
-#: ../mail/e-mail-config-confirm-page.c:155
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive e-mail using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-
-#: ../mail/e-mail-config-confirm-page.c:167
-msgid "Done"
-msgstr "Done"
-
-#: ../mail/e-mail-config-defaults-page.c:377
-msgid "Checking server settings..."
-msgstr "Checking server settings..."
-
-#: ../mail/e-mail-config-defaults-page.c:495
+#: ../src/mail/e-mail-config-composing-page.c:116
 msgctxt "ReplyForward"
 msgid "Use global setting"
 msgstr "Use global setting"
 
-#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:26
+#: ../src/mail/e-mail-config-composing-page.c:118
+#: ../src/mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Attachment"
 
-#: ../mail/e-mail-config-defaults-page.c:499 ../mail/mail-config.ui.h:27
+#: ../src/mail/e-mail-config-composing-page.c:120
+#: ../src/mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Inline (Outlook style)"
 
-#: ../mail/e-mail-config-defaults-page.c:501 ../mail/mail-config.ui.h:28
+#: ../src/mail/e-mail-config-composing-page.c:122
+#: ../src/mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Quoted"
 
-#: ../mail/e-mail-config-defaults-page.c:503 ../mail/mail-config.ui.h:29
+#: ../src/mail/e-mail-config-composing-page.c:124
+#: ../src/mail/mail-config.ui.h:30
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Do Not Quote"
 
-#: ../mail/e-mail-config-defaults-page.c:829
+#: ../src/mail/e-mail-config-composing-page.c:397
+#: ../src/mail/e-mail-config-composing-page.c:606
+msgid "Composing Messages"
+msgstr "Composing Messages"
+
+#: ../src/mail/e-mail-config-composing-page.c:406
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Alway_s carbon-copy (cc) to:"
+
+#: ../src/mail/e-mail-config-composing-page.c:431
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Always _blind carbon-copy (bcc) to:"
+
+#: ../src/mail/e-mail-config-composing-page.c:462
+msgid "Re_ply style:"
+msgstr "Re_ply style:"
+
+#: ../src/mail/e-mail-config-composing-page.c:488
+#: ../src/mail/mail-config.ui.h:20
+#| msgid "Start _typing at the bottom on replying"
+msgid "Start _typing at the bottom"
+msgstr "Start _typing at the bottom"
+
+#: ../src/mail/e-mail-config-composing-page.c:495
+#: ../src/mail/mail-config.ui.h:21
+#| msgid "_Keep signature above the original message on replying"
+msgid "_Keep signature above the original message"
+msgstr "_Keep signature above the original message"
+
+#: ../src/mail/e-mail-config-composing-page.c:512
+msgid "Message Receipts"
+msgstr "Message Receipts"
+
+#: ../src/mail/e-mail-config-composing-page.c:521
+msgid "S_end message receipts:"
+msgstr "S_end message receipts:"
+
+#: ../src/mail/e-mail-config-composing-page.c:546
+msgid "Never"
+msgstr "Never"
+
+#: ../src/mail/e-mail-config-composing-page.c:552
+msgid "Always"
+msgstr "Always"
+
+#: ../src/mail/e-mail-config-composing-page.c:558
+msgid "Ask for each message"
+msgstr "Ask for each message"
+
+#: ../src/mail/e-mail-config-confirm-page.c:154
+#| msgid ""
+#| "Congratulations, your mail configuration is complete.\n"
+#| "\n"
+#| "You are now ready to send and receive email using Evolution.\n"
+#| "\n"
+#| "Click \"Apply\" to save your settings."
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click “Apply” to save your settings."
+msgstr ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive e-mail using Evolution.\n"
+"\n"
+"Click “Apply” to save your settings."
+
+#: ../src/mail/e-mail-config-confirm-page.c:166
+msgid "Done"
+msgstr "Done"
+
+#: ../src/mail/e-mail-config-defaults-page.c:314
+msgid "Checking server settings..."
+msgstr "Checking server settings..."
+
+#: ../src/mail/e-mail-config-defaults-page.c:663
 msgid "Special Folders"
 msgstr "Special Folders"
 
-#: ../mail/e-mail-config-defaults-page.c:838
+#: ../src/mail/e-mail-config-defaults-page.c:672
 msgid "Draft Messages _Folder:"
 msgstr "Draft Messages _Folder:"
 
-#: ../mail/e-mail-config-defaults-page.c:848
+#: ../src/mail/e-mail-config-defaults-page.c:682
 msgid "Choose a folder for saving draft messages."
 msgstr "Choose a folder for saving draft messages."
 
-#: ../mail/e-mail-config-defaults-page.c:862
+#: ../src/mail/e-mail-config-defaults-page.c:698
 msgid "Sent _Messages Folder:"
 msgstr "Sent _Messages Folder:"
 
-#: ../mail/e-mail-config-defaults-page.c:872
+#: ../src/mail/e-mail-config-defaults-page.c:726
 msgid "Choose a folder for saving sent messages."
 msgstr "Choose a folder for saving sent messages."
 
-#: ../mail/e-mail-config-defaults-page.c:891
+#: ../src/mail/e-mail-config-defaults-page.c:752
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "S_ave replies in the folder of the message being replied to"
 
-#: ../mail/e-mail-config-defaults-page.c:908
+#: ../src/mail/e-mail-config-defaults-page.c:775
 msgid "Archi_ve Folder:"
 msgstr "Archi_ve Folder:"
 
-#: ../mail/e-mail-config-defaults-page.c:918
-#: ../modules/mail/em-mailer-prefs.c:1403
+#: ../src/mail/e-mail-config-defaults-page.c:785
+#: ../src/modules/mail/em-mailer-prefs.c:1407
 msgid "Choose a folder to archive messages to."
 msgstr "Choose a folder to archive messages to."
 
-#: ../mail/e-mail-config-defaults-page.c:932
+#: ../src/mail/e-mail-config-defaults-page.c:799
 msgid "_Templates Folder:"
 msgstr "_Templates Folder:"
 
-#: ../mail/e-mail-config-defaults-page.c:942
+#: ../src/mail/e-mail-config-defaults-page.c:809
 msgid "Choose a folder to use for template messages."
 msgstr "Choose a folder to use for template messages."
 
-#: ../mail/e-mail-config-defaults-page.c:964
+#: ../src/mail/e-mail-config-defaults-page.c:831
 msgid "_Restore Defaults"
 msgstr "_Restore Defaults"
 
-#: ../mail/e-mail-config-defaults-page.c:981
+#: ../src/mail/e-mail-config-defaults-page.c:848
 msgid "_Lookup Folders"
 msgstr "_Lookup Folders"
 
-#: ../mail/e-mail-config-defaults-page.c:999
+#: ../src/mail/e-mail-config-defaults-page.c:866
 msgid "Use a Real Folder for _Trash:"
 msgstr "Use a Real Folder for _Wastebasket:"
 
-#: ../mail/e-mail-config-defaults-page.c:1000
+#: ../src/mail/e-mail-config-defaults-page.c:867
 msgid "Choose a folder for deleted messages."
 msgstr "Choose a folder for deleted messages."
 
-#: ../mail/e-mail-config-defaults-page.c:1009
+#: ../src/mail/e-mail-config-defaults-page.c:876
 msgid "Use a Real Folder for _Junk:"
 msgstr "Use a Real Folder for _Junk:"
 
-#: ../mail/e-mail-config-defaults-page.c:1010
+#: ../src/mail/e-mail-config-defaults-page.c:877
 msgid "Choose a folder for junk messages."
 msgstr "Choose a folder for junk messages."
 
-#: ../mail/e-mail-config-defaults-page.c:1027
-msgid "Composing Messages"
-msgstr "Composing Messages"
-
-#: ../mail/e-mail-config-defaults-page.c:1036
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Alway_s carbon-copy (cc) to:"
-
-#: ../mail/e-mail-config-defaults-page.c:1061
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Always _blind carbon-copy (bcc) to:"
-
-#: ../mail/e-mail-config-defaults-page.c:1092
-msgid "Re_ply style:"
-msgstr "Re_ply style:"
-
-#: ../mail/e-mail-config-defaults-page.c:1128
-msgid "Message Receipts"
-msgstr "Message Receipts"
-
-#: ../mail/e-mail-config-defaults-page.c:1137
-msgid "S_end message receipts:"
-msgstr "S_end message receipts:"
-
-#: ../mail/e-mail-config-defaults-page.c:1162
-msgid "Never"
-msgstr "Never"
-
-#: ../mail/e-mail-config-defaults-page.c:1168
-msgid "Always"
-msgstr "Always"
-
-#: ../mail/e-mail-config-defaults-page.c:1174
-msgid "Ask for each message"
-msgstr "Ask for each message"
-
-#: ../mail/e-mail-config-defaults-page.c:1281
+#: ../src/mail/e-mail-config-defaults-page.c:981
 msgid "Defaults"
 msgstr "Defaults"
 
-#: ../mail/e-mail-config-identity-page.c:304
+#: ../src/mail/e-mail-config-identity-page.c:513
+#| msgid ""
+#| "Please enter your name and email address below. The \"optional\" fields "
+#| "below do not need to be filled in, unless you wish to include this "
+#| "information in email you send."
 msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"Please enter your name and email address below. The “optional” fields below "
+"do not need to be filled in, unless you wish to include this information in "
+"email you send."
 msgstr ""
-"Please enter your name and e-mail address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in e-mails you send."
+"Please enter your name and e-mail address below. The “optional” fields below "
+"do not need to be filled in, unless you wish to include this information in "
+"e-mail you send."
 
-#: ../mail/e-mail-config-identity-page.c:332
-#: ../mail/e-mail-config-summary-page.c:323
+#: ../src/mail/e-mail-config-identity-page.c:541
+#: ../src/mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Account Information"
 
-#: ../mail/e-mail-config-identity-page.c:370
-#: ../mail/e-mail-config-summary-page.c:353
+#: ../src/mail/e-mail-config-identity-page.c:579
+#: ../src/mail/e-mail-config-summary-page.c:353
+#| msgid ""
+#| "The above name will be used to identify this account.\n"
+#| "Use for example, \"Work\" or \"Personal\"."
 msgid ""
 "The above name will be used to identify this account.\n"
-"Use for example, \"Work\" or \"Personal\"."
+"Use for example, “Work” or “Personal”."
 msgstr ""
 "The above name will be used to identify this account.\n"
-"Use for example, \"Work\" or \"Personal\"."
+"Use for example, “Work” or “Personal”."
 
-#: ../mail/e-mail-config-identity-page.c:387
+#: ../src/mail/e-mail-config-identity-page.c:596
 msgid "Required Information"
 msgstr "Required Information"
 
-#: ../mail/e-mail-config-identity-page.c:396
+#: ../src/mail/e-mail-config-identity-page.c:605
 msgid "Full Nam_e:"
 msgstr "Full Nam_e:"
 
-#: ../mail/e-mail-config-identity-page.c:425
+#: ../src/mail/e-mail-config-identity-page.c:634
 msgid "Email _Address:"
 msgstr "E-mail _Address:"
 
-#: ../mail/e-mail-config-identity-page.c:474
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+#: ../src/mail/e-mail-config-identity-page.c:683
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Optional Information"
 
-#: ../mail/e-mail-config-identity-page.c:483
+#: ../src/mail/e-mail-config-identity-page.c:692
 msgid "Re_ply-To:"
 msgstr "Re_ply-To:"
 
-#: ../mail/e-mail-config-identity-page.c:512
+#: ../src/mail/e-mail-config-identity-page.c:721
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: ../mail/e-mail-config-identity-page.c:567
+#: ../src/mail/e-mail-config-identity-page.c:776
 msgid "Add Ne_w Signature..."
 msgstr "Add Ne_w Signature…"
 
-#: ../mail/e-mail-config-identity-page.c:585
+#: ../src/mail/e-mail-config-identity-page.c:790
+msgid "A_liases:"
+msgstr "A_liases:"
+
+#: ../src/mail/e-mail-config-identity-page.c:862
+msgid "Edi_t"
+msgstr "Edi_t"
+
+#: ../src/mail/e-mail-config-identity-page.c:885
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr "_Look up mail server details based on the entered e-mail address"
 
 #. This is only a warning, not a blocker
 #. complete = complete && correct;
-#: ../mail/e-mail-config-identity-page.c:630
+#: ../src/mail/e-mail-config-identity-page.c:934
 msgid "Full Name should not be empty"
 msgstr "Full Name should not be empty"
 
-#: ../mail/e-mail-config-identity-page.c:637
+#: ../src/mail/e-mail-config-identity-page.c:941
 msgid "Email Address cannot be empty"
 msgstr "E-mail Address cannot be empty"
 
-#: ../mail/e-mail-config-identity-page.c:642
+#: ../src/mail/e-mail-config-identity-page.c:946
 msgid "Email Address is not a valid email"
 msgstr "E-mail Address is not a valid email"
 
-#: ../mail/e-mail-config-identity-page.c:654
+#: ../src/mail/e-mail-config-identity-page.c:958
 msgid "Reply To is not a valid email"
 msgstr "Reply To is not a valid e-mail"
 
-#: ../mail/e-mail-config-identity-page.c:665
-#: ../mail/e-mail-config-summary-page.c:632
+#: ../src/mail/e-mail-config-identity-page.c:969
+#: ../src/mail/e-mail-config-summary-page.c:638
 msgid "Account Name cannot be empty"
 msgstr "Account Name cannot be empty"
 
-#: ../mail/e-mail-config-lookup-page.c:70
+#: ../src/mail/e-mail-config-lookup-page.c:65
 msgid "Looking up account details..."
 msgstr "Looking up account details…"
 
-#: ../mail/e-mail-config-provider-page.c:484
+#: ../src/mail/e-mail-config-provider-page.c:537
 msgid "Checking for New Mail"
 msgstr "Checking for New Mail"
 
-#: ../mail/e-mail-config-provider-page.c:500
+#: ../src/mail/e-mail-config-provider-page.c:553
 msgid "Check for _new messages every"
 msgstr "Check for _new messages every"
 
-#: ../mail/e-mail-config-provider-page.c:698
+#: ../src/mail/e-mail-config-provider-page.c:763
 msgid "Receiving Options"
 msgstr "Receiving Options"
 
-#: ../mail/e-mail-config-receiving-page.c:49
+#: ../src/mail/e-mail-config-receiving-page.c:50
 msgid "Receiving Email"
 msgstr "Receiving E-mail"
 
 #. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
 #. The first '%s' is a key ID, the second '%s' is a display name of the key.
-#: ../mail/e-mail-config-security-page.c:251
+#: ../src/mail/e-mail-config-security-page.c:231
 #, c-format
 msgctxt "PGPKeyDescription"
-msgid "%s - %s"
-msgstr "%s - %s"
-
-#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:701
-#: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:113
-#: ../modules/calendar/e-calendar-preferences.c:620
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
-#: ../modules/mail/e-mail-shell-backend.c:731
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "%s — %s"
+msgstr "%s — %s"
+
+#: ../src/mail/e-mail-config-security-page.c:318
+#: ../src/mail/em-folder-properties.c:1070 ../src/mail/mail-config.ui.h:32
+#: ../src/modules/addressbook/autocompletion-config.c:115
+#: ../src/modules/calendar/e-calendar-preferences.c:644
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:48
+#: ../src/modules/mail/e-mail-shell-backend.c:737
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "General"
 
-#: ../mail/e-mail-config-security-page.c:349
+#: ../src/mail/e-mail-config-security-page.c:327
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Do not sign meeting requests (for Outlook compatibility)"
 
-#: ../mail/e-mail-config-security-page.c:371
+#: ../src/mail/e-mail-config-security-page.c:349
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP)"
 
-#: ../mail/e-mail-config-security-page.c:380
+#: ../src/mail/e-mail-config-security-page.c:358
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP _Key ID:"
 
-#: ../mail/e-mail-config-security-page.c:413
+#: ../src/mail/e-mail-config-security-page.c:391
 msgid "Si_gning algorithm:"
 msgstr "Si_gning algorithm:"
 
-#: ../mail/e-mail-config-security-page.c:429
-#: ../mail/e-mail-config-security-page.c:593 ../mail/mail-config.ui.h:74
+#: ../src/mail/e-mail-config-security-page.c:407
+#: ../src/mail/e-mail-config-security-page.c:571
+#: ../src/mail/mail-config.ui.h:77
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:432
-#: ../mail/e-mail-config-security-page.c:596 ../mail/mail-config.ui.h:75
+#: ../src/mail/e-mail-config-security-page.c:410
+#: ../src/mail/e-mail-config-security-page.c:574
+#: ../src/mail/mail-config.ui.h:78
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:435
-#: ../mail/e-mail-config-security-page.c:599 ../mail/mail-config.ui.h:76
+#: ../src/mail/e-mail-config-security-page.c:413
+#: ../src/mail/e-mail-config-security-page.c:577
+#: ../src/mail/mail-config.ui.h:79
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:438
-#: ../mail/e-mail-config-security-page.c:602 ../mail/mail-config.ui.h:77
+#: ../src/mail/e-mail-config-security-page.c:416
+#: ../src/mail/e-mail-config-security-page.c:580
+#: ../src/mail/mail-config.ui.h:80
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:454
+#: ../src/mail/e-mail-config-security-page.c:432
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Al_ways sign outgoing messages when using this account"
 
-#: ../mail/e-mail-config-security-page.c:466
+#: ../src/mail/e-mail-config-security-page.c:444
 msgid "Always enc_rypt outgoing messages when using this account"
 msgstr "Always enc_rypt outgoing messages when using this account"
 
-#: ../mail/e-mail-config-security-page.c:478
+#: ../src/mail/e-mail-config-security-page.c:456
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Always encrypt to _myself when sending encrypted messages"
 
-#: ../mail/e-mail-config-security-page.c:490
+#: ../src/mail/e-mail-config-security-page.c:468
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Always _trust keys in my keyring when encrypting"
 
-#: ../mail/e-mail-config-security-page.c:502
+#: ../src/mail/e-mail-config-security-page.c:480
 msgid "Prefer _inline sign/encrypt for plain text messages"
 msgstr "Prefer _inline sign/encrypt for plain text messages"
 
-#: ../mail/e-mail-config-security-page.c:526
+#: ../src/mail/e-mail-config-security-page.c:504
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:535
+#: ../src/mail/e-mail-config-security-page.c:513
 msgid "Sig_ning certificate:"
 msgstr "Sig_ning certificate:"
 
-#: ../mail/e-mail-config-security-page.c:559
-#: ../mail/e-mail-config-security-page.c:665
+#: ../src/mail/e-mail-config-security-page.c:537
+#: ../src/mail/e-mail-config-security-page.c:635
 msgid "Select"
 msgstr "Select"
 
-#: ../mail/e-mail-config-security-page.c:568
-#: ../mail/e-mail-config-security-page.c:674 ../mail/mail-dialogs.ui.h:5
-#: ../shell/e-shell-window-actions.c:876
+#: ../src/mail/e-mail-config-security-page.c:546
+#: ../src/mail/e-mail-config-security-page.c:644
+#: ../src/mail/mail-dialogs.ui.h:16 ../src/shell/e-shell-window-actions.c:915
 msgid "_Clear"
 msgstr "_Clear"
 
-#: ../mail/e-mail-config-security-page.c:577
+#: ../src/mail/e-mail-config-security-page.c:555
 msgid "Signing _algorithm:"
 msgstr "Signing _algorithm:"
 
-#: ../mail/e-mail-config-security-page.c:618
+#: ../src/mail/e-mail-config-security-page.c:596
 msgid "Always sign outgoing messages when using this account"
 msgstr "Always sign outgoing messages when using this account"
 
-#: ../mail/e-mail-config-security-page.c:641
+#: ../src/mail/e-mail-config-security-page.c:611
 msgid "Encryption certificate:"
 msgstr "Encryption certificate:"
 
-#: ../mail/e-mail-config-security-page.c:683
+#: ../src/mail/e-mail-config-security-page.c:653
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Always encrypt outgoing messages when using this account"
 
-#: ../mail/e-mail-config-security-page.c:703
+#: ../src/mail/e-mail-config-security-page.c:665
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Always encrypt to myself when sending encrypted messages"
 
-#: ../mail/e-mail-config-sending-page.c:49
+#: ../src/mail/e-mail-config-sending-page.c:50
 msgid "Sending Email"
 msgstr "Sending E-mail"
 
-#: ../mail/e-mail-config-service-page.c:638
+#: ../src/mail/e-mail-config-service-page.c:499
 msgid "Server _Type:"
 msgstr "Server _Type:"
 
-#: ../mail/e-mail-config-summary-page.c:142
-msgid "TLS"
-msgstr "TLS"
-
-#: ../mail/e-mail-config-summary-page.c:145
-msgid "STARTTLS"
-msgstr "STARTTLS"
-
-#: ../mail/e-mail-config-summary-page.c:306
+#: ../src/mail/e-mail-config-summary-page.c:306
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "This is a summary of the settings which will be used to access your mail."
 
-#: ../mail/e-mail-config-summary-page.c:370
+#: ../src/mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "Personal Details"
 
-#: ../mail/e-mail-config-summary-page.c:379
+#: ../src/mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "Full Name:"
 
-#: ../mail/e-mail-config-summary-page.c:393
+#: ../src/mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "E-mail Address:"
 
-#: ../mail/e-mail-config-summary-page.c:407
+#: ../src/mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "Receiving"
 
-#: ../mail/e-mail-config-summary-page.c:419
+#: ../src/mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "Sending"
 
-#: ../mail/e-mail-config-summary-page.c:431
+#: ../src/mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "Server Type:"
 
-#: ../mail/e-mail-config-summary-page.c:452
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:605
+#: ../src/mail/e-mail-config-summary-page.c:452
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:606
 msgid "Server:"
 msgstr "Server:"
 
-#: ../mail/e-mail-config-summary-page.c:473
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:703
+#: ../src/mail/e-mail-config-summary-page.c:473
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:704
 msgid "Username:"
 msgstr "Username:"
 
-#: ../mail/e-mail-config-summary-page.c:494
+#: ../src/mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "Security:"
 
-#: ../mail/e-mail-config-summary-page.c:787
+#: ../src/mail/e-mail-config-summary-page.c:651
+msgid "Cannot have both receiving and sending parts set to None"
+msgstr "Cannot have both receiving and sending parts set to None"
+
+#: ../src/mail/e-mail-config-summary-page.c:807
 msgid "Account Summary"
 msgstr "Account Summary"
 
-#: ../mail/e-mail-config-welcome-page.c:156
+#: ../src/mail/e-mail-config-welcome-page.c:161
+#| msgid ""
+#| "Welcome to the Evolution Mail Configuration Assistant.\n"
+#| "\n"
+#| "Click \"Next\" to begin."
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin."
+"Click “Next” to begin."
 msgstr ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin."
+"Click “Next” to begin."
 
-#: ../mail/e-mail-config-welcome-page.c:166
-#: ../modules/startup-wizard/e-startup-assistant.c:151
+#: ../src/mail/e-mail-config-welcome-page.c:171
+#: ../src/modules/startup-wizard/e-startup-assistant.c:154
 msgid "Welcome"
 msgstr "Welcome"
 
-#: ../mail/e-mail-config-window.c:325
+#: ../src/mail/e-mail-config-window.c:329
 msgid "Account Editor"
 msgstr "Account Editor"
 
-#: ../mail/e-mail-display.c:124
+#: ../src/mail/e-mail-display.c:128
 msgid "_Add to Address Book..."
 msgstr "_Add to Address Book…"
 
-#: ../mail/e-mail-display.c:131
+#: ../src/mail/e-mail-display.c:135
 msgid "_To This Address"
 msgstr "_To this Address"
 
-#: ../mail/e-mail-display.c:138
+#: ../src/mail/e-mail-display.c:142
 msgid "_From This Address"
 msgstr "_From This Address"
 
-#: ../mail/e-mail-display.c:145
+#: ../src/mail/e-mail-display.c:149
 msgid "Send _Reply To..."
 msgstr "Send _Reply To…"
 
-#: ../mail/e-mail-display.c:147
+#: ../src/mail/e-mail-display.c:151
 msgid "Send a reply message to this address"
 msgstr "Send a reply message to this address"
 
-#: ../mail/e-mail-display.c:154
+#: ../src/mail/e-mail-display.c:158
 msgid "Create Search _Folder"
 msgstr "Create Search _Folder"
 
-#: ../mail/e-mail-display.c:749
+#: ../src/mail/e-mail-display.c:803
 msgid "Hid_e All"
 msgstr "Hid_e All"
 
-#: ../mail/e-mail-display.c:756
+#: ../src/mail/e-mail-display.c:810
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: ../mail/e-mail-display.c:763
+#: ../src/mail/e-mail-display.c:817
 msgid "Vie_w All Inline"
 msgstr "Vie_w All Inline"
 
-#: ../mail/e-mail-display.c:770
+#: ../src/mail/e-mail-display.c:824
 msgid "_Zoom to 100%"
 msgstr "_Zoom to 100%"
 
-#: ../mail/e-mail-display.c:772
+#: ../src/mail/e-mail-display.c:826
 msgid "Zoom the image to its natural size"
 msgstr "Zoom the image to its natural size"
 
-#: ../mail/e-mail-display.c:777
+#: ../src/mail/e-mail-display.c:831
 msgid "_Zoom to window"
 msgstr "_Zoom to window"
 
-#: ../mail/e-mail-display.c:779
+#: ../src/mail/e-mail-display.c:833
 msgid "Zoom large images to not be wider than the window width"
 msgstr "Zoom large images to not be wider than the window width"
 
-#: ../mail/e-mail-folder-create-dialog.c:327
+#: ../src/mail/e-mail-folder-create-dialog.c:328
 msgid "Create Folder"
 msgstr "Create Folder"
 
-#: ../mail/e-mail-folder-create-dialog.c:331
+#: ../src/mail/e-mail-folder-create-dialog.c:332
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
-#: ../mail/e-mail-folder-create-dialog.c:334
+#: ../src/mail/e-mail-folder-create-dialog.c:335
 msgid "C_reate"
 msgstr "C_reate"
 
-#: ../mail/e-mail-folder-create-dialog.c:351
+#: ../src/mail/e-mail-folder-create-dialog.c:352
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
-#: ../mail/e-mail-free-form-exp.c:236
+#: ../src/mail/e-mail-free-form-exp.c:231
 msgctxt "ffe"
 msgid "Answered"
 msgstr "Answered"
 
-#: ../mail/e-mail-free-form-exp.c:237
+#: ../src/mail/e-mail-free-form-exp.c:232
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "Deleted"
 
-#: ../mail/e-mail-free-form-exp.c:238
+#: ../src/mail/e-mail-free-form-exp.c:233
 msgctxt "ffe"
 msgid "Draft"
 msgstr "Draft"
 
-#: ../mail/e-mail-free-form-exp.c:239
+#: ../src/mail/e-mail-free-form-exp.c:234
 msgctxt "ffe"
 msgid "Flagged"
 msgstr "Flagged"
 
-#: ../mail/e-mail-free-form-exp.c:240
+#: ../src/mail/e-mail-free-form-exp.c:235
 msgctxt "ffe"
 msgid "Seen"
 msgstr "Seen"
 
-#: ../mail/e-mail-free-form-exp.c:241
+#: ../src/mail/e-mail-free-form-exp.c:236
 msgctxt "ffe"
 msgid "Attachment"
 msgstr "Attachment"
 
-#: ../mail/e-mail-free-form-exp.c:489
+#: ../src/mail/e-mail-free-form-exp.c:484
 msgctxt "ffe"
 msgid "no"
 msgstr "no"
 
-#: ../mail/e-mail-free-form-exp.c:490
+#: ../src/mail/e-mail-free-form-exp.c:485
 msgctxt "ffe"
 msgid "false"
 msgstr "false"
 
-#: ../mail/e-mail-junk-options.c:295
+#: ../src/mail/e-mail-junk-options.c:296
 msgid "Junk filtering software:"
 msgstr "Junk filtering software:"
 
-#: ../mail/e-mail-label-dialog.c:224
+#: ../src/mail/e-mail-label-dialog.c:222
 msgid "_Label name:"
 msgstr "_Label name:"
 
-#: ../mail/e-mail-label-list-store.c:57
+#: ../src/mail/e-mail-label-list-store.c:55
 msgid "I_mportant"
 msgstr "I_mportant"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:58
+#: ../src/mail/e-mail-label-list-store.c:56
 msgid "_Work"
 msgstr "_Work"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:59
+#: ../src/mail/e-mail-label-list-store.c:57
 msgid "_Personal"
 msgstr "_Personal"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:60
+#: ../src/mail/e-mail-label-list-store.c:58
 msgid "_To Do"
 msgstr "_To Do"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:61
+#: ../src/mail/e-mail-label-list-store.c:59
 msgid "_Later"
 msgstr "_Later"
 
-#: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1200
+#: ../src/mail/e-mail-label-manager.c:169
+#: ../src/mail/em-folder-properties.c:842
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1245
 msgid "Add Label"
 msgstr "Add Label"
 
-#: ../mail/e-mail-label-manager.c:222
+#: ../src/mail/e-mail-label-manager.c:220
+#: ../src/mail/em-folder-properties.c:869
 msgid "Edit Label"
 msgstr "Edit Label"
 
-#: ../mail/e-mail-label-manager.c:354
+#: ../src/mail/e-mail-label-manager.c:352
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -15584,784 +17238,816 @@ msgstr ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
 
-#: ../mail/e-mail-label-tree-view.c:88
+#: ../src/mail/e-mail-label-tree-view.c:86
 msgid "Color"
 msgstr "Colour"
 
-#: ../mail/e-mail-notes.c:321 ../mail/e-mail-notes.c:719
+#: ../src/mail/e-mail-notes.c:319 ../src/mail/e-mail-notes.c:719
 msgid "Message Note"
 msgstr "Message Note"
 
-#: ../mail/e-mail-notes.c:639
+#: ../src/mail/e-mail-notes.c:639
 msgid "Cannot find message in its folder summary"
 msgstr "Cannot find message in its folder summary"
 
-#: ../mail/e-mail-notes.c:842
+#: ../src/mail/e-mail-notes.c:842
 msgid "Storing changes..."
 msgstr "Storing changes..."
 
-#: ../mail/e-mail-notes.c:968
+#: ../src/mail/e-mail-notes.c:968
 msgid "Edit Message Note"
 msgstr "Edit Message Note"
 
-#: ../mail/e-mail-notes.c:1122
+#: ../src/mail/e-mail-notes.c:1122
 msgid "Retrieving message..."
 msgstr "Retrieving message..."
 
-#: ../mail/e-mail-print-config-headers.c:165
+#: ../src/mail/e-mail-print-config-headers.c:166
 msgid "Move selected headers to top"
 msgstr "Move selected headers to top"
 
-#: ../mail/e-mail-print-config-headers.c:170
+#: ../src/mail/e-mail-print-config-headers.c:171
 msgid "Move selected headers up one row"
 msgstr "Move selected headers up one row"
 
-#: ../mail/e-mail-print-config-headers.c:175
+#: ../src/mail/e-mail-print-config-headers.c:176
 msgid "Move selected headers down one row"
 msgstr "Move selected headers down one row"
 
-#: ../mail/e-mail-print-config-headers.c:180
+#: ../src/mail/e-mail-print-config-headers.c:181
 msgid "Move selected headers to bottom"
 msgstr "Move selected headers to bottom"
 
-#: ../mail/e-mail-print-config-headers.c:185
+#: ../src/mail/e-mail-print-config-headers.c:186
 msgid "Select all headers"
 msgstr "Select all headers"
 
-#: ../mail/e-mail-print-config-headers.c:204
+#: ../src/mail/e-mail-print-config-headers.c:205
 msgid "Header Name"
 msgstr "Header Name"
 
-#: ../mail/e-mail-print-config-headers.c:213
+#: ../src/mail/e-mail-print-config-headers.c:214
 msgid "Header Value"
 msgstr "Header Value"
 
-#: ../mail/e-mail-printer.c:111 ../mail/mail-config.ui.h:123
+#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:127
 msgid "Headers"
 msgstr "Headers"
 
-#: ../mail/e-mail-printer.c:153
+#: ../src/mail/e-mail-printer.c:142
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: ../mail/e-mail-reader.c:352 ../mail/filtertypes.xml.in.h:65
+#: ../src/mail/e-mail-reader.c:349 ../src/mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "Move to Folder"
 
-#: ../mail/e-mail-reader.c:352 ../mail/filtertypes.xml.in.h:66
+#: ../src/mail/e-mail-reader.c:349 ../src/mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "Copy to Folder"
 
-#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
-#: ../mail/mail.error.xml.h:152
+#: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
+#: ../src/mail/mail.error.xml.h:152
 msgid "_Move"
 msgstr "_Move"
 
-#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
+#: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
 msgid "C_opy"
 msgstr "C_opy"
 
-#: ../mail/e-mail-reader.c:488
+#: ../src/mail/e-mail-reader.c:479
 msgid "Deleting message note..."
 msgstr "Deleting message note..."
 
-#: ../mail/e-mail-reader.c:1310 ../mail/e-mail-reader.c:1522
-#: ../mail/e-mail-reader.c:1562
+#: ../src/mail/e-mail-reader.c:1301 ../src/mail/e-mail-reader.c:1513
+#: ../src/mail/e-mail-reader.c:1553
 msgid "_Do not ask me again."
 msgstr "_Do not ask me again."
 
-#: ../mail/e-mail-reader.c:1568
+#: ../src/mail/e-mail-reader.c:1559
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Always ignore Reply-To: for mailing lists."
 
-#: ../mail/e-mail-reader.c:1771
+#: ../src/mail/e-mail-reader.c:1762
 msgid "Failed to retrieve message:"
 msgstr "Failed to retrieve message:"
 
-#: ../mail/e-mail-reader.c:1816 ../mail/e-mail-reader.c:3186
+#: ../src/mail/e-mail-reader.c:1807 ../src/mail/e-mail-reader.c:3166
 #, c-format
-msgid "Retrieving message '%s'"
-msgstr "Retrieving message '%s'"
+#| msgid "Retrieving message '%s'"
+msgid "Retrieving message “%s”"
+msgstr "Retrieving message “%s”"
 
-#: ../mail/e-mail-reader.c:2004
+#: ../src/mail/e-mail-reader.c:1995
 msgid "A_dd Sender to Address Book"
 msgstr "A_dd Sender to Address Book"
 
-#: ../mail/e-mail-reader.c:2006
+#: ../src/mail/e-mail-reader.c:1997
 msgid "Add sender to address book"
 msgstr "Add sender to address book"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../src/mail/e-mail-reader.c:2002
 msgid "_Archive..."
 msgstr "_Archive..."
 
-#: ../mail/e-mail-reader.c:2013
+#: ../src/mail/e-mail-reader.c:2004
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Move selected messages to the Archive folder for the account"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../src/mail/e-mail-reader.c:2009
 msgid "Check for _Junk"
 msgstr "Check for _Junk"
 
-#: ../mail/e-mail-reader.c:2020
+#: ../src/mail/e-mail-reader.c:2011
 msgid "Filter the selected messages for junk status"
 msgstr "Filter the selected messages for junk status"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../src/mail/e-mail-reader.c:2016
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder…"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../src/mail/e-mail-reader.c:2018
 msgid "Copy selected messages to another folder"
 msgstr "Copy selected messages to another folder"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../src/mail/e-mail-reader.c:2023
 msgid "_Delete Message"
 msgstr "_Delete Message"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../src/mail/e-mail-reader.c:2025
 msgid "Mark the selected messages for deletion"
 msgstr "Mark the selected messages for deletion"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../src/mail/e-mail-reader.c:2030
 msgid "_Add note..."
 msgstr "_Add note..."
 
-#: ../mail/e-mail-reader.c:2041
+#: ../src/mail/e-mail-reader.c:2032
 msgid "Add a note for the selected message"
 msgstr "Add a note for the selected message"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../src/mail/e-mail-reader.c:2037
 msgid "Delete no_te"
 msgstr "Delete no_te"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../src/mail/e-mail-reader.c:2039
 msgid "Delete the note for the selected message"
 msgstr "Delete the note for the selected message"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../src/mail/e-mail-reader.c:2044
 msgid "_Edit note..."
 msgstr "_Edit note..."
 
-#: ../mail/e-mail-reader.c:2055
+#: ../src/mail/e-mail-reader.c:2046
 msgid "Edit a note for the selected message"
 msgstr "Edit a note for the selected message"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../src/mail/e-mail-reader.c:2051
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Create a Filter Rule for Mailing _List…"
 
-#: ../mail/e-mail-reader.c:2062
+#: ../src/mail/e-mail-reader.c:2053
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Create a rule to filter messages to this mailing list"
 
-#: ../mail/e-mail-reader.c:2067
+#: ../src/mail/e-mail-reader.c:2058
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Create a Filter Rule for _Recipients…"
 
-#: ../mail/e-mail-reader.c:2069
+#: ../src/mail/e-mail-reader.c:2060
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Create a rule to filter messages to these recipients"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../src/mail/e-mail-reader.c:2065
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Create a Filter Rule for Se_nder…"
 
-#: ../mail/e-mail-reader.c:2076
+#: ../src/mail/e-mail-reader.c:2067
 msgid "Create a rule to filter messages from this sender"
 msgstr "Create a rule to filter messages from this sender"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../src/mail/e-mail-reader.c:2072
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Create a Filter Rule for _Subject…"
 
-#: ../mail/e-mail-reader.c:2083
+#: ../src/mail/e-mail-reader.c:2074
 msgid "Create a rule to filter messages with this subject"
 msgstr "Create a rule to filter messages with this subject"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../src/mail/e-mail-reader.c:2079
 msgid "A_pply Filters"
 msgstr "A_pply Filters"
 
-#: ../mail/e-mail-reader.c:2090
+#: ../src/mail/e-mail-reader.c:2081
 msgid "Apply filter rules to the selected messages"
 msgstr "Apply filter rules to the selected messages"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../src/mail/e-mail-reader.c:2086
 msgid "_Find in Message..."
 msgstr "_Find in Message…"
 
-#: ../mail/e-mail-reader.c:2097
+#: ../src/mail/e-mail-reader.c:2088
 msgid "Search for text in the body of the displayed message"
 msgstr "Search for text in the body of the displayed message"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../src/mail/e-mail-reader.c:2093
 msgid "_Clear Flag"
 msgstr "_Clear Flag"
 
-#: ../mail/e-mail-reader.c:2104
+#: ../src/mail/e-mail-reader.c:2095
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Remove the follow-up flag from the selected messages"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../src/mail/e-mail-reader.c:2100
 msgid "_Flag Completed"
 msgstr "_Flag Completed"
 
-#: ../mail/e-mail-reader.c:2111
+#: ../src/mail/e-mail-reader.c:2102
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Set the follow-up flag to completed on the selected messages"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../src/mail/e-mail-reader.c:2107
 msgid "Follow _Up..."
 msgstr "Follow _Up…"
 
-#: ../mail/e-mail-reader.c:2118
+#: ../src/mail/e-mail-reader.c:2109
 msgid "Flag the selected messages for follow-up"
 msgstr "Flag the selected messages for follow-up"
 
-#: ../mail/e-mail-reader.c:2123 ../modules/mail/e-mail-attachment-handler.c:432
+#: ../src/mail/e-mail-reader.c:2114
+#: ../src/modules/mail/e-mail-attachment-handler.c:430
 msgid "_Attached"
 msgstr "_Attached"
 
-#: ../mail/e-mail-reader.c:2125 ../mail/e-mail-reader.c:2132
-#: ../modules/mail/e-mail-attachment-handler.c:434
+#: ../src/mail/e-mail-reader.c:2116 ../src/mail/e-mail-reader.c:2123
+#: ../src/modules/mail/e-mail-attachment-handler.c:432
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Forward the selected message to someone as an attachment"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../src/mail/e-mail-reader.c:2121
 msgid "Forward As _Attached"
 msgstr "Forward As _Attached"
 
-#: ../mail/e-mail-reader.c:2137 ../modules/mail/e-mail-attachment-handler.c:439
+#: ../src/mail/e-mail-reader.c:2128
+#: ../src/modules/mail/e-mail-attachment-handler.c:437
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ../mail/e-mail-reader.c:2139 ../mail/e-mail-reader.c:2146
-#: ../modules/mail/e-mail-attachment-handler.c:441
+#: ../src/mail/e-mail-reader.c:2130 ../src/mail/e-mail-reader.c:2137
+#: ../src/modules/mail/e-mail-attachment-handler.c:439
 msgid "Forward the selected message in the body of a new message"
 msgstr "Forward the selected message in the body of a new message"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../src/mail/e-mail-reader.c:2135
 msgid "Forward As _Inline"
 msgstr "Forward As _Inline"
 
-#: ../mail/e-mail-reader.c:2151 ../modules/mail/e-mail-attachment-handler.c:446
+#: ../src/mail/e-mail-reader.c:2142
+#: ../src/modules/mail/e-mail-attachment-handler.c:444
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ../mail/e-mail-reader.c:2153 ../mail/e-mail-reader.c:2160
-#: ../modules/mail/e-mail-attachment-handler.c:448
+#: ../src/mail/e-mail-reader.c:2144 ../src/mail/e-mail-reader.c:2151
+#: ../src/modules/mail/e-mail-attachment-handler.c:446
 msgid "Forward the selected message quoted like a reply"
 msgstr "Forward the selected message quoted like a reply"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../src/mail/e-mail-reader.c:2149
 msgid "Forward As _Quoted"
 msgstr "Forward As _Quoted"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../src/mail/e-mail-reader.c:2156
 msgid "_Load Images"
 msgstr "_Load Images"
 
-#: ../mail/e-mail-reader.c:2167
+#: ../src/mail/e-mail-reader.c:2158
 msgid "Force images in HTML mail to be loaded"
 msgstr "Force images in HTML mail to be loaded"
 
-#: ../mail/e-mail-reader.c:2172 ../mail/e-mail-reader.c:2562
+#: ../src/mail/e-mail-reader.c:2163 ../src/mail/e-mail-reader.c:2553
 msgid "_Ignore Subthread"
 msgstr "_Ignore Subthread"
 
-#: ../mail/e-mail-reader.c:2174
+#: ../src/mail/e-mail-reader.c:2165
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "Mark new mails in a subthread as read automatically"
 
-#: ../mail/e-mail-reader.c:2179 ../mail/e-mail-reader.c:2566
+#: ../src/mail/e-mail-reader.c:2170 ../src/mail/e-mail-reader.c:2557
 msgid "_Ignore Thread"
 msgstr "_Ignore Thread"
 
-#: ../mail/e-mail-reader.c:2181
+#: ../src/mail/e-mail-reader.c:2172
 msgid "Mark new mails in this thread as read automatically"
 msgstr "Mark new mails in this thread as read automatically"
 
-#: ../mail/e-mail-reader.c:2186
+#: ../src/mail/e-mail-reader.c:2177
 msgid "_Important"
 msgstr "_Important"
 
-#: ../mail/e-mail-reader.c:2188
+#: ../src/mail/e-mail-reader.c:2179
 msgid "Mark the selected messages as important"
 msgstr "Mark the selected messages as important"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../src/mail/e-mail-reader.c:2184
 msgid "_Junk"
 msgstr "_Junk"
 
-#: ../mail/e-mail-reader.c:2195
+#: ../src/mail/e-mail-reader.c:2186
 msgid "Mark the selected messages as junk"
 msgstr "Mark the selected messages as junk"
 
-#: ../mail/e-mail-reader.c:2200
+#: ../src/mail/e-mail-reader.c:2191
 msgid "_Not Junk"
 msgstr "_Not Junk"
 
-#: ../mail/e-mail-reader.c:2202
+#: ../src/mail/e-mail-reader.c:2193
 msgid "Mark the selected messages as not being junk"
 msgstr "Mark the selected messages as not being junk"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../src/mail/e-mail-reader.c:2198
 msgid "_Read"
 msgstr "_Read"
 
-#: ../mail/e-mail-reader.c:2209
+#: ../src/mail/e-mail-reader.c:2200
 msgid "Mark the selected messages as having been read"
 msgstr "Mark the selected messages as having been read"
 
-#: ../mail/e-mail-reader.c:2214 ../mail/e-mail-reader.c:2586
+#: ../src/mail/e-mail-reader.c:2205 ../src/mail/e-mail-reader.c:2577
 msgid "Do not _Ignore Subthread"
 msgstr "Do not _Ignore Subthread"
 
-#: ../mail/e-mail-reader.c:2216
+#: ../src/mail/e-mail-reader.c:2207
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "Do not mark new mails in a subthread as read automatically"
 
-#: ../mail/e-mail-reader.c:2221 ../mail/e-mail-reader.c:2590
+#: ../src/mail/e-mail-reader.c:2212 ../src/mail/e-mail-reader.c:2581
 msgid "Do not _Ignore Thread"
 msgstr "Do not _Ignore Thread"
 
-#: ../mail/e-mail-reader.c:2223
+#: ../src/mail/e-mail-reader.c:2214
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "Do not mark new mails in this thread as read automatically"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../src/mail/e-mail-reader.c:2219
 msgid "Uni_mportant"
 msgstr "Uni_mportant"
 
-#: ../mail/e-mail-reader.c:2230
+#: ../src/mail/e-mail-reader.c:2221
 msgid "Mark the selected messages as unimportant"
 msgstr "Mark the selected messages as unimportant"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../src/mail/e-mail-reader.c:2226
 msgid "_Unread"
 msgstr "_Unread"
 
-#: ../mail/e-mail-reader.c:2237
+#: ../src/mail/e-mail-reader.c:2228
 msgid "Mark the selected messages as not having been read"
 msgstr "Mark the selected messages as not having been read"
 
-#: ../mail/e-mail-reader.c:2242 ../modules/mail/e-mail-attachment-handler.c:418
+#: ../src/mail/e-mail-reader.c:2233
+#: ../src/modules/mail/e-mail-attachment-handler.c:416
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Message…"
 
-#: ../mail/e-mail-reader.c:2244 ../modules/mail/e-mail-attachment-handler.c:420
+#: ../src/mail/e-mail-reader.c:2235
+#: ../src/modules/mail/e-mail-attachment-handler.c:418
 msgid "Open the selected messages in the composer for editing"
 msgstr "Open the selected messages in the composer for editing"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../src/mail/e-mail-reader.c:2240
 msgid "Compose _New Message"
 msgstr "Compose _New Message"
 
-#: ../mail/e-mail-reader.c:2251
+#: ../src/mail/e-mail-reader.c:2242
 msgid "Open a window for composing a mail message"
 msgstr "Open a window for composing a mail message"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../src/mail/e-mail-reader.c:2247
 msgid "_Open in New Window"
 msgstr "_Open in New Window"
 
-#: ../mail/e-mail-reader.c:2258
+#: ../src/mail/e-mail-reader.c:2249
 msgid "Open the selected messages in a new window"
 msgstr "Open the selected messages in a new window"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../src/mail/e-mail-reader.c:2254
 msgid "_Move to Folder..."
 msgstr "_Move to Folder…"
 
-#: ../mail/e-mail-reader.c:2265
+#: ../src/mail/e-mail-reader.c:2256
 msgid "Move selected messages to another folder"
 msgstr "Move selected messages to another folder"
 
-#: ../mail/e-mail-reader.c:2270
+#: ../src/mail/e-mail-reader.c:2261
 msgid "_Next Message"
 msgstr "_Next Message"
 
-#: ../mail/e-mail-reader.c:2272
+#: ../src/mail/e-mail-reader.c:2263
 msgid "Display the next message"
 msgstr "Display the next message"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../src/mail/e-mail-reader.c:2268
 msgid "Next _Important Message"
 msgstr "Next _Important Message"
 
-#: ../mail/e-mail-reader.c:2279
+#: ../src/mail/e-mail-reader.c:2270
 msgid "Display the next important message"
 msgstr "Display the next important message"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../src/mail/e-mail-reader.c:2275
 msgid "Next _Thread"
 msgstr "Next _Thread"
 
-#: ../mail/e-mail-reader.c:2286
+#: ../src/mail/e-mail-reader.c:2277
 msgid "Display the next thread"
 msgstr "Display the next thread"
 
-#: ../mail/e-mail-reader.c:2291
+#: ../src/mail/e-mail-reader.c:2282
 msgid "Next _Unread Message"
 msgstr "Next _Unread Message"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../src/mail/e-mail-reader.c:2284
 msgid "Display the next unread message"
 msgstr "Display the next unread message"
 
-#: ../mail/e-mail-reader.c:2298
+#: ../src/mail/e-mail-reader.c:2289
 msgid "_Previous Message"
 msgstr "_Previous Message"
 
-#: ../mail/e-mail-reader.c:2300
+#: ../src/mail/e-mail-reader.c:2291
 msgid "Display the previous message"
 msgstr "Display the previous message"
 
-#: ../mail/e-mail-reader.c:2305
+#: ../src/mail/e-mail-reader.c:2296
 msgid "Pr_evious Important Message"
 msgstr "Pr_evious Important Message"
 
-#: ../mail/e-mail-reader.c:2307
+#: ../src/mail/e-mail-reader.c:2298
 msgid "Display the previous important message"
 msgstr "Display the previous important message"
 
-#: ../mail/e-mail-reader.c:2312
+#: ../src/mail/e-mail-reader.c:2303
 msgid "Previous T_hread"
 msgstr "Previous T_hread"
 
-#: ../mail/e-mail-reader.c:2314
+#: ../src/mail/e-mail-reader.c:2305
 msgid "Display the previous thread"
 msgstr "Display the previous thread"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../src/mail/e-mail-reader.c:2310
 msgid "P_revious Unread Message"
 msgstr "P_revious Unread Message"
 
-#: ../mail/e-mail-reader.c:2321
+#: ../src/mail/e-mail-reader.c:2312
 msgid "Display the previous unread message"
 msgstr "Display the previous unread message"
 
-#: ../mail/e-mail-reader.c:2328
+#: ../src/mail/e-mail-reader.c:2319
 msgid "Print this message"
 msgstr "Print this message"
 
-#: ../mail/e-mail-reader.c:2335
+#: ../src/mail/e-mail-reader.c:2326
 msgid "Preview the message to be printed"
 msgstr "Preview the message to be printed"
 
-#: ../mail/e-mail-reader.c:2340 ../modules/mail/e-mail-attachment-handler.c:453
+#: ../src/mail/e-mail-reader.c:2331
+#: ../src/modules/mail/e-mail-attachment-handler.c:451
 msgid "Re_direct"
 msgstr "Re_direct"
 
-#: ../mail/e-mail-reader.c:2342 ../modules/mail/e-mail-attachment-handler.c:455
+#: ../src/mail/e-mail-reader.c:2333
+#: ../src/modules/mail/e-mail-attachment-handler.c:453
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirect (bounce) the selected message to someone"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../src/mail/e-mail-reader.c:2338
 msgid "Remo_ve Attachments"
 msgstr "Remo_ve Attachments"
 
-#: ../mail/e-mail-reader.c:2349
+#: ../src/mail/e-mail-reader.c:2340
 msgid "Remove attachments"
 msgstr "Remove attachments"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../src/mail/e-mail-reader.c:2345
 msgid "Remove Du_plicate Messages"
 msgstr "Remove Du_plicate Messages"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../src/mail/e-mail-reader.c:2347
 msgid "Checks selected messages for duplicates"
 msgstr "Checks selected messages for duplicates"
 
-#: ../mail/e-mail-reader.c:2361 ../mail/mail.error.xml.h:28
-#: ../modules/calendar/e-cal-shell-view-actions.c:1432
-#: ../modules/mail/e-mail-attachment-handler.c:397
+#: ../src/mail/e-mail-reader.c:2352 ../src/mail/mail.error.xml.h:28
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../src/modules/mail/e-mail-attachment-handler.c:395
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: ../mail/e-mail-reader.c:2363 ../modules/mail/e-mail-attachment-handler.c:399
+#: ../src/mail/e-mail-reader.c:2354
+#: ../src/modules/mail/e-mail-attachment-handler.c:397
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Compose a reply to all the recipients of the selected message"
 
-#: ../mail/e-mail-reader.c:2368 ../mail/mail.error.xml.h:26
-#: ../modules/mail/e-mail-attachment-handler.c:404
+#: ../src/mail/e-mail-reader.c:2359 ../src/mail/mail.error.xml.h:26
+#: ../src/modules/mail/e-mail-attachment-handler.c:402
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: ../mail/e-mail-reader.c:2370 ../modules/mail/e-mail-attachment-handler.c:406
+#: ../src/mail/e-mail-reader.c:2361
+#: ../src/modules/mail/e-mail-attachment-handler.c:404
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Compose a reply to the mailing list of the selected message"
 
-#: ../mail/e-mail-reader.c:2375 ../modules/mail/e-mail-attachment-handler.c:411
+#: ../src/mail/e-mail-reader.c:2366
+#: ../src/modules/mail/e-mail-attachment-handler.c:409
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: ../mail/e-mail-reader.c:2377 ../modules/mail/e-mail-attachment-handler.c:413
+#: ../src/mail/e-mail-reader.c:2368
+#: ../src/modules/mail/e-mail-attachment-handler.c:411
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Compose a reply to the sender of the selected message"
 
-#: ../mail/e-mail-reader.c:2382
+#: ../src/mail/e-mail-reader.c:2373
 msgid "_Save as mbox..."
 msgstr "_Save as mbox…"
 
-#: ../mail/e-mail-reader.c:2384
+#: ../src/mail/e-mail-reader.c:2375
 msgid "Save selected messages as an mbox file"
 msgstr "Save selected messages as an mbox file"
 
-#: ../mail/e-mail-reader.c:2389
+#: ../src/mail/e-mail-reader.c:2380
 msgid "_Message Source"
 msgstr "_Message Source"
 
-#: ../mail/e-mail-reader.c:2391
+#: ../src/mail/e-mail-reader.c:2382
 msgid "Show the raw email source of the message"
 msgstr "Show the raw e-mail source of the message"
 
-#: ../mail/e-mail-reader.c:2403
+#: ../src/mail/e-mail-reader.c:2394
 msgid "_Undelete Message"
 msgstr "_Undelete Message"
 
-#: ../mail/e-mail-reader.c:2405
+#: ../src/mail/e-mail-reader.c:2396
 msgid "Undelete the selected messages"
 msgstr "Undelete the selected messages"
 
-#: ../mail/e-mail-reader.c:2410
+#: ../src/mail/e-mail-reader.c:2401
 msgid "_Normal Size"
 msgstr "_Normal Size"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../src/mail/e-mail-reader.c:2403
 msgid "Reset the text to its original size"
 msgstr "Reset the text to its original size"
 
-#: ../mail/e-mail-reader.c:2417
+#: ../src/mail/e-mail-reader.c:2408
 msgid "_Zoom In"
 msgstr "_Zoom In"
 
-#: ../mail/e-mail-reader.c:2419
+#: ../src/mail/e-mail-reader.c:2410
 msgid "Increase the text size"
 msgstr "Increase the text size"
 
-#: ../mail/e-mail-reader.c:2426
+#: ../src/mail/e-mail-reader.c:2417
 msgid "Decrease the text size"
 msgstr "Decrease the text size"
 
-#: ../mail/e-mail-reader.c:2433
+#: ../src/mail/e-mail-reader.c:2424
 msgid "Cre_ate"
 msgstr "Cre_ate"
 
-#: ../mail/e-mail-reader.c:2440
+#: ../src/mail/e-mail-reader.c:2431
 msgid "Ch_aracter Encoding"
 msgstr "Ch_aracter Encoding"
 
-#: ../mail/e-mail-reader.c:2447 ../modules/mail/e-mail-attachment-handler.c:425
+#: ../src/mail/e-mail-reader.c:2438
+#: ../src/modules/mail/e-mail-attachment-handler.c:423
 msgid "F_orward As"
 msgstr "F_orward As"
 
-#: ../mail/e-mail-reader.c:2454
+#: ../src/mail/e-mail-reader.c:2445
 msgid "_Group Reply"
 msgstr "_Group Reply"
 
-#: ../mail/e-mail-reader.c:2461
+#: ../src/mail/e-mail-reader.c:2452
 msgid "_Go To"
 msgstr "_Go To"
 
-#: ../mail/e-mail-reader.c:2468
+#: ../src/mail/e-mail-reader.c:2459
 msgid "Mar_k As"
 msgstr "Mar_k As"
 
-#: ../mail/e-mail-reader.c:2475
+#: ../src/mail/e-mail-reader.c:2466
 msgid "_Message"
 msgstr "_Message"
 
-#: ../mail/e-mail-reader.c:2482
+#: ../src/mail/e-mail-reader.c:2473
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:2492
+#: ../src/mail/e-mail-reader.c:2483
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Create a Search Folder from Mailing _List…"
 
-#: ../mail/e-mail-reader.c:2494
+#: ../src/mail/e-mail-reader.c:2485
 msgid "Create a search folder for this mailing list"
 msgstr "Create a search folder for this mailing list"
 
-#: ../mail/e-mail-reader.c:2499
+#: ../src/mail/e-mail-reader.c:2490
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Create a Search Folder from Recipien_ts…"
 
-#: ../mail/e-mail-reader.c:2501
+#: ../src/mail/e-mail-reader.c:2492
 msgid "Create a search folder for these recipients"
 msgstr "Create a search folder for these recipients"
 
-#: ../mail/e-mail-reader.c:2506
+#: ../src/mail/e-mail-reader.c:2497
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Create a Search Folder from Sen_der…"
 
-#: ../mail/e-mail-reader.c:2508
+#: ../src/mail/e-mail-reader.c:2499
 msgid "Create a search folder for this sender"
 msgstr "Create a search folder for this sender"
 
-#: ../mail/e-mail-reader.c:2513
+#: ../src/mail/e-mail-reader.c:2504
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Create a Search Folder from S_ubject…"
 
-#: ../mail/e-mail-reader.c:2515
+#: ../src/mail/e-mail-reader.c:2506
 msgid "Create a search folder for this subject"
 msgstr "Create a search folder for this subject"
 
-#: ../mail/e-mail-reader.c:2554
+#: ../src/mail/e-mail-reader.c:2545
 msgid "Mark for Follo_w Up..."
 msgstr "Mark for Follo_w Up…"
 
-#: ../mail/e-mail-reader.c:2570
+#: ../src/mail/e-mail-reader.c:2561
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: ../mail/e-mail-reader.c:2574
+#: ../src/mail/e-mail-reader.c:2565
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: ../mail/e-mail-reader.c:2578
+#: ../src/mail/e-mail-reader.c:2569
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: ../mail/e-mail-reader.c:2582
+#: ../src/mail/e-mail-reader.c:2573
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: ../mail/e-mail-reader.c:2594
+#: ../src/mail/e-mail-reader.c:2585
 msgid "Mark as Uni_mportant"
 msgstr "Mark as Uni_mportant"
 
-#: ../mail/e-mail-reader.c:2598
+#: ../src/mail/e-mail-reader.c:2589
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: ../mail/e-mail-reader.c:2642
+#: ../src/mail/e-mail-reader.c:2633
 msgid "_Caret Mode"
 msgstr "_Caret Mode"
 
-#: ../mail/e-mail-reader.c:2644
+#: ../src/mail/e-mail-reader.c:2635
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Show a blinking cursor in the body of displayed messages"
 
-#: ../mail/e-mail-reader.c:2650
+#: ../src/mail/e-mail-reader.c:2641
 msgid "All Message _Headers"
 msgstr "All Message _Headers"
 
-#: ../mail/e-mail-reader.c:2652
+#: ../src/mail/e-mail-reader.c:2643
 msgid "Show messages with all email headers"
 msgstr "Show messages with all e-mail headers"
 
-#: ../mail/e-mail-reader.c:3192
+#: ../src/mail/e-mail-reader.c:3172
 msgid "Retrieving message"
 msgstr "Retrieving message"
 
-#: ../mail/e-mail-reader.c:4242 ../modules/mail/e-mail-attachment-handler.c:390
+#: ../src/mail/e-mail-reader.c:4222
+#: ../src/modules/mail/e-mail-attachment-handler.c:388
 msgid "_Forward"
 msgstr "_Forward"
 
-#: ../mail/e-mail-reader.c:4243 ../modules/mail/e-mail-attachment-handler.c:392
+#: ../src/mail/e-mail-reader.c:4223
+#: ../src/modules/mail/e-mail-attachment-handler.c:390
 msgid "Forward the selected message to someone"
 msgstr "Forward the selected message to someone"
 
-#: ../mail/e-mail-reader.c:4262
+#. For Translators: "Group Reply" will reply either to a mailing list
+#. * (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:4242
 msgid "Group Reply"
 msgstr "Group Reply"
 
-#: ../mail/e-mail-reader.c:4263
+#: ../src/mail/e-mail-reader.c:4243
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Reply to the mailing list, or to all recipients"
 
-#: ../mail/e-mail-reader.c:4329 ../mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:4309 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Delete"
 
-#: ../mail/e-mail-reader.c:4341
-#: ../modules/calendar/e-cal-shell-view-actions.c:1243
+#: ../src/mail/e-mail-reader.c:4321
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1281
 msgid "Next"
 msgstr "Next"
 
-#: ../mail/e-mail-reader.c:4345
-#: ../modules/calendar/e-cal-shell-view-actions.c:1236
+#: ../src/mail/e-mail-reader.c:4325
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1274
 msgid "Previous"
 msgstr "Previous"
 
-#: ../mail/e-mail-reader.c:4354 ../mail/mail-dialogs.ui.h:16
+#: ../src/mail/e-mail-reader.c:4334 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Reply"
 
-#: ../mail/e-mail-reader.c:5426
+#: ../src/mail/e-mail-reader.c:5407
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr "Allow remote content for anyone from %s"
 
-#: ../mail/e-mail-reader.c:5428
+#: ../src/mail/e-mail-reader.c:5409
 #, c-format
 msgid "Allow remote content for %s"
 msgstr "Allow remote content for %s"
 
-#: ../mail/e-mail-reader.c:5445
+#: ../src/mail/e-mail-reader.c:5426
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "Allow remote content from %s"
 
-#: ../mail/e-mail-reader.c:5462
+#: ../src/mail/e-mail-reader.c:5443
 msgid "Do not show this message again"
 msgstr "Do not show this message again"
 
-#: ../mail/e-mail-reader.c:5510
+#: ../src/mail/e-mail-reader.c:5491
 msgid "Load remote content"
 msgstr "Load remote content"
 
-#: ../mail/e-mail-reader-utils.c:146
+#: ../src/mail/e-mail-reader-utils.c:144
 msgid "Do not warn me again"
 msgstr "Do not warn me again"
 
-#: ../mail/e-mail-reader-utils.c:570
+#: ../src/mail/e-mail-reader-utils.c:633
+#, c-format
+#| msgid "Moving messages into folder %s"
+msgid "Deleting messages in Junk folder “%s”…"
+msgstr "Deleting messages in Junk folder “%s”…"
+
+#: ../src/mail/e-mail-reader-utils.c:728
 #, c-format
-msgid "Refreshing folder '%s'"
-msgstr "Refreshing folder '%s'"
+#| msgid "Refreshing folder '%s'"
+msgid "Refreshing folder “%s”"
+msgstr "Refreshing folder “%s”"
 
-#: ../mail/e-mail-reader-utils.c:1163
+#: ../src/mail/e-mail-reader-utils.c:1335
 msgid "Marking thread to be ignored"
 msgstr "Marking thread to be ignored"
 
-#: ../mail/e-mail-reader-utils.c:1167
+#: ../src/mail/e-mail-reader-utils.c:1339
 msgid "Unmarking thread from being ignored"
 msgstr "Unmarking thread from being ignored"
 
-#: ../mail/e-mail-reader-utils.c:1171
+#: ../src/mail/e-mail-reader-utils.c:1343
 msgid "Marking subthread to be ignored"
 msgstr "Marking subthread to be ignored"
 
-#: ../mail/e-mail-reader-utils.c:1175
+#: ../src/mail/e-mail-reader-utils.c:1347
 msgid "Unmarking subthread from being ignored"
 msgstr "Unmarking subthread from being ignored"
 
-#: ../mail/e-mail-reader-utils.c:1419
+#: ../src/mail/e-mail-reader-utils.c:1599
 msgid "Printing"
 msgstr "Printing"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1656
+#: ../src/mail/e-mail-reader-utils.c:1836
 #, c-format
+#| msgid ""
+#| "Folder '%s' contains %u duplicate message. Are you sure you want to "
+#| "delete it?"
+#| msgid_plural ""
+#| "Folder '%s' contains %u duplicate messages. Are you sure you want to "
+#| "delete them?"
 msgid ""
-"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"Folder “%s” contains %u duplicate message. Are you sure you want to delete "
 "it?"
 msgid_plural ""
-"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"Folder “%s” contains %u duplicate messages. Are you sure you want to delete "
 "them?"
 msgstr[0] ""
-"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"Folder “%s” contains %u duplicate message. Are you sure you want to delete "
 "it?"
 msgstr[1] ""
-"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"Folder “%s” contains %u duplicate messages. Are you sure you want to delete "
 "them?"
 
-#: ../mail/e-mail-reader-utils.c:2656
+#: ../src/mail/e-mail-reader-utils.c:2854
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Save Message"
@@ -16372,36 +18058,37 @@ msgstr[1] "Save Messages"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:2677
+#: ../src/mail/e-mail-reader-utils.c:2875
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Message"
 msgstr[1] "Messages"
 
-#: ../mail/e-mail-reader-utils.c:3050
+#: ../src/mail/e-mail-reader-utils.c:3248
 msgid "Parsing message"
 msgstr "Parsing message"
 
-#: ../mail/e-mail-request.c:272
+#: ../src/mail/e-mail-request.c:270
 msgid "The message has no text content."
 msgstr "The message has no text content."
 
-#: ../mail/e-mail-tag-editor.c:237
+#: ../src/mail/e-mail-tag-editor.c:163
 msgid "Flag to Follow Up"
 msgstr "Flag to Follow Up"
 
-#: ../mail/e-mail-ui-session.c:801
+#: ../src/mail/e-mail-ui-session.c:821
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s authentication failed"
 
-#: ../mail/e-mail-ui-session.c:851
+#: ../src/mail/e-mail-ui-session.c:871
 #, c-format
-msgid "No data source found for UID '%s'"
-msgstr "No data source found for UID '%s'"
+#| msgid "No data source found for UID '%s'"
+msgid "No data source found for UID “%s”"
+msgstr "No data source found for UID “%s”"
 
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
-#: ../mail/em-composer-utils.c:390
+#: ../src/mail/em-composer-utils.c:388
 #, c-format
 msgid "Are you sure you want to send a message with %d To and CC recipients?"
 msgid_plural ""
@@ -16412,7 +18099,7 @@ msgstr[1] ""
 "Are you sure you want to send a message with %d To and CC recipients?"
 
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
-#: ../mail/em-composer-utils.c:396
+#: ../src/mail/em-composer-utils.c:394
 #, c-format
 msgid ""
 "You are trying to send a message to %d recipients in To and CC fields. This "
@@ -16441,7 +18128,7 @@ msgstr[1] ""
 
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
-#: ../mail/em-composer-utils.c:791
+#: ../src/mail/em-composer-utils.c:800
 msgid "Waiting for attachments to load..."
 msgstr "Waiting for attachments to load..."
 
@@ -16449,7 +18136,7 @@ msgstr "Waiting for attachments to load..."
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1742
+#: ../src/mail/em-composer-utils.c:1845
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -16457,290 +18144,333 @@ msgstr ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
-#: ../mail/em-composer-utils.c:1748
+#: ../src/mail/em-composer-utils.c:1851
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: ../mail/em-composer-utils.c:1753
+#: ../src/mail/em-composer-utils.c:1856
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
-#: ../mail/em-composer-utils.c:2968
+#. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the 
subject of the original message.
+#: ../src/mail/em-composer-utils.c:2562
+#, c-format
+#| msgid "URL: %s"
+msgid "Re: %s"
+msgstr "Re: %s"
+
+#: ../src/mail/em-composer-utils.c:3103
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3440
+#: ../src/mail/em-composer-utils.c:3581
 msgid "Posting destination"
 msgstr "Posting destination"
 
-#: ../mail/em-composer-utils.c:3445
+#: ../src/mail/em-composer-utils.c:3586
 msgid "Choose folders to post the message to."
 msgstr "Choose folders to post the message to."
 
-#: ../mail/em-filter-editor-folder-element.c:153
+#: ../src/mail/em-filter-editor-folder-element.c:154
 msgid "Select Folder"
 msgstr "Select Folder"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:597
+#: ../src/mail/em-filter-rule.c:595
 msgid "Then"
 msgstr "Then"
 
-#: ../mail/em-filter-rule.c:662
+#: ../src/mail/em-filter-rule.c:660
 msgid "Add Ac_tion"
 msgstr "Add Ac_tion"
 
-#: ../mail/em-folder-properties.c:227
+#: ../src/mail/em-folder-properties.c:240
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Unread messages:"
 msgstr[1] "Unread messages:"
 
-#: ../mail/em-folder-properties.c:238
+#: ../src/mail/em-folder-properties.c:251
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total messages:"
 msgstr[1] "Total messages:"
 
-#: ../mail/em-folder-properties.c:259
+#: ../src/mail/em-folder-properties.c:272
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Quota usage (%s):"
 
-#: ../mail/em-folder-properties.c:261
+#: ../src/mail/em-folder-properties.c:274
 #, 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
-#: ../mail/em-folder-properties.c:385
+#: ../src/mail/em-folder-properties.c:398
 msgid "_Send Account Override:"
 msgstr "_Send Account Override:"
 
-#: ../mail/em-folder-properties.c:589
+#: ../src/mail/em-folder-properties.c:605
 msgid "_Archive this folder using these settings:"
 msgstr "_Archive this folder using these settings:"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:598
+#: ../src/mail/em-folder-properties.c:614
 msgctxt "autoarchive"
 msgid "_Cleanup messages older than"
 msgstr "_Cleanup messages older than"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:614
+#: ../src/mail/em-folder-properties.c:630
 msgctxt "autoarchive"
 msgid "days"
 msgstr "days"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:616
+#: ../src/mail/em-folder-properties.c:632
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "weeks"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:618
+#: ../src/mail/em-folder-properties.c:634
 msgctxt "autoarchive"
 msgid "months"
 msgstr "months"
 
-#: ../mail/em-folder-properties.c:624
+#: ../src/mail/em-folder-properties.c:640
 msgid "Move old messages to the default archive _folder"
 msgstr "Move old messages to the default archive _folder"
 
-#: ../mail/em-folder-properties.c:635
+#: ../src/mail/em-folder-properties.c:651
 msgid "_Move old messages to:"
 msgstr "_Move old messages to:"
 
-#: ../mail/em-folder-properties.c:639
+#: ../src/mail/em-folder-properties.c:655
 msgid "AutoArchive folder"
 msgstr "AutoArchive folder"
 
-#: ../mail/em-folder-properties.c:639
+#: ../src/mail/em-folder-properties.c:655
 msgid "Select folder to use for AutoArchive"
 msgstr "Select folder to use for AutoArchive"
 
-#: ../mail/em-folder-properties.c:645
+#: ../src/mail/em-folder-properties.c:661
 msgid "_Delete old messages"
 msgstr "_Delete old messages"
 
-#: ../mail/em-folder-properties.c:704
+#: ../src/mail/em-folder-properties.c:1018
+#| msgid "Server"
+msgid "Server Tag"
+msgstr "Server Tag"
+
+#: ../src/mail/em-folder-properties.c:1022 ../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:1073
 msgid "AutoArchive"
 msgstr "AutoArchive"
 
-#: ../mail/em-folder-properties.c:783
+#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:120
+#: ../src/mail/message-list.etspec.h:19
+msgid "Labels"
+msgstr "Labels"
+
+#: ../src/mail/em-folder-properties.c:1155
 msgid "Folder Properties"
 msgstr "Folder Properties"
 
-#: ../mail/em-folder-selection-button.c:76
+#: ../src/mail/em-folder-properties.c:1394
+#| msgid "Category Properties"
+msgid "Gathering folder properties"
+msgstr "Gathering folder properties"
+
+#: ../src/mail/em-folder-selection-button.c:77
 msgid "<click here to select a folder>"
 msgstr "<click here to select a folder>"
 
-#: ../mail/em-folder-selector.c:398
+#: ../src/mail/em-folder-selector.c:399
 msgid "Create a new folder"
 msgstr "Create a new folder"
 
-#: ../mail/em-folder-tree.c:682
-msgid "Folder names cannot contain '/'"
-msgstr "Folder names cannot contain '/'"
-
-#: ../mail/em-folder-tree.c:845
+#: ../src/mail/em-folder-tree.c:683
+#| msgid "Folder names cannot contain '/'"
+msgid "Folder names cannot contain “/”"
+msgstr "Folder names cannot contain “/”"
+
+#. Translators: This is the string used for displaying the
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
+#. *
+#. * Most languages should translate this as "%s (%u%s)". The
+#. * languages that use localized digits (like Persian) may
+#. * need to replace "%u" with "%Iu". Right-to-left languages
+#. * (like Arabic and Hebrew) may need to add bidirectional
+#. * formatting codes to take care of the cases the folder
+#. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
+#.
+#: ../src/mail/em-folder-tree.c:877
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1703
+#: ../src/mail/em-folder-tree.c:1742
 msgid "Mail Folder Tree"
 msgstr "Mail Folder Tree"
 
-#: ../mail/em-folder-tree.c:2251 ../mail/em-folder-utils.c:82
+#: ../src/mail/em-folder-tree.c:2290 ../src/mail/em-folder-utils.c:83
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: ../mail/em-folder-tree.c:2254 ../mail/em-folder-utils.c:84
+#: ../src/mail/em-folder-tree.c:2293 ../src/mail/em-folder-utils.c:85
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2496
+#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2508
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2498
+#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2510
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: ../mail/em-folder-tree.c:2284
+#: ../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.
-#: ../mail/em-folder-tree-model.c:444 ../mail/em-folder-tree-model.c:446
+#: ../src/mail/em-folder-tree-model.c:445
+#: ../src/mail/em-folder-tree-model.c:447
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:1301 ../mail/em-folder-tree-model.c:1677
+#: ../src/mail/em-folder-tree-model.c:1326
+#: ../src/mail/em-folder-tree-model.c:1702
 msgid "Loading..."
 msgstr "Loading…"
 
-#: ../mail/em-folder-utils.c:488
+#: ../src/mail/em-folder-utils.c:502
 msgid "Move Folder To"
 msgstr "Move Folder To"
 
-#: ../mail/em-folder-utils.c:488
+#: ../src/mail/em-folder-utils.c:502
 msgid "Copy Folder To"
 msgstr "Copy Folder To"
 
-#: ../mail/em-subscription-editor.c:855
+#: ../src/mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
-#: ../mail/em-subscription-editor.c:864
+#: ../src/mail/em-subscription-editor.c:864
 msgid "Su_bscribe To Shown"
 msgstr "Su_bscribe To Shown"
 
-#: ../mail/em-subscription-editor.c:872
+#: ../src/mail/em-subscription-editor.c:872
 msgid "Subscribe To _All"
 msgstr "Subscribe To _All"
 
-#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1914
-#: ../mail/mail.error.xml.h:73 ../modules/mail/e-mail-shell-view-actions.c:1823
+#: ../src/mail/em-subscription-editor.c:970
+#: ../src/mail/em-subscription-editor.c:1914 ../src/mail/mail.error.xml.h:73
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
-#: ../mail/em-subscription-editor.c:979
+#: ../src/mail/em-subscription-editor.c:979
 msgid "Unsu_bscribe From Hidden"
 msgstr "Unsu_bscribe From Hidden"
 
-#: ../mail/em-subscription-editor.c:987
+#: ../src/mail/em-subscription-editor.c:987
 msgid "Unsubscribe From _All"
 msgstr "Unsubscribe From _All"
 
-#: ../mail/em-subscription-editor.c:1339
-#: ../modules/mail/e-mail-shell-view-private.c:1030
+#: ../src/mail/em-subscription-editor.c:1339
+#: ../src/modules/mail/e-mail-shell-view-private.c:1003
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d unread, "
 msgstr[1] "%d unread, "
 
-#: ../mail/em-subscription-editor.c:1343
-#: ../modules/mail/e-mail-shell-view-private.c:1040
+#: ../src/mail/em-subscription-editor.c:1343
+#: ../src/modules/mail/e-mail-shell-view-private.c:1013
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: ../mail/em-subscription-editor.c:1755
+#: ../src/mail/em-subscription-editor.c:1755
 msgid "Folder Subscriptions"
 msgstr "Folder Subscriptions"
 
-#: ../mail/em-subscription-editor.c:1790
+#: ../src/mail/em-subscription-editor.c:1790
 msgid "_Account:"
 msgstr "_Account:"
 
-#: ../mail/em-subscription-editor.c:1803
+#: ../src/mail/em-subscription-editor.c:1803
 msgid "Clear Search"
 msgstr "Clear Search"
 
-#: ../mail/em-subscription-editor.c:1820
+#: ../src/mail/em-subscription-editor.c:1820
 msgid "Sho_w items that contain:"
 msgstr "Sho_w items that contain:"
 
-#: ../mail/em-subscription-editor.c:1867
+#: ../src/mail/em-subscription-editor.c:1867
 msgid "Subscribe to the selected folder"
 msgstr "Subscribe to the selected folder"
 
-#: ../mail/em-subscription-editor.c:1868
+#: ../src/mail/em-subscription-editor.c:1868
 msgid "Su_bscribe"
 msgstr "Su_bscribe"
 
-#: ../mail/em-subscription-editor.c:1913
-#: ../modules/mail/e-mail-shell-view-actions.c:1825
+#: ../src/mail/em-subscription-editor.c:1913
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Unsubscribe from the selected folder"
 msgstr "Unsubscribe from the selected folder"
 
-#: ../mail/em-subscription-editor.c:1953
+#: ../src/mail/em-subscription-editor.c:1953
 msgid "Collapse all folders"
 msgstr "Collapse all folders"
 
-#: ../mail/em-subscription-editor.c:1954
+#: ../src/mail/em-subscription-editor.c:1954
 msgid "C_ollapse All"
 msgstr "C_ollapse All"
 
-#: ../mail/em-subscription-editor.c:1964
+#: ../src/mail/em-subscription-editor.c:1964
 msgid "Expand all folders"
 msgstr "Expand all folders"
 
-#: ../mail/em-subscription-editor.c:1965
+#: ../src/mail/em-subscription-editor.c:1965
 msgid "E_xpand All"
 msgstr "E_xpand All"
 
-#: ../mail/em-subscription-editor.c:1975
+#: ../src/mail/em-subscription-editor.c:1975
 msgid "Refresh the folder list"
 msgstr "Refresh the folder list"
 
-#: ../mail/em-subscription-editor.c:1976
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
-#: ../modules/mail/e-mail-shell-view-actions.c:1795
-msgid "_Refresh"
-msgstr "_Refresh"
-
-#: ../mail/em-subscription-editor.c:1987
+#: ../src/mail/em-subscription-editor.c:1987
 msgid "Stop the current operation"
 msgstr "Stop the current operation"
 
-#: ../mail/em-subscription-editor.c:1988
-#: ../modules/addressbook/e-book-shell-view-actions.c:1001
+#: ../src/mail/em-subscription-editor.c:1988
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1005
 msgid "_Stop"
 msgstr "_Stop"
 
@@ -16748,485 +18478,485 @@ msgstr "_Stop"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:76
+#: ../src/mail/em-utils.c:77
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Are you sure you want to open %d message at once?"
 msgstr[1] "Are you sure you want to open %d messages at once?"
 
-#: ../mail/em-utils.c:177
+#: ../src/mail/em-utils.c:178
 msgid "Message Filters"
 msgstr "Message Filters"
 
-#: ../mail/em-utils.c:923
+#: ../src/mail/em-utils.c:950
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
 
-#: ../mail/em-utils.c:1680
+#: ../src/mail/em-utils.c:1764
 msgid "Deleting old messages"
 msgstr "Deleting old messages"
 
-#: ../mail/em-vfolder-editor.c:104
+#: ../src/mail/em-vfolder-editor.c:102
 msgid "Search _Folders"
 msgstr "Search _Folders"
 
-#: ../mail/em-vfolder-editor-rule.c:392
+#: ../src/mail/em-vfolder-editor-rule.c:393
 msgid "Add Folder"
 msgstr "Add Folder"
 
-#: ../mail/em-vfolder-editor-rule.c:521
+#: ../src/mail/em-vfolder-editor-rule.c:522
 msgid "Search Folder Sources"
 msgstr "Search Folder Sources"
 
-#: ../mail/em-vfolder-editor-rule.c:553
+#: ../src/mail/em-vfolder-editor-rule.c:554
 msgid "Automatically update on any _source folder change"
 msgstr "Automatically update on any _source folder change"
 
-#: ../mail/em-vfolder-editor-rule.c:565
+#: ../src/mail/em-vfolder-editor-rule.c:566
 msgid "All local folders"
 msgstr "All local folders"
 
-#: ../mail/em-vfolder-editor-rule.c:566
+#: ../src/mail/em-vfolder-editor-rule.c:567
 msgid "All active remote folders"
 msgstr "All active remote folders"
 
-#: ../mail/em-vfolder-editor-rule.c:567
+#: ../src/mail/em-vfolder-editor-rule.c:568
 msgid "All local and active remote folders"
 msgstr "All local and active remote folders"
 
-#: ../mail/em-vfolder-editor-rule.c:568
+#: ../src/mail/em-vfolder-editor-rule.c:569
 msgid "Specific folders"
 msgstr "Specific folders"
 
-#: ../mail/em-vfolder-editor-rule.c:606
+#: ../src/mail/em-vfolder-editor-rule.c:607
 msgid "include subfolders"
 msgstr "include subfolders"
 
-#: ../mail/filtertypes.xml.in.h:1 ../mail/message-list.etspec.h:15
-#: ../mail/searchtypes.xml.in.h:1 ../mail/vfoldertypes.xml.in.h:1
+#: ../src/mail/filtertypes.xml.in.h:1 ../src/mail/message-list.etspec.h:15
+#: ../src/mail/searchtypes.xml.in.h:1 ../src/mail/vfoldertypes.xml.in.h:1
 msgid "Sender"
 msgstr "Sender"
 
-#: ../mail/filtertypes.xml.in.h:6 ../mail/searchtypes.xml.in.h:6
-#: ../mail/vfoldertypes.xml.in.h:6
+#: ../src/mail/filtertypes.xml.in.h:6 ../src/mail/searchtypes.xml.in.h:6
+#: ../src/mail/vfoldertypes.xml.in.h:6
 msgid "starts with"
 msgstr "starts with"
 
-#: ../mail/filtertypes.xml.in.h:7 ../mail/searchtypes.xml.in.h:7
-#: ../mail/vfoldertypes.xml.in.h:7
+#: ../src/mail/filtertypes.xml.in.h:7 ../src/mail/searchtypes.xml.in.h:7
+#: ../src/mail/vfoldertypes.xml.in.h:7
 msgid "does not start with"
 msgstr "does not start with"
 
-#: ../mail/filtertypes.xml.in.h:8 ../mail/searchtypes.xml.in.h:8
-#: ../mail/vfoldertypes.xml.in.h:8
+#: ../src/mail/filtertypes.xml.in.h:8 ../src/mail/searchtypes.xml.in.h:8
+#: ../src/mail/vfoldertypes.xml.in.h:8
 msgid "ends with"
 msgstr "ends with"
 
-#: ../mail/filtertypes.xml.in.h:9 ../mail/searchtypes.xml.in.h:9
-#: ../mail/vfoldertypes.xml.in.h:9
+#: ../src/mail/filtertypes.xml.in.h:9 ../src/mail/searchtypes.xml.in.h:9
+#: ../src/mail/vfoldertypes.xml.in.h:9
 msgid "does not end with"
 msgstr "does not end with"
 
-#: ../mail/filtertypes.xml.in.h:10 ../mail/searchtypes.xml.in.h:12
-#: ../mail/vfoldertypes.xml.in.h:12
+#: ../src/mail/filtertypes.xml.in.h:10 ../src/mail/searchtypes.xml.in.h:12
+#: ../src/mail/vfoldertypes.xml.in.h:12
 msgid "sounds like"
 msgstr "sounds like"
 
-#: ../mail/filtertypes.xml.in.h:11 ../mail/searchtypes.xml.in.h:13
-#: ../mail/vfoldertypes.xml.in.h:13
+#: ../src/mail/filtertypes.xml.in.h:11 ../src/mail/searchtypes.xml.in.h:13
+#: ../src/mail/vfoldertypes.xml.in.h:13
 msgid "does not sound like"
 msgstr "does not sound like"
 
-#: ../mail/filtertypes.xml.in.h:12 ../mail/message-list.etspec.h:16
-#: ../mail/searchtypes.xml.in.h:10 ../mail/vfoldertypes.xml.in.h:10
+#: ../src/mail/filtertypes.xml.in.h:12 ../src/mail/message-list.etspec.h:16
+#: ../src/mail/searchtypes.xml.in.h:10 ../src/mail/vfoldertypes.xml.in.h:10
 msgid "Recipients"
 msgstr "Recipients"
 
-#: ../mail/filtertypes.xml.in.h:13 ../mail/searchtypes.xml.in.h:14
-#: ../mail/vfoldertypes.xml.in.h:14
+#: ../src/mail/filtertypes.xml.in.h:13 ../src/mail/searchtypes.xml.in.h:14
+#: ../src/mail/vfoldertypes.xml.in.h:14
 msgid "CC"
 msgstr "CC"
 
-#: ../mail/filtertypes.xml.in.h:14 ../mail/searchtypes.xml.in.h:15
-#: ../mail/vfoldertypes.xml.in.h:15
+#: ../src/mail/filtertypes.xml.in.h:14 ../src/mail/searchtypes.xml.in.h:15
+#: ../src/mail/vfoldertypes.xml.in.h:15
 msgid "BCC"
 msgstr "BCC"
 
-#: ../mail/filtertypes.xml.in.h:15 ../mail/searchtypes.xml.in.h:16
-#: ../mail/vfoldertypes.xml.in.h:16
+#: ../src/mail/filtertypes.xml.in.h:15 ../src/mail/searchtypes.xml.in.h:16
+#: ../src/mail/vfoldertypes.xml.in.h:16
 msgid "Sender or Recipients"
 msgstr "Sender or Recipients"
 
-#: ../mail/filtertypes.xml.in.h:17 ../mail/searchtypes.xml.in.h:18
-#: ../mail/vfoldertypes.xml.in.h:18
+#: ../src/mail/filtertypes.xml.in.h:17 ../src/mail/searchtypes.xml.in.h:18
+#: ../src/mail/vfoldertypes.xml.in.h:18
 msgid "has words"
 msgstr "has words"
 
-#: ../mail/filtertypes.xml.in.h:18 ../mail/searchtypes.xml.in.h:19
-#: ../mail/vfoldertypes.xml.in.h:19
+#: ../src/mail/filtertypes.xml.in.h:18 ../src/mail/searchtypes.xml.in.h:19
+#: ../src/mail/vfoldertypes.xml.in.h:19
 msgid "does not have words"
 msgstr "does not have words"
 
-#: ../mail/filtertypes.xml.in.h:19 ../mail/searchtypes.xml.in.h:20
-#: ../mail/vfoldertypes.xml.in.h:20
+#: ../src/mail/filtertypes.xml.in.h:19 ../src/mail/searchtypes.xml.in.h:20
+#: ../src/mail/vfoldertypes.xml.in.h:20
 msgid "Specific header"
 msgstr "Specific header"
 
-#: ../mail/filtertypes.xml.in.h:20 ../mail/searchtypes.xml.in.h:21
-#: ../mail/vfoldertypes.xml.in.h:21
+#: ../src/mail/filtertypes.xml.in.h:20 ../src/mail/searchtypes.xml.in.h:21
+#: ../src/mail/vfoldertypes.xml.in.h:21
 msgid "exists"
 msgstr "exists"
 
-#: ../mail/filtertypes.xml.in.h:21 ../mail/searchtypes.xml.in.h:22
-#: ../mail/vfoldertypes.xml.in.h:22
+#: ../src/mail/filtertypes.xml.in.h:21 ../src/mail/searchtypes.xml.in.h:22
+#: ../src/mail/vfoldertypes.xml.in.h:22
 msgid "does not exist"
 msgstr "does not exist"
 
-#: ../mail/filtertypes.xml.in.h:22 ../mail/searchtypes.xml.in.h:24
-#: ../mail/vfoldertypes.xml.in.h:24
+#: ../src/mail/filtertypes.xml.in.h:22 ../src/mail/searchtypes.xml.in.h:24
+#: ../src/mail/vfoldertypes.xml.in.h:24
 msgid "Message Body"
 msgstr "Message Body"
 
-#: ../mail/filtertypes.xml.in.h:23 ../mail/searchtypes.xml.in.h:25
-#: ../mail/vfoldertypes.xml.in.h:25
+#: ../src/mail/filtertypes.xml.in.h:23 ../src/mail/searchtypes.xml.in.h:25
+#: ../src/mail/vfoldertypes.xml.in.h:25
 msgid "Expression"
 msgstr "Expression"
 
-#: ../mail/filtertypes.xml.in.h:24 ../mail/searchtypes.xml.in.h:26
-#: ../mail/vfoldertypes.xml.in.h:26
+#: ../src/mail/filtertypes.xml.in.h:24 ../src/mail/searchtypes.xml.in.h:26
+#: ../src/mail/vfoldertypes.xml.in.h:26
 msgid "Free Form Expression"
 msgstr "Free Form Expression"
 
-#: ../mail/filtertypes.xml.in.h:25 ../mail/searchtypes.xml.in.h:27
-#: ../mail/vfoldertypes.xml.in.h:27
+#: ../src/mail/filtertypes.xml.in.h:25 ../src/mail/searchtypes.xml.in.h:27
+#: ../src/mail/vfoldertypes.xml.in.h:27
 msgid "Date sent"
 msgstr "Date sent"
 
-#: ../mail/filtertypes.xml.in.h:26 ../mail/searchtypes.xml.in.h:28
-#: ../mail/vfoldertypes.xml.in.h:28
+#: ../src/mail/filtertypes.xml.in.h:26 ../src/mail/searchtypes.xml.in.h:28
+#: ../src/mail/vfoldertypes.xml.in.h:28
 msgid "is before"
 msgstr "is before"
 
-#: ../mail/filtertypes.xml.in.h:27 ../mail/searchtypes.xml.in.h:29
-#: ../mail/vfoldertypes.xml.in.h:29
+#: ../src/mail/filtertypes.xml.in.h:27 ../src/mail/searchtypes.xml.in.h:29
+#: ../src/mail/vfoldertypes.xml.in.h:29
 msgid "is after"
 msgstr "is after"
 
-#: ../mail/filtertypes.xml.in.h:28 ../mail/searchtypes.xml.in.h:30
-#: ../mail/vfoldertypes.xml.in.h:30
+#: ../src/mail/filtertypes.xml.in.h:28 ../src/mail/searchtypes.xml.in.h:30
+#: ../src/mail/vfoldertypes.xml.in.h:30
 msgid "Date received"
 msgstr "Date received"
 
-#: ../mail/filtertypes.xml.in.h:29 ../mail/searchtypes.xml.in.h:31
-#: ../mail/vfoldertypes.xml.in.h:31
-msgid "Label"
-msgstr "Label"
-
-#: ../mail/filtertypes.xml.in.h:30 ../mail/message-list.etspec.h:3
-#: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
+#: ../src/mail/filtertypes.xml.in.h:30 ../src/mail/message-list.etspec.h:3
+#: ../src/mail/searchtypes.xml.in.h:32 ../src/mail/vfoldertypes.xml.in.h:32
 msgid "Score"
 msgstr "Score"
 
-#: ../mail/filtertypes.xml.in.h:33 ../mail/searchtypes.xml.in.h:35
-#: ../mail/vfoldertypes.xml.in.h:35
+#: ../src/mail/filtertypes.xml.in.h:33 ../src/mail/searchtypes.xml.in.h:35
+#: ../src/mail/vfoldertypes.xml.in.h:35
 msgid "Size (kB)"
 msgstr "Size (kB)"
 
-#: ../mail/filtertypes.xml.in.h:34 ../mail/searchtypes.xml.in.h:36
-#: ../mail/vfoldertypes.xml.in.h:36
+#: ../src/mail/filtertypes.xml.in.h:34 ../src/mail/searchtypes.xml.in.h:36
+#: ../src/mail/vfoldertypes.xml.in.h:36
 msgid "is greater than or equal to"
 msgstr "is greater than or equal to"
 
-#: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
-#: ../mail/vfoldertypes.xml.in.h:37
+#: ../src/mail/filtertypes.xml.in.h:35 ../src/mail/searchtypes.xml.in.h:37
+#: ../src/mail/vfoldertypes.xml.in.h:37
 msgid "is less than or equal to"
 msgstr "is less than or equal to"
 
-#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:39
-#: ../mail/vfoldertypes.xml.in.h:39
+#: ../src/mail/filtertypes.xml.in.h:37 ../src/mail/searchtypes.xml.in.h:39
+#: ../src/mail/vfoldertypes.xml.in.h:39
 msgid "Replied to"
 msgstr "Replied to"
 
-#: ../mail/filtertypes.xml.in.h:39 ../mail/searchtypes.xml.in.h:42
-#: ../mail/vfoldertypes.xml.in.h:42
+#: ../src/mail/filtertypes.xml.in.h:39 ../src/mail/searchtypes.xml.in.h:42
+#: ../src/mail/vfoldertypes.xml.in.h:42
 msgid "Important"
 msgstr "Important"
 
 #. Past tense, as in "has been read".
-#: ../mail/filtertypes.xml.in.h:40 ../mail/mail-dialogs.ui.h:15
-#: ../mail/searchtypes.xml.in.h:43 ../mail/vfoldertypes.xml.in.h:43
+#: ../src/mail/filtertypes.xml.in.h:40 ../src/mail/mail-dialogs.ui.h:8
+#: ../src/mail/searchtypes.xml.in.h:43 ../src/mail/vfoldertypes.xml.in.h:43
 msgid "Read"
 msgstr "Read"
 
-#: ../mail/filtertypes.xml.in.h:41 ../mail/mail-config.ui.h:130
-#: ../mail/vfoldertypes.xml.in.h:44
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:134
+#: ../src/mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "Junk"
 
-#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
-#: ../mail/vfoldertypes.xml.in.h:45
+#: ../src/mail/filtertypes.xml.in.h:42 ../src/mail/searchtypes.xml.in.h:44
+#: ../src/mail/vfoldertypes.xml.in.h:45
 msgid "Follow Up"
 msgstr "Follow Up"
 
-#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
-#: ../mail/vfoldertypes.xml.in.h:46
+#: ../src/mail/filtertypes.xml.in.h:43 ../src/mail/searchtypes.xml.in.h:45
+#: ../src/mail/vfoldertypes.xml.in.h:46
 msgid "is Flagged"
 msgstr "is Flagged"
 
-#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
-#: ../mail/vfoldertypes.xml.in.h:47
+#: ../src/mail/filtertypes.xml.in.h:44 ../src/mail/searchtypes.xml.in.h:46
+#: ../src/mail/vfoldertypes.xml.in.h:47
 msgid "is not Flagged"
 msgstr "is not Flagged"
 
-#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
-#: ../mail/vfoldertypes.xml.in.h:48
+#: ../src/mail/filtertypes.xml.in.h:45 ../src/mail/searchtypes.xml.in.h:47
+#: ../src/mail/vfoldertypes.xml.in.h:48
 msgid "is Completed"
 msgstr "is Completed"
 
-#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
-#: ../mail/vfoldertypes.xml.in.h:49
+#: ../src/mail/filtertypes.xml.in.h:46 ../src/mail/searchtypes.xml.in.h:48
+#: ../src/mail/vfoldertypes.xml.in.h:49
 msgid "is not Completed"
 msgstr "is not Completed"
 
-#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
-#: ../mail/vfoldertypes.xml.in.h:54
+#: ../src/mail/filtertypes.xml.in.h:51 ../src/mail/searchtypes.xml.in.h:53
+#: ../src/mail/vfoldertypes.xml.in.h:54
 msgid "Mailing list"
 msgstr "Mailing list"
 
-#: ../mail/filtertypes.xml.in.h:52 ../mail/searchtypes.xml.in.h:54
-#: ../mail/vfoldertypes.xml.in.h:55
+#: ../src/mail/filtertypes.xml.in.h:52 ../src/mail/searchtypes.xml.in.h:54
+#: ../src/mail/vfoldertypes.xml.in.h:55
 msgid "Regex Match"
 msgstr "Regex Match"
 
-#: ../mail/filtertypes.xml.in.h:53 ../mail/searchtypes.xml.in.h:55
-#: ../mail/vfoldertypes.xml.in.h:56
+#: ../src/mail/filtertypes.xml.in.h:53 ../src/mail/searchtypes.xml.in.h:55
+#: ../src/mail/vfoldertypes.xml.in.h:56
 msgid "Message Header"
 msgstr "Message Header"
 
-#: ../mail/filtertypes.xml.in.h:54
+#: ../src/mail/filtertypes.xml.in.h:54
 msgid "Source Account"
 msgstr "Source Account"
 
-#: ../mail/filtertypes.xml.in.h:55
+#: ../src/mail/filtertypes.xml.in.h:55
 msgid "Pipe to Program"
 msgstr "Pipe to Program"
 
-#: ../mail/filtertypes.xml.in.h:56
+#: ../src/mail/filtertypes.xml.in.h:56
 msgid "returns"
 msgstr "returns"
 
-#: ../mail/filtertypes.xml.in.h:57
+#: ../src/mail/filtertypes.xml.in.h:57
 msgid "does not return"
 msgstr "does not return"
 
-#: ../mail/filtertypes.xml.in.h:58
+#: ../src/mail/filtertypes.xml.in.h:58
 msgid "returns greater than"
 msgstr "returns greater than"
 
-#: ../mail/filtertypes.xml.in.h:59
+#: ../src/mail/filtertypes.xml.in.h:59
 msgid "returns less than"
 msgstr "returns less than"
 
-#: ../mail/filtertypes.xml.in.h:60
+#: ../src/mail/filtertypes.xml.in.h:60
 msgid "Junk Test"
 msgstr "Junk Test"
 
-#: ../mail/filtertypes.xml.in.h:61
+#: ../src/mail/filtertypes.xml.in.h:61
 msgid "Message is Junk"
 msgstr "Message is Junk"
 
-#: ../mail/filtertypes.xml.in.h:62
+#: ../src/mail/filtertypes.xml.in.h:62
 msgid "Message is not Junk"
 msgstr "Message is not Junk"
 
-#: ../mail/filtertypes.xml.in.h:63 ../mail/vfoldertypes.xml.in.h:57
+#: ../src/mail/filtertypes.xml.in.h:63 ../src/mail/vfoldertypes.xml.in.h:57
 msgid "Message Location"
 msgstr "Message Location"
 
-#: ../mail/filtertypes.xml.in.h:64 ../mail/searchtypes.xml.in.h:56
-#: ../mail/vfoldertypes.xml.in.h:58
+#: ../src/mail/filtertypes.xml.in.h:64 ../src/mail/searchtypes.xml.in.h:56
+#: ../src/mail/vfoldertypes.xml.in.h:58
 msgid "Match All"
 msgstr "Match All"
 
-#: ../mail/filtertypes.xml.in.h:68
+#: ../src/mail/filtertypes.xml.in.h:68
 msgid "Stop Processing"
 msgstr "Stop Processing"
 
-#: ../mail/filtertypes.xml.in.h:69
+#: ../src/mail/filtertypes.xml.in.h:69
 msgid "Set Label"
 msgstr "Set Label"
 
-#: ../mail/filtertypes.xml.in.h:70
+#: ../src/mail/filtertypes.xml.in.h:70
 msgid "Assign Color"
 msgstr "Assign Colour"
 
-#: ../mail/filtertypes.xml.in.h:71
+#: ../src/mail/filtertypes.xml.in.h:71
 msgid "Unset Color"
 msgstr "Unset Colour"
 
-#: ../mail/filtertypes.xml.in.h:72
+#: ../src/mail/filtertypes.xml.in.h:72
 msgid "Assign Score"
 msgstr "Assign Score"
 
-#: ../mail/filtertypes.xml.in.h:73
+#: ../src/mail/filtertypes.xml.in.h:73
 msgid "Adjust Score"
 msgstr "Adjust Score"
 
-#: ../mail/filtertypes.xml.in.h:74
+#: ../src/mail/filtertypes.xml.in.h:74
 msgid "Set Status"
 msgstr "Set Status"
 
-#: ../mail/filtertypes.xml.in.h:75 ../mail/searchtypes.xml.in.h:40
-#: ../mail/vfoldertypes.xml.in.h:40
+#: ../src/mail/filtertypes.xml.in.h:75 ../src/mail/searchtypes.xml.in.h:40
+#: ../src/mail/vfoldertypes.xml.in.h:40
 msgid "Deleted"
 msgstr "Deleted"
 
-#: ../mail/filtertypes.xml.in.h:76
+#: ../src/mail/filtertypes.xml.in.h:76
 msgid "Unset Status"
 msgstr "Unset Status"
 
-#: ../mail/filtertypes.xml.in.h:77
+#: ../src/mail/filtertypes.xml.in.h:77
 msgid "Beep"
 msgstr "Beep"
 
-#: ../mail/filtertypes.xml.in.h:78
+#: ../src/mail/filtertypes.xml.in.h:78
 msgid "Play Sound"
 msgstr "Play Sound"
 
-#: ../mail/filtertypes.xml.in.h:79
+#: ../src/mail/filtertypes.xml.in.h:79
 msgid "Run Program"
 msgstr "Run Program"
 
-#: ../mail/filtertypes.xml.in.h:80
+#: ../src/mail/filtertypes.xml.in.h:80
 msgid "Forward to"
 msgstr "Forward to"
 
-#: ../mail/importers/elm-importer.c:173
+#: ../src/mail/importers/elm-importer.c:174
 msgid "Importing Elm data"
 msgstr "Importing Elm data"
 
-#: ../mail/importers/elm-importer.c:376
+#: ../src/mail/importers/elm-importer.c:377
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm importer"
 
-#: ../mail/importers/elm-importer.c:377
+#: ../src/mail/importers/elm-importer.c:378
 msgid "Import mail from Elm."
 msgstr "Import mail from Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:134
-#: ../mail/importers/kmail-importer.c:210
-#: ../plugins/dbx-import/dbx-importer.c:246
+#: ../src/mail/importers/evolution-mbox-importer.c:135
+#: ../src/mail/importers/kmail-importer.c:208
+#: ../src/plugins/dbx-import/dbx-importer.c:242
 msgid "_Destination folder:"
 msgstr "_Destination folder:"
 
-#: ../mail/importers/evolution-mbox-importer.c:140
-#: ../mail/importers/kmail-importer.c:216
-#: ../plugins/dbx-import/dbx-importer.c:252
-#: ../plugins/pst-import/pst-importer.c:541
+#: ../src/mail/importers/evolution-mbox-importer.c:141
+#: ../src/mail/importers/kmail-importer.c:214
+#: ../src/plugins/dbx-import/dbx-importer.c:248
+#: ../src/plugins/pst-import/pst-importer.c:537
 msgid "Select folder"
 msgstr "Select folder"
 
-#: ../mail/importers/evolution-mbox-importer.c:141
-#: ../mail/importers/kmail-importer.c:217
-#: ../plugins/dbx-import/dbx-importer.c:253
-#: ../plugins/pst-import/pst-importer.c:542
+#: ../src/mail/importers/evolution-mbox-importer.c:142
+#: ../src/mail/importers/kmail-importer.c:215
+#: ../src/plugins/dbx-import/dbx-importer.c:249
+#: ../src/plugins/pst-import/pst-importer.c:538
 msgid "Select folder to import into"
 msgstr "Select folder to import into"
 
-#: ../mail/importers/evolution-mbox-importer.c:509
+#. Translators: Column header for a message subject
+#: ../src/mail/importers/evolution-mbox-importer.c:510
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Subject"
 
-#: ../mail/importers/evolution-mbox-importer.c:514
+#. Translators: Column header for a message From address
+#: ../src/mail/importers/evolution-mbox-importer.c:515
 msgctxt "mboxImp"
 msgid "From"
 msgstr "From"
 
-#: ../mail/importers/evolution-mbox-importer.c:568 ../shell/e-shell-utils.c:173
+#: ../src/mail/importers/evolution-mbox-importer.c:569
+#: ../src/shell/e-shell-utils.c:176
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:569
+#: ../src/mail/importers/evolution-mbox-importer.c:570
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer Berkeley Mailbox format folders"
 
-#: ../mail/importers/kmail-importer.c:263
+#: ../src/mail/importers/kmail-importer.c:261
 #, c-format
 msgid "%d Address"
 msgid_plural "%d Addresses"
 msgstr[0] "%d Address"
 msgstr[1] "%d Addresses"
 
-#: ../mail/importers/kmail-importer.c:354
+#: ../src/mail/importers/kmail-importer.c:352
 msgid "Evolution KMail importer"
 msgstr "Evolution KMail importer"
 
-#: ../mail/importers/kmail-importer.c:355
+#: ../src/mail/importers/kmail-importer.c:353
 msgid "Import mail and contacts from KMail."
 msgstr "Import mail and contacts from KMail."
 
-#: ../mail/importers/kmail-libs.c:152
-#: ../modules/mail/e-mail-shell-view-private.c:1061
+#: ../src/mail/importers/kmail-libs.c:150
+#: ../src/modules/mail/e-mail-shell-view-private.c:1034
 msgid "Trash"
 msgstr "Wastebasket"
 
-#: ../mail/importers/mail-importer.c:54
+#: ../src/mail/importers/mail-importer.c:55
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
 
-#: ../mail/importers/mail-importer.c:60
+#: ../src/mail/importers/mail-importer.c:61
 msgid "Importing mail and contacts from KMail"
 msgstr "Importing mail and contacts from KMail"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:186 ../mail/importers/mail-importer.c:311
-#: ../plugins/dbx-import/dbx-importer.c:609
-#: ../plugins/pst-import/pst-importer.c:760
+#: ../src/mail/importers/mail-importer.c:187
+#: ../src/mail/importers/mail-importer.c:312
+#: ../src/plugins/dbx-import/dbx-importer.c:605
+#: ../src/plugins/pst-import/pst-importer.c:756
 #, c-format
-msgid "Importing '%s'"
-msgstr "Importing '%s'"
+#| msgid "Importing '%s'"
+msgid "Importing “%s”"
+msgstr "Importing “%s”"
 
-#: ../mail/importers/mail-importer.c:555
+#: ../src/mail/importers/mail-importer.c:556
 #, c-format
 msgid "Scanning %s"
 msgstr "Scanning %s"
 
-#: ../mail/importers/pine-importer.c:247
+#: ../src/mail/importers/pine-importer.c:248
 msgid "Importing Pine data"
 msgstr "Importing Pine data"
 
-#: ../mail/importers/pine-importer.c:477
+#: ../src/mail/importers/pine-importer.c:478
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine importer"
 
-#: ../mail/importers/pine-importer.c:478
+#: ../src/mail/importers/pine-importer.c:479
 msgid "Import mail from Pine."
 msgstr "Import mail from Pine."
 
-#: ../mail/mail-autofilter.c:63
+#: ../src/mail/mail-autofilter.c:64
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail to %s"
 
-#: ../mail/mail-autofilter.c:219 ../mail/mail-autofilter.c:262
+#: ../src/mail/mail-autofilter.c:220 ../src/mail/mail-autofilter.c:267
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail from %s"
 
-#: ../mail/mail-autofilter.c:245
+#: ../src/mail/mail-autofilter.c:250
 #, c-format
 msgid "Subject is %s"
 msgstr "Subject is %s"
 
-#: ../mail/mail-autofilter.c:286
+#: ../src/mail/mail-autofilter.c:290
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: ../mail/mail-autofilter.c:396
+#: ../src/mail/mail-autofilter.c:400
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
@@ -17235,28 +18965,36 @@ msgstr "Add Filter Rule"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:505
-#, c-format
-msgid ""
-"The filter rule \"%s\" has been modified to account for the deleted folder\n"
-"\"%s\"."
+#: ../src/mail/mail-autofilter.c:509
+#, c-format
+#| msgid ""
+#| "The filter rule \"%s\" has been modified to account for the deleted "
+#| "folder\n"
+#| "\"%s\"."
+#| msgid_plural ""
+#| "The following filter rules\n"
+#| "%s have been modified to account for the deleted folder\n"
+#| "\"%s\"."
+msgid ""
+"The filter rule “%s” has been modified to account for the deleted folder\n"
+"“%s”."
 msgid_plural ""
 "The following filter rules\n"
 "%s have been modified to account for the deleted folder\n"
-"\"%s\"."
+"“%s”."
 msgstr[0] ""
-"The filter rule \"%s\" has been modified to account for the deleted folder\n"
-"\"%s\"."
+"The filter rule “%s” has been modified to account for the deleted folder\n"
+"“%s”."
 msgstr[1] ""
 "The following filter rules\n"
 "%s have been modified to account for the deleted folder\n"
-"\"%s\"."
+"“%s”."
 
-#: ../mail/mail-config.ui.h:1
+#: ../src/mail/mail-config.ui.h:1
 msgid "Set custom junk header"
 msgstr "Set custom junk header"
 
-#: ../mail/mail-config.ui.h:4
+#: ../src/mail/mail-config.ui.h:4
 msgid ""
 "All new emails with header that matches given content will be automatically "
 "filtered as junk"
@@ -17264,108 +19002,104 @@ msgstr ""
 "All new e-mails with header that matches given content will be automatically "
 "filtered as junk"
 
-#: ../mail/mail-config.ui.h:5
+#: ../src/mail/mail-config.ui.h:5
 msgid "Header name"
 msgstr "Header name"
 
-#: ../mail/mail-config.ui.h:6
+#: ../src/mail/mail-config.ui.h:6
 msgid "Header content"
 msgstr "Header content"
 
-#: ../mail/mail-config.ui.h:7
+#: ../src/mail/mail-config.ui.h:7
 msgid "Default Behavior"
 msgstr "Default Behaviour"
 
-#: ../mail/mail-config.ui.h:8
+#: ../src/mail/mail-config.ui.h:8
 msgid "For_mat messages in HTML"
 msgstr "For_mat messages in HTML"
 
-#: ../mail/mail-config.ui.h:10
+#: ../src/mail/mail-config.ui.h:10
 msgid "Automatically insert _emoticons"
 msgstr "Automatically insert _emoticons"
 
-#: ../mail/mail-config.ui.h:11
+#: ../src/mail/mail-config.ui.h:11
 msgid "Use Un_icode characters for emoticons"
 msgstr "Use Un_icode characters for emoticons"
 
-#: ../mail/mail-config.ui.h:12
+#: ../src/mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "Always request rea_d receipt"
 
-#: ../mail/mail-config.ui.h:13
+#: ../src/mail/mail-config.ui.h:13
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Encode filenames in an _Outlook/GMail way"
 
-#: ../mail/mail-config.ui.h:14
+#: ../src/mail/mail-config.ui.h:14
 msgid "Send messages through Outbo_x folder"
 msgstr "Send messages through Outbo_x folder"
 
-#: ../mail/mail-config.ui.h:15
+#: ../src/mail/mail-config.ui.h:15
 msgid "Number of characters for word w_rapping:"
 msgstr "Number of characters for word w_rapping:"
 
-#: ../mail/mail-config.ui.h:16
+#: ../src/mail/mail-config.ui.h:16
 msgid "Ch_aracter encoding:"
 msgstr "Ch_aracter encoding:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../src/mail/mail-config.ui.h:17
 msgid "Replies and Forwards"
 msgstr "Replies and Forwards"
 
-#: ../mail/mail-config.ui.h:18
+#: ../src/mail/mail-config.ui.h:18
 msgid "_Reply style:"
 msgstr "_Reply style:"
 
-#: ../mail/mail-config.ui.h:19
+#: ../src/mail/mail-config.ui.h:19
 msgid "_Forward style:"
 msgstr "_Forward style:"
 
-#: ../mail/mail-config.ui.h:20
-msgid "Start _typing at the bottom on replying"
-msgstr "Start _typing at the bottom on replying"
-
-#: ../mail/mail-config.ui.h:21
-msgid "_Keep signature above the original message on replying"
-msgstr "_Keep signature above the original message on replying"
+#: ../src/mail/mail-config.ui.h:22
+msgid "Include si_gnature in new messages only"
+msgstr "Include si_gnature in new messages only"
 
-#: ../mail/mail-config.ui.h:22
+#: ../src/mail/mail-config.ui.h:23
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "Ig_nore Reply-To: for mailing lists"
 
-#: ../mail/mail-config.ui.h:23
+#: ../src/mail/mail-config.ui.h:24
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "Gro_up Reply goes only to mailing list, if possible"
 
-#: ../mail/mail-config.ui.h:24
+#: ../src/mail/mail-config.ui.h:25
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr "Digitally _sign messages when original message signed (PGP or S/MIME)"
 
-#: ../mail/mail-config.ui.h:25
+#: ../src/mail/mail-config.ui.h:26
 msgid "_Wrap quoted text in replies"
 msgstr "_Wrap quoted text in replies"
 
-#: ../mail/mail-config.ui.h:30
+#: ../src/mail/mail-config.ui.h:31
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Inline"
 
-#: ../mail/mail-config.ui.h:32
+#: ../src/mail/mail-config.ui.h:33
 msgid "Sig_natures"
 msgstr "Sig_natures"
 
-#: ../mail/mail-config.ui.h:33
+#: ../src/mail/mail-config.ui.h:34
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.ui.h:34
+#: ../src/mail/mail-config.ui.h:35
 msgid "_Languages"
 msgstr "_Languages"
 
-#: ../mail/mail-config.ui.h:35
+#: ../src/mail/mail-config.ui.h:36
 msgid "Languages Table"
 msgstr "Languages Table"
 
-#: ../mail/mail-config.ui.h:36
+#: ../src/mail/mail-config.ui.h:37
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -17373,11 +19107,11 @@ msgstr ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 
-#: ../mail/mail-config.ui.h:38
+#: ../src/mail/mail-config.ui.h:39
 msgid "Check spelling while I _type"
 msgstr "Check spelling while I _type"
 
-#: ../mail/mail-config.ui.h:40
+#: ../src/mail/mail-config.ui.h:41
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -17386,69 +19120,74 @@ msgstr ""
 "before taking the following checkmarked actions:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:42
+#: ../src/mail/mail-config.ui.h:43
 msgid "Sending a message with an _empty subject line"
 msgstr "Sending a message with an _empty subject line"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:44
+#: ../src/mail/mail-config.ui.h:45
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Sending a message with only _Bcc recipients defined"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:46
+#: ../src/mail/mail-config.ui.h:47
 msgid "Sending a message to many _To and CC recipients"
 msgstr "Sending a message to many _To and CC recipients"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:48
+#: ../src/mail/mail-config.ui.h:49
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Sending a _private reply to a mailing list message"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:50
+#: ../src/mail/mail-config.ui.h:51
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Sending a reply to a large _number of recipients"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:52
+#: ../src/mail/mail-config.ui.h:53
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "Allowing a _mailing list to redirect a private reply to the list"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:54
+#: ../src/mail/mail-config.ui.h:55
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Sending a message with _recipients not entered as mail addresses"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:56
+#: ../src/mail/mail-config.ui.h:57
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Sending a message using _key accelerator (Ctrl+Enter)"
 
-#: ../mail/mail-config.ui.h:57
+#. Translators:
+#: ../src/mail/mail-config.ui.h:59
+msgid "Before composer _format changes from HTML to Plain Text"
+msgstr "Before composer _format changes from HTML to Plain Text"
+
+#: ../src/mail/mail-config.ui.h:60
 msgid "Confirmations"
 msgstr "Confirmations"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:61
+#: ../src/mail/mail-config.ui.h:64
 msgid "Use for Folders"
 msgstr "Use for Folders"
 
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:66
+#: ../src/mail/mail-config.ui.h:69
 msgid "Use for Recipients"
 msgstr "Use for Recipients"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../mail/mail-config.ui.h:68 ../modules/mail/em-composer-prefs.c:863
+#: ../src/mail/mail-config.ui.h:71 ../src/modules/mail/em-composer-prefs.c:875
 msgid "Account"
 msgstr "Account"
 
-#: ../mail/mail-config.ui.h:69
+#: ../src/mail/mail-config.ui.h:72
 msgid "Send account overrides"
 msgstr "Send account overrides"
 
-#: ../mail/mail-config.ui.h:70
+#: ../src/mail/mail-config.ui.h:73
 msgid ""
 "Assign which account should be used as a send account for respective folders "
 "or recipients, an override for usual send account detection. List of "
@@ -17460,310 +19199,314 @@ msgstr ""
 "recipients can contain partial addresses or names. The name and the address "
 "parts are compared separately."
 
-#: ../mail/mail-config.ui.h:71
+#: ../src/mail/mail-config.ui.h:74
 msgid "_Folder override has precedence over Recipient override"
 msgstr "_Folder override has precedence over Recipient override"
 
-#: ../mail/mail-config.ui.h:72
+#: ../src/mail/mail-config.ui.h:75
 msgid "Send Account"
 msgstr "Send Account"
 
-#: ../mail/mail-config.ui.h:78 ../smime/gui/smime-ui.ui.h:1
+#: ../src/mail/mail-config.ui.h:81 ../src/smime/gui/smime-ui.ui.h:27
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:79 ../smime/gui/smime-ui.ui.h:2
+#: ../src/mail/mail-config.ui.h:82 ../src/smime/gui/smime-ui.ui.h:28
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:80
+#: ../src/mail/mail-config.ui.h:83
 msgid "Start up"
 msgstr "Start up"
 
-#: ../mail/mail-config.ui.h:81
+#: ../src/mail/mail-config.ui.h:84
 msgid "Check for new _messages on start"
 msgstr "Check for new _messages on start"
 
-#: ../mail/mail-config.ui.h:82
+#: ../src/mail/mail-config.ui.h:85
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Check for new messa_ges in all active accounts"
 
-#: ../mail/mail-config.ui.h:83
+#: ../src/mail/mail-config.ui.h:86
 msgid "Message Display"
 msgstr "Message Display"
 
-#: ../mail/mail-config.ui.h:84
+#: ../src/mail/mail-config.ui.h:87
 msgid "_Use the same fonts as other applications"
 msgstr "_Use the same fonts as other applications"
 
-#: ../mail/mail-config.ui.h:85
+#: ../src/mail/mail-config.ui.h:88
 msgid "S_tandard Font:"
 msgstr "S_tandard Font:"
 
-#: ../mail/mail-config.ui.h:86
+#: ../src/mail/mail-config.ui.h:89
 msgid "Select HTML fixed width font"
 msgstr "Select HTML fixed width font"
 
-#: ../mail/mail-config.ui.h:87
+#: ../src/mail/mail-config.ui.h:90
 msgid "Select HTML variable width font"
 msgstr "Select HTML variable width font"
 
-#: ../mail/mail-config.ui.h:88
+#: ../src/mail/mail-config.ui.h:91
 msgid "Fix_ed Width Font:"
 msgstr "Fix_ed Width Font:"
 
-#: ../mail/mail-config.ui.h:89
+#: ../src/mail/mail-config.ui.h:92
 msgid "_Mark messages as read after"
 msgstr "_Mark messages as read after"
 
-#: ../mail/mail-config.ui.h:91
+#: ../src/mail/mail-config.ui.h:94
 msgid "Highlight _quotations with"
 msgstr "Highlight _quotations with"
 
-#: ../mail/mail-config.ui.h:92
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../src/mail/mail-config.ui.h:95
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: ../mail/mail-config.ui.h:93
+#: ../src/mail/mail-config.ui.h:96
 msgid "color"
 msgstr "colour"
 
-#: ../mail/mail-config.ui.h:94
+#: ../src/mail/mail-config.ui.h:97
 msgid "Default character e_ncoding:"
 msgstr "Default character e_ncoding:"
 
-#: ../mail/mail-config.ui.h:95
+#: ../src/mail/mail-config.ui.h:98
 msgid "Apply the same _view settings to all folders"
 msgstr "Apply the same _view settings to all folders"
 
-#: ../mail/mail-config.ui.h:96
+#: ../src/mail/mail-config.ui.h:99
 msgid "F_all back to threading messages by subject"
 msgstr "F_all back to threading messages by subject"
 
-#: ../mail/mail-config.ui.h:97
+#: ../src/mail/mail-config.ui.h:100
 msgid "Delete Mail"
 msgstr "Delete Mail"
 
-#: ../mail/mail-config.ui.h:98
+#: ../src/mail/mail-config.ui.h:101
 msgid "Empty _trash folders"
 msgstr "Empty wastebaske_t folders"
 
-#: ../mail/mail-config.ui.h:99
+#: ../src/mail/mail-config.ui.h:102
 msgid "Confirm _when expunging a folder"
 msgstr "Confirm _when expunging a folder"
 
-#: ../mail/mail-config.ui.h:100
+#: ../src/mail/mail-config.ui.h:103
+#| msgid "Confirm _when expunging a folder"
+msgid "Confirm when emptying a _Junk folder"
+msgstr "Confirm when emptying a _Junk folder"
+
+#: ../src/mail/mail-config.ui.h:104
 msgid "Archive Mail"
 msgstr "Archive Mail"
 
-#: ../mail/mail-config.ui.h:101
-msgid "On This Computer A_rchive folder:"
-msgstr "On This Computer A_rchive folder:"
-
-#: ../mail/mail-config.ui.h:102
+#: ../src/mail/mail-config.ui.h:105
 msgid "Archive folder to use for On This Computer messages"
 msgstr "Archive folder to use for On This Computer messages"
 
+#: ../src/mail/mail-config.ui.h:106
+msgid "On This Computer A_rchive folder:"
+msgstr "On This Computer A_rchive folder:"
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:104
+#: ../src/mail/mail-config.ui.h:108
 msgid "_Show animated images"
 msgstr "_Show animated images"
 
-#: ../mail/mail-config.ui.h:105
+#: ../src/mail/mail-config.ui.h:109
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Prompt on sending HTML mail to contacts that do not want them"
 
-#: ../mail/mail-config.ui.h:106
+#: ../src/mail/mail-config.ui.h:110
 msgid "Loading Remote Content"
 msgstr "Loading Remote Content"
 
-#: ../mail/mail-config.ui.h:107
+#: ../src/mail/mail-config.ui.h:111
 msgid "_Never load remote content from the Internet"
 msgstr "_Never load remote content from the Internet"
 
-#: ../mail/mail-config.ui.h:108
+#: ../src/mail/mail-config.ui.h:112
 msgid "_Load remote content only in messages from contacts"
 msgstr "_Load remote content only in messages from contacts"
 
-#: ../mail/mail-config.ui.h:109
+#: ../src/mail/mail-config.ui.h:113
 msgid "_Always load remote content from the Internet"
 msgstr "_Always load remote content from the Internet"
 
-#: ../mail/mail-config.ui.h:110
+#: ../src/mail/mail-config.ui.h:114
 msgid "Notify about _missing remote content in the message preview"
 msgstr "Notify about _missing remote content in the message preview"
 
-#: ../mail/mail-config.ui.h:111
+#: ../src/mail/mail-config.ui.h:115
 msgid "Add"
 msgstr "Add"
 
-#: ../mail/mail-config.ui.h:112
+#: ../src/mail/mail-config.ui.h:116
 msgid "Remove"
 msgstr "Remove"
 
-#: ../mail/mail-config.ui.h:113
+#: ../src/mail/mail-config.ui.h:117
 msgid "Allow for sites:"
 msgstr "Allow for sites:"
 
-#: ../mail/mail-config.ui.h:114
+#: ../src/mail/mail-config.ui.h:118
 msgid "Allow for senders:"
 msgstr "Allow for senders:"
 
-#: ../mail/mail-config.ui.h:115
+#: ../src/mail/mail-config.ui.h:119
 msgid "HTML Messages"
 msgstr "HTML Messages"
 
-#: ../mail/mail-config.ui.h:116 ../mail/message-list.etspec.h:19
-msgid "Labels"
-msgstr "Labels"
-
-#: ../mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:121
 msgid "Sender Photograph"
 msgstr "Sender Photograph"
 
-#: ../mail/mail-config.ui.h:118
+#: ../src/mail/mail-config.ui.h:122
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Show the photograph of sender in the message preview"
 
-#: ../mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:123
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr "Search gra_vatar.com for the photograph of sender"
 
-#: ../mail/mail-config.ui.h:120
+#: ../src/mail/mail-config.ui.h:124
 msgid "Displayed Message Headers"
 msgstr "Displayed Message Headers"
 
-#: ../mail/mail-config.ui.h:121
+#: ../src/mail/mail-config.ui.h:125
 msgid "Mail Headers Table"
 msgstr "Mail Headers Table"
 
-#: ../mail/mail-config.ui.h:122
-#: ../modules/addressbook/autocompletion-config.c:116
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../src/mail/mail-config.ui.h:126
+#: ../src/modules/addressbook/autocompletion-config.c:118
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Date/Time Format"
 
-#: ../mail/mail-config.ui.h:124
+#: ../src/mail/mail-config.ui.h:128
 msgid "Check incoming _messages for junk"
 msgstr "Check incoming _messages for junk"
 
-#: ../mail/mail-config.ui.h:125
+#: ../src/mail/mail-config.ui.h:129
 msgid "_Delete junk messages"
 msgstr "_Delete junk messages"
 
-#: ../mail/mail-config.ui.h:126
+#: ../src/mail/mail-config.ui.h:130
 msgid "Junk Test Options"
 msgstr "Junk Test Options"
 
-#: ../mail/mail-config.ui.h:127
+#: ../src/mail/mail-config.ui.h:131
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Do not mar_k messages as junk if sender is in my address book"
 
-#: ../mail/mail-config.ui.h:128
+#: ../src/mail/mail-config.ui.h:132
 msgid "_Lookup in local address book only"
 msgstr "_Look up in local address book only"
 
-#: ../mail/mail-config.ui.h:129
+#: ../src/mail/mail-config.ui.h:133
 msgid "Check cu_stom headers for junk"
 msgstr "Check cu_stom headers for junk"
 
-#: ../mail/mail-config.ui.h:131
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:301
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:244
+#: ../src/mail/mail-config.ui.h:135
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:302
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:245
 msgid "No encryption"
 msgstr "No encryption"
 
-#: ../mail/mail-config.ui.h:132
+#: ../src/mail/mail-config.ui.h:136
 msgid "TLS encryption"
 msgstr "TLS encryption"
 
-#: ../mail/mail-config.ui.h:133
+#: ../src/mail/mail-config.ui.h:137
 msgid "SSL encryption"
 msgstr "SSL encryption"
 
-#: ../mail/mail-dialogs.ui.h:1
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-
-#: ../mail/mail-dialogs.ui.h:3
-msgid "_Flag:"
-msgstr "_Flag:"
-
-#: ../mail/mail-dialogs.ui.h:4
-msgid "_Due By:"
-msgstr "_Due By:"
-
-#. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:7
-msgid "Co_mpleted"
-msgstr "Co_mpleted"
-
-#: ../mail/mail-dialogs.ui.h:8
+#: ../src/mail/mail-dialogs.ui.h:1
 msgid "Call"
 msgstr "Call"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../src/mail/mail-dialogs.ui.h:2
 msgid "Do Not Forward"
 msgstr "Do Not Forward"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../src/mail/mail-dialogs.ui.h:3
 msgid "Follow-Up"
 msgstr "Follow-Up"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../src/mail/mail-dialogs.ui.h:4
 msgid "For Your Information"
 msgstr "For Your Information"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../src/mail/mail-dialogs.ui.h:5
 msgid "Forward"
 msgstr "Forward"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../src/mail/mail-dialogs.ui.h:6
 msgid "No Response Necessary"
 msgstr "No Response Necessary"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../src/mail/mail-dialogs.ui.h:10
 msgid "Reply to All"
 msgstr "Reply to All"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../src/mail/mail-dialogs.ui.h:11
 msgid "Review"
 msgstr "Review"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../src/mail/mail-dialogs.ui.h:12
+#| msgid ""
+#| "The messages you have selected for follow up are listed below.\n"
+#| "Please select a follow up action from the \"Flag\" menu."
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the “Flag” menu."
+msgstr ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the “Flag” menu."
+
+#: ../src/mail/mail-dialogs.ui.h:14
+msgid "_Flag:"
+msgstr "_Flag:"
+
+#: ../src/mail/mail-dialogs.ui.h:15
+msgid "_Due By:"
+msgstr "_Due By:"
+
+#. Translators: Flag Completed
+#: ../src/mail/mail-dialogs.ui.h:18
+msgid "Co_mpleted"
+msgstr "Co_mpleted"
+
+#: ../src/mail/mail-dialogs.ui.h:19
 msgid "License Agreement"
 msgstr "Licence Agreement"
 
-#: ../mail/mail-dialogs.ui.h:20
-msgid "_Tick this to accept the license agreement"
-msgstr "_Tick this to accept the licence agreement"
-
-#: ../mail/mail-dialogs.ui.h:22
+#: ../src/mail/mail-dialogs.ui.h:21
 msgid "_Accept License"
 msgstr "_Accept Licence"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../src/mail/mail-dialogs.ui.h:22
+msgid "_Tick this to accept the license agreement"
+msgstr "_Tick this to accept the licence agreement"
+
+#: ../src/mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "Security Information"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../src/mail/mail-dialogs.ui.h:25
 msgid "Digital Signature"
 msgstr "Digital Signature"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../src/mail/mail-dialogs.ui.h:26
 msgid "Encryption"
 msgstr "Encryption"
 
-#: ../mail/mail.error.xml.h:1
+#: ../src/mail/mail.error.xml.h:1
 msgid "Invalid authentication"
 msgstr "Invalid authentication"
 
-#: ../mail/mail.error.xml.h:2
+#: ../src/mail/mail.error.xml.h:2
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -17771,11 +19514,12 @@ msgstr ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 
-#: ../mail/mail.error.xml.h:3
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
+#: ../src/mail/mail.error.xml.h:3
+#| msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgid "Your login to your server “{0}” as “{0}” failed."
+msgstr "Your login to your server “{0}” as “{0}” failed."
 
-#: ../mail/mail.error.xml.h:4
+#: ../src/mail/mail.error.xml.h:4
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -17783,11 +19527,11 @@ msgstr ""
 "Check to make sure your password is spelt correctly. Remember that many "
 "passwords are case-sensitive; your caps lock might be on."
 
-#: ../mail/mail.error.xml.h:5
+#: ../src/mail/mail.error.xml.h:5
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Are you sure you want to send a message in HTML format?"
 
-#: ../mail/mail.error.xml.h:6
+#: ../src/mail/mail.error.xml.h:6
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -17797,11 +19541,11 @@ msgstr ""
 "HTML e-mail:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:9
+#: ../src/mail/mail.error.xml.h:9
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Are you sure you want to send a message without a subject?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../src/mail/mail.error.xml.h:10
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -17809,11 +19553,11 @@ msgstr ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 
-#: ../mail/mail.error.xml.h:11
+#: ../src/mail/mail.error.xml.h:11
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Are you sure you want to send a message with only Bcc recipients?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../src/mail/mail.error.xml.h:12
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -17829,7 +19573,7 @@ msgstr ""
 "your message. To avoid this, you should add at least one To: or Cc: "
 "recipient. "
 
-#: ../mail/mail.error.xml.h:15
+#: ../src/mail/mail.error.xml.h:15
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -17841,11 +19585,11 @@ msgstr ""
 "your message anyway. To avoid this, you should add at least one To: or Cc: "
 "recipient."
 
-#: ../mail/mail.error.xml.h:17
+#: ../src/mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "Are you sure you want to send a message with an invalid address?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../src/mail/mail.error.xml.h:18
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -17853,11 +19597,11 @@ msgstr ""
 "The following recipient was not recognised as a valid mail address:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:20
+#: ../src/mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "Are you sure you want to send a message with invalid addresses?"
 
-#: ../mail/mail.error.xml.h:21
+#: ../src/mail/mail.error.xml.h:21
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -17865,11 +19609,11 @@ msgstr ""
 "The following recipients were not recognised as valid mail addresses:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:23
+#: ../src/mail/mail.error.xml.h:23
 msgid "Send private reply?"
 msgstr "Send private reply?"
 
-#: ../mail/mail.error.xml.h:24
+#: ../src/mail/mail.error.xml.h:24
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -17879,11 +19623,11 @@ msgstr ""
 "but the list is trying to redirect your reply to go back to the list. Are "
 "you sure you want to proceed?"
 
-#: ../mail/mail.error.xml.h:25
+#: ../src/mail/mail.error.xml.h:25
 msgid "Reply _Privately"
 msgstr "Reply _Privately"
 
-#: ../mail/mail.error.xml.h:27
+#: ../src/mail/mail.error.xml.h:27
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -17893,11 +19637,11 @@ msgstr ""
 "replying privately to the sender; not to the list. Are you sure you want to "
 "proceed?"
 
-#: ../mail/mail.error.xml.h:29
+#: ../src/mail/mail.error.xml.h:29
 msgid "Send reply to all recipients?"
 msgstr "Send reply to all recipients?"
 
-#: ../mail/mail.error.xml.h:30
+#: ../src/mail/mail.error.xml.h:30
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -17905,13 +19649,13 @@ msgstr ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
 
-#: ../mail/mail.error.xml.h:31
+#: ../src/mail/mail.error.xml.h:31
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "This message cannot be sent because you have not specified any recipients"
 
-#: ../mail/mail.error.xml.h:32
+#: ../src/mail/mail.error.xml.h:32
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -17919,43 +19663,51 @@ msgstr ""
 "Please enter a valid e-mail address in the To: field. You can search for e-"
 "mail addresses by clicking on the To: button next to the entry box."
 
-#: ../mail/mail.error.xml.h:33
+#: ../src/mail/mail.error.xml.h:33
 msgid "Use default drafts folder?"
 msgstr "Use default drafts folder?"
 
-#: ../mail/mail.error.xml.h:34
+#: ../src/mail/mail.error.xml.h:34
+#| msgid ""
+#| "Unable to open the drafts folder for this account. Use the system drafts "
+#| "folder instead?\n"
+#| "\n"
+#| "The reported error was &quot;{0}&quot;."
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?\n"
 "\n"
-"The reported error was &quot;{0}&quot;."
+"The reported error was “{0}”."
 msgstr ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?\n"
 "\n"
-"The reported error was &quot;{0}&quot;."
+"The reported error was “{0}”."
 
-#: ../mail/mail.error.xml.h:37
+#: ../src/mail/mail.error.xml.h:37
 msgid "Use _Default"
 msgstr "Use _Default"
 
-#: ../mail/mail.error.xml.h:38
+#: ../src/mail/mail.error.xml.h:38
+#| msgid ""
+#| "Are you sure you want to permanently remove all the deleted messages in "
+#| "folder \"{0}\"?"
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
+"folder “{0}”?"
 msgstr ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
+"folder “{0}”?"
 
-#: ../mail/mail.error.xml.h:39
+#: ../src/mail/mail.error.xml.h:39
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "If you continue, you will not be able to recover these messages."
 
-#: ../mail/mail.error.xml.h:40
+#: ../src/mail/mail.error.xml.h:40
 msgid "_Expunge"
 msgstr "_Expunge"
 
-#: ../mail/mail.error.xml.h:41
+#: ../src/mail/mail.error.xml.h:41
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -17963,23 +19715,24 @@ msgstr ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 
-#: ../mail/mail.error.xml.h:42 ../modules/mail/e-mail-shell-view-actions.c:1710
+#: ../src/mail/mail.error.xml.h:42
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1631
 msgid "_Empty Trash"
 msgstr "_Empty Wastebasket"
 
-#: ../mail/mail.error.xml.h:43
+#: ../src/mail/mail.error.xml.h:43
 msgid "Opening too many messages at once may take a long time."
 msgstr "Opening too many messages at once may take a long time."
 
-#: ../mail/mail.error.xml.h:44
+#: ../src/mail/mail.error.xml.h:44
 msgid "_Open Messages"
 msgstr "_Open Messages"
 
-#: ../mail/mail.error.xml.h:45
+#: ../src/mail/mail.error.xml.h:45
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "You have unsent messages, do you wish to quit anyway?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../src/mail/mail.error.xml.h:46
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -17990,55 +19743,60 @@ msgstr ""
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:50
+#: ../src/mail/mail.error.xml.h:50
 msgid "Error while {0}."
 msgstr "Error while {0}."
 
-#: ../mail/mail.error.xml.h:51
+#: ../src/mail/mail.error.xml.h:51
 msgid "Error while performing operation."
 msgstr "Error while performing operation."
 
-#: ../mail/mail.error.xml.h:52
+#: ../src/mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Enter password."
 
-#: ../mail/mail.error.xml.h:53
+#: ../src/mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Error loading filter definitions."
 
-#: ../mail/mail.error.xml.h:54
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Cannot save to directory \"{0}\"."
+#: ../src/mail/mail.error.xml.h:54
+#| msgid "Cannot save to directory \"{0}\"."
+msgid "Cannot save to directory “{0}”."
+msgstr "Cannot save to directory “{0}”."
 
-#: ../mail/mail.error.xml.h:55
-msgid "Cannot save to file \"{0}\"."
-msgstr "Cannot save to file \"{0}\"."
+#: ../src/mail/mail.error.xml.h:55
+#| msgid "Cannot save to file \"{0}\"."
+msgid "Cannot save to file “{0}”."
+msgstr "Cannot save to file “{0}”."
 
-#: ../mail/mail.error.xml.h:56
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Cannot create the save directory, because \"{1}\""
+#: ../src/mail/mail.error.xml.h:56
+#| msgid "Cannot create the save directory, because \"{1}\""
+msgid "Cannot create the save directory, because “{1}”"
+msgstr "Cannot create the save directory, because “{1}”"
 
-#: ../mail/mail.error.xml.h:57
+#: ../src/mail/mail.error.xml.h:57
 msgid "Cannot create temporary save directory."
 msgstr "Cannot create temporary save directory."
 
-#: ../mail/mail.error.xml.h:58
+#: ../src/mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "File exists but cannot overwrite it."
 
-#: ../mail/mail.error.xml.h:59
+#: ../src/mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "File exists but is not a regular file."
 
-#: ../mail/mail.error.xml.h:60
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Cannot delete folder \"{0}\"."
+#: ../src/mail/mail.error.xml.h:60
+#| msgid "Cannot delete folder \"{0}\"."
+msgid "Cannot delete folder “{0}”."
+msgstr "Cannot delete folder “{0}”."
 
-#: ../mail/mail.error.xml.h:61
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Cannot delete system folder \"{0}\"."
+#: ../src/mail/mail.error.xml.h:61
+#| msgid "Cannot delete system folder \"{0}\"."
+msgid "Cannot delete system folder “{0}”."
+msgstr "Cannot delete system folder “{0}”."
 
-#: ../mail/mail.error.xml.h:62
+#: ../src/mail/mail.error.xml.h:62
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -18046,63 +19804,76 @@ msgstr ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 
-#: ../mail/mail.error.xml.h:63
-msgid "Failed to expunge folder &quot;{0}&quot;."
-msgstr "Failed to expunge folder &quot;{0}&quot;."
+#: ../src/mail/mail.error.xml.h:63
+#| msgid "Failed to expunge folder &quot;{0}&quot;."
+msgid "Failed to expunge folder “{0}”."
+msgstr "Failed to expunge folder “{0}”."
 
-#: ../mail/mail.error.xml.h:65
-msgid "Failed to refresh folder &quot;{0}&quot;."
-msgstr "Failed to refresh folder &quot;{0}&quot;."
+#: ../src/mail/mail.error.xml.h:65
+#| msgid "Failed to refresh folder &quot;{0}&quot;."
+msgid "Failed to refresh folder “{0}”."
+msgstr "Failed to refresh folder “{0}”."
 
-#: ../mail/mail.error.xml.h:66
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Cannot rename or move system folder \"{0}\"."
+#: ../src/mail/mail.error.xml.h:66
+#| msgid "Cannot rename or move system folder \"{0}\"."
+msgid "Cannot rename or move system folder “{0}”."
+msgstr "Cannot rename or move system folder “{0}”."
 
-#: ../mail/mail.error.xml.h:67
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Really delete folder \"{0}\" and all of its subfolders?"
+#: ../src/mail/mail.error.xml.h:67
+#| msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgid "Really delete folder “{0}” and all of its subfolders?"
+msgstr "Really delete folder “{0}” and all of its subfolders?"
 
-#: ../mail/mail.error.xml.h:68
+#: ../src/mail/mail.error.xml.h:68
+#| msgid ""
+#| "If you delete the folder, all of its contents and its subfolders' "
+#| "contents will be deleted permanently."
 msgid ""
-"If you delete the folder, all of its contents and its subfolders' contents "
+"If you delete the folder, all of its contents and its subfolders’ contents "
 "will be deleted permanently."
 msgstr ""
-"If you delete the folder, all of its contents and its subfolders' contents "
+"If you delete the folder, all of its contents and its subfolders’ contents "
 "will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:70
-msgid "Really unsubscribe folder \"{0}\"?"
-msgstr "Really unsubscribe folder \"{0}\"?"
+#: ../src/mail/mail.error.xml.h:70
+#| msgid "Really unsubscribe folder \"{0}\"?"
+msgid "Really unsubscribe folder “{0}”?"
+msgstr "Really unsubscribe folder “{0}”?"
 
-#: ../mail/mail.error.xml.h:71
+#: ../src/mail/mail.error.xml.h:71
+#| msgid ""
+#| "If you unsubscribe the folder, it might not be visible in the Evolution, "
+#| "while still being available on the server. You can re-subscribe in Folder-"
+#| ">Subscriptions... menu."
 msgid ""
 "If you unsubscribe the folder, it might not be visible in the Evolution, "
-"while still being available on the server. You can re-subscribe in Folder-"
-">Subscriptions... menu."
+"while still being available on the server. You can re-subscribe in "
+"Folder→Subscriptions... menu."
 msgstr ""
 "If you unsubscribe the folder, it might not be visible in the Evolution, "
-"while still being available on the server. You can re-subscribe in Folder-"
-">Subscriptions... menu."
+"while still being available on the server. You can re-subscribe in "
+"Folder→Subscriptions... menu."
 
-#: ../mail/mail.error.xml.h:72
+#: ../src/mail/mail.error.xml.h:72
 msgid "Do _Not Unsubscribe"
 msgstr "Do _Not Unsubscribe"
 
-#: ../mail/mail.error.xml.h:74
-msgid "Really delete folder \"{0}\"?"
-msgstr "Really delete folder \"{0}\"?"
+#: ../src/mail/mail.error.xml.h:74
+#| msgid "Really delete folder \"{0}\"?"
+msgid "Really delete folder “{0}”?"
+msgstr "Really delete folder “{0}”?"
 
-#: ../mail/mail.error.xml.h:75
+#: ../src/mail/mail.error.xml.h:75
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 "If you delete the folder, all of its contents will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:76
+#: ../src/mail/mail.error.xml.h:76
 msgid "These messages are not copies."
 msgstr "These messages are not copies."
 
-#: ../mail/mail.error.xml.h:77
+#: ../src/mail/mail.error.xml.h:77
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
@@ -18112,63 +19883,69 @@ msgstr ""
 "Folder will delete the actual messages from the folder or folders in which "
 "they physically reside. Do you really want to delete these messages?"
 
-#: ../mail/mail.error.xml.h:78
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Cannot rename \"{0}\" to \"{1}\"."
+#: ../src/mail/mail.error.xml.h:78
+#| msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgid "Cannot rename “{0}” to “{1}”."
+msgstr "Cannot rename “{0}” to “{1}”."
 
-#: ../mail/mail.error.xml.h:79
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "A folder named \"{1}\" already exists. Please use a different name."
+#: ../src/mail/mail.error.xml.h:79
+#| msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgid "A folder named “{1}” already exists. Please use a different name."
+msgstr "A folder named “{1}” already exists. Please use a different name."
 
-#: ../mail/mail.error.xml.h:80
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Cannot move folder \"{0}\" to \"{1}\"."
+#: ../src/mail/mail.error.xml.h:80
+#| msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgid "Cannot move folder “{0}” to “{1}”."
+msgstr "Cannot move folder “{0}” to “{1}”."
 
-#: ../mail/mail.error.xml.h:81
+#: ../src/mail/mail.error.xml.h:81
 msgid "Cannot open source folder. Error: {2}"
 msgstr "Cannot open source folder. Error: {2}"
 
-#: ../mail/mail.error.xml.h:82
+#: ../src/mail/mail.error.xml.h:82
 msgid "Cannot open target folder. Error: {2}"
 msgstr "Cannot open target folder. Error: {2}"
 
-#: ../mail/mail.error.xml.h:83
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
+#: ../src/mail/mail.error.xml.h:83
+#| msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgid "Cannot copy folder “{0}” to “{1}”."
+msgstr "Cannot copy folder “{0}” to “{1}”."
 
-#: ../mail/mail.error.xml.h:84
-msgid "Cannot create folder \"{0}\"."
-msgstr "Cannot create folder \"{0}\"."
+#: ../src/mail/mail.error.xml.h:84
+#| msgid "Cannot create folder \"{0}\"."
+msgid "Cannot create folder “{0}”."
+msgstr "Cannot create folder “{0}”."
 
-#: ../mail/mail.error.xml.h:85
+#: ../src/mail/mail.error.xml.h:85
 msgid "Cannot open folder. Error: {1}"
 msgstr "Cannot open folder. Error: {1}"
 
-#: ../mail/mail.error.xml.h:86
+#: ../src/mail/mail.error.xml.h:86
 msgid "Cannot save changes to account."
 msgstr "Cannot save changes to account."
 
-#: ../mail/mail.error.xml.h:87
+#: ../src/mail/mail.error.xml.h:87
 msgid "You have not filled in all of the required information."
 msgstr "You have not filled in all of the required information."
 
-#: ../mail/mail.error.xml.h:88
+#: ../src/mail/mail.error.xml.h:88
 msgid "You may not create two accounts with the same name."
 msgstr "You may not create two accounts with the same name."
 
-#: ../mail/mail.error.xml.h:89
-msgid "Are you sure you want to delete this account?"
-msgstr "Are you sure you want to delete this account?"
+#: ../src/mail/mail.error.xml.h:89
+#| msgid "Are you sure you want to delete this account?"
+msgid "Are you sure you want to delete account “{0}”?"
+msgstr "Are you sure you want to delete account “{0}”?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../src/mail/mail.error.xml.h:90
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "If you proceed, the account information will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:91
+#: ../src/mail/mail.error.xml.h:91
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Are you sure you want to delete this account and all its proxies?"
 
-#: ../mail/mail.error.xml.h:92
+#: ../src/mail/mail.error.xml.h:92
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -18176,29 +19953,30 @@ msgstr ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:94
+#: ../src/mail/mail.error.xml.h:94
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Are you sure you want to disable this account and delete all its proxies?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../src/mail/mail.error.xml.h:95
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "If you proceed, all proxy accounts will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:96
+#: ../src/mail/mail.error.xml.h:96
 msgid "Do _Not Disable"
 msgstr "Do _Not Disable"
 
-#: ../mail/mail.error.xml.h:97
+#: ../src/mail/mail.error.xml.h:97
 msgid "_Disable"
 msgstr "_Disable"
 
-#: ../mail/mail.error.xml.h:98
-msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr "Cannot edit Search Folder \"{0}\" as it does not exist."
+#: ../src/mail/mail.error.xml.h:98
+#| msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgid "Cannot edit Search Folder “{0}” as it does not exist."
+msgstr "Cannot edit Search Folder “{0}” as it does not exist."
 
-#: ../mail/mail.error.xml.h:99
+#: ../src/mail/mail.error.xml.h:99
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -18206,39 +19984,41 @@ msgstr ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 
-#: ../mail/mail.error.xml.h:101
-msgid "Cannot add Search Folder \"{0}\"."
-msgstr "Cannot add Search Folder \"{0}\"."
+#: ../src/mail/mail.error.xml.h:101
+#| msgid "Cannot add Search Folder \"{0}\"."
+msgid "Cannot add Search Folder “{0}”."
+msgstr "Cannot add Search Folder “{0}”."
 
-#: ../mail/mail.error.xml.h:102
-msgid "A folder named \"{0}\" already exists. Please use a different name."
-msgstr "A folder named \"{0}\" already exists. Please use a different name."
+#: ../src/mail/mail.error.xml.h:102
+#| msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgid "A folder named “{0}” already exists. Please use a different name."
+msgstr "A folder named “{0}” already exists. Please use a different name."
 
-#: ../mail/mail.error.xml.h:103
+#: ../src/mail/mail.error.xml.h:103
 msgid "Search Folders automatically updated."
 msgstr "Search Folders automatically updated."
 
-#: ../mail/mail.error.xml.h:104
+#: ../src/mail/mail.error.xml.h:104
 msgid "Mail filters automatically updated."
 msgstr "Mail filters automatically updated."
 
-#: ../mail/mail.error.xml.h:105
+#: ../src/mail/mail.error.xml.h:105
 msgid "Missing folder."
 msgstr "Missing folder."
 
-#: ../mail/mail.error.xml.h:106
+#: ../src/mail/mail.error.xml.h:106
 msgid "You must specify a folder."
 msgstr "You must specify a folder."
 
-#: ../mail/mail.error.xml.h:108
+#: ../src/mail/mail.error.xml.h:108
 msgid "You must name this Search Folder."
 msgstr "You must name this Search Folder."
 
-#: ../mail/mail.error.xml.h:109
+#: ../src/mail/mail.error.xml.h:109
 msgid "No folder selected."
 msgstr "No folder selected."
 
-#: ../mail/mail.error.xml.h:110
+#: ../src/mail/mail.error.xml.h:110
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -18248,37 +20028,52 @@ msgstr ""
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 
-#: ../mail/mail.error.xml.h:112
-msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "Problem migrating old mail folder \"{0}\"."
+#: ../src/mail/mail.error.xml.h:112
+#| msgid "Problem migrating old mail folder \"{0}\"."
+msgid "Problem migrating old mail folder “{0}”."
+msgstr "Problem migrating old mail folder “{0}”."
 
-#: ../mail/mail.error.xml.h:113
+#: ../src/mail/mail.error.xml.h:113
+#| msgid ""
+#| "A non-empty folder at \"{1}\" already exists.\n"
+#| "\n"
+#| "You can choose to ignore this folder, overwrite or append its contents, "
+#| "or quit."
 msgid ""
-"A non-empty folder at \"{1}\" already exists.\n"
+"A non-empty folder at “{1}” already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 msgstr ""
-"A non-empty folder at \"{1}\" already exists.\n"
+"A non-empty folder at “{1}” already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 
-#: ../mail/mail.error.xml.h:117
+#: ../src/mail/mail.error.xml.h:117
 msgid "_Overwrite"
 msgstr "_Overwrite"
 
-#: ../mail/mail.error.xml.h:118
+#: ../src/mail/mail.error.xml.h:118
 msgid "_Append"
 msgstr "_Append"
 
-#: ../mail/mail.error.xml.h:119
-msgid "Evolution's local mail format has changed."
-msgstr "Evolution's local mail format has changed."
-
-#: ../mail/mail.error.xml.h:120
-msgid ""
-"Evolution's local mail format has changed from mbox to Maildir. Your local "
+#: ../src/mail/mail.error.xml.h:119
+#| msgid "Evolution's local mail format has changed."
+msgid "Evolution’s local mail format has changed."
+msgstr "Evolution’s local mail format has changed."
+
+#: ../src/mail/mail.error.xml.h:120
+#| msgid ""
+#| "Evolution's local mail format has changed from mbox to Maildir. Your "
+#| "local mail must be migrated to the new format before Evolution can "
+#| "proceed. Do you want to migrate now?\n"
+#| "\n"
+#| "An mbox account will be created to preserve the old mbox folders. You can "
+#| "delete the account after ensuring the data is safely migrated. Please "
+#| "make sure there is enough disk space if you choose to migrate now."
+msgid ""
+"Evolution’s local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
 "want to migrate now?\n"
 "\n"
@@ -18286,7 +20081,7 @@ msgid ""
 "delete the account after ensuring the data is safely migrated. Please make "
 "sure there is enough disk space if you choose to migrate now."
 msgstr ""
-"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"Evolution’s local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
 "want to migrate now?\n"
 "\n"
@@ -18294,49 +20089,52 @@ msgstr ""
 "delete the account after ensuring the data is safely migrated. Please make "
 "sure there is enough disk space if you choose to migrate now."
 
-#: ../mail/mail.error.xml.h:123
+#: ../src/mail/mail.error.xml.h:123
 msgid "_Exit Evolution"
 msgstr "_Exit Evolution"
 
-#: ../mail/mail.error.xml.h:124
+#: ../src/mail/mail.error.xml.h:124
 msgid "_Migrate Now"
 msgstr "_Migrate Now"
 
-#: ../mail/mail.error.xml.h:125
+#: ../src/mail/mail.error.xml.h:125
 msgid "Unable to read license file."
 msgstr "Unable to read licence file."
 
-#: ../mail/mail.error.xml.h:126
+#: ../src/mail/mail.error.xml.h:126
+#| msgid ""
+#| "Cannot read the license file \"{0}\", due to an installation problem. You "
+#| "will not be able to use this provider until you can accept its license."
 msgid ""
-"Cannot read the license file \"{0}\", due to an installation problem. You "
-"will not be able to use this provider until you can accept its license."
+"Cannot read the license file “{0}”, due to an installation problem. You will "
+"not be able to use this provider until you can accept its license."
 msgstr ""
-"Cannot read the licence file \"{0}\", due to an installation problem. You "
-"will not be able to use this provider until you can accept its licence."
+"Cannot read the license file “{0}”, due to an installation problem. You will "
+"not be able to use this provider until you can accept its licence."
 
-#: ../mail/mail.error.xml.h:127
+#: ../src/mail/mail.error.xml.h:127
 msgid "Please wait."
 msgstr "Please wait."
 
-#: ../mail/mail.error.xml.h:128
+#: ../src/mail/mail.error.xml.h:128
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Querying server for a list of supported authentication mechanisms."
 
-#: ../mail/mail.error.xml.h:129
+#: ../src/mail/mail.error.xml.h:129
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr ""
 "Failed to query server for a list of supported authentication mechanisms."
 
-#: ../mail/mail.error.xml.h:130
+#: ../src/mail/mail.error.xml.h:130
 msgid "Failed to get server setup."
 msgstr "Failed to get server setup."
 
-#: ../mail/mail.error.xml.h:131
+#: ../src/mail/mail.error.xml.h:131
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synchronise folders locally for offline usage?"
 
-#: ../mail/mail.error.xml.h:132
+#: ../src/mail/mail.error.xml.h:132
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -18344,27 +20142,27 @@ msgstr ""
 "Do you want to locally synchronise the folders that are marked for offline "
 "usage?"
 
-#: ../mail/mail.error.xml.h:133
+#: ../src/mail/mail.error.xml.h:133
 msgid "Do _Not Synchronize"
 msgstr "Do _Not Synchronise"
 
-#: ../mail/mail.error.xml.h:134
+#: ../src/mail/mail.error.xml.h:134
 msgid "_Synchronize"
 msgstr "_Synchronise"
 
-#: ../mail/mail.error.xml.h:135
+#: ../src/mail/mail.error.xml.h:135
 msgid "Do you want to mark all messages as read?"
 msgstr "Do you want to mark all messages as read?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../src/mail/mail.error.xml.h:136
 msgid "This will mark all messages as read in the selected folder."
 msgstr "This will mark all messages as read in the selected folder."
 
-#: ../mail/mail.error.xml.h:137
+#: ../src/mail/mail.error.xml.h:137
 msgid "Also mark messages in subfolders?"
 msgstr "Also mark messages in subfolders?"
 
-#: ../mail/mail.error.xml.h:138
+#: ../src/mail/mail.error.xml.h:138
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18372,67 +20170,69 @@ msgstr ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
 
-#: ../mail/mail.error.xml.h:139
+#: ../src/mail/mail.error.xml.h:139
 msgid "In Current Folder and _Subfolders"
 msgstr "In Current Folder and _Subfolders"
 
-#: ../mail/mail.error.xml.h:140
+#: ../src/mail/mail.error.xml.h:140
 msgid "In Current _Folder Only"
 msgstr "In Current _Folder Only"
 
-#: ../mail/mail.error.xml.h:141
+#: ../src/mail/mail.error.xml.h:141
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr "Should Evolution close this window when replying or forwarding?"
 
-#: ../mail/mail.error.xml.h:142
+#: ../src/mail/mail.error.xml.h:142
 msgid "_Yes, Always"
 msgstr "_Yes, Always"
 
-#: ../mail/mail.error.xml.h:143
+#: ../src/mail/mail.error.xml.h:143
 msgid "_No, Never"
 msgstr "_No, Never"
 
-#: ../mail/mail.error.xml.h:144
+#: ../src/mail/mail.error.xml.h:144
 msgid "Copy folder in folder tree."
 msgstr "Copy folder in folder tree."
 
-#: ../mail/mail.error.xml.h:145
-msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
-msgstr "Are you sure you want to copy folder '{0}' to folder '{1}'?"
+#: ../src/mail/mail.error.xml.h:145
+#| msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
+msgid "Are you sure you want to copy folder “{0}” to folder “{1}”?"
+msgstr "Are you sure you want to copy folder “{0}” to folder “{1}”?"
 
-#: ../mail/mail.error.xml.h:147
+#: ../src/mail/mail.error.xml.h:147
 msgid "Do _not copy"
 msgstr "Do _not copy"
 
-#: ../mail/mail.error.xml.h:148
+#: ../src/mail/mail.error.xml.h:148
 msgid "_Always copy"
 msgstr "_Always copy"
 
-#: ../mail/mail.error.xml.h:149
+#: ../src/mail/mail.error.xml.h:149
 msgid "N_ever copy"
 msgstr "N_ever copy"
 
-#: ../mail/mail.error.xml.h:150
+#: ../src/mail/mail.error.xml.h:150
 msgid "Move folder in folder tree."
 msgstr "Move folder in folder tree."
 
-#: ../mail/mail.error.xml.h:151
-msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
-msgstr "Are you sure you want to to move folder '{0}' to folder '{1}'?"
+#: ../src/mail/mail.error.xml.h:151
+#| msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
+msgid "Are you sure you want to to move folder “{0}” to folder “{1}”?"
+msgstr "Are you sure you want to to move folder “{0}” to folder “{1}”?"
 
-#: ../mail/mail.error.xml.h:153
+#: ../src/mail/mail.error.xml.h:153
 msgid "Do _not move"
 msgstr "Do _not move"
 
-#: ../mail/mail.error.xml.h:154
+#: ../src/mail/mail.error.xml.h:154
 msgid "_Always move"
 msgstr "_Always move"
 
-#: ../mail/mail.error.xml.h:155
+#: ../src/mail/mail.error.xml.h:155
 msgid "N_ever move"
 msgstr "N_ever move"
 
-#: ../mail/mail.error.xml.h:156
+#: ../src/mail/mail.error.xml.h:156
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -18441,114 +20241,142 @@ msgstr ""
 "not enabled"
 
 #  mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:157
+#: ../src/mail/mail.error.xml.h:157
 msgid "Please enable the account or send using another account."
 msgstr "Please enable the account or send using another account."
 
-#: ../mail/mail.error.xml.h:158
+#: ../src/mail/mail.error.xml.h:158
+#| msgid ""
+#| "This message cannot be sent because you have not specified any recipients"
+msgid "This message cannot be sent because there is no mail account configured"
+msgstr ""
+"This message cannot be sent because there is no mail account configured"
+
+#: ../src/mail/mail.error.xml.h:159
+msgid ""
+"There had not been found any active mail account to send the message. Create "
+"or enable one first, please."
+msgstr ""
+"There had not been found any active mail account to send the message. Create "
+"or enable one first, please."
+
+#: ../src/mail/mail.error.xml.h:160
 msgid "Mail Deletion Failed"
 msgstr "Mail Deletion Failed"
 
-#: ../mail/mail.error.xml.h:159
+#: ../src/mail/mail.error.xml.h:161
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "You do not have sufficient permissions to delete this mail."
 
-#: ../mail/mail.error.xml.h:160
-msgid "\"Check Junk\" Failed"
-msgstr "\"Check Junk\" Failed"
+#: ../src/mail/mail.error.xml.h:162
+#| msgid "\"Check Junk\" Failed"
+msgid "“Check Junk” Failed"
+msgstr "“Check Junk” Failed"
 
-#: ../mail/mail.error.xml.h:161
-msgid "\"Report Junk\" Failed"
-msgstr "\"Report Junk\" Failed"
+#: ../src/mail/mail.error.xml.h:163
+#| msgid "\"Report Junk\" Failed"
+msgid "“Report Junk” Failed"
+msgstr "“Report Junk” Failed"
 
-#: ../mail/mail.error.xml.h:162
-msgid "\"Report Not Junk\" Failed"
-msgstr "\"Report Not Junk\" Failed"
+#: ../src/mail/mail.error.xml.h:164
+#| msgid "\"Report Not Junk\" Failed"
+msgid "“Report Not Junk” Failed"
+msgstr "“Report Not Junk” Failed"
 
-#: ../mail/mail.error.xml.h:163
+#: ../src/mail/mail.error.xml.h:165
 msgid "Remove duplicate messages?"
 msgstr "Remove duplicate messages?"
 
-#: ../mail/mail.error.xml.h:164
+#: ../src/mail/mail.error.xml.h:166
 msgid "No duplicate messages found."
 msgstr "No duplicate messages found."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:166
-msgid "Folder '{0}' doesn't contain any duplicate message."
-msgstr "Folder '{0}' doesn't contain any duplicate messages."
-
-#: ../mail/mail.error.xml.h:167
-msgid "Failed to connect account &quot;{0}&quot;."
-msgstr "Failed to connect account &quot;{0}&quot;."
-
-#: ../mail/mail.error.xml.h:168
-msgid "Failed to disconnect account &quot;{0}&quot;."
-msgstr "Failed to disconnect account &quot;{0}&quot;."
-
-#: ../mail/mail.error.xml.h:169
-msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
-msgstr "Failed to unsubscribe from folder &quot;{0}&quot;."
-
-#: ../mail/mail.error.xml.h:170
+#: ../src/mail/mail.error.xml.h:168
+#| msgid "Folder '{0}' doesn't contain any duplicate message."
+msgid "Folder “{0}” doesn’t contain any duplicate message."
+msgstr "Folder “{0}” doesn’t contain any duplicate message."
+
+#: ../src/mail/mail.error.xml.h:169
+#| msgid "Failed to connect mail account '{0}'"
+msgid "Failed to connect account “{0}”."
+msgstr "Failed to connect account “{0}”."
+
+#: ../src/mail/mail.error.xml.h:170
+#| msgid "Failed to disconnect account &quot;{0}&quot;."
+msgid "Failed to disconnect account “{0}”."
+msgstr "Failed to disconnect account “{0}”."
+
+#: ../src/mail/mail.error.xml.h:171
+#| msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
+msgid "Failed to unsubscribe from folder “{0}”."
+msgstr "Failed to unsubscribe from folder “{0}”."
+
+#: ../src/mail/mail.error.xml.h:172
 msgid "Unable to retrieve message."
 msgstr "Unable to retrieve message."
 
-#: ../mail/mail.error.xml.h:171
+#: ../src/mail/mail.error.xml.h:173
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:172
+#: ../src/mail/mail.error.xml.h:174
 msgid "Message is not available in offline mode."
 msgstr "Message is not available in offline mode."
 
-#: ../mail/mail.error.xml.h:173
+#: ../src/mail/mail.error.xml.h:175
+#| msgid ""
+#| "This can be due to the message not being downloaded yet. The folder, or "
+#| "the account, can be marked for offline synchronization. Then, once the "
+#| "account is online again, use File-&gt;Download Messages for Offline "
+#| "Usage, when this folder is selected, to make sure that all the messages "
+#| "in the folder will be available in offline mode."
 msgid ""
 "This can be due to the message not being downloaded yet. The folder, or the "
 "account, can be marked for offline synchronization. Then, once the account "
-"is online again, use File-&gt;Download Messages for Offline Usage, when this "
+"is online again, use File→Download Messages for Offline Usage, when this "
 "folder is selected, to make sure that all the messages in the folder will be "
 "available in offline mode."
 msgstr ""
 "This can be due to the message not being downloaded yet. The folder, or the "
 "account, can be marked for offline synchronisation. Then, once the account "
-"is online again, use File-&gt;Download Messages for Offline Usage, when this "
+"is online again, use File→Download Messages for Offline Usage, when this "
 "folder is selected, to make sure that all the messages in the folder will be "
 "available in offline mode."
 
-#: ../mail/mail.error.xml.h:174
+#: ../src/mail/mail.error.xml.h:176
 msgid "Failed to open folder."
 msgstr "Failed to open folder."
 
-#: ../mail/mail.error.xml.h:176
+#: ../src/mail/mail.error.xml.h:178
 msgid "Failed to find duplicate messages."
 msgstr "Failed to find duplicate messages."
 
-#: ../mail/mail.error.xml.h:177
+#: ../src/mail/mail.error.xml.h:179
 msgid "Failed to retrieve messages."
 msgstr "Failed to retrieve messages."
 
-#: ../mail/mail.error.xml.h:178
+#: ../src/mail/mail.error.xml.h:180
 msgid "Failed to mark messages as read."
 msgstr "Failed to mark messages as read."
 
-#: ../mail/mail.error.xml.h:179
+#: ../src/mail/mail.error.xml.h:181
 msgid "Failed to remove attachments from messages."
 msgstr "Failed to remove attachments from messages."
 
-#: ../mail/mail.error.xml.h:180
+#: ../src/mail/mail.error.xml.h:182
 msgid "Failed to download messages for offline viewing."
 msgstr "Failed to download messages for offline viewing."
 
-#: ../mail/mail.error.xml.h:181
+#: ../src/mail/mail.error.xml.h:183
 msgid "Failed to save messages to disk."
 msgstr "Failed to save messages to disk."
 
-#: ../mail/mail.error.xml.h:182
+#: ../src/mail/mail.error.xml.h:184
 msgid "Hidden file is attached."
 msgstr "Hidden file is attached."
 
-#: ../mail/mail.error.xml.h:183
+#: ../src/mail/mail.error.xml.h:185
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -18556,47 +20384,53 @@ msgstr ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
 
-#: ../mail/mail.error.xml.h:184
+#: ../src/mail/mail.error.xml.h:186
 msgid "Printing failed."
 msgstr "Printing failed."
 
-#: ../mail/mail.error.xml.h:185
-msgid "The printer replied &quot;{0}&quot;."
-msgstr "The printer replied &quot;{0}&quot;."
+#: ../src/mail/mail.error.xml.h:187
+#| msgid "The printer replied &quot;{0}&quot;."
+msgid "The printer replied “{0}”."
+msgstr "The printer replied “{0}”."
 
-#: ../mail/mail.error.xml.h:186
+#: ../src/mail/mail.error.xml.h:188
 msgid "Could not perform this operation on {0}."
 msgstr "Could not perform this operation on {0}."
 
-#: ../mail/mail.error.xml.h:187
+#: ../src/mail/mail.error.xml.h:189
 msgid "You must be working online to complete this operation."
 msgstr "You must be working online to complete this operation."
 
-#: ../mail/mail.error.xml.h:188
-msgid "Message from &quot;{0}&quot; account:"
-msgstr "Message from &quot;{0}&quot; account:"
+#: ../src/mail/mail.error.xml.h:190
+#| msgid "Message from &quot;{0}&quot; account:"
+msgid "Message from “{0}” account:"
+msgstr "Message from “{0}” account:"
 
-#: ../mail/mail.error.xml.h:189
-msgid "Failed to mark thread to be ignored in folder '{0}'"
-msgstr "Failed to mark thread to be ignored in folder '{0}'"
+#: ../src/mail/mail.error.xml.h:191
+#| msgid "Failed to mark thread to be ignored in folder '{0}'"
+msgid "Failed to mark thread to be ignored in folder “{0}”"
+msgstr "Failed to mark thread to be ignored in folder “{0}”"
 
-#: ../mail/mail.error.xml.h:190
-msgid "Failed to unmark thread from being ignored in folder '{0}'"
-msgstr "Failed to unmark thread from being ignored in folder '{0}'"
+#: ../src/mail/mail.error.xml.h:192
+#| msgid "Failed to unmark thread from being ignored in folder '{0}'"
+msgid "Failed to unmark thread from being ignored in folder “{0}”"
+msgstr "Failed to unmark thread from being ignored in folder “{0}”"
 
-#: ../mail/mail.error.xml.h:191
-msgid "Failed to mark subthread to be ignored in folder '{0}'"
-msgstr "Failed to mark subthread to be ignored in folder '{0}'"
+#: ../src/mail/mail.error.xml.h:193
+#| msgid "Failed to mark subthread to be ignored in folder '{0}'"
+msgid "Failed to mark subthread to be ignored in folder “{0}”"
+msgstr "Failed to mark subthread to be ignored in folder “{0}”"
 
-#: ../mail/mail.error.xml.h:192
-msgid "Failed to unmark subthread from being ignored in folder '{0}'"
-msgstr "Failed to unmark subthread from being ignored in folder '{0}'"
+#: ../src/mail/mail.error.xml.h:194
+#| msgid "Failed to unmark subthread from being ignored in folder '{0}'"
+msgid "Failed to unmark subthread from being ignored in folder “{0}”"
+msgstr "Failed to unmark subthread from being ignored in folder “{0}”"
 
-#: ../mail/mail.error.xml.h:193
+#: ../src/mail/mail.error.xml.h:195
 msgid "Remote content download had been blocked for this message."
 msgstr "Remote content download had been blocked for this message."
 
-#: ../mail/mail.error.xml.h:194
+#: ../src/mail/mail.error.xml.h:196
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
@@ -18605,607 +20439,752 @@ msgstr ""
 "remote content for this sender or used sites."
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:196
+#: ../src/mail/mail.error.xml.h:198
 msgid "{0}, Completed on {1}"
 msgstr "{0}, Completed on {1}"
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:198
+#: ../src/mail/mail.error.xml.h:200
 msgid "{0} by {1}"
 msgstr "{0} by {1}"
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:200
+#: ../src/mail/mail.error.xml.h:202
 msgid "Overdue: {0} by {1}"
 msgstr "Overdue: {0} by {1}"
 
-#: ../mail/mail.error.xml.h:202
+#: ../src/mail/mail.error.xml.h:204
 msgid "This message note has been changed, but has not been saved."
 msgstr "This message note has been changed, but has not been saved."
 
 #. Translators: {0} is the name of the folder where the delete of the message note failed.
-#: ../mail/mail.error.xml.h:205
-msgid "Failed to delete message note in folder '{0}'"
-msgstr "Failed to delete message note in folder '{0}'"
+#: ../src/mail/mail.error.xml.h:207
+#| msgid "Failed to delete message note in folder '{0}'"
+msgid "Failed to delete message note in folder “{0}”"
+msgstr "Failed to delete message note in folder “{0}”"
 
 #. Translators: {0} is the name of the folder where the store of the message note failed.
-#: ../mail/mail.error.xml.h:207
-msgid "Failed to store message note in folder '{0}'"
-msgstr "Failed to store message note in folder '{0}'"
+#: ../src/mail/mail.error.xml.h:209
+#| msgid "Failed to store message note in folder '{0}'"
+msgid "Failed to store message note in folder “{0}”"
+msgstr "Failed to store message note in folder “{0}”"
+
+#: ../src/mail/mail.error.xml.h:210
+#| msgid "Search for text in the body of the displayed message"
+msgid "Something has gone wrong when displaying the message"
+msgstr "Something has gone wrong when displaying the message"
+
+#: ../src/mail/mail.error.xml.h:211
+msgid ""
+"A WebKitWebProcess crashed when displaying the message. You can try again by "
+"moving to another message and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+msgstr ""
+"A WebKitWebProcess crashed when displaying the message. You can try again by "
+"moving to another message and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+
+#: ../src/mail/mail.error.xml.h:212
+msgid "Something has gone wrong when displaying the signature"
+msgstr "Something has gone wrong when displaying the signature"
+
+#: ../src/mail/mail.error.xml.h:213
+msgid ""
+"A WebKitWebProcess crashed when displaying the signature. You can try again "
+"by moving to another signature and back. If the issue persists, please file "
+"a bug report in the GNOME bugzilla."
+msgstr ""
+"A WebKitWebProcess crashed when displaying the signature. You can try again "
+"by moving to another signature and back. If the issue persists, please file "
+"a bug report in the GNOME bugzilla."
+
+#: ../src/mail/mail.error.xml.h:214
+#| msgid ""
+#| "Are you sure you want to permanently remove all the deleted messages in "
+#| "all folders?"
+msgid "Are you sure you want to delete all the messages in the Junk folder?"
+msgstr "Are you sure you want to delete all the messages in the Junk folder?"
 
-#: ../mail/mail-send-recv.c:191
+#: ../src/mail/mail.error.xml.h:215
+msgid ""
+"These messages will be shown in the Trash folder, where they can be "
+"permanently deleted later."
+msgstr ""
+"These messages will be shown in the Wastebasket folder, where they can be "
+"permanently deleted later."
+
+#: ../src/mail/mail.error.xml.h:216
+#| msgid "_Not Junk"
+msgid "_Empty Junk"
+msgstr "_Empty Junk"
+
+#: ../src/mail/mail.error.xml.h:217
+#| msgid "Failed to open folder."
+msgid "Failed to empty Junk folder “{0}”"
+msgstr "Failed to empty Junk folder “{0}”"
+
+#: ../src/mail/mail-send-recv.c:192
 msgid "Canceling..."
 msgstr "Cancelling…"
 
-#: ../mail/mail-send-recv.c:639
+#: ../src/mail/mail-send-recv.c:640
 msgid "Send & Receive Mail"
 msgstr "Send & Receive Mail"
 
-#: ../mail/mail-send-recv.c:653
+#: ../src/mail/mail-send-recv.c:654
 msgid "Cancel _All"
 msgstr "Cancel _All"
 
-#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:1263
+#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:1262
 msgid "Updating..."
 msgstr "Updating…"
 
-#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
+#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:826
 msgid "Waiting..."
 msgstr "Waiting…"
 
-#: ../mail/mail-send-recv.c:1229
+#: ../src/mail/mail-send-recv.c:1228
 #, c-format
-msgid "Checking for new mail at '%s'"
-msgstr "Checking for new mail at '%s'"
+#| msgid "Checking for new mail at '%s'"
+msgid "Checking for new mail at “%s”"
+msgstr "Checking for new mail at “%s”"
 
-#: ../mail/mail-send-recv.c:1456
+#: ../src/mail/mail-send-recv.c:1455
 #, c-format
-msgid "Deleting junk and expunging trash at '%s'"
-msgstr "Deleting junk and expunging wastebasket at '%s'"
+#| msgid "Deleting junk and expunging trash at '%s'"
+msgid "Deleting junk and expunging trash at “%s”"
+msgstr "Deleting junk and expunging wastebasket at “%s”"
 
-#: ../mail/mail-send-recv.c:1458
+#: ../src/mail/mail-send-recv.c:1457
 #, c-format
-msgid "Deleting junk at '%s'"
-msgstr "Deleting junk at '%s'"
+#| msgid "Deleting junk at '%s'"
+msgid "Deleting junk at “%s”"
+msgstr "Deleting junk at “%s”"
 
-#: ../mail/mail-send-recv.c:1460
+#: ../src/mail/mail-send-recv.c:1459
 #, c-format
-msgid "Expunging trash at '%s'"
-msgstr "Expunging wastebasket at '%s'"
+#| msgid "Expunging trash at '%s'"
+msgid "Expunging trash at “%s”"
+msgstr "Expunging wastebasket at “%s”"
 
-#: ../mail/mail-vfolder-ui.c:66
+#: ../src/mail/mail-vfolder-ui.c:67
 msgid "Search Folders"
 msgstr "Search Folders"
 
-#: ../mail/mail-vfolder-ui.c:146
+#: ../src/mail/mail-vfolder-ui.c:147
 msgid "Edit Search Folder"
 msgstr "Edit Search Folder"
 
-#: ../mail/mail-vfolder-ui.c:267
+#: ../src/mail/mail-vfolder-ui.c:268
 msgid "New Search Folder"
 msgstr "New Search Folder"
 
-#: ../mail/message-list.c:296
+#: ../src/mail/message-list.c:300
 msgid "Unseen"
 msgstr "Unseen"
 
-#: ../mail/message-list.c:297
+#: ../src/mail/message-list.c:301
 msgid "Seen"
 msgstr "Seen"
 
-#: ../mail/message-list.c:298
+#: ../src/mail/message-list.c:302
 msgid "Answered"
 msgstr "Answered"
 
-#: ../mail/message-list.c:299
+#: ../src/mail/message-list.c:303
 msgid "Forwarded"
 msgstr "Forwarded"
 
-#: ../mail/message-list.c:300
+#: ../src/mail/message-list.c:304
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: ../mail/message-list.c:301
+#: ../src/mail/message-list.c:305
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: ../mail/message-list.c:314
+#: ../src/mail/message-list.c:318
 msgid "Lowest"
 msgstr "Lowest"
 
-#: ../mail/message-list.c:315
+#: ../src/mail/message-list.c:319
 msgid "Lower"
 msgstr "Lower"
 
-#: ../mail/message-list.c:319
+#: ../src/mail/message-list.c:323
 msgid "Higher"
 msgstr "Higher"
 
-#: ../mail/message-list.c:320
+#: ../src/mail/message-list.c:324
 msgid "Highest"
 msgstr "Highest"
 
-#: ../mail/message-list.c:466 ../mail/message-list.c:6186
+#: ../src/mail/message-list.c:470 ../src/mail/message-list.c:6289
 msgid "Generating message list"
 msgstr "Generating message list"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2062 ../modules/itip-formatter/itip-view.c:269
+#: ../src/mail/message-list.c:2074
+#: ../src/modules/itip-formatter/itip-view.c:267
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: ../mail/message-list.c:2071
+#: ../src/mail/message-list.c:2083
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: ../mail/message-list.c:2083
+#: ../src/mail/message-list.c:2095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:2091
+#: ../src/mail/message-list.c:2103
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:2093
+#: ../src/mail/message-list.c:2105
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:3001
+#: ../src/mail/message-list.c:3062
 msgid "Select all visible messages"
 msgstr "Select all visible messages"
 
-#: ../mail/message-list.c:3703 ../mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:3781 ../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
-#: ../mail/message-list.c:5117
+#: ../src/mail/message-list.c:5213
 msgid "Follow-up"
 msgstr "Follow-up"
 
-#: ../mail/message-list.c:6125
+#: ../src/mail/message-list.c:6228
+#| 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 "
+#| "running a new search either by clearing it with Search->Clear menu item "
+#| "or by changing the query above."
 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 "
-"running a new search either by clearing it with Search->Clear menu item or "
-"by changing the query above."
+"running a new search either by clearing it with Search→Clear menu item or by "
+"changing the query above."
 msgstr ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
-"running a new search either by clearing it with Search->Clear menu item or "
-"by changing the query above."
+"running a new search either by clearing it with Search→Clear menu item or by "
+"changing the query above."
 
-#: ../mail/message-list.c:6133
+#: ../src/mail/message-list.c:6236
 msgid "There are no messages in this folder."
 msgstr "There are no messages in this folder."
 
-#: ../mail/message-list.etspec.h:2
+#: ../src/mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Flagged"
 
-#: ../mail/message-list.etspec.h:8
+#: ../src/mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Received"
 
-#: ../mail/message-list.etspec.h:11
+#: ../src/mail/message-list.etspec.h:11
 msgid "Flag Status"
 msgstr "Flag Status"
 
-#: ../mail/message-list.etspec.h:12
+#: ../src/mail/message-list.etspec.h:12
 msgid "Follow Up Flag"
 msgstr "Follow Up Flag"
 
-#: ../mail/message-list.etspec.h:13
+#: ../src/mail/message-list.etspec.h:13
 msgid "Due By"
 msgstr "Due By"
 
-#: ../mail/message-list.etspec.h:18
+#: ../src/mail/message-list.etspec.h:18
 msgid "Messages To"
 msgstr "Messages To"
 
-#: ../mail/message-list.etspec.h:20
-msgid "Subject - Trimmed"
+#: ../src/mail/message-list.etspec.h:20
+#| msgid "Subject - Trimmed"
+msgid "Subject — Trimmed"
 msgstr "Subject — Trimmed"
 
-#: ../mail/message-list.etspec.h:21 ../plugins/save-calendar/csv-format.c:374
+#: ../src/mail/message-list.etspec.h:21
+#: ../src/plugins/save-calendar/csv-format.c:372
 msgid "UID"
 msgstr "UID"
 
-#: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
+#: ../src/mail/searchtypes.xml.in.h:23 ../src/mail/vfoldertypes.xml.in.h:23
 msgid "Any header"
 msgstr "Any header"
 
-#: ../mail/searchtypes.xml.in.h:57
+#: ../src/mail/searchtypes.xml.in.h:57
 msgid "Subject or Addresses contains"
 msgstr "Subject or Addresses contains"
 
-#: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2239
+#: ../src/mail/searchtypes.xml.in.h:58
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2179
 msgid "Recipients contain"
 msgstr "Recipients contain"
 
-#: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2232
+#: ../src/mail/searchtypes.xml.in.h:59
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2172
 msgid "Message contains"
 msgstr "Message contains"
 
-#: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2253
+#: ../src/mail/searchtypes.xml.in.h:60
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2193
 msgid "Subject contains"
 msgstr "Subject contains"
 
-#: ../mail/searchtypes.xml.in.h:61
-#: ../modules/mail/e-mail-shell-view-actions.c:2246
+#: ../src/mail/searchtypes.xml.in.h:61
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2186
 msgid "Sender contains"
 msgstr "Sender contains"
 
-#: ../mail/searchtypes.xml.in.h:62
-#: ../modules/mail/e-mail-shell-view-actions.c:2218
+#: ../src/mail/searchtypes.xml.in.h:62
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2158
 msgid "Body contains"
 msgstr "Body contains"
 
-#: ../mail/searchtypes.xml.in.h:63
-#: ../modules/mail/e-mail-shell-view-actions.c:2225
+#: ../src/mail/searchtypes.xml.in.h:63
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2165
 msgid "Free form expression"
 msgstr "Free form expression"
 
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:275
+#| msgid "Collection"
+msgid "Edit Collection"
+msgstr "Edit Collection"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:312
+#| msgid "Use for Folders"
+msgid "Use for"
+msgstr "Use for"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:316
+#: ../src/plugins/pst-import/pst-importer.c:522
+msgid "_Mail"
+msgstr "_Mail"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:327
+#| msgid "C_alendar:"
+msgid "C_alendar"
+msgstr "C_alendar"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:428
+#: ../src/modules/addressbook/e-book-shell-backend.c:262
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:137
+msgid "New Address Book"
+msgstr "New Address Book"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:436
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:185
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:178
+msgid "New Memo List"
+msgstr "New Memo List"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:480
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:210
+msgid "Address Book Properties"
+msgstr "Address Book Properties"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:484
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:283
+msgid "Calendar Properties"
+msgstr "Calendar Properties"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:488
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:250
+msgid "Memo List Properties"
+msgstr "Memo List Properties"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:492
+#: ../src/modules/calendar/e-task-shell-view-actions.c:274
+msgid "Task List Properties"
+msgstr "Task List Properties"
+
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:174
+#| msgid "Back"
+msgid "_Back"
+msgstr "_Back"
+
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:195
+msgid "_Browse"
+msgstr "_Browse"
+
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:197
+msgid ""
+"Browse a WebDAV (CalDAV or CardDAV) server and create, edit or delete "
+"address books, calendars, memo lists or task lists there"
+msgstr ""
+"Browse a WebDAV (CalDAV or CardDAV) server and create, edit or delete "
+"address books, calendars, memo lists or task lists there"
+
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
-#: ../modules/addressbook/autocompletion-config.c:122
-#: ../modules/mail/em-mailer-prefs.c:1558
+#: ../src/modules/addressbook/autocompletion-config.c:124
+#: ../src/modules/mail/em-mailer-prefs.c:1562
 msgid "_Table column:"
 msgstr "_Table column:"
 
-#: ../modules/addressbook/autocompletion-config.c:125
-msgid "Address formatting"
-msgstr "Address formatting"
-
-#: ../modules/addressbook/autocompletion-config.c:128
+#: ../src/modules/addressbook/autocompletion-config.c:130
 msgid "_Format address according to standard of its destination country"
 msgstr "_Format address according to standard of its destination country"
 
-#: ../modules/addressbook/autocompletion-config.c:136
+#. Translators: This is part of a sentence "Open maps with OpenStreetMap" and "Open maps with Google"
+#: ../src/modules/addressbook/autocompletion-config.c:143
+#| msgid "Open map"
+msgctxt "OpenMap"
+msgid "Open _maps with"
+msgstr "Open _maps with"
+
+#. Translators: This is part of "Open maps with OpenStreetMap"
+#: ../src/modules/addressbook/autocompletion-config.c:150
+msgctxt "OpenMap"
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap"
+
+#. Translators: This is part of "Open maps with Google"
+#: ../src/modules/addressbook/autocompletion-config.c:153
+#| msgctxt "addressbook-label"
+#| msgid "Google Talk"
+msgctxt "OpenMap"
+msgid "Google"
+msgstr "Google"
+
+#: ../src/modules/addressbook/autocompletion-config.c:169
 msgid "Autocompletion"
 msgstr "Autocompletion"
 
-#: ../modules/addressbook/autocompletion-config.c:139
+#: ../src/modules/addressbook/autocompletion-config.c:172
 msgid "Always _show address of the autocompleted contact"
 msgstr "Always _show address of the autocompleted contact"
 
-#: ../modules/addressbook/eab-composer-util.c:100
+#: ../src/modules/addressbook/eab-composer-util.c:98
 msgid "Multiple vCards"
 msgstr "Multiple vCards"
 
-#: ../modules/addressbook/eab-composer-util.c:108
+#: ../src/modules/addressbook/eab-composer-util.c:106
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard for %s"
 
-#: ../modules/addressbook/eab-composer-util.c:119
-#: ../modules/addressbook/eab-composer-util.c:146
+#: ../src/modules/addressbook/eab-composer-util.c:117
+#: ../src/modules/addressbook/eab-composer-util.c:144
 #, c-format
 msgid "Contact information"
 msgstr "Contact information"
 
-#: ../modules/addressbook/eab-composer-util.c:148
+#: ../src/modules/addressbook/eab-composer-util.c:146
 #, c-format
 msgid "Contact information for %s"
 msgstr "Contact information for %s"
 
-#: ../modules/addressbook/e-book-shell-backend.c:258
-#: ../modules/addressbook/e-book-shell-view-actions.c:139
-msgid "New Address Book"
-msgstr "New Address Book"
-
-#: ../modules/addressbook/e-book-shell-backend.c:267
+#: ../src/modules/addressbook/e-book-shell-backend.c:271
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contact"
 
-#: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:1045
+#: ../src/modules/addressbook/e-book-shell-backend.c:273
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1049
 msgid "Create a new contact"
 msgstr "Create a new contact"
 
-#: ../modules/addressbook/e-book-shell-backend.c:274
+#: ../src/modules/addressbook/e-book-shell-backend.c:278
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Contact _List"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:1052
+#: ../src/modules/addressbook/e-book-shell-backend.c:280
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1056
 msgid "Create a new contact list"
 msgstr "Create a new contact list"
 
-#: ../modules/addressbook/e-book-shell-backend.c:284
+#: ../src/modules/addressbook/e-book-shell-backend.c:288
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Address _Book"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:968
+#: ../src/modules/addressbook/e-book-shell-backend.c:290
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:972
 msgid "Create a new address book"
 msgstr "Create a new address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:212
-msgid "Address Book Properties"
-msgstr "Address Book Properties"
-
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:535
-#: ../modules/addressbook/e-book-shell-view-actions.c:831
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:534
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Save as vCard"
 msgstr "Save as vCard…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:938
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:942
 msgid "Co_py All Contacts To..."
 msgstr "Co_py All Contacts To…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:940
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Copy the contacts of the selected address book to another"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:945
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:949
 msgid "D_elete Address Book"
 msgstr "D_elete Address Book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:947
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:951
 msgid "Delete the selected address book"
 msgstr "Delete the selected address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:952
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:956
 msgid "_Manage Address Book groups..."
 msgstr "_Manage Address Book groups..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:954
-#: ../modules/calendar/e-task-shell-view-actions.c:721
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:958
+#: ../src/modules/calendar/e-task-shell-view-actions.c:719
 msgid "Manage task list groups order and visibility"
 msgstr "Manage task list groups order and visibility"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:959
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:963
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_ve All Contacts To…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:961
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:965
 msgid "Move the contacts of the selected address book to another"
 msgstr "Move the contacts of the selected address book to another"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:966
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:970
 msgid "_New Address Book"
 msgstr "_New Address Book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:973
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:977
 msgid "Address _Book Properties"
 msgstr "Address _Book Properties"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:975
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:979
 msgid "Show properties of the selected address book"
 msgstr "Show properties of the selected address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:980
-#: ../modules/calendar/e-cal-shell-view-actions.c:1292
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:984
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:612
+#: ../src/modules/calendar/e-task-shell-view-actions.c:738
 msgid "Re_fresh"
 msgstr "Re_fresh"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:982
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:986
 msgid "Refresh the selected address book"
 msgstr "Refresh the selected address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:987
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:991
 msgid "Address Book _Map"
 msgstr "Address Book _Map"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:989
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:993
 msgid "Show map with all contacts from selected address book"
 msgstr "Show map with all contacts from selected address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:994
-#: ../modules/calendar/e-cal-shell-view-actions.c:1299
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
-#: ../modules/calendar/e-task-shell-view-actions.c:747
-#: ../modules/mail/e-mail-shell-view-actions.c:1802
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:998
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../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:1730
 msgid "_Rename..."
 msgstr "_Rename…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:996
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1000
 msgid "Rename the selected address book"
 msgstr "Rename the selected address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1003
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1007
 msgid "Stop loading"
 msgstr "Stop loading"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1008
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1012
 msgid "_Copy Contact To..."
 msgstr "_Copy Contact To…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1010
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1014
 msgid "Copy selected contacts to another address book"
 msgstr "Copy selected contacts to another address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1015
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1019
 msgid "_Delete Contact"
 msgstr "_Delete Contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1022
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1026
 msgid "_Find in Contact..."
 msgstr "_Find in Contact…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1024
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1028
 msgid "Search for text in the displayed contact"
 msgstr "Search for text in the displayed contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1029
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1033
 msgid "_Forward Contact..."
 msgstr "_Forward Contact…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1031
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1035
 msgid "Send selected contacts to another person"
 msgstr "Send selected contacts to another person"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1036
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1040
 msgid "_Move Contact To..."
 msgstr "_Move Contact To…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1038
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1042
 msgid "Move selected contacts to another address book"
 msgstr "Move selected contacts to another address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1043
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1047
 msgid "_New Contact..."
 msgstr "_New Contact…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1050
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1054
 msgid "New Contact _List..."
 msgstr "New Contact _List…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1057
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1061
 msgid "_Open Contact"
 msgstr "_Open Contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1059
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1063
 msgid "View the current contact"
 msgstr "View the current contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1064
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1068
 msgid "_Send Message to Contact..."
 msgstr "_Send Message to Contact…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1070
 msgid "Send a message to the selected contacts"
 msgstr "Send a message to the selected contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1073
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1077
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1507
+#: ../src/modules/calendar/e-task-shell-view-actions.c:810
 msgid "_Actions"
 msgstr "_Actions"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1080
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
-#: ../modules/calendar/e-task-shell-view-actions.c:819
-#: ../modules/mail/e-mail-shell-view-actions.c:1974
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1084
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:663
+#: ../src/modules/calendar/e-task-shell-view-actions.c:817
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1902
 msgid "_Preview"
 msgstr "_Preview"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1093
-#: ../modules/calendar/e-cal-shell-view-actions.c:1491
-#: ../modules/calendar/e-memo-shell-view-actions.c:682
-#: ../modules/calendar/e-task-shell-view-actions.c:836
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1536
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:680
+#: ../src/modules/calendar/e-task-shell-view-actions.c:834
 msgid "_Manage groups..."
 msgstr "_Manage groups..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1105
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1109
 msgid "Address Book Map"
 msgstr "Address Book Map"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1137
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1141
 msgid "Contact _Preview"
 msgstr "Contact _Preview"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1139
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1143
 msgid "Show contact preview window"
 msgstr "Show contact preview window"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1145
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1149
 msgid "Show _Maps"
 msgstr "Show _Maps"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1147
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1151
 msgid "Show maps in contact preview window"
 msgstr "Show maps in contact preview window"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1166
-#: ../modules/calendar/e-memo-shell-view-actions.c:743
-#: ../modules/calendar/e-task-shell-view-actions.c:909
-#: ../modules/mail/e-mail-shell-view-actions.c:2120
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1170
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:741
+#: ../src/modules/calendar/e-task-shell-view-actions.c:907
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2060
 msgid "_Classic View"
 msgstr "_Classic View"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1168
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1172
 msgid "Show contact preview below the contact list"
 msgstr "Show contact preview below the contact list"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1173
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:916
-#: ../modules/mail/e-mail-shell-view-actions.c:2127
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1177
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:748
+#: ../src/modules/calendar/e-task-shell-view-actions.c:914
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2067
 msgid "_Vertical View"
 msgstr "_Vertical View"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1175
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1179
 msgid "Show contact preview alongside the contact list"
 msgstr "Show contact preview alongside the contact list"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1190
-#: ../modules/calendar/e-cal-shell-view-actions.c:1647
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:968
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1194
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:765
+#: ../src/modules/calendar/e-task-shell-view-actions.c:966
 msgid "Unmatched"
 msgstr "Unmatched"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1200
-#: ../modules/calendar/e-cal-shell-view-actions.c:1657
-#: ../modules/calendar/e-memo-shell-view-actions.c:777
-#: ../modules/calendar/e-task-shell-view-actions.c:978
-#: ../modules/mail/e-mail-shell-view-actions.c:2211
-#: ../shell/e-shell-content.c:657
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1204
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:775
+#: ../src/modules/calendar/e-task-shell-view-actions.c:976
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2151
+#: ../src/shell/e-shell-content.c:637
 msgid "Advanced Search"
 msgstr "Advanced Search"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1233
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1237
 msgid "Print all shown contacts"
 msgstr "Print all shown contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1240
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1244
 msgid "Preview the contacts to be printed"
 msgstr "Preview the contacts to be printed"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1247
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1251
 msgid "Print selected contacts"
 msgstr "Print selected contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1262
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1266
 msgid "S_ave Address Book as vCard"
 msgstr "S_ave Address Book as vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1264
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1268
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Save the contacts of the selected address book as a vCard"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1270
-#: ../modules/addressbook/e-book-shell-view-actions.c:1280
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1274
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1284
 msgid "_Save as vCard..."
 msgstr "_Save as vCard…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1272
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1276
 msgid "Save selected contacts as a vCard"
 msgstr "Save selected contacts as a vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:313
+#: ../src/modules/addressbook/e-book-shell-view.c:311
 msgid "_Forward Contacts"
 msgstr "_Forward Contacts"
 
-#: ../modules/addressbook/e-book-shell-view.c:315
+#: ../src/modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contact"
 msgstr "_Forward Contact"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../src/modules/addressbook/e-book-shell-view.c:344
 msgid "_Send Message to Contacts"
 msgstr "_Send Message to Contacts"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../src/modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to List"
 msgstr "_Send Message to List"
 
-#: ../modules/addressbook/e-book-shell-view.c:350
+#: ../src/modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to Contact"
 msgstr "_Send Message to Contact"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:163
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:162
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -19215,172 +21194,176 @@ msgstr ""
 "\n"
 "This will restore all your personal data, settings mail filters, etc."
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:178
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:177
 msgid "_Restore from a backup file:"
 msgstr "_Restore from a backup file:"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:189
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:188
 msgid "Choose a backup file to restore"
 msgstr "Choose a backup file to restore"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:309
-#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:291
+#: ../src/modules/backup-restore/e-mail-config-restore-ready-page.c:57
 msgid "Restore from Backup"
 msgstr "Restore from Backup"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:217
+#: ../src/modules/backup-restore/evolution-backup-restore.c:285
 msgid "Select name of the Evolution backup file"
 msgstr "Select name of the Evolution backup file"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:250
+#: ../src/modules/backup-restore/evolution-backup-restore.c:318
 msgid "_Restart Evolution after backup"
 msgstr "_Restart Evolution after backup"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:285
+#: ../src/modules/backup-restore/evolution-backup-restore.c:353
 msgid "Re_start Evolution after restore"
 msgstr "Re_start Evolution after restore"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:327
+#: ../src/modules/backup-restore/evolution-backup-restore.c:395
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Select name of the Evolution backup file to restore"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:336
+#: ../src/modules/backup-restore/evolution-backup-restore.c:404
 #, 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..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:357
+#: ../src/modules/backup-restore/evolution-backup-restore.c:425
 msgid "_Back up Evolution Data..."
 msgstr "_Back up Evolution Data…"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:359
+#: ../src/modules/backup-restore/evolution-backup-restore.c:427
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Back up Evolution data and settings to an archive file"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:364
+#: ../src/modules/backup-restore/evolution-backup-restore.c:432
 msgid "R_estore Evolution Data..."
 msgstr "R_estore Evolution Data…"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:366
+#: ../src/modules/backup-restore/evolution-backup-restore.c:434
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Restore Evolution data and settings from an archive file"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:75
+#: ../src/modules/backup-restore/evolution-backup-tool.c:73
 msgid "Back up Evolution directory"
 msgstr "Back up Evolution directory"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:77
+#: ../src/modules/backup-restore/evolution-backup-tool.c:75
 msgid "Restore Evolution directory"
 msgstr "Restore Evolution directory"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:79
+#: ../src/modules/backup-restore/evolution-backup-tool.c:77
 msgid "Check Evolution Back up"
 msgstr "Check Evolution Backup"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:81
+#: ../src/modules/backup-restore/evolution-backup-tool.c:79
 msgid "Restart Evolution"
 msgstr "Restart Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../src/modules/backup-restore/evolution-backup-tool.c:81
 msgid "With Graphical User Interface"
 msgstr "With Graphical User Interface"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:281
-#: ../modules/backup-restore/evolution-backup-tool.c:485
+#: ../src/modules/backup-restore/evolution-backup-tool.c:294
+#: ../src/modules/backup-restore/evolution-backup-tool.c:498
 msgid "Shutting down Evolution"
 msgstr "Shutting down Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:290
+#: ../src/modules/backup-restore/evolution-backup-tool.c:303
 msgid "Backing Evolution accounts and settings"
 msgstr "Backing up Evolution accounts and settings"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:307
+#: ../src/modules/backup-restore/evolution-backup-tool.c:320
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Backing up Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:323
+#: ../src/modules/backup-restore/evolution-backup-tool.c:336
 msgid "Back up complete"
 msgstr "Backup complete"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:330
-#: ../modules/backup-restore/evolution-backup-tool.c:679
+#: ../src/modules/backup-restore/evolution-backup-tool.c:343
+#: ../src/modules/backup-restore/evolution-backup-tool.c:705
 msgid "Restarting Evolution"
 msgstr "Restarting Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:491
+#: ../src/modules/backup-restore/evolution-backup-tool.c:504
 msgid "Back up current Evolution data"
 msgstr "Back up current Evolution data"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:498
+#: ../src/modules/backup-restore/evolution-backup-tool.c:511
 msgid "Extracting files from back up"
 msgstr "Extracting files from backup"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:580
+#: ../src/modules/backup-restore/evolution-backup-tool.c:606
 msgid "Loading Evolution settings"
 msgstr "Loading Evolution settings"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:650
+#: ../src/modules/backup-restore/evolution-backup-tool.c:676
 msgid "Removing temporary back up files"
 msgstr "Removing temporary backup files"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:664
+#: ../src/modules/backup-restore/evolution-backup-tool.c:690
 msgid "Reloading registry service"
 msgstr "Reloading registry service"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:866
+#: ../src/modules/backup-restore/evolution-backup-tool.c:899
 msgid "Evolution Back Up"
 msgstr "Evolution Back Up"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:867
+#: ../src/modules/backup-restore/evolution-backup-tool.c:900
 #, c-format
-msgid "Backing up to the folder %s"
-msgstr "Backing up to the folder %s"
+#| msgid "Backing up to the folder %s"
+msgid "Backing up to the file %s"
+msgstr "Backing up to the file %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:871
+#: ../src/modules/backup-restore/evolution-backup-tool.c:904
 msgid "Evolution Restore"
 msgstr "Evolution Restore"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:872
+#: ../src/modules/backup-restore/evolution-backup-tool.c:905
 #, c-format
-msgid "Restoring from the folder %s"
-msgstr "Restoring from the folder %s"
+#| msgid "Restoring from the folder %s"
+msgid "Restoring from the file %s"
+msgstr "Restoring from the file %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:941
+#: ../src/modules/backup-restore/evolution-backup-tool.c:974
 msgid "Backing up Evolution Data"
 msgstr "Backing up Evolution Data"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:942
+#: ../src/modules/backup-restore/evolution-backup-tool.c:975
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Please wait while Evolution backs up your data."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:944
+#: ../src/modules/backup-restore/evolution-backup-tool.c:977
 msgid "Restoring Evolution Data"
 msgstr "Restoring Evolution Data"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:945
+#: ../src/modules/backup-restore/evolution-backup-tool.c:978
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Please wait while Evolution restores your data."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:967
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1000
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "This may take a while depending on the amount of data in your account."
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Invalid Evolution backup file"
 msgstr "Invalid Evolution backup file"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "File '{0}' is not a valid Evolution backup file."
-msgstr "File '{0}' is not a valid Evolution backup file."
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
+#| msgid "File '{0}' is not a valid Evolution backup file."
+msgid "File “{0}” is not a valid Evolution backup file."
+msgstr "File “{0}” is not a valid Evolution backup file."
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid "Are you sure you want to close Evolution?"
 msgstr "Are you sure you want to close Evolution?"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid ""
 "To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
@@ -19388,17 +21371,17 @@ msgstr ""
 "To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Close and _Back up Evolution"
 msgstr "Close and _Back up Evolution"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid ""
 "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr ""
 "Are you sure you want to restore Evolution from the selected backup file?"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
@@ -19410,289 +21393,302 @@ msgstr ""
 "all your current Evolution data and settings and restore them from your "
 "backup."
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "Close and _Restore Evolution"
 msgstr "Close and _Restore Evolution"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid "Insufficient Permissions"
 msgstr "Insufficient Permissions"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
 msgid "The selected folder is not writable."
 msgstr "The selected folder is not writable."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:160
+#: ../src/modules/bogofilter/evolution-bogofilter.c:158
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Failed to spawn Bogofilter (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:178
+#: ../src/modules/bogofilter/evolution-bogofilter.c:176
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "Failed to stream mail message content to Bogofilter: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:227
+#: ../src/modules/bogofilter/evolution-bogofilter.c:225
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Bogofilter either crashed or failed to process a mail message"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:372
+#: ../src/modules/bogofilter/evolution-bogofilter.c:370
 msgid "Bogofilter Options"
 msgstr "Bogofilter Options"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:381
+#: ../src/modules/bogofilter/evolution-bogofilter.c:379
 msgid "Convert message text to _Unicode"
 msgstr "Convert message text to _Unicode"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:539
-#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
+#: ../src/modules/bogofilter/evolution-bogofilter.c:537
+#: ../src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+#: ../src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
 msgid "Junk filter using Bogofilter"
 msgstr "Junk filter using Bogofilter"
 
-#: ../modules/book-config-google/evolution-book-config-google.c:92
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:993
-#: ../modules/cal-config-google/e-cal-config-google.c:177
-#: ../modules/cal-config-google/e-cal-config-gtasks.c:117
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:433
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:468
+#: ../src/modules/book-config-google/evolution-book-config-google.c:93
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:994
+#: ../src/modules/cal-config-google/e-cal-config-google.c:190
+#: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:434
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:469
 msgid "User name cannot be empty"
 msgstr "User name cannot be empty"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:443
 msgid "Standard LDAP Port"
 msgstr "Standard LDAP Port"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:631
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:449
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:632
 msgid "LDAP over SSL/TLS (deprecated)"
 msgstr "LDAP over SSL/TLS (deprecated)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:455
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft Global Catalogue"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:461
 msgid "Microsoft Global Catalog over SSL/TLS"
 msgstr "Microsoft Global Catalog over SSL/TLS"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:567
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:568
 msgid "Connecting to LDAP"
 msgstr "Connecting to LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:584
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:585
 msgid "Server Information"
 msgstr "Server Information"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:611
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:612
 msgid "Port:"
 msgstr "Port:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:200
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:620
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:246
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:201
 msgid "Port number is not valid"
 msgstr "Port number is not valid"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:634
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:635
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (recommended)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:636
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:637
 msgid "Encryption:"
 msgstr "Encryption:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:660
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:322
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:265
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:323
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:266
 msgid "Authentication"
 msgstr "Authentication"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:686
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
 msgid "Using email address"
 msgstr "Using e-mail address"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:690
 msgid "Using distinguished name (DN)"
 msgstr "Using distinguished name (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:692
 msgid "Method:"
 msgstr "Method:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:697
+#| msgid ""
+#| "This is the method Evolution will use to authenticate you.  Note that "
+#| "setting this to \"Using email address\" requires anonymous access to your "
+#| "LDAP server."
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Using email address\" requires anonymous access to your "
-"LDAP server."
+"setting this to “Using email address” requires anonymous access to your LDAP "
+"server."
 msgstr ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Using e-mail address\" requires anonymous access to your "
+"setting this to “Using e-mail address” requires anonymous access to your "
 "LDAP server."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:711
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:712
 msgid "Using LDAP"
 msgstr "Using LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:728
-#: ../modules/mail/e-mail-shell-view.c:120
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:729
+#: ../src/modules/mail/e-mail-shell-view.c:118
 msgid "Searching"
 msgstr "Searching"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:750
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:751
 msgid "Search Base:"
 msgstr "Search Base:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:754
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
 msgid "Find Possible Search Bases"
 msgstr "Find Possible Search Bases"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:777
 msgid "One Level"
 msgstr "One Level"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
 msgid "Subtree"
 msgstr "Subtree"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:780
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:781
 msgid "Search Scope:"
 msgstr "Search Scope:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:785
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:786
+#| msgid ""
+#| "The search scope defines how deep you would like the search to extend "
+#| "down the directory tree.  A search scope of \"Subtree\" will include all "
+#| "entries below your search base.  A search scope of \"One Level\" will "
+#| "only include the entries one level beneath your search base."
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the directory tree.  A search scope of \"Subtree\" will include all entries "
-"below your search base.  A search scope of \"One Level\" will only include "
-"the entries one level beneath your search base."
+"the directory tree.  A search scope of “Subtree” will include all entries "
+"below your search base.  A search scope of “One Level” will only include the "
+"entries one level beneath your search base."
 msgstr ""
 "The search scope defines how deep you would like the search to extend down "
-"the directory tree.  A search scope of \"Subtree\" will include all entries "
-"below your search base.  A search scope of \"One Level\" will only include "
-"the entries one level beneath your search base."
+"the directory tree.  A search scope of “Subtree” will include all entries "
+"below your search base.  A search scope of “One Level” will only include the "
+"entries one level beneath your search base."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:795
 msgid "Search Filter:"
 msgstr "Search Filter:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:806
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:807
 msgid "Downloading"
 msgstr "Downloading"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:827
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:828
 msgid "Limit:"
 msgstr "Limit:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:838
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:839
 msgid "contacts"
 msgstr "contacts"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:843
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:844
 msgid "Browse until limit is reached"
 msgstr "Browse until limit is reached"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:978
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:414
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:450
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:979
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:415
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:451
 msgid "Server address cannot be empty"
 msgstr "Server address cannot be empty"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:92
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:93
 msgid "Choose an Address Book"
 msgstr "Choose an Address Book"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:240
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:296
-#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:241
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:297
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:249
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:250
 msgid "Find Address Books"
 msgstr "Find Address Books"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:259
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:260
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Avoid IfMatch (needed on Apache < 2.2.8)"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:308
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:412
-#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:184
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:309
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:413
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:185
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr "URL is not a valid http:// nor https:// URL"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:109
-#: ../modules/cal-config-google/e-google-chooser-button.c:224
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:110
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:225
 msgid "Choose a Calendar"
 msgstr "Choose a Calendar"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:113
-#: ../modules/cal-config-google/e-google-chooser-button.c:228
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:114
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:229
 msgid "Choose a Memo List"
 msgstr "Choose a Memo List"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:117
-#: ../modules/cal-config-google/e-google-chooser-button.c:232
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:118
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:233
 msgid "Choose a Task List"
 msgstr "Choose a Task List"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:310
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:311
 msgid "Find Calendars"
 msgstr "Find Calendars"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:314
 msgid "Find Memo Lists"
 msgstr "Find Memo Lists"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:317
 msgid "Find Task Lists"
 msgstr "Find Task Lists"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:334
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:335
 msgid "Email:"
 msgstr "E-mail:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:339
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:340
 msgid "Server handles meeting invitations"
 msgstr "Server handles meeting invitations"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:70
+#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:71
 msgid "Choose which address books to use."
 msgstr "Choose which address books to use."
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
+#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:204
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Use in Birthdays & Anniversaries calendar"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:143
+#: ../src/modules/cal-config-google/e-cal-config-google.c:101
+msgid "Enable Calendars to synchronize"
+msgstr "Enable Calendars to synchronise"
+
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:144
 msgid "Default User Calendar"
 msgstr "Default User Calendar"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:158
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:159
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Use an existing iCalendar (ics) file"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:183
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:184
 msgid "iCalendar File"
 msgstr "iCalendar File"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:195
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:196
 msgid "Choose an iCalendar file"
 msgstr "Choose an iCalendar file"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:198
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:199
 msgid "File:"
 msgstr "File:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:213
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:214
 msgid "Allow Evolution to update the file"
 msgstr "Allow Evolution to update the file"
 
@@ -19702,463 +21698,482 @@ msgstr "Allow Evolution to update the file"
 #. *
 #. * This string is just a fallback mechanism for systems on
 #. * which _NL_MEASUREMENT_MEASUREMENT is not available.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:186
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:187
 msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "default:mm"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:258
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:259
 msgid "Fahrenheit (°F)"
 msgstr "Fahrenheit (°F)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:263
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:264
 msgid "Centigrade (°C)"
 msgstr "Centigrade (°C)"
 
 #. Translators: This is the temperature in kelvin.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:267
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:268
 msgid "Kelvin (K)"
 msgstr "Kelvin (K)"
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:270
 msgid "Units:"
 msgstr "Units:"
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:321
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:322
 msgid "Location cannot be empty"
 msgstr "Location cannot be empty"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:287
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../src/modules/calendar/e-cal-attachment-handler.c:285
+#: ../src/smime/gui/smime-ui.ui.h:7
 msgid "I_mport"
 msgstr "I_mport"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:337
+#: ../src/modules/calendar/e-cal-attachment-handler.c:335
 msgid "Importing an event"
 msgstr "Importing an event"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:341
+#: ../src/modules/calendar/e-cal-attachment-handler.c:339
 msgid "Importing a memo"
 msgstr "Importing a memo"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:345
+#: ../src/modules/calendar/e-cal-attachment-handler.c:343
 msgid "Importing a task"
 msgstr "Importing a task"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:403
+#: ../src/modules/calendar/e-cal-attachment-handler.c:401
 msgid "Select a Calendar"
 msgstr "Select a Calendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:410
+#: ../src/modules/calendar/e-cal-attachment-handler.c:408
 msgid "Select a Memo List"
 msgstr "Select a Memo List"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:417
+#: ../src/modules/calendar/e-cal-attachment-handler.c:415
 msgid "Select a Task List"
 msgstr "Select a Task List"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:424
+#: ../src/modules/calendar/e-cal-attachment-handler.c:422
 msgid "I_mport to Calendar"
 msgstr "I_mport to Calendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:431
+#: ../src/modules/calendar/e-cal-attachment-handler.c:429
 msgid "I_mport to Memo List"
 msgstr "I_mport to Memo List"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:438
+#: ../src/modules/calendar/e-cal-attachment-handler.c:436
 msgid "I_mport to Task List"
 msgstr "I_mport to Task List"
 
-#: ../modules/calendar/e-cal-base-shell-backend.c:187
-#: ../modules/calendar/e-memo-shell-view-actions.c:180
-msgid "New Memo List"
-msgstr "New Memo List"
-
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:556
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:563
 #, c-format
-msgid "Copying an event into the calendar '%s'"
-msgstr "Copying an event into the calendar '%s'"
+#| msgid "Copying an event into the calendar '%s'"
+msgid "Copying an event into the calendar “%s”"
+msgstr "Copying an event into the calendar “%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:557
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:564
 #, c-format
-msgid "Moving an event into the calendar '%s'"
-msgstr "Moving an event into the calendar '%s'"
+#| msgid "Moving an event into the calendar '%s'"
+msgid "Moving an event into the calendar “%s”"
+msgstr "Moving an event into the calendar “%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:562
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:569
 #, c-format
-msgid "Copying a memo into the memo list '%s'"
-msgstr "Copying a memo into the memo list '%s'"
+#| msgid "Copying a memo into the memo list '%s'"
+msgid "Copying a memo into the memo list “%s”"
+msgstr "Copying a memo into the memo list “%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:563
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:570
 #, c-format
-msgid "Moving a memo into the memo list '%s'"
-msgstr "Moving a memo into the memo list '%s'"
+#| msgid "Moving a memo into the memo list '%s'"
+msgid "Moving a memo into the memo list “%s”"
+msgstr "Moving a memo into the memo list “%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:568
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:575
 #, c-format
-msgid "Copying a task into the task list '%s'"
-msgstr "Copying a task into the task list '%s'"
+#| msgid "Copying a task into the task list '%s'"
+msgid "Copying a task into the task list “%s”"
+msgstr "Copying a task into the task list “%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:569
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:576
 #, c-format
-msgid "Moving a task into the task list '%s'"
-msgstr "Moving a task into the task list '%s'"
+#| msgid "Moving a task into the task list '%s'"
+msgid "Moving a task into the task list “%s”"
+msgstr "Moving a task into the task list “%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:686
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:693
 msgid "Calendar Selector"
 msgstr "Calendar Selector"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:692
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:699
 msgid "Memo List Selector"
 msgstr "Memo List Selector"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:697
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:704
 msgid "Task List Selector"
 msgstr "Task List Selector"
 
-#: ../modules/calendar/e-calendar-preferences.c:515
-msgid "Selected Calendars for Alarms"
-msgstr "Selected Calendars for Alarms"
+#: ../src/modules/calendar/e-calendar-preferences.c:525
+#| msgid "Select the calendars for reminder notification"
+msgid "Selected Calendars for Notifications of Reminders"
+msgstr "Selected Calendars for Notifications of Reminders"
+
+#: ../src/modules/calendar/e-calendar-preferences.c:532
+msgid "Selected Memo Lists for Notifications of Reminders"
+msgstr "Selected Memo Lists for Notifications of Reminders"
 
-#: ../modules/calendar/e-calendar-preferences.c:611
+#: ../src/modules/calendar/e-calendar-preferences.c:539
+msgid "Selected Task Lists for Notifications of Reminders"
+msgstr "Selected Task Lists for Notifications of Reminders"
+
+#: ../src/modules/calendar/e-calendar-preferences.c:635
 msgid "Meeting Invitations"
 msgstr "Meeting Invitations"
 
-#: ../modules/calendar/e-calendar-preferences.c:637
+#: ../src/modules/calendar/e-calendar-preferences.c:661
 msgid "_Delete message after acting"
 msgstr "_Delete message after acting"
 
-#: ../modules/calendar/e-calendar-preferences.c:651
-#: ../modules/calendar/e-calendar-preferences.c:682
+#: ../src/modules/calendar/e-calendar-preferences.c:675
+#: ../src/modules/calendar/e-calendar-preferences.c:706
 msgid "Conflict Search"
 msgstr "Conflict Search"
 
 #. Source selector
-#: ../modules/calendar/e-calendar-preferences.c:666
+#: ../src/modules/calendar/e-calendar-preferences.c:690
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Select the calendars to search for meeting conflicts"
 
-#: ../modules/calendar/e-calendar-preferences.c:1064
+#: ../src/modules/calendar/e-calendar-preferences.c:1102
 msgid "Ti_me and date:"
 msgstr "Ti_me and date:"
 
-#: ../modules/calendar/e-calendar-preferences.c:1065
+#: ../src/modules/calendar/e-calendar-preferences.c:1103
 msgid "_Date only:"
 msgstr "_Date only:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:1
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Minutes"
 msgstr "Minutes"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Hours"
 msgstr "Hours"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Days"
 msgstr "Days"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:4
 msgid "60 minutes"
 msgstr "60 minutes"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:5
 msgid "30 minutes"
 msgstr "30 minutes"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:6
 msgid "15 minutes"
 msgstr "15 minutes"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:7
 msgid "10 minutes"
 msgstr "10 minutes"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:8
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:8
 msgid "05 minutes"
 msgstr "05 minutes"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Se_cond zone:"
 msgstr "Se_cond zone:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:12
 msgid "(Shown in a Day View)"
 msgstr "(Shown in a Day View)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:13
 msgid "Time _zone:"
 msgstr "Time _zone:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Use s_ystem time zone"
 msgstr "Use s_ystem time zone"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:15
 msgid "Time format:"
 msgstr "Time format:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:16
 msgid "_12 hour (AM/PM)"
 msgstr "_12 hour (AM/PM)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:17
 msgid "_24 hour"
 msgstr "_24 hour"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:18
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1658
 msgid "Work Week"
 msgstr "Work Week"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Wee_k starts on:"
 msgstr "Wee_k starts on:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Work days:"
 msgstr "Work days:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:22
 msgid "_Day begins:"
 msgstr "_Day begins:"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:24
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:24
 msgid "_Mon"
 msgstr "_Mon"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "Monday"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "_Tue"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "Tuesday"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:30
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "_Wed"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "Wednesday"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "T_hu"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "Thursday"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "_Fri"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "Friday"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "_Sat"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "Saturday"
 
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "S_un"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "Sunday"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:44
 msgid "Day _ends:"
 msgstr "Day _ends:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Create events, memos and tasks as _Private by default"
 msgstr "Create events, memos and tasks as _Private by default"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:49
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:49
 msgid "View Options"
 msgstr "View Options"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:50
 msgid "_Time divisions:"
 msgstr "_Time divisions:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:51
 msgid "_Show appointment end times in week and month view"
 msgstr "_Show appointment end times in week and month view"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:52
 msgid "Show appointment _icons in the month view"
 msgstr "Show appointment _icons in the month view"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:53
 msgid "_Compress weekends in month view"
 msgstr "_Compress weekends in month view"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Show week _numbers"
 msgstr "Show week _numbers"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:55
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr "Show r_ecurring events in italic in bottom left calendar"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Sc_roll Month View by a week"
 msgstr "Sc_roll Month View by a week"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Alerts"
 msgstr "Alerts"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Ask for confirmation when deleting items"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Display"
 msgstr "Display"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Task List"
 msgstr "Task List"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
 msgid "Highlight t_asks due today"
 msgstr "Highlight t_asks due today"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Highlight _overdue tasks"
 msgstr "Highlight _overdue tasks"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:64
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Hide completed tasks after"
 msgstr "_Hide completed tasks after"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
 msgid "Display reminders in _notification area only"
 msgstr "Display reminders in _notification area only"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:68
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#| msgid "Display reminders in _notification area only"
+msgid "Keep reminder notification _window always on top"
+msgstr "Keep reminder notification _window always on top"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
 msgid "Display reminders for completed _tasks"
 msgstr "Display reminders for completed _tasks"
 
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:70
-msgid "Sh_ow a reminder"
-msgstr "Sh_ow a reminder"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
+#| msgid "Display reminders for completed _tasks"
+msgid "Display reminders for _past events"
+msgstr "Display reminders for _past events"
+
+#. This is the first half of a user preference. "Set default reminder [time-period] before every new 
appointment"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+#| msgid "Default reminder value"
+msgid "Set _default reminder"
+msgstr "Set _default reminder"
 
-#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
-msgid "before every appointment"
-msgstr "before every appointment"
+#. This is the last half of a user preference. "Set default reminder [time-period] before every new 
appointment"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
+#| msgid "before every appointment"
+msgid "before every new appointment"
+msgstr "before every new appointment"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
 msgid "Show a _reminder"
 msgstr "Show a _reminder"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:78
 msgid "before every anniversary/birthday"
 msgstr "before every anniversary/birthday"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
 msgid "Default _snooze time (in minutes)"
 msgstr "Default _snooze time (in minutes)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:78
-msgid "Select the calendars for reminder notification"
-msgstr "Select the calendars for reminder notification"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:80
+#| msgid "Select the calendars for reminder notification"
+msgid "Select the sources for reminder notification:"
+msgstr "Select the sources for reminder notification:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:79
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
 msgid "Default Free/Busy Server"
 msgstr "Default Free/Busy Server"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:82
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 #, 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."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:83
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
 msgid "Publishing Information"
 msgstr "Publishing Information"
 
-#: ../modules/calendar/e-cal-shell-backend.c:114
+#: ../src/modules/calendar/e-cal-shell-backend.c:113
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:116
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../src/modules/calendar/e-cal-shell-backend.c:115
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../src/modules/calendar/e-cal-shell-backend.c:120
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "All Day A_ppointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../src/modules/calendar/e-cal-shell-backend.c:122
 msgid "Create a new all-day appointment"
 msgstr "Create a new all-day appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:128
+#: ../src/modules/calendar/e-cal-shell-backend.c:127
 msgctxt "New"
 msgid "M_eeting"
 msgstr "M_eeting"
 
-#: ../modules/calendar/e-cal-shell-backend.c:130
+#: ../src/modules/calendar/e-cal-shell-backend.c:129
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: ../modules/calendar/e-cal-shell-backend.c:138
+#: ../src/modules/calendar/e-cal-shell-backend.c:137
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:140
-#: ../modules/calendar/e-cal-shell-view-actions.c:1273
+#: ../src/modules/calendar/e-cal-shell-backend.c:139
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:257
+#: ../src/modules/calendar/e-cal-shell-backend.c:256
 msgid "Calendar and Tasks"
 msgstr "Calendar and Tasks"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:199
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
 msgid "Print"
 msgstr "Print"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:285
-msgid "Calendar Properties"
-msgstr "Calendar Properties"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:314
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:312
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -20170,377 +22185,380 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:331
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:329
 msgid "Purge events older than"
 msgstr "Purge events older than"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:926
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:924
 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.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1086
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1124
 msgid "event"
 msgstr "event"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1088
-#: ../modules/calendar/e-cal-shell-view-memopad.c:209
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:498
-#: ../modules/calendar/e-task-shell-view-actions.c:617
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1126
+#: ../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:496
+#: ../src/modules/calendar/e-task-shell-view-actions.c:615
 msgid "Save as iCalendar"
 msgstr "Save as iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1222
-#: ../modules/calendar/e-memo-shell-view-actions.c:579
-#: ../modules/calendar/e-task-shell-view-actions.c:705
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:577
+#: ../src/modules/calendar/e-task-shell-view-actions.c:703
 msgid "_Copy..."
 msgstr "_Copy…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1229
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1267
 msgid "D_elete Calendar"
 msgstr "D_elete Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1231
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1269
 msgid "Delete the selected calendar"
 msgstr "Delete the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1238
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1276
 msgid "Go Back"
 msgstr "Go Back"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1245
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
 msgid "Go Forward"
 msgstr "Go Forward"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1252
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
 msgid "Select today"
 msgstr "Select today"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1257
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1295
 msgid "Select _Date"
 msgstr "Select _Date"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
 msgid "Select a specific date"
 msgstr "Select a specific date"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1302
 msgid "_Manage Calendar groups..."
 msgstr "_Manage Calendar groups..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1304
 msgid "Manage Calendar groups order and visibility"
 msgstr "Manage Calendar groups order and visibility"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1309
 msgid "_New Calendar"
 msgstr "_New Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1285
-#: ../modules/calendar/e-task-shell-view-actions.c:803
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1323
+#: ../src/modules/calendar/e-task-shell-view-actions.c:801
 msgid "Purg_e"
 msgstr "Purg_e"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1287
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1325
 msgid "Purge old appointments and meetings"
 msgstr "Purge old appointments and meetings"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
 msgid "Refresh the selected calendar"
 msgstr "Refresh the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1301
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
 msgid "Rename the selected calendar"
 msgstr "Rename the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1344
 msgid "Find _Next"
 msgstr "Find _Next"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1308
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1346
 msgid "Find next occurrence of the current search string"
 msgstr "Find next occurrence of the current search string"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1351
 msgid "Find _Previous"
 msgstr "Find _Previous"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1315
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
 msgid "Find previous occurrence of the current search string"
 msgstr "Find previous occurrence of the current search string"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1358
 msgid "Stop _Running Search"
 msgstr "Stop _Running Search"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1322
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Stop currently running search"
 msgstr "Stop currently running search"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Sho_w All Calendars"
 msgstr "Sho_w All Calendars"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Show _Only This Calendar"
 msgstr "Show _Only This Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Cop_y to Calendar..."
 msgstr "Cop_y to Calendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "_Delegate Meeting..."
 msgstr "_Delegate Meeting…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "_Delete Appointment"
 msgstr "_Delete Appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Delete selected appointments"
 msgstr "Delete selected appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Delete This _Occurrence"
 msgstr "Delete This _Occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1402
 msgid "Delete this occurrence"
 msgstr "Delete this occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1369
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Delete All Occ_urrences"
 msgstr "Delete All Occ_urrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Delete all occurrences"
 msgstr "Delete all occurrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1414
+#| msgid "_Edit as New Message..."
+msgid "Edit as Ne_w..."
+msgstr "Edit as Ne_w..."
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
+#| msgid "View the current appointment"
+msgid "Edit the current appointment as new"
+msgstr "Edit the current appointment as new"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "New All Day _Event..."
 msgstr "New All Day _Event…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Create a new all day event"
 msgstr "Create a new all-day event"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1383
-#: ../modules/calendar/e-cal-shell-view-memopad.c:243
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:572
-#: ../modules/calendar/e-task-shell-view-actions.c:698
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../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:570
+#: ../src/modules/calendar/e-task-shell-view-actions.c:696
 msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1390
-msgid "New _Meeting..."
-msgstr "New _Meeting…"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "Create a new meeting"
 msgstr "Create a new meeting"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1404
-msgid "New _Appointment..."
-msgstr "New _Appointment…"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Make this Occurrence _Movable"
 msgstr "Make this Occurrence _Movable"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1418
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1463
 msgid "_Open Appointment"
 msgstr "_Open Appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1465
 msgid "View the current appointment"
 msgstr "View the current appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "_Reply"
 msgstr "_Reply"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "_Schedule Meeting..."
 msgstr "_Schedule Meeting…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Converts an appointment to a meeting"
 msgstr "Converts an appointment to a meeting"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1446
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_ert to Appointment…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1493
 msgid "Converts a meeting to an appointment"
 msgstr "Converts a meeting to an appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "Quit"
 msgstr "Quit"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1581
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1630
 msgid "Day"
 msgstr "Day"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1583
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Show one day"
 msgstr "Show one day"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "List"
 msgstr "List"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1590
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Show as list"
 msgstr "Show as list"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1644
 msgid "Month"
 msgstr "Month"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1597
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1646
 msgid "Show one month"
 msgstr "Show one month"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1651
 msgid "Week"
 msgstr "Week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1604
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1653
 msgid "Show one week"
 msgstr "Show one week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1660
 msgid "Show one work week"
 msgstr "Show one work week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1668
 msgid "Active Appointments"
 msgstr "Active Appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-msgid "Next 7 Days' Appointments"
-msgstr "Next 7 Days' Appointments"
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1682
+#| msgid "Next 7 Days' Appointments"
+msgid "Next 7 Days’ Appointments"
+msgstr "Next 7 Days’ Appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Occurs Less Than 5 Times"
 msgstr "Occurs Less Than 5 Times"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1671
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
-#: ../modules/calendar/e-task-shell-view-actions.c:992
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:789
+#: ../src/modules/calendar/e-task-shell-view-actions.c:990
 msgid "Description contains"
 msgstr "Description contains"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1678
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
-#: ../modules/calendar/e-task-shell-view-actions.c:999
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:796
+#: ../src/modules/calendar/e-task-shell-view-actions.c:997
 msgid "Summary contains"
 msgstr "Summary contains"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1688
-#: ../modules/calendar/e-cal-shell-view-actions.c:1702
-#: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
-#: ../modules/calendar/e-memo-shell-view-actions.c:822
-#: ../modules/calendar/e-task-shell-view-actions.c:1009
-#: ../modules/calendar/e-task-shell-view-actions.c:1023
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1737
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1751
+#: ../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:806
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:820
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1007
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1021
 msgid "Print..."
 msgstr "Print..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1690
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1739
 msgid "Print this calendar"
 msgstr "Print this calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1697
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1746
 msgid "Preview the calendar to be printed"
 msgstr "Preview the calendar to be printed"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1719
-#: ../modules/calendar/e-cal-shell-view-memopad.c:284
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
-#: ../modules/calendar/e-memo-shell-view-actions.c:839
-#: ../modules/calendar/e-task-shell-view-actions.c:1040
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1768
+#: ../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:837
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1038
 msgid "_Save as iCalendar..."
 msgstr "_Save as iCalendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1845
 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.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:496
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:205
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:494
 msgid "memo"
 msgstr "memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:248
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:640
 msgid "New _Memo"
 msgstr "New _Memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:81
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../src/modules/calendar/e-memo-shell-backend.c:79
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Create a new memo"
 msgstr "Create a new memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:255
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:647
 msgid "_Open Memo"
 msgstr "_Open Memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:651
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:649
 msgid "View the selected memo"
 msgstr "View the selected memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../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:654
+#: ../src/modules/calendar/e-task-shell-view-actions.c:794
 msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:276
-#: ../modules/calendar/e-memo-shell-view-actions.c:824
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:822
 msgid "Print the selected memo"
 msgstr "Print the selected memo"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:816
+#: ../src/modules/calendar/e-cal-shell-view-private.c:811
 msgid "Searching next matching event"
 msgstr "Searching next matching event"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:817
+#: ../src/modules/calendar/e-cal-shell-view-private.c:812
 msgid "Searching previous matching event"
 msgstr "Searching previous matching event"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:838
+#: ../src/modules/calendar/e-cal-shell-view-private.c:833
 #, 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"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:842
+#: ../src/modules/calendar/e-cal-shell-view-private.c:837
 #, 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"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:865
+#: ../src/modules/calendar/e-cal-shell-view-private.c:860
 msgid "Cannot search with no active calendar"
 msgstr "Cannot search with no active calendar"
 
@@ -20548,221 +22566,213 @@ 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
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:615
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:273
+#: ../src/modules/calendar/e-task-shell-view-actions.c:613
 msgid "task"
 msgstr "task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:677
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:308
+#: ../src/modules/calendar/e-task-shell-view-actions.c:675
 msgid "_Assign Task"
 msgstr "_Assign Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:322
+#: ../src/modules/calendar/e-task-shell-view-actions.c:766
 msgid "_Mark as Complete"
 msgstr "_Mark as Complete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:770
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../src/modules/calendar/e-task-shell-view-actions.c:768
 msgid "Mark selected tasks as complete"
 msgstr "Mark selected tasks as complete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:329
 msgid "_Mark as Incomplete"
 msgstr "_Mark as Incomplete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:777
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../src/modules/calendar/e-task-shell-view-actions.c:775
 msgid "Mark selected tasks as incomplete"
 msgstr "Mark selected tasks as incomplete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:782
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:336
+#: ../src/modules/calendar/e-task-shell-view-actions.c:780
 msgid "New _Task"
 msgstr "New _Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:79
-#: ../modules/calendar/e-task-shell-view-actions.c:784
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../src/modules/calendar/e-task-shell-backend.c:77
+#: ../src/modules/calendar/e-task-shell-view-actions.c:782
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:789
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:343
+#: ../src/modules/calendar/e-task-shell-view-actions.c:787
 msgid "_Open Task"
 msgstr "_Open Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:791
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../src/modules/calendar/e-task-shell-view-actions.c:789
 msgid "View the selected task"
 msgstr "View the selected task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:364
-#: ../modules/calendar/e-task-shell-view-actions.c:1025
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:362
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1023
 msgid "Print the selected task"
 msgstr "Print the selected task"
 
-#: ../modules/calendar/e-memo-shell-backend.c:79
+#: ../src/modules/calendar/e-memo-shell-backend.c:77
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Mem_o"
 
-#: ../modules/calendar/e-memo-shell-backend.c:86
+#: ../src/modules/calendar/e-memo-shell-backend.c:84
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Shared Memo"
 
-#: ../modules/calendar/e-memo-shell-backend.c:88
+#: ../src/modules/calendar/e-memo-shell-backend.c:86
 msgid "Create a new shared memo"
 msgstr "Create a new shared memo"
 
-#: ../modules/calendar/e-memo-shell-backend.c:96
+#: ../src/modules/calendar/e-memo-shell-backend.c:94
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Memo Li_st"
 
-#: ../modules/calendar/e-memo-shell-backend.c:98
-#: ../modules/calendar/e-memo-shell-view-actions.c:602
+#: ../src/modules/calendar/e-memo-shell-backend.c:96
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Create a new memo list"
 msgstr "Create a new memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:196
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:194
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:209
 msgid "Print Memos"
 msgstr "Print Memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:252
-msgid "Memo List Properties"
-msgstr "Memo List Properties"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:558
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:556
 msgid "_Delete Memo"
 msgstr "_Delete Memo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:565
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:563
 msgid "_Find in Memo..."
 msgstr "_Find in Memo…"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:567
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:565
 msgid "Search for text in the displayed memo"
 msgstr "Search for text in the displayed memo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:584
 msgid "D_elete Memo List"
 msgstr "D_elete Memo List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:588
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:586
 msgid "Delete the selected memo list"
 msgstr "Delete the selected memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:591
 msgid "_Manage Memo List groups..."
 msgstr "_Manage Memo List groups..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:595
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:593
 msgid "Manage Memo List groups order and visibility"
 msgstr "Manage Memo List groups order and visibility"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:598
 msgid "_New Memo List"
 msgstr "_New Memo List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Refresh the selected memo list"
 msgstr "Refresh the selected memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Rename the selected memo list"
 msgstr "Rename the selected memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:628
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:626
 msgid "Show _Only This Memo List"
 msgstr "Show _Only This Memo List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:633
 msgid "Sho_w All Memo Lists"
 msgstr "Sho_w All Memo Lists"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:722
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:720
 msgid "Memo _Preview"
 msgstr "Memo _Preview"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:722
 msgid "Show memo preview pane"
 msgstr "Show memo preview pane"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:745
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:743
 msgid "Show memo preview below the memo list"
 msgstr "Show memo preview below the memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:752
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:750
 msgid "Show memo preview alongside the memo list"
 msgstr "Show memo preview alongside the memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:810
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Print the list of memos"
 msgstr "Print the list of memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:817
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:815
 msgid "Preview the list of memos to be printed"
 msgstr "Preview the list of memos to be printed"
 
-#: ../modules/calendar/e-memo-shell-view.c:219
+#: ../src/modules/calendar/e-memo-shell-view.c:217
 msgid "Delete Memos"
 msgstr "Delete Memos"
 
-#: ../modules/calendar/e-memo-shell-view.c:221
+#: ../src/modules/calendar/e-memo-shell-view.c:219
 msgid "Delete Memo"
 msgstr "Delete Memo"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:369
+#: ../src/modules/calendar/e-memo-shell-view-private.c:367
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d memo"
 msgstr[1] "%d memos"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:373
-#: ../modules/calendar/e-task-shell-view-private.c:550
+#: ../src/modules/calendar/e-memo-shell-view-private.c:371
+#: ../src/modules/calendar/e-task-shell-view-private.c:548
 #, c-format
 msgid "%d selected"
 msgstr "%d selected"
 
-#: ../modules/calendar/e-task-shell-backend.c:77
+#: ../src/modules/calendar/e-task-shell-backend.c:75
 msgctxt "New"
 msgid "_Task"
 msgstr "_Task"
 
-#: ../modules/calendar/e-task-shell-backend.c:84
+#: ../src/modules/calendar/e-task-shell-backend.c:82
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Assigne_d Task"
 
-#: ../modules/calendar/e-task-shell-backend.c:86
+#: ../src/modules/calendar/e-task-shell-backend.c:84
 msgid "Create a new assigned task"
 msgstr "Create a new assigned task"
 
-#: ../modules/calendar/e-task-shell-backend.c:94
+#: ../src/modules/calendar/e-task-shell-backend.c:92
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Tas_k List"
 
-#: ../modules/calendar/e-task-shell-backend.c:96
-#: ../modules/calendar/e-task-shell-view-actions.c:728
+#: ../src/modules/calendar/e-task-shell-backend.c:94
+#: ../src/modules/calendar/e-task-shell-view-actions.c:726
 msgid "Create a new task list"
 msgstr "Create a new task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:220
-#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../src/modules/calendar/e-task-shell-view-actions.c:218
+#: ../src/modules/calendar/e-task-shell-view-actions.c:233
 msgid "Print Tasks"
 msgstr "Print Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:276
-msgid "Task List Properties"
-msgstr "Task List Properties"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../src/modules/calendar/e-task-shell-view-actions.c:557
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -20774,319 +22784,358 @@ msgstr ""
 "\n"
 "Really erase these tasks?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:566
+#: ../src/modules/calendar/e-task-shell-view-actions.c:564
 msgid "Do not ask me again"
 msgstr "Do not ask me again"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:684
+#: ../src/modules/calendar/e-task-shell-view-actions.c:682
 msgid "_Delete Task"
 msgstr "_Delete Task"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:691
+#: ../src/modules/calendar/e-task-shell-view-actions.c:689
 msgid "_Find in Task..."
 msgstr "_Find in Task…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:693
+#: ../src/modules/calendar/e-task-shell-view-actions.c:691
 msgid "Search for text in the displayed task"
 msgstr "Search for text in the displayed task"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../src/modules/calendar/e-task-shell-view-actions.c:710
 msgid "D_elete Task List"
 msgstr "D_elete Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:714
+#: ../src/modules/calendar/e-task-shell-view-actions.c:712
 msgid "Delete the selected task list"
 msgstr "Delete the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:719
+#: ../src/modules/calendar/e-task-shell-view-actions.c:717
 msgid "_Manage Task List groups..."
 msgstr "_Manage Task List groups..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:726
+#: ../src/modules/calendar/e-task-shell-view-actions.c:724
 msgid "_New Task List"
 msgstr "_New Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:742
+#: ../src/modules/calendar/e-task-shell-view-actions.c:740
 msgid "Refresh the selected task list"
 msgstr "Refresh the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:749
+#: ../src/modules/calendar/e-task-shell-view-actions.c:747
 msgid "Rename the selected task list"
 msgstr "Rename the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:754
+#: ../src/modules/calendar/e-task-shell-view-actions.c:752
 msgid "Sho_w All Task Lists"
 msgstr "Sho_w All Task Lists"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../src/modules/calendar/e-task-shell-view-actions.c:759
 msgid "Show _Only This Task List"
 msgstr "Show _Only This Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../src/modules/calendar/e-task-shell-view-actions.c:773
 msgid "Mar_k as Incomplete"
 msgstr "Mar_k as Incomplete"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:805
+#: ../src/modules/calendar/e-task-shell-view-actions.c:803
 msgid "Delete completed tasks"
 msgstr "Delete completed tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:888
+#: ../src/modules/calendar/e-task-shell-view-actions.c:886
 msgid "Task _Preview"
 msgstr "Task _Preview"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../src/modules/calendar/e-task-shell-view-actions.c:888
 msgid "Show task preview pane"
 msgstr "Show task preview pane"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:911
+#: ../src/modules/calendar/e-task-shell-view-actions.c:909
 msgid "Show task preview below the task list"
 msgstr "Show task preview below the task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:918
+#: ../src/modules/calendar/e-task-shell-view-actions.c:916
 msgid "Show task preview alongside the task list"
 msgstr "Show task preview alongside the task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../src/modules/calendar/e-task-shell-view-actions.c:924
 msgid "Active Tasks"
 msgstr "Active Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../src/modules/calendar/e-task-shell-view-actions.c:938
 msgid "Completed Tasks"
 msgstr "Completed Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:947
-msgid "Next 7 Days' Tasks"
-msgstr "Next 7 Days' Tasks"
+#: ../src/modules/calendar/e-task-shell-view-actions.c:945
+#| msgid "Next 7 Days' Tasks"
+msgid "Next 7 Days’ Tasks"
+msgstr "Next 7 Days’ Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:954
+#: ../src/modules/calendar/e-task-shell-view-actions.c:952
 msgid "Overdue Tasks"
 msgstr "Overdue Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:961
+#: ../src/modules/calendar/e-task-shell-view-actions.c:959
 msgid "Tasks with Attachments"
 msgstr "Tasks with Attachments"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1011
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1009
 msgid "Print the list of tasks"
 msgstr "Print the list of tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1018
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1016
 msgid "Preview the list of tasks to be printed"
 msgstr "Preview the list of tasks to be printed"
 
-#: ../modules/calendar/e-task-shell-view.c:323
+#: ../src/modules/calendar/e-task-shell-view.c:321
 msgid "Delete Tasks"
 msgstr "Delete Tasks"
 
-#: ../modules/calendar/e-task-shell-view.c:325
+#: ../src/modules/calendar/e-task-shell-view.c:323
 msgid "Delete Task"
 msgstr "Delete Task"
 
-#: ../modules/calendar/e-task-shell-view-private.c:546
+#: ../src/modules/calendar/e-task-shell-view-private.c:544
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d task"
 msgstr[1] "%d tasks"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:156
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:319
+#| msgid "Con_vert to Meeting"
+msgid "Convert to M_eeting"
+msgstr "Convert to M_eeting"
+
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:321
+#| msgid "%s has replied to a meeting request."
+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
+#| msgid "Con_vert to Meeting"
+msgid "Convert to M_essage"
+msgstr "Convert to M_essage"
+
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:359
+#| msgid "Compose a new mail message"
+msgid "Convert to the mail message"
+msgstr "Convert to the mail message"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:83
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:84
+#| msgid "LDAP Servers"
+msgid "CalDAV server"
+msgstr "CalDAV server"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+#| msgid "LDAP Servers"
+msgid "CardDAV server"
+msgstr "CardDAV server"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+#| msgid "LDAP Servers"
+msgid "LDAP server"
+msgstr "LDAP server"
+
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:162
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:157
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:163
 msgid "Display part as an invitation"
 msgstr "Display part as an invitation"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:260
+#: ../src/modules/itip-formatter/itip-view.c:258
 msgid "Today %H:%M"
 msgstr "Today %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:264
+#: ../src/modules/itip-formatter/itip-view.c:262
 msgid "Today %H:%M:%S"
 msgstr "Today %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:273
+#: ../src/modules/itip-formatter/itip-view.c:271
 msgid "Today %l:%M:%S %p"
 msgstr "Today %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:288
+#: ../src/modules/itip-formatter/itip-view.c:286
 msgid "Tomorrow %H:%M"
 msgstr "Tomorrow %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:292
+#: ../src/modules/itip-formatter/itip-view.c:290
 msgid "Tomorrow %H:%M:%S"
 msgstr "Tomorrow %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:297
+#: ../src/modules/itip-formatter/itip-view.c:295
 msgid "Tomorrow %l:%M %p"
 msgstr "Tomorrow %l:%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:301
+#: ../src/modules/itip-formatter/itip-view.c:299
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Tomorrow %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:320
+#: ../src/modules/itip-formatter/itip-view.c:318
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:325
+#: ../src/modules/itip-formatter/itip-view.c:323
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:329
+#: ../src/modules/itip-formatter/itip-view.c:327
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:334
+#: ../src/modules/itip-formatter/itip-view.c:332
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:338
+#: ../src/modules/itip-formatter/itip-view.c:336
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:347
+#: ../src/modules/itip-formatter/itip-view.c:345
 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.
-#: ../modules/itip-formatter/itip-view.c:353
+#: ../src/modules/itip-formatter/itip-view.c:351
 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.
-#: ../modules/itip-formatter/itip-view.c:357
+#: ../src/modules/itip-formatter/itip-view.c:355
 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.
-#: ../modules/itip-formatter/itip-view.c:362
+#: ../src/modules/itip-formatter/itip-view.c:360
 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.
-#: ../modules/itip-formatter/itip-view.c:366
+#: ../src/modules/itip-formatter/itip-view.c:364
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:372
+#: ../src/modules/itip-formatter/itip-view.c:370
 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.
-#: ../modules/itip-formatter/itip-view.c:377
+#: ../src/modules/itip-formatter/itip-view.c:375
 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.
-#: ../modules/itip-formatter/itip-view.c:381
+#: ../src/modules/itip-formatter/itip-view.c:379
 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.
-#: ../modules/itip-formatter/itip-view.c:386
+#: ../src/modules/itip-formatter/itip-view.c:384
 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.
-#: ../modules/itip-formatter/itip-view.c:390
+#: ../src/modules/itip-formatter/itip-view.c:388
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l:%M:%S %p"
 
-#: ../modules/itip-formatter/itip-view.c:428
-#: ../modules/itip-formatter/itip-view.c:429
-#: ../modules/itip-formatter/itip-view.c:518
-#: ../modules/itip-formatter/itip-view.c:519
-#: ../modules/itip-formatter/itip-view.c:608
+#: ../src/modules/itip-formatter/itip-view.c:426
+#: ../src/modules/itip-formatter/itip-view.c:427
+#: ../src/modules/itip-formatter/itip-view.c:516
+#: ../src/modules/itip-formatter/itip-view.c:517
+#: ../src/modules/itip-formatter/itip-view.c:606
 msgid "An unknown person"
 msgstr "An unknown person"
 
-#: ../modules/itip-formatter/itip-view.c:433
-#: ../modules/itip-formatter/itip-view.c:523
-#: ../modules/itip-formatter/itip-view.c:612
+#: ../src/modules/itip-formatter/itip-view.c:431
+#: ../src/modules/itip-formatter/itip-view.c:521
+#: ../src/modules/itip-formatter/itip-view.c:610
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Please respond on behalf of %s"
 
-#: ../modules/itip-formatter/itip-view.c:435
-#: ../modules/itip-formatter/itip-view.c:525
-#: ../modules/itip-formatter/itip-view.c:614
+#: ../src/modules/itip-formatter/itip-view.c:433
+#: ../src/modules/itip-formatter/itip-view.c:523
+#: ../src/modules/itip-formatter/itip-view.c:612
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Received on behalf of %s"
 
-#: ../modules/itip-formatter/itip-view.c:440
+#: ../src/modules/itip-formatter/itip-view.c:438
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s through %s has published the following meeting information:"
 
-#: ../modules/itip-formatter/itip-view.c:442
+#: ../src/modules/itip-formatter/itip-view.c:440
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s has published the following meeting information:"
 
-#: ../modules/itip-formatter/itip-view.c:447
+#: ../src/modules/itip-formatter/itip-view.c:445
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s has delegated the following meeting to you:"
 
-#: ../modules/itip-formatter/itip-view.c:450
+#: ../src/modules/itip-formatter/itip-view.c:448
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s through %s requests your presence at the following meeting:"
 
-#: ../modules/itip-formatter/itip-view.c:452
+#: ../src/modules/itip-formatter/itip-view.c:450
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s requests your presence at the following meeting:"
 
-#: ../modules/itip-formatter/itip-view.c:458
+#: ../src/modules/itip-formatter/itip-view.c:456
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s through %s wishes to add to an existing meeting:"
 
-#: ../modules/itip-formatter/itip-view.c:460
+#: ../src/modules/itip-formatter/itip-view.c:458
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s wishes to add to an existing meeting:"
 
-#: ../modules/itip-formatter/itip-view.c:464
+#: ../src/modules/itip-formatter/itip-view.c:462
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -21095,87 +23144,87 @@ msgstr ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 
-#: ../modules/itip-formatter/itip-view.c:466
+#: ../src/modules/itip-formatter/itip-view.c:464
 #, 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:"
 
-#: ../modules/itip-formatter/itip-view.c:470
+#: ../src/modules/itip-formatter/itip-view.c:468
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s through %s has sent back the following meeting response:"
 
-#: ../modules/itip-formatter/itip-view.c:472
+#: ../src/modules/itip-formatter/itip-view.c:470
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s has sent back the following meeting response:"
 
-#: ../modules/itip-formatter/itip-view.c:476
+#: ../src/modules/itip-formatter/itip-view.c:474
 #, c-format
 msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s through %s has cancelled the following meeting:"
 
-#: ../modules/itip-formatter/itip-view.c:478
+#: ../src/modules/itip-formatter/itip-view.c:476
 #, c-format
 msgid "%s has cancelled the following meeting:"
 msgstr "%s has cancelled the following meeting:"
 
-#: ../modules/itip-formatter/itip-view.c:482
+#: ../src/modules/itip-formatter/itip-view.c:480
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s through %s has proposed the following meeting changes."
 
-#: ../modules/itip-formatter/itip-view.c:484
+#: ../src/modules/itip-formatter/itip-view.c:482
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s has proposed the following meeting changes:"
 
-#: ../modules/itip-formatter/itip-view.c:488
+#: ../src/modules/itip-formatter/itip-view.c:486
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s through %s has declined the following meeting changes:"
 
-#: ../modules/itip-formatter/itip-view.c:490
+#: ../src/modules/itip-formatter/itip-view.c:488
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s has declined the following meeting changes:"
 
-#: ../modules/itip-formatter/itip-view.c:530
+#: ../src/modules/itip-formatter/itip-view.c:528
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s through %s has published the following task:"
 
-#: ../modules/itip-formatter/itip-view.c:532
+#: ../src/modules/itip-formatter/itip-view.c:530
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s has published the following task:"
 
-#: ../modules/itip-formatter/itip-view.c:537
+#: ../src/modules/itip-formatter/itip-view.c:535
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s requests the assignment of %s to the following task:"
 
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../src/modules/itip-formatter/itip-view.c:538
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s through %s has assigned you a task:"
 
-#: ../modules/itip-formatter/itip-view.c:542
+#: ../src/modules/itip-formatter/itip-view.c:540
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s has assigned you a task:"
 
-#: ../modules/itip-formatter/itip-view.c:548
+#: ../src/modules/itip-formatter/itip-view.c:546
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s through %s wishes to add to an existing task:"
 
-#: ../modules/itip-formatter/itip-view.c:550
+#: ../src/modules/itip-formatter/itip-view.c:548
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s wishes to add to an existing task:"
 
-#: ../modules/itip-formatter/itip-view.c:554
+#: ../src/modules/itip-formatter/itip-view.c:552
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -21184,336 +23233,360 @@ msgstr ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 
-#: ../modules/itip-formatter/itip-view.c:556
+#: ../src/modules/itip-formatter/itip-view.c:554
 #, 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:"
 
-#: ../modules/itip-formatter/itip-view.c:560
+#: ../src/modules/itip-formatter/itip-view.c:558
 #, 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:"
 
-#: ../modules/itip-formatter/itip-view.c:562
+#: ../src/modules/itip-formatter/itip-view.c:560
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s has sent back the following assigned task response:"
 
-#: ../modules/itip-formatter/itip-view.c:566
+#: ../src/modules/itip-formatter/itip-view.c:564
 #, c-format
 msgid "%s through %s has cancelled the following assigned task:"
 msgstr "%s through %s has cancelled the following assigned task:"
 
-#: ../modules/itip-formatter/itip-view.c:568
+#: ../src/modules/itip-formatter/itip-view.c:566
 #, c-format
 msgid "%s has cancelled the following assigned task:"
 msgstr "%s has cancelled the following assigned task:"
 
-#: ../modules/itip-formatter/itip-view.c:572
+#: ../src/modules/itip-formatter/itip-view.c:570
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s through %s has proposed the following task assignment changes:"
 
-#: ../modules/itip-formatter/itip-view.c:574
+#: ../src/modules/itip-formatter/itip-view.c:572
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s has proposed the following task assignment changes:"
 
-#: ../modules/itip-formatter/itip-view.c:578
+#: ../src/modules/itip-formatter/itip-view.c:576
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s through %s has declined the following assigned task:"
 
-#: ../modules/itip-formatter/itip-view.c:580
+#: ../src/modules/itip-formatter/itip-view.c:578
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s has declined the following assigned task:"
 
-#: ../modules/itip-formatter/itip-view.c:619
+#: ../src/modules/itip-formatter/itip-view.c:617
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s through %s has published the following memo:"
 
-#: ../modules/itip-formatter/itip-view.c:621
+#: ../src/modules/itip-formatter/itip-view.c:619
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s has published the following memo:"
 
-#: ../modules/itip-formatter/itip-view.c:626
+#: ../src/modules/itip-formatter/itip-view.c:624
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s through %s wishes to add to an existing memo:"
 
-#: ../modules/itip-formatter/itip-view.c:628
+#: ../src/modules/itip-formatter/itip-view.c:626
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s wishes to add to an existing memo:"
 
-#: ../modules/itip-formatter/itip-view.c:632
+#: ../src/modules/itip-formatter/itip-view.c:630
 #, c-format
 msgid "%s through %s has cancelled the following shared memo:"
 msgstr "%s through %s has cancelled the following shared memo:"
 
-#: ../modules/itip-formatter/itip-view.c:634
+#: ../src/modules/itip-formatter/itip-view.c:632
 #, c-format
 msgid "%s has cancelled the following shared memo:"
 msgstr "%s has cancelled the following shared memo:"
 
-#: ../modules/itip-formatter/itip-view.c:859
+#: ../src/modules/itip-formatter/itip-view.c:857
 msgid "All day:"
 msgstr "All day:"
 
-#: ../modules/itip-formatter/itip-view.c:865
+#: ../src/modules/itip-formatter/itip-view.c:863
 msgid "Start day:"
 msgstr "Start day:"
 
-#: ../modules/itip-formatter/itip-view.c:865
-#: ../modules/itip-formatter/itip-view.c:1667
+#: ../src/modules/itip-formatter/itip-view.c:863
+#: ../src/modules/itip-formatter/itip-view.c:1679
 msgid "Start time:"
 msgstr "Start time:"
 
-#: ../modules/itip-formatter/itip-view.c:874
+#: ../src/modules/itip-formatter/itip-view.c:872
 msgid "End day:"
 msgstr "End day:"
 
-#: ../modules/itip-formatter/itip-view.c:874
-#: ../modules/itip-formatter/itip-view.c:1668
+#: ../src/modules/itip-formatter/itip-view.c:872
+#: ../src/modules/itip-formatter/itip-view.c:1680
 msgid "End time:"
 msgstr "End time:"
 
-#: ../modules/itip-formatter/itip-view.c:1205
+#: ../src/modules/itip-formatter/itip-view.c:1210
 msgid "Ope_n Calendar"
 msgstr "Ope_n Calendar"
 
-#: ../modules/itip-formatter/itip-view.c:1208
+#: ../src/modules/itip-formatter/itip-view.c:1213
 msgid "_Decline all"
 msgstr "_Decline all"
 
-#: ../modules/itip-formatter/itip-view.c:1211
+#: ../src/modules/itip-formatter/itip-view.c:1216
 msgid "_Decline"
 msgstr "_Decline"
 
-#: ../modules/itip-formatter/itip-view.c:1214
+#: ../src/modules/itip-formatter/itip-view.c:1219
 msgid "_Tentative all"
 msgstr "_Tentative all"
 
-#: ../modules/itip-formatter/itip-view.c:1217
+#: ../src/modules/itip-formatter/itip-view.c:1222
 msgid "_Tentative"
 msgstr "_Tentative"
 
-#: ../modules/itip-formatter/itip-view.c:1220
+#: ../src/modules/itip-formatter/itip-view.c:1225
 msgid "Acce_pt all"
 msgstr "Acce_pt all"
 
-#: ../modules/itip-formatter/itip-view.c:1223
+#: ../src/modules/itip-formatter/itip-view.c:1228
 msgid "Acce_pt"
 msgstr "Acce_pt"
 
-#: ../modules/itip-formatter/itip-view.c:1226
+#: ../src/modules/itip-formatter/itip-view.c:1231
 msgid "Send _Information"
 msgstr "Send _Information"
 
-#: ../modules/itip-formatter/itip-view.c:1229
+#: ../src/modules/itip-formatter/itip-view.c:1234
 msgid "_Update Attendee Status"
 msgstr "_Update Attendee Status"
 
-#: ../modules/itip-formatter/itip-view.c:1232
-#: ../smime/gui/certificate-manager.c:1679
+#: ../src/modules/itip-formatter/itip-view.c:1237
+#: ../src/smime/gui/certificate-manager.c:1677
 msgid "_Update"
 msgstr "_Update"
 
-#: ../modules/itip-formatter/itip-view.c:1670
-#: ../modules/itip-formatter/itip-view.c:1718
-#: ../modules/itip-formatter/itip-view.c:1789
+#: ../src/modules/itip-formatter/itip-view.c:1682
+#: ../src/modules/itip-formatter/itip-view.c:1730
+#: ../src/modules/itip-formatter/itip-view.c:1801
 msgid "Comment:"
 msgstr "Comment:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1706
+#: ../src/modules/itip-formatter/itip-view.c:1718
 msgid "Send reply to sender"
 msgstr "Send reply to sender"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1721
+#: ../src/modules/itip-formatter/itip-view.c:1733
 msgid "Send _updates to attendees"
 msgstr "Send _updates to attendees"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1724
+#: ../src/modules/itip-formatter/itip-view.c:1736
 msgid "_Apply to all instances"
 msgstr "_Apply to all instances"
 
-#: ../modules/itip-formatter/itip-view.c:1725
+#: ../src/modules/itip-formatter/itip-view.c:1737
 msgid "Show time as _free"
 msgstr "Show time as _free"
 
-#: ../modules/itip-formatter/itip-view.c:1726
+#: ../src/modules/itip-formatter/itip-view.c:1738
 msgid "_Preserve my reminder"
 msgstr "_Preserve my reminder"
 
-#: ../modules/itip-formatter/itip-view.c:1727
+#: ../src/modules/itip-formatter/itip-view.c:1739
 msgid "_Inherit reminder"
 msgstr "_Inherit reminder"
 
-#: ../modules/itip-formatter/itip-view.c:2036
+#: ../src/modules/itip-formatter/itip-view.c:2048
 msgid "_Tasks:"
 msgstr "_Tasks:"
 
-#: ../modules/itip-formatter/itip-view.c:2039
+#: ../src/modules/itip-formatter/itip-view.c:2051
 msgid "_Memos:"
 msgstr "_Memos:"
 
-#: ../modules/itip-formatter/itip-view.c:2952
+#: ../src/modules/itip-formatter/itip-view.c:2964
 msgid "Sa_ve"
 msgstr "Sa_ve"
 
-#: ../modules/itip-formatter/itip-view.c:3392
-#: ../modules/itip-formatter/itip-view.c:4848
+#: ../src/modules/itip-formatter/itip-view.c:3486
+#: ../src/modules/itip-formatter/itip-view.c:5015
 msgid "Attendee status updated"
 msgstr "Attendee status updated"
 
-#: ../modules/itip-formatter/itip-view.c:3557
+#: ../src/modules/itip-formatter/itip-view.c:3701
 #, c-format
-msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr "An appointment in the calendar '%s' conflicts with this meeting"
+#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
+msgstr "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 
-#: ../modules/itip-formatter/itip-view.c:3587
+#: ../src/modules/itip-formatter/itip-view.c:3707
 #, c-format
-msgid "Found the appointment in the calendar '%s'"
-msgstr "Found the appointment in the calendar '%s'"
+#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
+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"
+msgstr[0] ""
+"The calendar “%s” contains an appointment which conflicts with this meeting"
+msgstr[1] ""
+"The calendar “%s” contains %d appointments which conflict with this meeting"
+
+#: ../src/modules/itip-formatter/itip-view.c:3740
+#, c-format
+#| msgid "Found the appointment in the calendar '%s'"
+msgid "Found the appointment in the calendar “%s”"
+msgstr "Found the appointment in the calendar “%s”"
 
-#: ../modules/itip-formatter/itip-view.c:3721
+#: ../src/modules/itip-formatter/itip-view.c:3749
+#| msgid "The meeting is invalid and cannot be updated"
+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:3891
 msgid "Unable to find any calendars"
 msgstr "Unable to find any calendars"
 
-#: ../modules/itip-formatter/itip-view.c:3729
+#: ../src/modules/itip-formatter/itip-view.c:3899
 msgid "Unable to find this meeting in any calendar"
 msgstr "Unable to find this meeting in any calendar"
 
-#: ../modules/itip-formatter/itip-view.c:3734
+#: ../src/modules/itip-formatter/itip-view.c:3904
 msgid "Unable to find this task in any task list"
 msgstr "Unable to find this task in any task list"
 
-#: ../modules/itip-formatter/itip-view.c:3739
+#: ../src/modules/itip-formatter/itip-view.c:3909
 msgid "Unable to find this memo in any memo list"
 msgstr "Unable to find this memo in any memo list"
 
-#: ../modules/itip-formatter/itip-view.c:4083
+#: ../src/modules/itip-formatter/itip-view.c:4250
 msgid "Opening the calendar. Please wait..."
 msgstr "Opening the calendar. Please wait…"
 
-#: ../modules/itip-formatter/itip-view.c:4088
+#: ../src/modules/itip-formatter/itip-view.c:4255
 msgid "Searching for an existing version of this appointment"
 msgstr "Searching for an existing version of this appointment"
 
-#: ../modules/itip-formatter/itip-view.c:4487
+#: ../src/modules/itip-formatter/itip-view.c:4654
 #, 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 calendar “%s”.  %s"
+msgstr "Unable to send item to calendar “%s”.  %s"
 
-#: ../modules/itip-formatter/itip-view.c:4502
+#: ../src/modules/itip-formatter/itip-view.c:4669
 #, c-format
-msgid "Sent to calendar '%s' as accepted"
-msgstr "Sent to calendar '%s' as accepted"
+#| msgid "Sent to calendar '%s' as accepted"
+msgid "Sent to calendar “%s” as accepted"
+msgstr "Sent to calendar “%s” as accepted"
 
-#: ../modules/itip-formatter/itip-view.c:4507
+#: ../src/modules/itip-formatter/itip-view.c:4674
 #, c-format
-msgid "Sent to calendar '%s' as tentative"
-msgstr "Sent to calendar '%s' as tentative"
+#| msgid "Sent to calendar '%s' as tentative"
+msgid "Sent to calendar “%s” as tentative"
+msgstr "Sent to calendar “%s” as tentative"
 
-#: ../modules/itip-formatter/itip-view.c:4513
+#: ../src/modules/itip-formatter/itip-view.c:4680
 #, c-format
-msgid "Sent to calendar '%s' as declined"
-msgstr "Sent to calendar '%s' as declined"
+#| msgid "Sent to calendar '%s' as declined"
+msgid "Sent to calendar “%s” as declined"
+msgstr "Sent to calendar “%s” as declined"
 
-#: ../modules/itip-formatter/itip-view.c:4519
+#: ../src/modules/itip-formatter/itip-view.c:4686
 #, c-format
-msgid "Sent to calendar '%s' as cancelled"
-msgstr "Sent to calendar '%s' as cancelled"
+#| msgid "Sent to calendar '%s' as cancelled"
+msgid "Sent to calendar “%s” as cancelled"
+msgstr "Sent to calendar “%s” as cancelled"
 
-#: ../modules/itip-formatter/itip-view.c:4539
-#: ../modules/itip-formatter/itip-view.c:4985
-#: ../modules/itip-formatter/itip-view.c:5088
+#: ../src/modules/itip-formatter/itip-view.c:4706
+#: ../src/modules/itip-formatter/itip-view.c:5152
+#: ../src/modules/itip-formatter/itip-view.c:5255
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Saving changes to the calendar. Please wait…"
 
-#: ../modules/itip-formatter/itip-view.c:4580
+#: ../src/modules/itip-formatter/itip-view.c:4747
 msgid "Unable to parse item"
 msgstr "Unable to parse item"
 
-#: ../modules/itip-formatter/itip-view.c:4772
+#: ../src/modules/itip-formatter/itip-view.c:4939
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organiser has removed the delegate %s "
 
-#: ../modules/itip-formatter/itip-view.c:4789
+#: ../src/modules/itip-formatter/itip-view.c:4956
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Sent a cancellation notice to the delegate"
 
-#: ../modules/itip-formatter/itip-view.c:4793
+#: ../src/modules/itip-formatter/itip-view.c:4960
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Could not send the cancellation notice to the delegate"
 
-#: ../modules/itip-formatter/itip-view.c:4840
+#: ../src/modules/itip-formatter/itip-view.c:5007
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Unable to update attendee. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4875
+#: ../src/modules/itip-formatter/itip-view.c:5042
 msgid "The meeting is invalid and cannot be updated"
 msgstr "The meeting is invalid and cannot be updated"
 
-#: ../modules/itip-formatter/itip-view.c:4950
+#: ../src/modules/itip-formatter/itip-view.c:5117
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Attendee status could not be updated because the status is invalid"
 
-#: ../modules/itip-formatter/itip-view.c:5021
-#: ../modules/itip-formatter/itip-view.c:5059
+#: ../src/modules/itip-formatter/itip-view.c:5188
+#: ../src/modules/itip-formatter/itip-view.c:5226
 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"
 
-#: ../modules/itip-formatter/itip-view.c:5120
+#: ../src/modules/itip-formatter/itip-view.c:5287
 msgid "Meeting information sent"
 msgstr "Meeting information sent"
 
-#: ../modules/itip-formatter/itip-view.c:5125
+#: ../src/modules/itip-formatter/itip-view.c:5292
 msgid "Task information sent"
 msgstr "Task information sent"
 
-#: ../modules/itip-formatter/itip-view.c:5130
+#: ../src/modules/itip-formatter/itip-view.c:5297
 msgid "Memo information sent"
 msgstr "Memo information sent"
 
-#: ../modules/itip-formatter/itip-view.c:5141
+#: ../src/modules/itip-formatter/itip-view.c:5308
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Unable to send meeting information, the meeting does not exist"
 
-#: ../modules/itip-formatter/itip-view.c:5146
+#: ../src/modules/itip-formatter/itip-view.c:5313
 msgid "Unable to send task information, the task does not exist"
 msgstr "Unable to send task information, the task does not exist"
 
-#: ../modules/itip-formatter/itip-view.c:5151
+#: ../src/modules/itip-formatter/itip-view.c:5318
 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.
-#: ../modules/itip-formatter/itip-view.c:5216
+#: ../src/modules/itip-formatter/itip-view.c:5383
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5221
+#: ../src/modules/itip-formatter/itip-view.c:5388
 msgid "Save Calendar"
 msgstr "Save Calendar"
 
-#: ../modules/itip-formatter/itip-view.c:5269
-#: ../modules/itip-formatter/itip-view.c:5282
+#: ../src/modules/itip-formatter/itip-view.c:5436
+#: ../src/modules/itip-formatter/itip-view.c:5449
 msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
-#: ../modules/itip-formatter/itip-view.c:5270
-#: ../modules/itip-formatter/itip-view.c:5283
+#: ../src/modules/itip-formatter/itip-view.c:5437
+#: ../src/modules/itip-formatter/itip-view.c:5450
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -21521,15 +23594,15 @@ msgstr ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5325
-#: ../modules/itip-formatter/itip-view.c:5355
-#: ../modules/itip-formatter/itip-view.c:5458
+#: ../src/modules/itip-formatter/itip-view.c:5492
+#: ../src/modules/itip-formatter/itip-view.c:5522
+#: ../src/modules/itip-formatter/itip-view.c:5625
 msgid "The item in the calendar is not valid"
 msgstr "The item in the calendar is not valid"
 
-#: ../modules/itip-formatter/itip-view.c:5326
-#: ../modules/itip-formatter/itip-view.c:5356
-#: ../modules/itip-formatter/itip-view.c:5459
+#: ../src/modules/itip-formatter/itip-view.c:5493
+#: ../src/modules/itip-formatter/itip-view.c:5523
+#: ../src/modules/itip-formatter/itip-view.c:5626
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -21537,11 +23610,11 @@ msgstr ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 
-#: ../modules/itip-formatter/itip-view.c:5371
+#: ../src/modules/itip-formatter/itip-view.c:5538
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
-#: ../modules/itip-formatter/itip-view.c:5372
+#: ../src/modules/itip-formatter/itip-view.c:5539
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -21549,551 +23622,587 @@ msgstr ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 
-#: ../modules/itip-formatter/itip-view.c:5890
+#: ../src/modules/itip-formatter/itip-view.c:6057
 msgctxt "cal-itip"
 msgid "None"
 msgstr "None"
 
-#: ../modules/itip-formatter/itip-view.c:5906
+#: ../src/modules/itip-formatter/itip-view.c:6073
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
-#: ../modules/itip-formatter/itip-view.c:6072
+#: ../src/modules/itip-formatter/itip-view.c:6239
 msgid "This meeting recurs"
 msgstr "This meeting recurs"
 
-#: ../modules/itip-formatter/itip-view.c:6075
+#: ../src/modules/itip-formatter/itip-view.c:6242
 msgid "This task recurs"
 msgstr "This task recurs"
 
-#: ../modules/itip-formatter/itip-view.c:6078
+#: ../src/modules/itip-formatter/itip-view.c:6245
 msgid "This memo recurs"
 msgstr "This memo recurs"
 
-#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+#: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 
-#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "This meeting has been delegated"
 
-#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+#: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#| msgid ""
+#| "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgid "“{0}” has delegated the meeting. Do you want to add the delegate “{1}”?"
 msgstr ""
-"'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+"“{0}” has delegated the meeting. Do you want to add the delegate “{1}”?"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:265
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:283
 msgid "Google Features"
 msgstr "Google Features"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:274
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:292
 msgid "Add Google Ca_lendar to this account"
 msgstr "Add Google Ca_lendar to this account"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:283
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:301
 msgid "Add Google Con_tacts to this account"
 msgstr "Add Google Con_tacts to this account"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:292
-msgid "You may need to enable IMAP access"
-msgstr "You may need to enable IMAP access"
-
-#: ../modules/mail-config/e-mail-config-local-accounts.c:267
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
+#. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:312
+#| msgid "IMAP Headers"
+msgctxt "GoggleSummary"
+msgid "IMAP access"
+msgstr "IMAP access"
+
+#. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
+#. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:315
+#| msgid "Calendars to run reminders for"
+msgctxt "GoggleSummary"
+msgid "Calendars to synchronize"
+msgstr "Calendars to synchronise"
+
+#. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
+#. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:318
+#, c-format
+#| msgid "You may need to enable IMAP access"
+msgctxt "GoggleSummary"
+msgid "You may need to enable %s and %s"
+msgstr "You may need to enable %s and %s"
+
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:268
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:316
 msgid "Mail _Directory:"
 msgstr "Mail _Directory:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:268
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:269
 msgid "Choose a MH mail directory"
 msgstr "Choose a MH mail directory"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:271
 msgid "MH mail directory cannot be empty"
 msgstr "MH mail directory cannot be empty"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:291
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:292
 msgid "Local Delivery _File:"
 msgstr "Local Delivery _File:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:293
 msgid "Choose a local delivery file"
 msgstr "Choose a local delivery file"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:294
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:295
 msgid "Local delivery file cannot be empty"
 msgstr "Local delivery file cannot be empty"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:316
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:317
 msgid "Choose a Maildir mail directory"
 msgstr "Choose a Maildir mail directory"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:318
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:319
 msgid "Maildir mail directory cannot be empty"
 msgstr "Maildir mail directory cannot be empty"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:339
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:340
 msgid "Spool _File:"
 msgstr "Spool _File:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:340
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:341
 msgid "Choose a mbox spool file"
 msgstr "Choose a mbox spool file"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:342
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:343
 msgid "Mbox spool file cannot be empty"
 msgstr "Mbox spool file cannot be empty"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:363
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:364
 msgid "Spool _Directory:"
 msgstr "Spool _Directory:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:364
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:365
 msgid "Choose a mbox spool directory"
 msgstr "Choose a mbox spool directory"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:366
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:367
 msgid "Mbox spool directory cannot be empty"
 msgstr "Mbox spool directory cannot be empty"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:197
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:61
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:153
-#: ../modules/plugin-manager/evolution-plugin-manager.c:158
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:198
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:59
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:154
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:156
 msgid "Configuration"
 msgstr "Configuration"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:215
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:171
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:216
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:172
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:184
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:230
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:185
 msgid "_Port:"
 msgstr "_Port:"
 
 #. do not reference
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:250
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:312
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:251
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:313
 msgid "User_name:"
 msgstr "User_name:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:264
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:326
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:265
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:327
 msgid "_Forget password"
 msgstr "_Forget password"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:290
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:233
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:291
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:234
 msgid "Encryption _method:"
 msgstr "Encryption _method:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:305
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:248
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:306
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:249
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS after connecting"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:309
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:310
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:253
 msgid "TLS on a dedicated port"
 msgstr "TLS on a dedicated port"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:77
-msgid "_Use custom binary, instead of 'sendmail'"
-msgstr "_Use custom binary, instead of 'sendmail'"
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:75
+#| msgid "_Use custom binary, instead of 'sendmail'"
+msgid "_Use custom binary, instead of “sendmail”"
+msgstr "_Use custom binary, instead of “sendmail”"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:81
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:79
 msgid "_Custom binary:"
 msgstr "_Custom binary:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:100
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:98
 msgid "U_se custom arguments"
 msgstr "U_se custom arguments"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:104
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:102
 msgid "Cus_tom arguments:"
 msgstr "Cus_tom arguments:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:122
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:120
+#| msgid ""
+#| "Default arguments are '-i -f %F -- %R', where\n"
+#| "   %F - stands for the From address\n"
+#| "   %R - stands for the recipient addresses"
 msgid ""
-"Default arguments are '-i -f %F -- %R', where\n"
-"   %F - stands for the From address\n"
-"   %R - stands for the recipient addresses"
+"Default arguments are “-i -f %F -- %R”, where\n"
+"   %F — stands for the From address\n"
+"   %R — stands for the recipient addresses"
 msgstr ""
-"Default arguments are '-i -f %F -- %R', where\n"
-"   %F - stands for the From address\n"
-"   %R - stands for the recipient addresses"
+"Default arguments are “-i -f %F -- %R”, where\n"
+"   %F — stands for the From address\n"
+"   %R — stands for the recipient addresses"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:137
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:135
 msgid "Send mail also when in offline _mode"
 msgstr "Send mail also when in offline _mode"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:210
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:208
 msgid "Custom binary cannot be empty"
 msgstr "Custom binary cannot be empty"
 
 #. do not reference
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:205
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:206
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver requires authentication"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:294
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:295
 msgid "T_ype:"
 msgstr "T_ype:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:251
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:252
 msgid "Yahoo! Features"
 msgstr "Yahoo! Features"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:260
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:261
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Add Yahoo! Ca_lendar and Tasks to this account"
 
-#: ../modules/mail/e-mail-attachment-handler.c:673
+#: ../src/modules/mail/e-mail-attachment-handler.c:671
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d attached message"
 msgstr[1] "%d attached messages"
 
-#: ../modules/mail/e-mail-shell-backend.c:377
+#: ../src/modules/mail/e-mail-shell-backend.c:383
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: ../modules/mail/e-mail-shell-backend.c:379
+#: ../src/modules/mail/e-mail-shell-backend.c:385
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: ../modules/mail/e-mail-shell-backend.c:387
+#: ../src/modules/mail/e-mail-shell-backend.c:393
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Mail Acco_unt"
 
-#: ../modules/mail/e-mail-shell-backend.c:389
+#: ../src/modules/mail/e-mail-shell-backend.c:395
 msgid "Create a new mail account"
 msgstr "Create a new mail account"
 
-#: ../modules/mail/e-mail-shell-backend.c:394
+#: ../src/modules/mail/e-mail-shell-backend.c:400
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: ../modules/mail/e-mail-shell-backend.c:396
+#: ../src/modules/mail/e-mail-shell-backend.c:402
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../modules/mail/e-mail-shell-backend.c:711
+#: ../src/modules/mail/e-mail-shell-backend.c:717
 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.
-#: ../modules/mail/e-mail-shell-backend.c:714
+#: ../src/modules/mail/e-mail-shell-backend.c:720
 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.
-#: ../modules/mail/e-mail-shell-backend.c:717
+#: ../src/modules/mail/e-mail-shell-backend.c:723
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "networkmanager"
 
-#: ../modules/mail/e-mail-shell-backend.c:749
+#: ../src/modules/mail/e-mail-shell-backend.c:757
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "Method to detect _online state:"
 
 #. Always as the first
-#: ../modules/mail/e-mail-shell-backend.c:758
+#: ../src/modules/mail/e-mail-shell-backend.c:766
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Default"
 
 #. Always as the last
-#: ../modules/mail/e-mail-shell-backend.c:772
+#: ../src/modules/mail/e-mail-shell-backend.c:780
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Always Online"
 
-#: ../modules/mail/e-mail-shell-backend.c:832
-msgid "Mail Accounts"
-msgstr "Mail Accounts"
-
-#: ../modules/mail/e-mail-shell-backend.c:841
+#: ../src/modules/mail/e-mail-shell-backend.c:849
 msgid "Mail Preferences"
 msgstr "Mail Preferences"
 
-#: ../modules/mail/e-mail-shell-backend.c:850
+#: ../src/modules/mail/e-mail-shell-backend.c:858
 msgid "Composer Preferences"
 msgstr "Composer Preferences"
 
-#: ../modules/mail/e-mail-shell-backend.c:859
+#: ../src/modules/mail/e-mail-shell-backend.c:867
 msgid "Network Preferences"
 msgstr "Network Preferences"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:1151
+#: ../src/modules/mail/e-mail-shell-backend.c:1220
 msgctxt "label"
 msgid "None"
 msgstr "None"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:736
+#: ../src/modules/mail/e-mail-shell-view-actions.c:781
 msgid "Marking messages as read..."
 msgstr "Marking messages as read..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1095
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1140
 msgid "Go to Folder"
 msgstr "Go to Folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1144
 msgid "_Select"
 msgstr "_Select"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1624
 msgid "_Disable Account"
 msgstr "_Disable Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1705
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1626
 msgid "Disable this account"
 msgstr "Disable this account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1712
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Permanently remove all the deleted messages from all folders"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1719
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1638
+#| msgid "Not Junk"
+msgid "Empty _Junk"
+msgstr "Empty _Junk"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1640
+#| msgid "Permanently remove all the deleted messages from all folders"
+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:1647
 msgid "Edit properties of this account"
 msgstr "Edit properties of this account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1726
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1654
 msgid "Refresh list of folders of this account"
 msgstr "Refresh list of folders of this account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1659
 msgid "_Download Messages for Offline Usage"
 msgstr "_Download Messages for Offline Usage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1661
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Download messages of accounts and folders marked for offline usage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Fl_ush Outbox"
 msgstr "Fl_ush Outbox"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
 msgid "_Copy Folder To..."
 msgstr "_Copy Folder To…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1747
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1675
 msgid "Copy the selected folder into another folder"
 msgstr "Copy the selected folder into another folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1754
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1682
 msgid "Permanently remove this folder"
 msgstr "Permanently remove this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1759
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
 msgid "E_xpunge"
 msgstr "E_xpunge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1689
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Permanently remove all deleted messages from this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1766
-#: ../modules/mail/e-mail-shell-view-actions.c:1874
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1802
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_k All Messages as Read"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
-#: ../modules/mail/e-mail-shell-view-actions.c:1876
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1696
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
 msgid "Mark all messages in the folder as read"
 msgstr "Mark all messages in the folder as read"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1773
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
 msgid "_Move Folder To..."
 msgstr "_Move Folder To…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1703
 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
-#: ../modules/mail/e-mail-shell-view-actions.c:1781
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
 msgid "_New..."
 msgstr "_New…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1783
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1711
 msgid "Create a new folder for storing mail"
 msgstr "Create a new folder for storing mail"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1790
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1718
 msgid "Change the properties of this folder"
 msgstr "Change the properties of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1797
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Refresh the folder"
 msgstr "Refresh the folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1804
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1732
 msgid "Change the name of this folder"
 msgstr "Change the name of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1809
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Select Message _Thread"
 msgstr "Select Message _Thread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1811
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Select all messages in the same thread as the selected message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1816
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Select Message S_ubthread"
 msgstr "Select Message S_ubthread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1818
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Select all replies to the currently selected message"
 msgstr "Select all replies to the currently selected message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1830
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Empty _Trash"
 msgstr "Empty Was_tebasket"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1832
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1760
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Permanently remove all the deleted messages from all accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1837
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
 msgid "Go to _Folder"
 msgstr "Go to _Folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1839
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1767
 msgid "Opens a dialog to select a folder to go to"
 msgstr "Opens a dialog to select a folder to go to"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1844
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1772
 msgid "_New Label"
 msgstr "_New Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1853
+#. Translators: "None" is used in the message label context menu.
+#. *              It removes all labels from the selected messages.
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1781
 msgid "N_one"
 msgstr "N_one"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1867
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1795
 msgid "_Manage Subscriptions"
 msgstr "_Manage Subscriptions"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1869
-#: ../modules/mail/e-mail-shell-view-actions.c:1953
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1881
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Subscribe or unsubscribe to folders on remote servers"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1881
-#: ../modules/mail/e-mail-shell-view-actions.c:1902
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1809
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1830
 msgid "Send / _Receive"
 msgstr "Send / _Receive"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1883
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
 msgid "Send queued items and retrieve new items"
 msgstr "Send queued items and retrieve new items"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1888
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
 msgid "R_eceive All"
 msgstr "R_eceive All"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1890
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
 msgid "Receive new items from all accounts"
 msgstr "Receive new items from all accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1895
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Send All"
 msgstr "_Send All"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1897
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1825
 msgid "Send queued items in all accounts"
 msgstr "Send queued items in all accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1925
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1853
 msgid "Cancel the current mail operation"
 msgstr "Cancel the current mail operation"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1930
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1858
 msgid "Collapse All _Threads"
 msgstr "Collapse All _Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1932
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1860
 msgid "Collapse all message threads"
 msgstr "Collapse all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1937
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1865
 msgid "E_xpand All Threads"
 msgstr "E_xpand All Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1939
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1867
 msgid "Expand all message threads"
 msgstr "Expand all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1944
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1872
 msgid "_Message Filters"
 msgstr "_Message Filters"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1946
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1874
 msgid "Create or edit rules for filtering new mail"
 msgstr "Create or edit rules for filtering new mail"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1951
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1879
 msgid "_Subscriptions..."
 msgstr "_Subscriptions…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1960
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1888
 msgid "F_older"
 msgstr "F_older"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1967
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_Label"
 msgstr "_Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1984
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1912
 msgid "C_reate Search Folder From Search..."
 msgstr "C_reate Search Folder From Search…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1991
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1919
 msgid "Search F_olders"
 msgstr "Search F_olders"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1993
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1921
 msgid "Create or edit search folder definitions"
 msgstr "Create or edit search folder definitions"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2032
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1964
 msgid "_New Folder..."
 msgstr "_New Folder…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2060
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
 msgid "Show Message _Preview"
 msgstr "Show Message _Preview"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2062
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1994
 msgid "Show message preview pane"
 msgstr "Show message preview pane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2068
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2000
 msgid "Show _Attachment Bar"
 msgstr "Show _Attachment Bar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2070
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2002
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments"
@@ -22101,278 +24210,302 @@ msgstr ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2076
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2008
 msgid "Show _Deleted Messages"
 msgstr "Show _Deleted Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2078
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2010
 msgid "Show deleted messages with a line through them"
 msgstr "Show deleted messages with a line through them"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2084
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
 msgid "Show _Junk Messages"
 msgstr "Show _Junk Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2086
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2018
 msgid "Show junk messages with a red line through them"
 msgstr "Show junk messages with a red line through them"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2092
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
 msgid "_Group By Threads"
 msgstr "_Group By Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2094
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2026
 msgid "Threaded message list"
 msgstr "Threaded message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2100
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2032
+#| msgid "Show _Tool Bar"
+msgid "Show To _Do Bar"
+msgstr "Show To _Do Bar"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2034
+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:2040
 msgid "_Unmatched Folder Enabled"
 msgstr "_Unmatched Folder Enabled"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2102
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2042
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Toggles whether Unmatched search folder is enabled"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2122
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2062
 msgid "Show message preview below the message list"
 msgstr "Show message preview below the message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2129
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2069
 msgid "Show message preview alongside the message list"
 msgstr "Show message preview alongside the message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2137
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2077
 msgid "All Messages"
 msgstr "All Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2144
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2084
 msgid "Important Messages"
 msgstr "Important Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2151
-msgid "Last 5 Days' Messages"
-msgstr "Last 5 Days' Messages"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2091
+#| msgid "Last 5 Days' Messages"
+msgid "Last 5 Days’ Messages"
+msgstr "Last 5 Days’ Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2158
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2098
 msgid "Messages Not Junk"
 msgstr "Messages Not Junk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2165
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2105
 msgid "Messages with Attachments"
 msgstr "Messages with Attachments"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2172
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2112
 msgid "Messages with Notes"
 msgstr "Messages with Notes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2179
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2119
 msgid "No Label"
 msgstr "No Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2186
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2126
 msgid "Read Messages"
 msgstr "Read Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2193
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2133
 msgid "Unread Messages"
 msgstr "Unread Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2200
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2140
 msgid "Message Thread"
 msgstr "Message Thread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2260
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2200
 msgid "Subject or Addresses contain"
 msgstr "Subject or Addresses contain"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2270
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2210
 msgid "All Accounts"
 msgstr "All Accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2277
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2217
 msgid "Current Account"
 msgstr "Current Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2284
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2224
 msgid "Current Folder"
 msgstr "Current Folder"
 
-#: ../modules/mail/e-mail-shell-view.c:779
+#: ../src/modules/mail/e-mail-shell-view.c:777
 msgid "All Account Search"
 msgstr "All Account Search"
 
-#: ../modules/mail/e-mail-shell-view.c:887
+#: ../src/modules/mail/e-mail-shell-view.c:885
 msgid "Account Search"
 msgstr "Account Search"
 
-#: ../modules/mail/e-mail-shell-view-private.c:958
+#: ../src/modules/mail/e-mail-shell-view-private.c:931
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d selected, "
 msgstr[1] "%d selected, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:967
-#: ../modules/mail/e-mail-shell-view-private.c:984
+#: ../src/modules/mail/e-mail-shell-view-private.c:940
+#: ../src/modules/mail/e-mail-shell-view-private.c:957
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d deleted"
 msgstr[1] "%d deleted"
 
-#: ../modules/mail/e-mail-shell-view-private.c:993
-#: ../modules/mail/e-mail-shell-view-private.c:999
+#: ../src/modules/mail/e-mail-shell-view-private.c:966
+#: ../src/modules/mail/e-mail-shell-view-private.c:972
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d junk"
 msgstr[1] "%d junk"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1006
+#: ../src/modules/mail/e-mail-shell-view-private.c:979
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d draft"
 msgstr[1] "%d drafts"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1012
+#: ../src/modules/mail/e-mail-shell-view-private.c:985
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d unsent"
 msgstr[1] "%d unsent"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1018
+#: ../src/modules/mail/e-mail-shell-view-private.c:991
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sent"
 msgstr[1] "%d sent"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1035
+#: ../src/modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d unread"
 msgstr[1] "%d unread"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1553
+#: ../src/modules/mail/e-mail-shell-view-private.c:1526
 msgid "Send / Receive"
 msgstr "Send / Receive"
 
-#: ../modules/mail/em-composer-prefs.c:413
+#: ../src/modules/mail/em-composer-prefs.c:419
 msgid "Select Folder to Add"
 msgstr "Select Folder to Add"
 
-#: ../modules/mail/em-composer-prefs.c:883
+#: ../src/modules/mail/em-composer-prefs.c:895
 msgid "Folder"
 msgstr "Folder"
 
-#: ../modules/mail/em-composer-prefs.c:919
+#: ../src/modules/mail/em-composer-prefs.c:931
 msgid "Recipient"
 msgstr "Recipient"
 
-#: ../modules/mail/em-composer-prefs.c:1204
+#: ../src/modules/mail/em-composer-prefs.c:1222
 msgid "Keep in Outbox"
 msgstr "Keep in Outbox"
 
-#: ../modules/mail/em-composer-prefs.c:1205
+#: ../src/modules/mail/em-composer-prefs.c:1223
 msgid "Send immediately"
 msgstr "Send immediately"
 
-#: ../modules/mail/em-composer-prefs.c:1206
+#: ../src/modules/mail/em-composer-prefs.c:1224
 msgid "Send after 5 minutes"
 msgstr "Send after 5 minutes"
 
-#: ../modules/mail/em-composer-prefs.c:1285
+#: ../src/modules/mail/em-composer-prefs.c:1309
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: ../modules/mail/em-mailer-prefs.c:79
+#: ../src/modules/mail/em-mailer-prefs.c:77
 msgid "On exit, every time"
 msgstr "On exit, every time"
 
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../src/modules/mail/em-mailer-prefs.c:78
 msgid "Once per day"
 msgstr "Once per day"
 
-#: ../modules/mail/em-mailer-prefs.c:81
+#: ../src/modules/mail/em-mailer-prefs.c:79
 msgid "Once per week"
 msgstr "Once per week"
 
-#: ../modules/mail/em-mailer-prefs.c:82
+#: ../src/modules/mail/em-mailer-prefs.c:80
 msgid "Once per month"
 msgstr "Once per month"
 
-#: ../modules/mail/em-mailer-prefs.c:83
+#: ../src/modules/mail/em-mailer-prefs.c:81
 msgid "Immediately, on folder leave"
 msgstr "Immediately, on folder leave"
 
-#: ../modules/mail/em-mailer-prefs.c:420
+#: ../src/modules/mail/em-mailer-prefs.c:418
 msgid "Header"
 msgstr "Header"
 
-#: ../modules/mail/em-mailer-prefs.c:424
+#: ../src/modules/mail/em-mailer-prefs.c:422
 msgid "Contains Value"
 msgstr "Contains Value"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1560
+#: ../src/modules/mail/em-mailer-prefs.c:1564
 msgid "_Date header:"
 msgstr "_Date header:"
 
-#: ../modules/mail/em-mailer-prefs.c:1561
+#: ../src/modules/mail/em-mailer-prefs.c:1565
 msgid "Show _original header value"
 msgstr "Show _original header value"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:140
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:112
+#| msgid "Exchange Settings"
+msgid "Do _not change settings"
+msgstr "Do _not change settings"
+
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:113
+#| msgid "Make Anjal the default email client"
+msgid "_Set as default email client"
+msgstr "_Set as default e-mail client"
+
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:138
 msgid "Do you want to make Evolution your default email client?"
 msgstr "Do you want to make Evolution your default e-mail client?"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:304
+#: ../src/modules/mdn/evolution-mdn.c:308
 #, c-format
-msgid "Your message to %s about \"%s\" on %s has been read."
-msgstr "Your message to %s about \"%s\" on %s has been read."
+#| msgid "Your message to %s about \"%s\" on %s has been read."
+msgid "Your message to %s about “%s” on %s has been read."
+msgstr "Your message to %s about “%s” on %s has been read."
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:370
+#: ../src/modules/mdn/evolution-mdn.c:374
 #, c-format
-msgid "Delivery Notification for \"%s\""
-msgstr "Delivery Notification for \"%s\""
+#| msgid "Delivery Notification for \"%s\""
+msgid "Delivery Notification for “%s”"
+msgstr "Delivery Notification for “%s”"
 
-#: ../modules/mdn/evolution-mdn.c:534
+#: ../src/modules/mdn/evolution-mdn.c:540
 #, c-format
-msgid "Send a read receipt to '%s'"
-msgstr "Send a read receipt to '%s'"
+#| msgid "Send a read receipt to '%s'"
+msgid "Send a read receipt to “%s”"
+msgstr "Send a read receipt to “%s”"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:539
+#: ../src/modules/mdn/evolution-mdn.c:545
 msgid "_Notify Sender"
 msgstr "_Notify Sender"
 
-#: ../modules/mdn/evolution-mdn.error.xml.h:1
+#: ../src/modules/mdn/evolution-mdn.error.xml.h:1
 msgid "Sender wants to be notified when you have read this message."
 msgstr "Sender wants to be notified when you have read this message."
 
-#: ../modules/mdn/evolution-mdn.error.xml.h:2
+#: ../src/modules/mdn/evolution-mdn.error.xml.h:2
 msgid "Sender has been notified that you have read this message."
 msgstr "Sender has been notified that you have read this message."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+#: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:1
 msgid "Evolution is currently offline."
 msgstr "Evolution is currently offline."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
-msgid "Click 'Work Online' to return to online mode."
-msgstr "Click 'Work Online' to return to online mode."
+#: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:2
+#| msgid "Click 'Work Online' to return to online mode."
+msgid "Click “Work Online” to return to online mode."
+msgstr "Click “Work Online” to return to online mode."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
+#: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:3
 msgid "Evolution is currently offline due to a network outage."
 msgstr "Evolution is currently offline due to a network outage."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
+#: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:4
 msgid ""
 "Evolution will return to online mode once a network connection is "
 "established."
@@ -22380,68 +24513,68 @@ msgstr ""
 "Evolution will return to online mode once a network connection is "
 "established."
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:65
 msgid "Author(s)"
 msgstr "Author(s)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:253
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:251
 msgid "Plugin Manager"
 msgstr "Plugin Manager"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:268
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:266
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Note: Some changes will not take effect until restart"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:296
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:294
 msgid "Overview"
 msgstr "Overview"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:365
-#: ../modules/plugin-manager/evolution-plugin-manager.c:448
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:363
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:446
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:484
 msgid "_Plugins"
 msgstr "_Plugins"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:485
 msgid "Enable and disable plugins"
 msgstr "Enable and disable plugins"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:137
 msgid "Display plain text version"
 msgstr "Display plain text version"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:141
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
 msgid "Display plain text version of multipart/alternative message"
 msgstr "Display plain text version of multipart/alternative message"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:145
 msgid "Display HTML version"
 msgstr "Display HTML version"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:149
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Display HTML version of multipart/alternative message"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
-#: ../modules/prefer-plain/plugin/config-ui.c:37
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../src/modules/prefer-plain/plugin/config-ui.c:35
 msgid "Show HTML if present"
 msgstr "Show HTML if present"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:80
-#: ../modules/prefer-plain/plugin/config-ui.c:38
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../src/modules/prefer-plain/plugin/config-ui.c:36
 msgid "Let Evolution choose the best part to show."
 msgstr "Let Evolution choose the best part to show."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:41
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../src/modules/prefer-plain/plugin/config-ui.c:39
 msgid "Show plain text if present"
 msgstr "Show plain text if present"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:84
-#: ../modules/prefer-plain/plugin/config-ui.c:42
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../src/modules/prefer-plain/plugin/config-ui.c:40
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -22449,23 +24582,23 @@ msgstr ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
-#: ../modules/prefer-plain/plugin/config-ui.c:46
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../src/modules/prefer-plain/plugin/config-ui.c:44
 msgid "Show plain text if present, or HTML source"
 msgstr "Show plain text if present, or HTML source"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:89
-#: ../modules/prefer-plain/plugin/config-ui.c:47
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../src/modules/prefer-plain/plugin/config-ui.c:45
 msgid "Show plain text part, if present, otherwise the HTML part source."
 msgstr "Show plain text part, if present, otherwise the HTML part source."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:93
-#: ../modules/prefer-plain/plugin/config-ui.c:51
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:91
+#: ../src/modules/prefer-plain/plugin/config-ui.c:49
 msgid "Only ever show plain text"
 msgstr "Only ever show plain text"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:94
-#: ../modules/prefer-plain/plugin/config-ui.c:52
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:92
+#: ../src/modules/prefer-plain/plugin/config-ui.c:50
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -22473,86 +24606,87 @@ msgstr ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 
-#: ../modules/prefer-plain/plugin/config-ui.c:103
+#: ../src/modules/prefer-plain/plugin/config-ui.c:101
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Show s_uppressed HTML parts as attachments"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:125
+#: ../src/modules/prefer-plain/plugin/config-ui.c:123
 msgid "HTML _Mode"
 msgstr "HTML _Mode"
 
-#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
+#: ../src/modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
 msgid "Prefer Plain Text"
 msgstr "Prefer Plain Text"
 
 #. but then we also need to create our own section frame
-#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:3
+#: ../src/modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:3
 msgid "Plain Text Mode"
 msgstr "Plain Text Mode"
 
-#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
+#: ../src/modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "View mail messages as plain text, even if they contain HTML content."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:187
+#: ../src/modules/spamassassin/evolution-spamassassin.c:188
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "Failed to spawn SpamAssassin (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:210
+#: ../src/modules/spamassassin/evolution-spamassassin.c:211
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "Failed to stream mail message content to SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:229
+#: ../src/modules/spamassassin/evolution-spamassassin.c:230
 #, c-format
-msgid "Failed to write '%s' to SpamAssassin: "
-msgstr "Failed to write '%s' to SpamAssassin: "
+#| msgid "Failed to write '%s' to SpamAssassin: "
+msgid "Failed to write “%s” to SpamAssassin: "
+msgstr "Failed to write “%s” to SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:257
+#: ../src/modules/spamassassin/evolution-spamassassin.c:258
 msgid "Failed to read output from SpamAssassin: "
 msgstr "Failed to read output from SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:312
+#: ../src/modules/spamassassin/evolution-spamassassin.c:313
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "SpamAssassin either crashed or failed to process a mail message"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:535
+#: ../src/modules/spamassassin/evolution-spamassassin.c:536
 msgid "SpamAssassin Options"
 msgstr "SpamAssassin Options"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:550
+#: ../src/modules/spamassassin/evolution-spamassassin.c:551
 msgid "I_nclude remote tests"
 msgstr "I_nclude remote tests"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:564
+#: ../src/modules/spamassassin/evolution-spamassassin.c:565
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "This will make SpamAssassin more reliable, but slower."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:739
-#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
+#: ../src/modules/spamassassin/evolution-spamassassin.c:740
+#: ../src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+#: ../src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
 msgid "Junk filter using SpamAssassin"
 msgstr "Junk filter using SpamAssassin"
 
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:270
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:271
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:340
 msgid "Importing Files"
 msgstr "Importing Files"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:258
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:257
 msgid "Import cancelled."
 msgstr "Import cancelled."
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:275
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:274
 msgid "Import complete."
 msgstr "Import complete."
 
-#: ../modules/startup-wizard/e-startup-assistant.c:155
+#: ../src/modules/startup-wizard/e-startup-assistant.c:158
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -22564,281 +24698,287 @@ msgstr ""
 "The next few screens will allow Evolution to connect to your e-mail "
 "accounts, and to import files from other applications."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:228
+#: ../src/modules/startup-wizard/e-startup-assistant.c:165
+#| msgid "Do not show this message again"
+msgid "Do not _show this wizard again"
+msgstr "Do not _show this wizard again"
+
+#: ../src/modules/startup-wizard/evolution-startup-wizard.c:212
 msgid "Loading accounts..."
 msgstr "Loading accounts…"
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
+#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:93
 msgid "_Format as..."
 msgstr "_Format as…"
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
+#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:101
 msgid "_Other languages"
 msgstr "_Other languages"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:453
 msgid "Text Highlight"
 msgstr "Text Highlight"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:439
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:454
 msgid "Syntax highlighting of mail parts"
 msgstr "Syntax highlighting of mail parts"
 
-#: ../modules/text-highlight/languages.c:31
+#: ../src/modules/text-highlight/languages.c:29
 msgid "_Plain text"
 msgstr "_Plain text"
 
-#: ../modules/text-highlight/languages.c:37
+#: ../src/modules/text-highlight/languages.c:35
 msgid "_Assembler"
 msgstr "_Assembler"
 
-#: ../modules/text-highlight/languages.c:42
+#: ../src/modules/text-highlight/languages.c:40
 msgid "_Bash"
 msgstr "_Bash"
 
-#: ../modules/text-highlight/languages.c:53
+#: ../src/modules/text-highlight/languages.c:51
 msgid "_C/C++"
 msgstr "_C/C++"
 
-#: ../modules/text-highlight/languages.c:62
+#: ../src/modules/text-highlight/languages.c:60
 msgid "_C#"
 msgstr "_C#"
 
-#: ../modules/text-highlight/languages.c:67
+#: ../src/modules/text-highlight/languages.c:65
 msgid "_Cascade Style Sheet"
 msgstr "_Cascade Style Sheet"
 
-#: ../modules/text-highlight/languages.c:80
+#: ../src/modules/text-highlight/languages.c:78
 msgid "_Java"
 msgstr "_Java"
 
-#: ../modules/text-highlight/languages.c:86
+#: ../src/modules/text-highlight/languages.c:84
 msgid "_JavaScript"
 msgstr "_JavaScript"
 
-#: ../modules/text-highlight/languages.c:92
+#: ../src/modules/text-highlight/languages.c:90
 msgid "_Patch/diff"
 msgstr "_Patch/diff"
 
-#: ../modules/text-highlight/languages.c:98
+#: ../src/modules/text-highlight/languages.c:96
 msgid "_Perl"
 msgstr "_Perl"
 
-#: ../modules/text-highlight/languages.c:109
+#: ../src/modules/text-highlight/languages.c:107
 msgid "_PHP"
 msgstr "_PHP"
 
-#: ../modules/text-highlight/languages.c:122
+#: ../src/modules/text-highlight/languages.c:120
 msgid "_Python"
 msgstr "_Python"
 
-#: ../modules/text-highlight/languages.c:127
+#: ../src/modules/text-highlight/languages.c:125
 msgid "_Ruby"
 msgstr "_Ruby"
 
-#: ../modules/text-highlight/languages.c:134
+#: ../src/modules/text-highlight/languages.c:132
 msgid "_Tcl/Tk"
 msgstr "_Tcl/Tk"
 
-#: ../modules/text-highlight/languages.c:140
+#: ../src/modules/text-highlight/languages.c:138
 msgid "_TeX/LaTeX"
 msgstr "_TeX/LaTeX"
 
-#: ../modules/text-highlight/languages.c:146
+#: ../src/modules/text-highlight/languages.c:144
 msgid "_Vala"
 msgstr "_Vala"
 
-#: ../modules/text-highlight/languages.c:151
+#: ../src/modules/text-highlight/languages.c:149
 msgid "_Visual Basic"
 msgstr "_Visual Basic"
 
-#: ../modules/text-highlight/languages.c:158
+#: ../src/modules/text-highlight/languages.c:156
 msgid "_XML"
 msgstr "_XML"
 
-#: ../modules/text-highlight/languages.c:176
+#: ../src/modules/text-highlight/languages.c:174
 msgid "_ActionScript"
 msgstr "_ActionScript"
 
-#: ../modules/text-highlight/languages.c:181
+#: ../src/modules/text-highlight/languages.c:179
 msgid "_ADA95"
 msgstr "_ADA95"
 
-#: ../modules/text-highlight/languages.c:188
+#: ../src/modules/text-highlight/languages.c:186
 msgid "_ALGOL 68"
 msgstr "_ALGOL 68"
 
-#: ../modules/text-highlight/languages.c:193
+#: ../src/modules/text-highlight/languages.c:191
 msgid "(_G)AWK"
 msgstr "(_G)AWK"
 
-#: ../modules/text-highlight/languages.c:198
+#: ../src/modules/text-highlight/languages.c:196
 msgid "_COBOL"
 msgstr "_COBOL"
 
-#: ../modules/text-highlight/languages.c:203
+#: ../src/modules/text-highlight/languages.c:201
 msgid "_DOS Batch"
 msgstr "_DOS Batch"
 
-#: ../modules/text-highlight/languages.c:208
+#: ../src/modules/text-highlight/languages.c:206
 msgid "_D"
 msgstr "_D"
 
-#: ../modules/text-highlight/languages.c:213
+#: ../src/modules/text-highlight/languages.c:211
 msgid "_Erlang"
 msgstr "_Erlang"
 
-#: ../modules/text-highlight/languages.c:218
+#: ../src/modules/text-highlight/languages.c:216
 msgid "_FORTRAN 77"
 msgstr "_FORTRAN 77"
 
-#: ../modules/text-highlight/languages.c:224
+#: ../src/modules/text-highlight/languages.c:222
 msgid "_FORTRAN 90"
 msgstr "_FORTRAN 90"
 
-#: ../modules/text-highlight/languages.c:229
+#: ../src/modules/text-highlight/languages.c:227
 msgid "_F#"
 msgstr "_F#"
 
-#: ../modules/text-highlight/languages.c:234
+#: ../src/modules/text-highlight/languages.c:232
 msgid "_Go"
 msgstr "_Go"
 
-#: ../modules/text-highlight/languages.c:239
+#: ../src/modules/text-highlight/languages.c:237
 msgid "_Haskell"
 msgstr "_Haskell"
 
-#: ../modules/text-highlight/languages.c:244
+#: ../src/modules/text-highlight/languages.c:242
 msgid "_JSP"
 msgstr "_JSP"
 
-#: ../modules/text-highlight/languages.c:249
+#: ../src/modules/text-highlight/languages.c:247
 msgid "_Lisp"
 msgstr "_Lisp"
 
-#: ../modules/text-highlight/languages.c:257
+#: ../src/modules/text-highlight/languages.c:255
 msgid "_Lotus"
 msgstr "_Lotus"
 
-#: ../modules/text-highlight/languages.c:262
+#: ../src/modules/text-highlight/languages.c:260
 msgid "_Lua"
 msgstr "_Lua"
 
-#: ../modules/text-highlight/languages.c:267
+#: ../src/modules/text-highlight/languages.c:265
 msgid "_Maple"
 msgstr "_Maple"
 
-#: ../modules/text-highlight/languages.c:272
+#: ../src/modules/text-highlight/languages.c:270
 msgid "_Matlab"
 msgstr "_Matlab"
 
-#: ../modules/text-highlight/languages.c:277
+#: ../src/modules/text-highlight/languages.c:275
 msgid "_Maya"
 msgstr "_Maya"
 
-#: ../modules/text-highlight/languages.c:282
+#: ../src/modules/text-highlight/languages.c:280
 msgid "_Oberon"
 msgstr "_Oberon"
 
-#: ../modules/text-highlight/languages.c:287
+#: ../src/modules/text-highlight/languages.c:285
 msgid "_Objective C"
 msgstr "_Objective C"
 
-#: ../modules/text-highlight/languages.c:293
+#: ../src/modules/text-highlight/languages.c:291
 msgid "_OCaml"
 msgstr "_OCaml"
 
-#: ../modules/text-highlight/languages.c:298
+#: ../src/modules/text-highlight/languages.c:296
 msgid "_Octave"
 msgstr "_Octave"
 
-#: ../modules/text-highlight/languages.c:303
+#: ../src/modules/text-highlight/languages.c:301
 msgid "_Object Script"
 msgstr "_Object Script"
 
-#: ../modules/text-highlight/languages.c:308
+#: ../src/modules/text-highlight/languages.c:306
 msgid "_Pascal"
 msgstr "_Pascal"
 
-#: ../modules/text-highlight/languages.c:313
+#: ../src/modules/text-highlight/languages.c:311
 msgid "_POV-Ray"
 msgstr "_POV-Ray"
 
-#: ../modules/text-highlight/languages.c:318
+#: ../src/modules/text-highlight/languages.c:316
 msgid "_Prolog"
 msgstr "_Prolog"
 
-#: ../modules/text-highlight/languages.c:323
+#: ../src/modules/text-highlight/languages.c:321
 msgid "_R"
 msgstr "_R"
 
-#: ../modules/text-highlight/languages.c:328
+#: ../src/modules/text-highlight/languages.c:326
 msgid "_RPM Spec"
 msgstr "_RPM Spec"
 
-#: ../modules/text-highlight/languages.c:333
+#: ../src/modules/text-highlight/languages.c:331
 msgid "_Scala"
 msgstr "_Scala"
 
-#: ../modules/text-highlight/languages.c:338
+#: ../src/modules/text-highlight/languages.c:336
 msgid "_Smalltalk"
 msgstr "_Smalltalk"
 
-#: ../modules/text-highlight/languages.c:344
+#: ../src/modules/text-highlight/languages.c:342
 msgid "_TCSH"
 msgstr "_TCSH"
 
-#: ../modules/text-highlight/languages.c:349
+#: ../src/modules/text-highlight/languages.c:347
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
-#: ../modules/vcard-inline/e-mail-part-vcard.c:187
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:129
+#: ../src/modules/vcard-inline/e-mail-part-vcard.c:188
 msgid "Show F_ull vCard"
 msgstr "Show F_ull vCard"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:134
-#: ../modules/vcard-inline/e-mail-part-vcard.c:192
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:132
+#: ../src/modules/vcard-inline/e-mail-part-vcard.c:193
 msgid "Show Com_pact vCard"
 msgstr "Show Com_pact vCard"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:165
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:163
 msgid "Save _To Addressbook"
 msgstr "Save _To Addressbook"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:187
 msgid "There is one other contact."
 msgstr "There is one other contact."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:194
+#. Translators: This will always be two or more.
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:192
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "There is %d other contact."
 msgstr[1] "There are %d other contacts."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:220
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:218
 msgid "Addressbook Contact"
 msgstr "Addressbook Contact"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:221
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:219
 msgid "Display the part as an addressbook contact"
 msgstr "Display the part as an addressbook contact"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:126
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:169
 msgid "_Do not show this message again."
 msgstr "_Do not show this message again."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:484
-#: ../plugins/templates/templates.c:490
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:570
+#: ../src/plugins/templates/templates.c:488
 msgid "Keywords"
 msgstr "Keywords"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
 msgid "Message has no attachments"
 msgstr "Message has no attachments"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
@@ -22846,59 +24986,59 @@ msgstr ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add Attachment..."
 msgstr "_Add Attachment…"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
 msgstr "_Edit Message"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#: ../src/plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 msgid "Attachment Reminder"
 msgstr "Attachment Reminder"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+#: ../src/plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Reminds you when you forgot to add an attachment to a mail message."
 
-#: ../plugins/bbdb/bbdb.c:724 ../plugins/bbdb/bbdb.c:835
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+#: ../src/plugins/bbdb/bbdb.c:735 ../src/plugins/bbdb/bbdb.c:846
+#: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatic Contacts"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:739
+#: ../src/plugins/bbdb/bbdb.c:750
 msgid "Create _address book entries when sending mails"
 msgstr "Create _address book entries when sending mails"
 
-#: ../plugins/bbdb/bbdb.c:749
+#: ../src/plugins/bbdb/bbdb.c:760
 msgid "Select Address book for Automatic Contacts"
 msgstr "Select Address book for Automatic Contacts"
 
-#: ../plugins/bbdb/bbdb.c:769
+#: ../src/plugins/bbdb/bbdb.c:780
 msgid "Instant Messaging Contacts"
 msgstr "Instant Messaging Contacts"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:784
+#: ../src/plugins/bbdb/bbdb.c:795
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Synchronise contact info and images from Pidgin buddy list"
 
-#: ../plugins/bbdb/bbdb.c:794
+#: ../src/plugins/bbdb/bbdb.c:805
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Select Address book for Pidgin buddy list"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:810
+#: ../src/plugins/bbdb/bbdb.c:821
 msgid "Synchronize with _buddy list now"
 msgstr "Synchronise with _buddy list now"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+#: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+#: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
@@ -22912,131 +25052,139 @@ msgstr ""
 "reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 
-#: ../plugins/dbx-import/dbx-importer.c:278
+#: ../src/plugins/dbx-import/dbx-importer.c:274
 msgid "Importing Outlook Express data"
 msgstr "Importing Outlook Express data"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+#: ../src/plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
 msgid "Outlook DBX import"
 msgstr "Outlook DBX import"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+#: ../src/plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Outlook Express 5/6 personal folders (.dbx)"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#: ../src/plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
 msgid "Import Outlook Express messages from DBX file"
 msgstr "Import Outlook Express messages from DBX file"
 
-#: ../plugins/email-custom-header/email-custom-header.c:293
+#: ../src/plugins/email-custom-header/email-custom-header.c:291
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Security:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:297
+#: ../src/plugins/email-custom-header/email-custom-header.c:295
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Personal"
 
-#: ../plugins/email-custom-header/email-custom-header.c:298
+#: ../src/plugins/email-custom-header/email-custom-header.c:296
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Unclassified"
 
-#: ../plugins/email-custom-header/email-custom-header.c:299
+#: ../src/plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Protected"
 
-#: ../plugins/email-custom-header/email-custom-header.c:300
+#: ../src/plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Confidential"
 
-#: ../plugins/email-custom-header/email-custom-header.c:301
+#: ../src/plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Secret"
 
-#: ../plugins/email-custom-header/email-custom-header.c:302
+#: ../src/plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Top secret"
 
-#: ../plugins/email-custom-header/email-custom-header.c:362
+#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from 
Composer,
+#. * indicating the header will not be added to a mail message
+#: ../src/plugins/email-custom-header/email-custom-header.c:360
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "None"
 
-#: ../plugins/email-custom-header/email-custom-header.c:539
+#: ../src/plugins/email-custom-header/email-custom-header.c:537
 msgid "_Custom Header"
 msgstr "_Custom Header"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:809
+#: ../src/plugins/email-custom-header/email-custom-header.c:807
+#| msgid ""
+#| "The format for specifying a Custom Header key value is:\n"
+#| "Name of the Custom Header key values separated by \";\"."
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
-"Name of the Custom Header key values separated by \";\"."
+"Name of the Custom Header key values separated by “;”."
 msgstr ""
 "The format for specifying a Custom Header key value is:\n"
-"Name of the Custom Header key values separated by \";\"."
+"Name of the Custom Header key values separated by “;”."
 
-#: ../plugins/email-custom-header/email-custom-header.c:862
+#: ../src/plugins/email-custom-header/email-custom-header.c:860
 msgid "Key"
 msgstr "Key"
 
-#: ../plugins/email-custom-header/email-custom-header.c:879
-#: ../plugins/templates/templates.c:499
+#: ../src/plugins/email-custom-header/email-custom-header.c:877
+#: ../src/plugins/templates/templates.c:497
 msgid "Values"
 msgstr "Values"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
 msgid "Custom Header"
 msgstr "Custom Header"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to 
specify what value for the message header would be added
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Add custom headers to outgoing mail messages."
 msgstr "Add custom headers to outgoing mail messages."
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
 msgid "Email Custom Header"
 msgstr "E-mail Custom Header"
 
-#: ../plugins/external-editor/external-editor.c:113
+#: ../src/plugins/external-editor/external-editor.c:111
 msgid "Command to be executed to launch the editor: "
 msgstr "Command to be executed to launch the editor: "
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../src/plugins/external-editor/external-editor.c:112
+#| msgid ""
+#| "For XEmacs use \"xemacs\"\n"
+#| "For Vim use \"gvim -f\""
 msgid ""
-"For XEmacs use \"xemacs\"\n"
-"For Vim use \"gvim -f\""
+"For XEmacs use “xemacs”\n"
+"For Vim use “gvim -f”"
 msgstr ""
-"For XEmacs use \"xemacs\"\n"
-"For Vim use \"gvim -f\""
+"For XEmacs use “xemacs”\n"
+"For Vim use “gvim -f”"
 
-#: ../plugins/external-editor/external-editor.c:124
+#: ../src/plugins/external-editor/external-editor.c:122
 msgid "_Automatically launch when a new mail is edited"
 msgstr "_Automatically launch when a new mail is edited"
 
-#: ../plugins/external-editor/external-editor.c:437
-#: ../plugins/external-editor/external-editor.c:439
+#: ../src/plugins/external-editor/external-editor.c:453
+#: ../src/plugins/external-editor/external-editor.c:455
 msgid "Compose in External Editor"
 msgstr "Compose in External Editor"
 
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+#: ../src/plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid "External Editor"
 msgstr "External Editor"
 
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+#: ../src/plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
 msgid "Use an external editor to compose plain-text mail messages."
 msgstr "Use an external editor to compose plain-text mail messages."
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Editor not launchable"
 msgstr "Editor not launchable"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
@@ -23044,11 +25192,11 @@ msgstr ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid "Cannot create Temporary File"
 msgstr "Cannot create Temporary File"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:4
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
@@ -23056,11 +25204,11 @@ msgstr ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:5
 msgid "External editor still running"
 msgstr "External editor still running"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor is still running. The mail composer window cannot be "
 "closed as long as the editor is active."
@@ -23068,149 +25216,156 @@ msgstr ""
 "The external editor is still running. The mail composer window cannot be "
 "closed as long as the editor is active."
 
-#: ../plugins/face/face.c:294
+#: ../src/plugins/face/face.c:292
 msgid "Select a Face Picture"
 msgstr "Select a Face Picture"
 
-#: ../plugins/face/face.c:304
+#: ../src/plugins/face/face.c:302
 msgid "Image files"
 msgstr "Image files"
 
-#: ../plugins/face/face.c:392
+#: ../src/plugins/face/face.c:390
 msgid "_Insert Face picture by default"
 msgstr "_Insert Face picture by default"
 
-#: ../plugins/face/face.c:405
+#: ../src/plugins/face/face.c:403
 msgid "Load new _Face picture"
 msgstr "Load new _Face picture"
 
-#: ../plugins/face/face.c:449
+#: ../src/plugins/face/face.c:447
 msgid "Change Face Image"
 msgstr "Change Face Image"
 
-#: ../plugins/face/face.c:537
+#: ../src/plugins/face/face.c:535
 msgid "Include _Face"
 msgstr "Include _Face"
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../src/plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Attach a small picture of your face to outgoing messages."
 msgstr "Attach a small picture of your face to outgoing messages."
 
-#: ../plugins/face/org-gnome-face.error.xml.h:1
+#: ../src/plugins/face/org-gnome-face.error.xml.h:1
 msgid "Failed Read"
 msgstr "Failed Read"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:2
+#: ../src/plugins/face/org-gnome-face.error.xml.h:2
 msgid "The file cannot be read"
 msgstr "The file cannot be read"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:3
+#: ../src/plugins/face/org-gnome-face.error.xml.h:3
 msgid "Invalid Image Size"
 msgstr "Invalid Image Size"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:4
+#: ../src/plugins/face/org-gnome-face.error.xml.h:4
+#| msgid ""
+#| "Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
+#| "exceed 723 bytes."
 msgid ""
-"Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
+"Please select a PNG image of size 48 × 48 pixels, whose file size doesn’t "
 "exceed 723 bytes."
 msgstr ""
-"Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
+"Please select a PNG image of size 48 × 48 pixels, whose file size doesn’t "
 "exceed 723 bytes."
 
-#: ../plugins/face/org-gnome-face.error.xml.h:5
+#: ../src/plugins/face/org-gnome-face.error.xml.h:5
 msgid "Incorrect Face Image Byte Size"
 msgstr "Incorrect Face Image Byte Size"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:6
+#: ../src/plugins/face/org-gnome-face.error.xml.h:6
+#| msgid ""
+#| "The Face image size is {0} bytes, while it should not be more than 723 "
+#| "bytes. Please select a PNG image of size 48 * 48 pixels, whose file size "
+#| "doesn't exceed 723 bytes."
 msgid ""
 "The Face image size is {0} bytes, while it should not be more than 723 "
-"bytes. Please select a PNG image of size 48 * 48 pixels, whose file size "
-"doesn't exceed 723 bytes."
+"bytes. Please select a PNG image of size 48 × 48 pixels, whose file size "
+"doesn’t exceed 723 bytes."
 msgstr ""
 "The Face image size is {0} bytes, while it should not be more than 723 "
-"bytes. Please select a PNG image of size 48 * 48 pixels, whose file size "
-"doesn't exceed 723 bytes."
+"bytes. Please select a PNG image of size 48 × 48 pixels, whose file size "
+"doesn’t exceed 723 bytes."
 
-#: ../plugins/face/org-gnome-face.error.xml.h:7
+#: ../src/plugins/face/org-gnome-face.error.xml.h:7
 msgid "Not an image"
 msgstr "Not an image"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:8
+#: ../src/plugins/face/org-gnome-face.error.xml.h:8
 msgid "The file you selected does not look like a valid PNG image. Error: {0}"
 msgstr "The file you selected does not look like a valid PNG image. Error: {0}"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:415
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:413
 msgid "Get List _Archive"
 msgstr "Get List _Archive"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:417
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:415
 msgid "Get an archive of the list this message belongs to"
 msgstr "Get an archive of the list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:422
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:420
 msgid "Copy _Message Archive URL"
 msgstr "Copy _Message Archive URL"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:424
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:422
 msgid "Copy direct URL for the selected message in its archive"
 msgstr "Copy direct URL for the selected message in its archive"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:429
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:427
 msgid "Get List _Usage Information"
 msgstr "Get List _Usage Information"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:431
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:429
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Get information about the usage of the list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:436
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:434
 msgid "Contact List _Owner"
 msgstr "Contact List _Owner"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:438
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:436
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Contact the owner of the mailing list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:443
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:441
 msgid "_Post Message to List"
 msgstr "_Post Message to List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:445
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:443
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Post a message to the mailing list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:450
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:448
 msgid "_Subscribe to List"
 msgstr "_Subscribe to List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:452
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:450
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Subscribe to the mailing list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:457
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:455
 msgid "_Unsubscribe from List"
 msgstr "_Unsubscribe from List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:459
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:457
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Unsubscribe from the mailing list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:466
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:464
 msgid "Mailing _List"
 msgstr "Mailing _List"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Mailing List Actions"
 msgstr "Mailing List Actions"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
 msgstr "Action not available"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
 "This message does not contain the header information required for this "
 "action."
@@ -23218,11 +25373,11 @@ msgstr ""
 "This message does not contain the header information required for this "
 "action."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
 msgid "Posting not allowed"
 msgstr "Posting not allowed"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
@@ -23230,37 +25385,43 @@ msgstr ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Send e-mail message to mailing list?"
 msgstr "Send e-mail message to mailing list?"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+#| msgid ""
+#| "An e-mail message will be sent to the URL \"{0}\". You can either send "
+#| "the message automatically, or see and change it first.\n"
+#| "\n"
+#| "You should receive an answer from the mailing list shortly after the "
+#| "message has been sent."
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"An e-mail message will be sent to the URL “{0}”. You can either send the "
 "message automatically, or see and change it first.\n"
 "\n"
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
 msgstr ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"An e-mail message will be sent to the URL “{0}”. You can either send the "
 "message automatically, or see and change it first.\n"
 "\n"
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "_Send message"
 msgstr "_Send message"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid "_Edit message"
 msgstr "_Edit message"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:11
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:11
 msgid "Malformed header"
 msgstr "Malformed header"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:12
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:12
 msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
@@ -23270,11 +25431,11 @@ msgstr ""
 "\n"
 "Header: {1}"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
 msgid "No e-mail action"
 msgstr "No e-mail action"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
 "The action could not be performed. The header for this action did not "
 "contain any action that could be processed.\n"
@@ -23286,8 +25447,9 @@ msgstr ""
 "\n"
 "Header: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:400
-#: ../plugins/mail-notification/mail-notification.c:436
+#. Translators: '%d' is the count of mails received.
+#: ../src/plugins/mail-notification/mail-notification.c:401
+#: ../src/plugins/mail-notification/mail-notification.c:437
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -23296,117 +25458,127 @@ msgstr[1] "You have received %d new messages."
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:411
+#: ../src/plugins/mail-notification/mail-notification.c:412
 #, c-format
 msgid "From: %s"
 msgstr "From: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:425
+#: ../src/plugins/mail-notification/mail-notification.c:426
 #, c-format
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:442
+#: ../src/plugins/mail-notification/mail-notification.c:443
 msgid "New email in Evolution"
 msgstr "New e-mail in Evolution"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:483
+#: ../src/plugins/mail-notification/mail-notification.c:483
 #, c-format
 msgid "Show %s"
 msgstr "Show %s"
 
-#: ../plugins/mail-notification/mail-notification.c:687
+#: ../src/plugins/mail-notification/mail-notification.c:687
 msgid "_Play sound when a new message arrives"
 msgstr "_Play sound when a new message arrives"
 
-#: ../plugins/mail-notification/mail-notification.c:719
+#: ../src/plugins/mail-notification/mail-notification.c:719
 msgid "_Beep"
 msgstr "_Beep"
 
-#: ../plugins/mail-notification/mail-notification.c:732
+#: ../src/plugins/mail-notification/mail-notification.c:732
 msgid "Use sound _theme"
 msgstr "Use sound _theme"
 
-#: ../plugins/mail-notification/mail-notification.c:751
+#: ../src/plugins/mail-notification/mail-notification.c:751
 msgid "Play _file:"
 msgstr "Play _file:"
 
-#: ../plugins/mail-notification/mail-notification.c:760
+#: ../src/plugins/mail-notification/mail-notification.c:760
 msgid "Select sound file"
 msgstr "Select sound file"
 
-#: ../plugins/mail-notification/mail-notification.c:837
+#: ../src/plugins/mail-notification/mail-notification.c:837
 msgid "Notify new messages for _Inbox only"
 msgstr "Notify new messages for _Inbox only"
 
-#: ../plugins/mail-notification/mail-notification.c:853
+#: ../src/plugins/mail-notification/mail-notification.c:853
 msgid "Show _notification when a new message arrives"
 msgstr "Show _notification when a new message arrives"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+#: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr "Mail Notification"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 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>"
-#: ../plugins/mail-to-task/mail-to-task.c:196
+#: ../src/plugins/mail-to-task/mail-to-task.c:194
 #, 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
-#: ../plugins/mail-to-task/mail-to-task.c:561
+#: ../src/plugins/mail-to-task/mail-to-task.c:576
 msgctxt "mail-to-task"
 msgid "_Cancel"
 msgstr "_Cancel"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:563
+#: ../src/plugins/mail-to-task/mail-to-task.c:578
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "_Edit"
 
 #. Translators: Dialog button to create a New event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:565
+#: ../src/plugins/mail-to-task/mail-to-task.c:580
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "_New"
 
-#: ../plugins/mail-to-task/mail-to-task.c:583
+#: ../src/plugins/mail-to-task/mail-to-task.c:598
 #, c-format
+#| msgid ""
+#| "Selected calendar contains event '%s' already. Would you like to edit the "
+#| "old event?"
 msgid ""
-"Selected calendar contains event '%s' already. Would you like to edit the "
+"Selected calendar contains event “%s” already. Would you like to edit the "
 "old event?"
 msgstr ""
-"Selected calendar contains event '%s' already. Would you like to edit the "
+"Selected calendar contains event “%s” already. Would you like to edit the "
 "old event?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:586
+#: ../src/plugins/mail-to-task/mail-to-task.c:601
 #, c-format
+#| msgid ""
+#| "Selected task list contains task '%s' already. Would you like to edit the "
+#| "old task?"
 msgid ""
-"Selected task list contains task '%s' already. Would you like to edit the "
+"Selected task list contains task “%s” already. Would you like to edit the "
 "old task?"
 msgstr ""
-"Selected task list contains task '%s' already. Would you like to edit the "
+"Selected task list contains task “%s” already. Would you like to edit the "
 "old task?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:589
+#: ../src/plugins/mail-to-task/mail-to-task.c:604
 #, c-format
+#| msgid ""
+#| "Selected memo list contains memo '%s' already. Would you like to edit the "
+#| "old memo?"
 msgid ""
-"Selected memo list contains memo '%s' already. Would you like to edit the "
+"Selected memo list contains memo “%s” already. Would you like to edit the "
 "old memo?"
 msgstr ""
-"Selected memo list contains memo '%s' already. Would you like to edit the "
+"Selected memo list contains memo “%s” already. Would you like to edit the "
 "old memo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:609
+#. Translators: Note there are always more than 10 mails selected
+#: ../src/plugins/mail-to-task/mail-to-task.c:624
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -23421,7 +25593,8 @@ msgstr[1] ""
 "You have selected %d mails to be converted to events. Do you really want to "
 "add them all?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#. Translators: Note there are always more than 10 mails selected
+#: ../src/plugins/mail-to-task/mail-to-task.c:631
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -23436,7 +25609,8 @@ msgstr[1] ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
 "add them all?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:623
+#. Translators: Note there are always more than 10 mails selected
+#: ../src/plugins/mail-to-task/mail-to-task.c:638
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -23451,29 +25625,29 @@ msgstr[1] ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:644
+#: ../src/plugins/mail-to-task/mail-to-task.c:659
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Do you wish to continue converting remaining mails?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:720
+#: ../src/plugins/mail-to-task/mail-to-task.c:735
 msgid "[No Summary]"
 msgstr "[No Summary]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:733
+#: ../src/plugins/mail-to-task/mail-to-task.c:748
 msgid "Invalid object returned from a server"
 msgstr "Invalid object returned from a server"
 
-#: ../plugins/mail-to-task/mail-to-task.c:787
+#: ../src/plugins/mail-to-task/mail-to-task.c:802
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "An error occurred during processing: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:823
+#: ../src/plugins/mail-to-task/mail-to-task.c:838
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Cannot open calendar. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:827
+#: ../src/plugins/mail-to-task/mail-to-task.c:842
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -23481,7 +25655,7 @@ msgstr ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:830
+#: ../src/plugins/mail-to-task/mail-to-task.c:845
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -23489,7 +25663,7 @@ msgstr ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:833
+#: ../src/plugins/mail-to-task/mail-to-task.c:848
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -23497,321 +25671,315 @@ msgstr ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1231
+#: ../src/plugins/mail-to-task/mail-to-task.c:1252
 msgid "Create an _Appointment"
 msgstr "Create an _Appointment"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1233
+#: ../src/plugins/mail-to-task/mail-to-task.c:1254
 msgid "Create a new event from the selected message"
 msgstr "Create a new event from the selected message"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1238
+#: ../src/plugins/mail-to-task/mail-to-task.c:1259
 msgid "Create a Mem_o"
 msgstr "Create a Mem_o"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1240
+#: ../src/plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create a new memo from the selected message"
 msgstr "Create a new memo from the selected message"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1245
+#: ../src/plugins/mail-to-task/mail-to-task.c:1266
 msgid "Create a _Task"
 msgstr "Create a _Task"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1247
+#: ../src/plugins/mail-to-task/mail-to-task.c:1268
 msgid "Create a new task from the selected message"
 msgstr "Create a new task from the selected message"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1255
+#: ../src/plugins/mail-to-task/mail-to-task.c:1276
 msgid "Create a _Meeting"
 msgstr "Create a _Meeting"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1257
+#: ../src/plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a new meeting from the selected message"
 msgstr "Create a new meeting from the selected message"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../src/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid "Convert a mail message to a task."
 msgstr "Convert a mail message to a task."
 
-#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:1
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+#: ../src/plugins/pst-import/evolution-pst.metainfo.xml.in.h:1
+#: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Outlook PST import"
 
-#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:2
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+#: ../src/plugins/pst-import/evolution-pst.metainfo.xml.in.h:2
+#: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
 msgid "Import Outlook messages from PST file"
 msgstr "Import Outlook messages from PST file"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+#: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook personal folders (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:526
-msgid "_Mail"
-msgstr "_Mail"
-
-#: ../plugins/pst-import/pst-importer.c:555
+#: ../src/plugins/pst-import/pst-importer.c:551
 msgid "Destination folder:"
 msgstr "Destination folder:"
 
-#: ../plugins/pst-import/pst-importer.c:565
+#: ../src/plugins/pst-import/pst-importer.c:561
 msgid "_Address Book"
 msgstr "_Address Book"
 
-#: ../plugins/pst-import/pst-importer.c:570
+#: ../src/plugins/pst-import/pst-importer.c:566
 msgid "A_ppointments"
 msgstr "A_ppointments"
 
-#: ../plugins/pst-import/pst-importer.c:575 ../views/tasks/galview.xml.h:1
-msgid "_Tasks"
-msgstr "_Tasks"
-
-#: ../plugins/pst-import/pst-importer.c:580
+#: ../src/plugins/pst-import/pst-importer.c:576
 msgid "_Journal entries"
 msgstr "_Journal entries"
 
-#: ../plugins/pst-import/pst-importer.c:697
+#: ../src/plugins/pst-import/pst-importer.c:693
 msgid "Importing Outlook data"
 msgstr "Importing Outlook data"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:140
-#: ../plugins/publish-calendar/publish-calendar.c:147
+#: ../src/plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../src/plugins/publish-calendar/publish-calendar.c:138
+#: ../src/plugins/publish-calendar/publish-calendar.c:145
 msgid "Calendar Publishing"
 msgstr "Calendar Publishing"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+#: ../src/plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "Locations"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../src/plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 msgid "Publish calendars to the web."
 msgstr "Publish calendars to the web."
 
-#: ../plugins/publish-calendar/publish-calendar.c:217
-#: ../plugins/publish-calendar/publish-calendar.c:484
+#: ../src/plugins/publish-calendar/publish-calendar.c:215
+#: ../src/plugins/publish-calendar/publish-calendar.c:482
 #, c-format
 msgid "Could not open %s:"
 msgstr "Could not open %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:236
+#: ../src/plugins/publish-calendar/publish-calendar.c:234
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "There was an error while publishing to %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:242
+#: ../src/plugins/publish-calendar/publish-calendar.c:240
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Publishing to %s finished successfully"
 
-#: ../plugins/publish-calendar/publish-calendar.c:290
+#: ../src/plugins/publish-calendar/publish-calendar.c:288
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Mount of %s failed:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:789
+#: ../src/plugins/publish-calendar/publish-calendar.c:787
 msgid "Are you sure you want to remove this location?"
 msgstr "Are you sure you want to remove this location?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1097
+#: ../src/plugins/publish-calendar/publish-calendar.c:1097
 msgid "Could not create publish thread."
 msgstr "Could not create publish thread."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1107
+#: ../src/plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "_Publish Calendar Information"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:1
 msgid "iCal"
 msgstr "iCal"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:3
 msgid "Daily"
 msgstr "Daily"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "Weekly"
 msgstr "Weekly"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:5
 msgid "Manual (via Actions menu)"
 msgstr "Manual (via Actions menu)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:9
 msgid "Secure FTP (SFTP)"
 msgstr "Secure FTP (SFTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Public FTP"
 msgstr "Public FTP"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:11
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "FTP (with login)"
 msgstr "FTP (with login)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:12
 msgid "Windows share"
 msgstr "Windows share"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:13
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "WebDAV (HTTP)"
 msgstr "WebDAV (HTTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:14
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Secure WebDAV (HTTPS)"
 msgstr "Secure WebDAV (HTTPS)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:15
 msgid "Custom Location"
 msgstr "Custom Location"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:17
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "_Publish as:"
 msgstr "_Publish as:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:18
 msgid "Publishing _Frequency:"
 msgstr "Publishing _Frequency:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:19
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr "Time _duration:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:20
 msgid "Sources"
 msgstr "Sources"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
 msgid "Service _type:"
 msgstr "Service _type:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_File:"
 msgstr "_File:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "P_ort:"
 msgstr "P_ort:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Username:"
 msgstr "_Username:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../smime/gui/certificate-manager.c:787
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../src/smime/gui/certificate-manager.c:785
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "_Remember password"
 msgstr "_Remember password"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "Publishing Location"
 msgstr "Publishing Location"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:84
-#: ../plugins/publish-calendar/publish-format-ical.c:104
+#: ../src/plugins/publish-calendar/publish-format-fb.c:82
+#: ../src/plugins/publish-calendar/publish-format-ical.c:102
 #, c-format
-msgid "Invalid source UID '%s'"
-msgstr "Invalid source UID '%s'"
+#| msgid "Invalid source UID '%s'"
+msgid "Invalid source UID “%s”"
+msgstr "Invalid source UID “%s”"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:544
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:542
 msgid "New Location"
 msgstr "New Location"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:546
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:544
 msgid "Edit Location"
 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.
-#: ../plugins/save-calendar/csv-format.c:160
+#: ../src/plugins/save-calendar/csv-format.c:158
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../src/plugins/save-calendar/csv-format.c:374
 msgid "Description List"
 msgstr "Description List"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../src/plugins/save-calendar/csv-format.c:375
 msgid "Categories List"
 msgstr "Categories List"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../src/plugins/save-calendar/csv-format.c:376
 msgid "Comment List"
 msgstr "Comment List"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../src/plugins/save-calendar/csv-format.c:379
 msgid "Contact List"
 msgstr "Contact List"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../src/plugins/save-calendar/csv-format.c:380
 msgid "Start"
 msgstr "Start"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../src/plugins/save-calendar/csv-format.c:381
 msgid "End"
 msgstr "End"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../src/plugins/save-calendar/csv-format.c:382
 msgid "Due"
 msgstr "Due"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../src/plugins/save-calendar/csv-format.c:383
 msgid "percent Done"
 msgstr "percent Done"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../src/plugins/save-calendar/csv-format.c:385
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../src/plugins/save-calendar/csv-format.c:386
 msgid "Attendees List"
 msgstr "Attendees List"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../src/plugins/save-calendar/csv-format.c:388
 msgid "Modified"
 msgstr "Modified"
 
-#: ../plugins/save-calendar/csv-format.c:563
+#: ../src/plugins/save-calendar/csv-format.c:561
 msgid "A_dvanced options for the CSV format"
 msgstr "A_dvanced options for the CSV format"
 
-#: ../plugins/save-calendar/csv-format.c:571
+#: ../src/plugins/save-calendar/csv-format.c:569
 msgid "Prepend a _header"
 msgstr "Prepend a _header"
 
-#: ../plugins/save-calendar/csv-format.c:580
+#: ../src/plugins/save-calendar/csv-format.c:578
 msgid "_Value delimiter:"
 msgstr "_Value delimiter:"
 
-#: ../plugins/save-calendar/csv-format.c:591
+#: ../src/plugins/save-calendar/csv-format.c:589
 msgid "_Record delimiter:"
 msgstr "_Record delimiter:"
 
-#: ../plugins/save-calendar/csv-format.c:602
+#: ../src/plugins/save-calendar/csv-format.c:600
 msgid "_Encapsulate values with:"
 msgstr "_Encapsulate values with:"
 
-#: ../plugins/save-calendar/csv-format.c:628
+#: ../src/plugins/save-calendar/csv-format.c:626
 msgid "Comma separated values (.csv)"
 msgstr "Comma separated values (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:183 ../shell/e-shell-utils.c:179
+#: ../src/plugins/save-calendar/ical-format.c:181
+#: ../src/shell/e-shell-utils.c:182
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+#: ../src/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Save Selected"
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+#: ../src/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Save a calendar or task list to disk."
 msgstr "Save a calendar or task list to disk."
 
@@ -23820,43 +25988,43 @@ msgstr "Save a calendar or task list to disk."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:147
+#: ../src/plugins/save-calendar/rdf-format.c:145
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:385
+#: ../src/plugins/save-calendar/rdf-format.c:383
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:119
+#: ../src/plugins/save-calendar/save-calendar.c:117
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../plugins/save-calendar/save-calendar.c:184
+#: ../src/plugins/save-calendar/save-calendar.c:182
 msgid "Select destination file"
 msgstr "Select destination file"
 
-#: ../plugins/save-calendar/save-calendar.c:188
+#: ../src/plugins/save-calendar/save-calendar.c:186
 msgid "_Save As"
 msgstr "_Save As"
 
-#: ../plugins/save-calendar/save-calendar.c:347
+#: ../src/plugins/save-calendar/save-calendar.c:349
 msgid "Save the selected calendar to disk"
 msgstr "Save the selected calendar to disk"
 
-#: ../plugins/save-calendar/save-calendar.c:378
+#: ../src/plugins/save-calendar/save-calendar.c:380
 msgid "Save the selected memo list to disk"
 msgstr "Save the selected memo list to disk"
 
-#: ../plugins/save-calendar/save-calendar.c:409
+#: ../src/plugins/save-calendar/save-calendar.c:411
 msgid "Save the selected task list to disk"
 msgstr "Save the selected task list to disk"
 
-#: ../plugins/templates/e-templates-store.c:117
+#: ../src/plugins/templates/e-templates-store.c:115
 msgid "No Title"
 msgstr "No Title"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../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 "
@@ -23866,59 +26034,64 @@ msgstr ""
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
 "an e-mail you are replying to."
 
-#: ../plugins/templates/templates.c:1286
+#: ../src/plugins/templates/templates.c:1299
 msgid "Saving message template"
 msgstr "Saving message template"
 
-#: ../plugins/templates/templates.c:1307
+#: ../src/plugins/templates/templates.c:1320
 msgid "Save as _Template"
 msgstr "Save as _Template"
 
-#: ../plugins/templates/templates.c:1309
+#: ../src/plugins/templates/templates.c:1322
 msgid "Save as Template"
 msgstr "Save as Template"
 
-#: ../shell/e-shell.c:381
+#: ../src/shell/e-shell.c:379
 msgid "Preparing to go offline..."
 msgstr "Preparing to go offline…"
 
-#: ../shell/e-shell.c:410
+#: ../src/shell/e-shell.c:408
 msgid "Preparing to go online..."
 msgstr "Preparing to go online…"
 
-#: ../shell/e-shell.c:521
+#: ../src/shell/e-shell.c:519
 msgid "Preparing to quit"
 msgstr "Preparing to quit"
 
-#: ../shell/e-shell.c:527
+#: ../src/shell/e-shell.c:525
 msgid "Preparing to quit..."
 msgstr "Preparing to quit…"
 
-#: ../shell/e-shell.c:1044
+#: ../src/shell/e-shell.c:926
+#| msgid "Settings"
+msgid "Open _Settings"
+msgstr "Open _Settings"
+
+#: ../src/shell/e-shell.c:1127
 msgid "Credentials are required to connect to the destination host."
 msgstr "Credentials are required to connect to the destination host."
 
-#: ../shell/e-shell.c:1212 ../shell/e-shell-window-actions.c:827
+#: ../src/shell/e-shell.c:1297 ../src/shell/e-shell-window-actions.c:866
 msgid "New _Window"
 msgstr "New _Window"
 
-#: ../shell/e-shell.c:1223
+#: ../src/shell/e-shell.c:1308
 msgid "Quick _Reference"
 msgstr "Quick _Reference"
 
-#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:764
+#: ../src/shell/e-shell.c:1310 ../src/shell/e-shell-window-actions.c:796
 msgid "_About"
 msgstr "_About"
 
-#: ../shell/e-shell.c:1226 ../shell/e-shell-window-actions.c:862
+#: ../src/shell/e-shell.c:1311 ../src/shell/e-shell-window-actions.c:901
 msgid "_Quit"
 msgstr "_Quit"
 
-#: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
+#: ../src/shell/e-shell-content.c:700 ../src/shell/e-shell-content.c:701
 msgid "Searches"
 msgstr "Searches"
 
-#: ../shell/e-shell-content.c:764
+#: ../src/shell/e-shell-content.c:744
 msgid "Save Search"
 msgstr "Save Search"
 
@@ -23926,325 +26099,348 @@ msgstr "Save Search"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:926
+#: ../src/shell/e-shell-searchbar.c:925
 msgid "Sho_w:"
 msgstr "Sho_w:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:951
+#: ../src/shell/e-shell-searchbar.c:950
 msgid "Sear_ch:"
 msgstr "Sear_ch:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1019
+#: ../src/shell/e-shell-searchbar.c:1018
 msgid "i_n"
 msgstr "i_n"
 
-#: ../shell/e-shell-utils.c:176
+#: ../src/shell/e-shell-utils.c:179
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:200
+#: ../src/shell/e-shell-utils.c:205
 msgid "All Files (*)"
 msgstr "All Files (*)"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-utils.c:409
+#: ../src/shell/e-shell-utils.c:419
 msgid "translator-credits"
 msgstr ""
 "Gareth Owen <gowen72 yahoo com>\n"
 "David Lodge <dave cirt net>\n"
 "Philip Withnall <philip tecnocode co uk>\n"
-"Bruce Cowan <bruce bcowan me uk>\n"
+"Bruce Cowan <bruce bcowan eu>\n"
 "Chris Leonard <cjl laptop org>"
 
-#: ../shell/e-shell-utils.c:420
+#: ../src/shell/e-shell-utils.c:430
 msgid "Evolution Website"
 msgstr "Evolution Website"
 
-#: ../shell/e-shell-view.c:292
+#: ../src/shell/e-shell-view.c:290
 msgid "Saving user interface state"
 msgstr "Saving user interface state"
 
-#: ../shell/e-shell-window-actions.c:277
+#: ../src/shell/e-shell-window-actions.c:293
 msgid "Categories Editor"
 msgstr "Categories Editor"
 
-#: ../shell/e-shell-window-actions.c:585
+#: ../src/shell/e-shell-window-actions.c:612
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy is not installed."
 
-#: ../shell/e-shell-window-actions.c:586
+#: ../src/shell/e-shell-window-actions.c:613
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy could not be run."
 
-#: ../shell/e-shell-window-actions.c:766
+#: ../src/shell/e-shell-window-actions.c:798
 msgid "Show information about Evolution"
 msgstr "Show information about Evolution"
 
-#: ../shell/e-shell-window-actions.c:771 ../shell/e-shell-window-actions.c:785
+#: ../src/shell/e-shell-window-actions.c:803
+#| msgid "_Account:"
+msgid "_Accounts"
+msgstr "_Accounts"
+
+#: ../src/shell/e-shell-window-actions.c:805
+#| msgid "Configure Evolution"
+msgid "Configure Evolution Accounts"
+msgstr "Configure Evolution Accounts"
+
+#: ../src/shell/e-shell-window-actions.c:810
+#: ../src/shell/e-shell-window-actions.c:824
 msgid "_Close Window"
 msgstr "_Close Window"
 
-#: ../shell/e-shell-window-actions.c:792
+#: ../src/shell/e-shell-window-actions.c:831
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../shell/e-shell-window-actions.c:794
+#: ../src/shell/e-shell-window-actions.c:833
 msgid "Open the Evolution User Guide"
 msgstr "Open the Evolution User Guide"
 
-#: ../shell/e-shell-window-actions.c:820
+#: ../src/shell/e-shell-window-actions.c:859
 msgid "I_mport..."
 msgstr "I_mport…"
 
-#: ../shell/e-shell-window-actions.c:822
+#: ../src/shell/e-shell-window-actions.c:861
 msgid "Import data from other programs"
 msgstr "Import data from other programs"
 
-#: ../shell/e-shell-window-actions.c:829
+#: ../src/shell/e-shell-window-actions.c:868
 msgid "Create a new window displaying this view"
 msgstr "Create a new window displaying this view"
 
-#: ../shell/e-shell-window-actions.c:841
+#: ../src/shell/e-shell-window-actions.c:880
 msgid "Available Cate_gories"
 msgstr "Available Cate_gories"
 
-#: ../shell/e-shell-window-actions.c:843
+#: ../src/shell/e-shell-window-actions.c:882
 msgid "Manage available categories"
 msgstr "Manage available categories"
 
-#: ../shell/e-shell-window-actions.c:855
+#: ../src/shell/e-shell-window-actions.c:894
 msgid "_Quick Reference"
 msgstr "_Quick Reference"
 
-#: ../shell/e-shell-window-actions.c:857
-msgid "Show Evolution's shortcut keys"
-msgstr "Show Evolution's shortcut keys"
+#: ../src/shell/e-shell-window-actions.c:896
+#| msgid "Show Evolution's shortcut keys"
+msgid "Show Evolution’s shortcut keys"
+msgstr "Show Evolution’s shortcut keys"
 
-#: ../shell/e-shell-window-actions.c:864
+#: ../src/shell/e-shell-window-actions.c:903
 msgid "Exit the program"
 msgstr "Exit the program"
 
-#: ../shell/e-shell-window-actions.c:869
+#: ../src/shell/e-shell-window-actions.c:908
 msgid "_Advanced Search..."
 msgstr "_Advanced Search…"
 
-#: ../shell/e-shell-window-actions.c:871
+#: ../src/shell/e-shell-window-actions.c:910
 msgid "Construct a more advanced search"
 msgstr "Construct a more advanced search"
 
-#: ../shell/e-shell-window-actions.c:878
+#: ../src/shell/e-shell-window-actions.c:917
 msgid "Clear the current search parameters"
 msgstr "Clear the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:883
+#: ../src/shell/e-shell-window-actions.c:922
 msgid "_Edit Saved Searches..."
 msgstr "_Edit Saved Searches…"
 
-#: ../shell/e-shell-window-actions.c:885
+#: ../src/shell/e-shell-window-actions.c:924
 msgid "Manage your saved searches"
 msgstr "Manage your saved searches"
 
-#: ../shell/e-shell-window-actions.c:892
+#: ../src/shell/e-shell-window-actions.c:931
 msgid "Click here to change the search type"
 msgstr "Click here to change the search type"
 
-#: ../shell/e-shell-window-actions.c:897
+#: ../src/shell/e-shell-window-actions.c:936
 msgid "_Find Now"
 msgstr "_Find Now"
 
-#: ../shell/e-shell-window-actions.c:899
+#: ../src/shell/e-shell-window-actions.c:938
 msgid "Execute the current search parameters"
 msgstr "Execute the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:904
+#: ../src/shell/e-shell-window-actions.c:943
 msgid "_Save Search..."
 msgstr "_Save Search…"
 
-#: ../shell/e-shell-window-actions.c:906
+#: ../src/shell/e-shell-window-actions.c:945
 msgid "Save the current search parameters"
 msgstr "Save the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:918
+#: ../src/shell/e-shell-window-actions.c:957
 msgid "Submit _Bug Report..."
 msgstr "Submit _Bug Report…"
 
-#: ../shell/e-shell-window-actions.c:920
+#: ../src/shell/e-shell-window-actions.c:959
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Submit a bug report using Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:925
+#: ../src/shell/e-shell-window-actions.c:964
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: ../shell/e-shell-window-actions.c:927
+#: ../src/shell/e-shell-window-actions.c:966
 msgid "Put Evolution into offline mode"
 msgstr "Put Evolution into offline mode"
 
-#: ../shell/e-shell-window-actions.c:932
+#: ../src/shell/e-shell-window-actions.c:971
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: ../shell/e-shell-window-actions.c:934
+#: ../src/shell/e-shell-window-actions.c:973
 msgid "Put Evolution into online mode"
 msgstr "Put Evolution into online mode"
 
-#: ../shell/e-shell-window-actions.c:962
+#: ../src/shell/e-shell-window-actions.c:1001
 msgid "Lay_out"
 msgstr "Lay_out"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../shell/e-shell-window-actions.c:970
+#: ../src/shell/e-shell-window-actions.c:1009
 msgid "_New"
 msgstr "_New"
 
-#: ../shell/e-shell-window-actions.c:977
+#: ../src/shell/e-shell-window-actions.c:1016
 msgid "_Search"
 msgstr "_Search"
 
-#: ../shell/e-shell-window-actions.c:984
+#: ../src/shell/e-shell-window-actions.c:1023
 msgid "_Switcher Appearance"
 msgstr "_Switcher Appearance"
 
-#: ../shell/e-shell-window-actions.c:998
+#: ../src/shell/e-shell-window-actions.c:1037
 msgid "_Window"
 msgstr "_Window"
 
-#: ../shell/e-shell-window-actions.c:1027
+#: ../src/shell/e-shell-window-actions.c:1066
+#| msgid "Show _Status Bar"
+msgid "Show _Menu Bar"
+msgstr "Show _Menu Bar"
+
+#: ../src/shell/e-shell-window-actions.c:1068
+#| msgid "Show the side bar"
+msgid "Show the menu bar"
+msgstr "Show the menu bar"
+
+#: ../src/shell/e-shell-window-actions.c:1074
 msgid "Show Side _Bar"
 msgstr "Show Side _Bar"
 
-#: ../shell/e-shell-window-actions.c:1029
+#: ../src/shell/e-shell-window-actions.c:1076
 msgid "Show the side bar"
 msgstr "Show the side bar"
 
-#: ../shell/e-shell-window-actions.c:1035
+#: ../src/shell/e-shell-window-actions.c:1082
 msgid "Show _Buttons"
 msgstr "Show _Buttons"
 
-#: ../shell/e-shell-window-actions.c:1037
+#: ../src/shell/e-shell-window-actions.c:1084
 msgid "Show the switcher buttons"
 msgstr "Show the switcher buttons"
 
-#: ../shell/e-shell-window-actions.c:1043
+#: ../src/shell/e-shell-window-actions.c:1090
 msgid "Show _Status Bar"
 msgstr "Show _Status Bar"
 
-#: ../shell/e-shell-window-actions.c:1045
+#: ../src/shell/e-shell-window-actions.c:1092
 msgid "Show the status bar"
 msgstr "Show the status bar"
 
-#: ../shell/e-shell-window-actions.c:1051
+#: ../src/shell/e-shell-window-actions.c:1098
 msgid "Show _Tool Bar"
 msgstr "Show _Tool Bar"
 
-#: ../shell/e-shell-window-actions.c:1053
+#: ../src/shell/e-shell-window-actions.c:1100
 msgid "Show the tool bar"
 msgstr "Show the tool bar"
 
-#: ../shell/e-shell-window-actions.c:1075
+#: ../src/shell/e-shell-window-actions.c:1122
 msgid "_Icons Only"
 msgstr "_Icons Only"
 
-#: ../shell/e-shell-window-actions.c:1077
+#: ../src/shell/e-shell-window-actions.c:1124
 msgid "Display window buttons with icons only"
 msgstr "Display window buttons with icons only"
 
-#: ../shell/e-shell-window-actions.c:1082
+#: ../src/shell/e-shell-window-actions.c:1129
 msgid "_Text Only"
 msgstr "_Text Only"
 
-#: ../shell/e-shell-window-actions.c:1084
+#: ../src/shell/e-shell-window-actions.c:1131
 msgid "Display window buttons with text only"
 msgstr "Display window buttons with text only"
 
-#: ../shell/e-shell-window-actions.c:1089
+#: ../src/shell/e-shell-window-actions.c:1136
 msgid "Icons _and Text"
 msgstr "Icons _and Text"
 
-#: ../shell/e-shell-window-actions.c:1091
+#: ../src/shell/e-shell-window-actions.c:1138
 msgid "Display window buttons with icons and text"
 msgstr "Display window buttons with icons and text"
 
-#: ../shell/e-shell-window-actions.c:1096
+#: ../src/shell/e-shell-window-actions.c:1143
 msgid "Tool_bar Style"
 msgstr "Tool_bar Style"
 
-#: ../shell/e-shell-window-actions.c:1098
+#: ../src/shell/e-shell-window-actions.c:1145
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Display window buttons using the desktop toolbar setting"
 
-#: ../shell/e-shell-window-actions.c:1106
+#: ../src/shell/e-shell-window-actions.c:1153
 msgid "Delete Current View"
 msgstr "Delete Current View"
 
-#: ../shell/e-shell-window-actions.c:1113
+#: ../src/shell/e-shell-window-actions.c:1160
 msgid "Save Custom View..."
 msgstr "Save Custom View…"
 
-#: ../shell/e-shell-window-actions.c:1115
+#: ../src/shell/e-shell-window-actions.c:1162
 msgid "Save current custom view"
 msgstr "Save current custom view"
 
-#: ../shell/e-shell-window-actions.c:1122
+#: ../src/shell/e-shell-window-actions.c:1169
 msgid "C_urrent View"
 msgstr "C_urrent View"
 
-#: ../shell/e-shell-window-actions.c:1132
+#: ../src/shell/e-shell-window-actions.c:1179
 msgid "Custom View"
 msgstr "Custom View"
 
-#: ../shell/e-shell-window-actions.c:1134
+#: ../src/shell/e-shell-window-actions.c:1181
 msgid "Current view is a customized view"
 msgstr "Current view is a customised view"
 
-#: ../shell/e-shell-window-actions.c:1142
+#: ../src/shell/e-shell-window-actions.c:1189
 msgid "Page Set_up..."
 msgstr "Page Set_up…"
 
-#: ../shell/e-shell-window-actions.c:1144
+#: ../src/shell/e-shell-window-actions.c:1191
 msgid "Change the page settings for your current printer"
 msgstr "Change the page settings for your current printer"
 
-#: ../shell/e-shell-window-actions.c:1507
+#: ../src/shell/e-shell-window-actions.c:1560
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: ../shell/e-shell-window-actions.c:1630
+#: ../src/shell/e-shell-window-actions.c:1683
 #, c-format
 msgid "Select view: %s"
 msgstr "Select view: %s"
 
-#: ../shell/e-shell-window-actions.c:1647
+#: ../src/shell/e-shell-window-actions.c:1700
 #, c-format
 msgid "Delete view: %s"
 msgstr "Delete view: %s"
 
-#: ../shell/e-shell-window-actions.c:1748
+#: ../src/shell/e-shell-window-actions.c:1801
 msgid "Execute these search parameters"
 msgstr "Execute these search parameters"
 
 #. Translators: a 'New' toolbar button caption which is context sensitive and
 #. runs one of the actions under File->New menu
-#: ../shell/e-shell-window.c:567
+#: ../src/shell/e-shell-window.c:563
 msgctxt "toolbar-button"
 msgid "New"
 msgstr "New"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:632
+#: ../src/shell/e-shell-window-private.c:721
 #, c-format
-msgid "%s - Evolution"
+#| msgid "%s - Evolution"
+msgid "%s — Evolution"
 msgstr "%s — Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:195
+#: ../src/shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -24279,7 +26475,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: ../shell/main.c:219
+#: ../src/shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -24287,53 +26483,56 @@ msgstr ""
 "Thanks\n"
 "The Evolution Team\n"
 
-#: ../shell/main.c:225
+#: ../src/shell/main.c:225
 msgid "Do not tell me again"
 msgstr "Do not tell me again"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:314
+#: ../src/shell/main.c:314
+#| msgid ""
+#| "Start Evolution showing the specified component. Available options are "
+#| "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgid ""
 "Start Evolution showing the specified component. Available options are "
-"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+"“mail”, “calendar”, “contacts”, “tasks”, and “memos”"
 msgstr ""
 "Start Evolution showing the specified component. Available options are "
-"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+"“mail”, “calendar”, “contacts”, “tasks”, and “memos”"
 
-#: ../shell/main.c:318
+#: ../src/shell/main.c:318
 msgid "Apply the given geometry to the main window"
 msgstr "Apply the given geometry to the main window"
 
-#: ../shell/main.c:322
+#: ../src/shell/main.c:322
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: ../shell/main.c:324
+#: ../src/shell/main.c:324
 msgid "Ignore network availability"
 msgstr "Ignore network availability"
 
-#: ../shell/main.c:327
+#: ../src/shell/main.c:327
 msgid "Forcibly shut down Evolution"
 msgstr "Forcibly shut down Evolution"
 
-#: ../shell/main.c:330
+#: ../src/shell/main.c:330
 msgid "Disable loading of any plugins."
 msgstr "Disable loading of any plugins."
 
-#: ../shell/main.c:332
+#: ../src/shell/main.c:332
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Disable preview pane of Mail, Contacts and Tasks."
 
-#: ../shell/main.c:336
+#: ../src/shell/main.c:336
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Import URIs or filenames given as rest of arguments."
 
-#: ../shell/main.c:338
+#: ../src/shell/main.c:338
 msgid "Request a running Evolution process to quit"
 msgstr "Request a running Evolution process to quit"
 
-#: ../shell/main.c:415
+#: ../src/shell/main.c:415
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -24342,33 +26541,40 @@ msgstr ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
 "System error: %s"
 
-#: ../shell/main.c:469 ../shell/main.c:474
-msgid "- The Evolution PIM and Email Client"
-msgstr "- The Evolution PIM and E-mail Client"
+#: ../src/shell/main.c:466 ../src/shell/main.c:471
+#| msgid "- The Evolution PIM and Email Client"
+msgid "— The Evolution PIM and Email Client"
+msgstr "— The Evolution PIM and Email Client"
 
-#: ../shell/main.c:536
+#: ../src/shell/main.c:533
 #, c-format
+#| msgid ""
+#| "%s: --online and --offline cannot be used together.\n"
+#| "  Run '%s --help' for more information.\n"
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
-"  Run '%s --help' for more information.\n"
+"  Run “%s --help” for more information.\n"
 msgstr ""
 "%s: --online and --offline cannot be used together.\n"
-"  Run '%s --help' for more information.\n"
+"  Run “%s --help” for more information.\n"
 
-#: ../shell/main.c:542
+#: ../src/shell/main.c:539
 #, c-format
+#| msgid ""
+#| "%s: --force-online and --offline cannot be used together.\n"
+#| "  Run '%s --help' for more information.\n"
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
-"  Run '%s --help' for more information.\n"
+"  Run “%s --help” for more information.\n"
 msgstr ""
 "%s: --force-online and --offline cannot be used together.\n"
-"  Run '%s --help' for more information.\n"
+"  Run “%s --help” for more information.\n"
 
-#: ../shell/shell.error.xml.h:2
+#: ../src/shell/shell.error.xml.h:2
 msgid "Upgrade from previous version failed:"
 msgstr "Upgrade from previous version failed:"
 
-#: ../shell/shell.error.xml.h:3
+#: ../src/shell/shell.error.xml.h:3
 msgid ""
 "{0}\n"
 "\n"
@@ -24380,21 +26586,21 @@ msgstr ""
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
 
-#: ../shell/shell.error.xml.h:7
+#: ../src/shell/shell.error.xml.h:7
 msgid "Continue Anyway"
 msgstr "Continue Anyway"
 
-#: ../shell/shell.error.xml.h:8
+#: ../src/shell/shell.error.xml.h:8
 msgid "Quit Now"
 msgstr "Quit Now"
 
 #  shell:upgrade-remove-1-4 title
 #  shell:upgrade-remove-1-4 primary
-#: ../shell/shell.error.xml.h:9
+#: ../src/shell/shell.error.xml.h:9
 msgid "Cannot upgrade directly from version {0}"
 msgstr "Cannot upgrade directly from version {0}"
 
-#: ../shell/shell.error.xml.h:10
+#: ../src/shell/shell.error.xml.h:10
 msgid ""
 "Evolution no longer supports upgrading directly from version {0}. However as "
 "a workaround you might try first upgrading to Evolution 2, and then "
@@ -24404,11 +26610,11 @@ msgstr ""
 "a workaround you might try first upgrading to Evolution 2, and then "
 "upgrading to Evolution 3."
 
-#: ../shell/shell.error.xml.h:11
+#: ../src/shell/shell.error.xml.h:11
 msgid "Close Evolution with pending background operations?"
 msgstr "Close Evolution with pending background operations?"
 
-#: ../shell/shell.error.xml.h:12
+#: ../src/shell/shell.error.xml.h:12
 msgid ""
 "Evolution is taking a long time to shut down, possibly due to network "
 "connectivity issues. Would you like to cancel all pending operations and "
@@ -24418,161 +26624,193 @@ msgstr ""
 "connectivity issues. Would you like to cancel all pending operations and "
 "close immediately, or keep waiting?"
 
-#: ../shell/shell.error.xml.h:13
+#: ../src/shell/shell.error.xml.h:13
 msgid "_Close Immediately"
 msgstr "_Close Immediately"
 
-#: ../shell/shell.error.xml.h:14
+#: ../src/shell/shell.error.xml.h:14
 msgid "Keep _Waiting"
 msgstr "Keep _Waiting"
 
-#: ../shell/shell.error.xml.h:15
-msgid "Failed to get values from '{0}'"
-msgstr "Failed to get values from '{0}'"
+#: ../src/shell/shell.error.xml.h:15
+#| msgid "Failed to get values from '{0}'"
+msgid "Failed to get values from “{0}”"
+msgstr "Failed to get values from “{0}”"
 
-#: ../shell/shell.error.xml.h:16
-msgid "Failed to invoke authenticate for '{0}'"
-msgstr "Failed to invoke authenticate for '{0}'"
+#: ../src/shell/shell.error.xml.h:16
+#| msgid "Failed to invoke authenticate for '{0}'"
+msgid "Failed to invoke authenticate for “{0}”"
+msgstr "Failed to invoke authenticate for “{0}”"
 
-#: ../shell/shell.error.xml.h:17
-msgid "Failed to connect '{0}'"
-msgstr "Failed to connect '{0}'"
+#: ../src/shell/shell.error.xml.h:17
+#| msgid "Failed to connect '{0}'"
+msgid "Failed to connect “{0}”"
+msgstr "Failed to connect “{0}”"
 
-#: ../shell/shell.error.xml.h:18
+#: ../src/shell/shell.error.xml.h:18
 msgid "_Reconnect"
 msgstr "_Reconnect"
 
-#: ../shell/shell.error.xml.h:19
-msgid "Failed to connect address book '{0}'"
-msgstr "Failed to connect address book '{0}'"
-
-#: ../shell/shell.error.xml.h:20
-msgid "Failed to connect calendar '{0}'"
-msgstr "Failed to connect calendar '{0}'"
-
-#: ../shell/shell.error.xml.h:21
-msgid "Failed to connect mail account '{0}'"
-msgstr "Failed to connect mail account '{0}'"
-
-#: ../shell/shell.error.xml.h:22
-msgid "Failed to connect memo list '{0}'"
-msgstr "Failed to connect memo list '{0}'"
-
-#: ../shell/shell.error.xml.h:23
-msgid "Failed to connect task list '{0}'"
-msgstr "Failed to connect task list '{0}'"
-
-#: ../shell/shell.error.xml.h:24
-msgid "Failed to prompt for credentials for '{0}'"
-msgstr "Failed to prompt for credentials for '{0}'"
-
-#: ../shell/shell.error.xml.h:25
-msgid "Failed to finish trust prompt for '{0}'"
-msgstr "Failed to finish trust prompt for '{0}'"
-
-#: ../shell/shell.error.xml.h:26
-msgid "SSL certificate for '{0}' is not trusted."
-msgstr "SSL certificate for '{0}' is not trusted."
-
-#: ../shell/shell.error.xml.h:27
+#: ../src/shell/shell.error.xml.h:19
+#| msgid "Failed to connect address book '{0}'"
+msgid "Failed to connect address book “{0}”"
+msgstr "Failed to connect address book “{0}”"
+
+#: ../src/shell/shell.error.xml.h:20
+#| msgid "Failed to connect calendar '{0}'"
+msgid "Failed to connect calendar “{0}”"
+msgstr "Failed to connect calendar “{0}”"
+
+#: ../src/shell/shell.error.xml.h:21
+#| msgid "Failed to connect mail account '{0}'"
+msgid "Failed to connect mail account “{0}”"
+msgstr "Failed to connect mail account “{0}”"
+
+#: ../src/shell/shell.error.xml.h:22
+#| msgid "Failed to connect memo list '{0}'"
+msgid "Failed to connect memo list “{0}”"
+msgstr "Failed to connect memo list “{0}”"
+
+#: ../src/shell/shell.error.xml.h:23
+#| msgid "Failed to connect task list '{0}'"
+msgid "Failed to connect task list “{0}”"
+msgstr "Failed to connect task list “{0}”"
+
+#: ../src/shell/shell.error.xml.h:24
+#| msgid "Failed to prompt for credentials for '{0}'"
+msgid "Failed to prompt for credentials for “{0}”"
+msgstr "Failed to prompt for credentials for “{0}”"
+
+#: ../src/shell/shell.error.xml.h:25
+#| msgid "Failed to finish trust prompt for '{0}'"
+msgid "Failed to finish trust prompt for “{0}”"
+msgstr "Failed to finish trust prompt for “{0}”"
+
+#: ../src/shell/shell.error.xml.h:26
+#| msgid "SSL certificate for '{0}' is not trusted."
+msgid "SSL certificate for “{0}” is not trusted."
+msgstr "SSL certificate for “{0}” is not trusted."
+
+#: ../src/shell/shell.error.xml.h:27
 msgid "Reason: {1}"
 msgstr "Reason: {1}"
 
-#: ../shell/shell.error.xml.h:29
-msgid "SSL certificate for address book '{0}' is not trusted."
-msgstr "SSL certificate for address book '{0}' is not trusted."
+#: ../src/shell/shell.error.xml.h:29
+#| msgid "SSL certificate for address book '{0}' is not trusted."
+msgid "SSL certificate for address book “{0}” is not trusted."
+msgstr "SSL certificate for address book “{0}” is not trusted."
 
-#: ../shell/shell.error.xml.h:30
-msgid "SSL certificate for calendar '{0}' is not trusted."
-msgstr "SSL certificate for calendar '{0}' is not trusted."
+#: ../src/shell/shell.error.xml.h:30
+#| msgid "SSL certificate for calendar '{0}' is not trusted."
+msgid "SSL certificate for calendar “{0}” is not trusted."
+msgstr "SSL certificate for calendar “{0}” is not trusted."
 
-#: ../shell/shell.error.xml.h:31
-msgid "SSL certificate for mail account '{0}' is not trusted."
-msgstr "SSL certificate for mail account '{0}' is not trusted."
+#: ../src/shell/shell.error.xml.h:31
+#| msgid "SSL certificate for mail account '{0}' is not trusted."
+msgid "SSL certificate for mail account “{0}” is not trusted."
+msgstr "SSL certificate for mail account “{0}” is not trusted."
 
-#: ../shell/shell.error.xml.h:32
-msgid "SSL certificate for memo list '{0}' is not trusted."
-msgstr "SSL certificate for memo list '{0}' is not trusted."
+#: ../src/shell/shell.error.xml.h:32
+#| msgid "SSL certificate for memo list '{0}' is not trusted."
+msgid "SSL certificate for memo list “{0}” is not trusted."
+msgstr "SSL certificate for memo list “{0}” is not trusted."
 
-#: ../shell/shell.error.xml.h:33
-msgid "SSL certificate for task list '{0}' is not trusted."
-msgstr "SSL certificate for task list '{0}' is not trusted."
+#: ../src/shell/shell.error.xml.h:33
+#| msgid "SSL certificate for task list '{0}' is not trusted."
+msgid "SSL certificate for task list “{0}” is not trusted."
+msgstr "SSL certificate for task list “{0}” is not trusted."
 
-#: ../smime/gui/ca-trust-dialog.c:106
+#: ../src/smime/gui/ca-trust-dialog.c:104
 #, c-format
+#| msgid ""
+#| "Certificate '%s' is a CA certificate.\n"
+#| "\n"
+#| "Edit trust settings:"
 msgid ""
-"Certificate '%s' is a CA certificate.\n"
+"Certificate “%s” is a CA certificate.\n"
 "\n"
 "Edit trust settings:"
 msgstr ""
-"Certificate '%s' is a CA certificate.\n"
+"Certificate “%s” is a CA certificate.\n"
 "\n"
 "Edit trust settings:"
 
-#: ../smime/gui/certificate-manager.c:84 ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:123
+#: ../src/smime/gui/certificate-manager.c:82
+#: ../src/smime/gui/certificate-manager.c:101
+#: ../src/smime/gui/certificate-manager.c:121
 msgid "Certificate Name"
 msgstr "Certificate Name"
 
-#: ../smime/gui/certificate-manager.c:85 ../smime/gui/certificate-manager.c:105
+#: ../src/smime/gui/certificate-manager.c:83
+#: ../src/smime/gui/certificate-manager.c:103
 msgid "Issued To Organization"
 msgstr "Issued To Organisation"
 
-#: ../smime/gui/certificate-manager.c:86 ../smime/gui/certificate-manager.c:106
+#: ../src/smime/gui/certificate-manager.c:84
+#: ../src/smime/gui/certificate-manager.c:104
 msgid "Issued To Organizational Unit"
 msgstr "Issued To Organisational Unit"
 
-#: ../smime/gui/certificate-manager.c:87 ../smime/gui/certificate-manager.c:107
-#: ../smime/gui/certificate-manager.c:125
+#: ../src/smime/gui/certificate-manager.c:85
+#: ../src/smime/gui/certificate-manager.c:105
+#: ../src/smime/gui/certificate-manager.c:123
 msgid "Serial Number"
 msgstr "Serial Number"
 
-#: ../smime/gui/certificate-manager.c:88 ../smime/gui/certificate-manager.c:108
-#: ../smime/gui/certificate-manager.c:126
+#: ../src/smime/gui/certificate-manager.c:86
+#: ../src/smime/gui/certificate-manager.c:106
+#: ../src/smime/gui/certificate-manager.c:124
 msgid "Purposes"
 msgstr "Purposes"
 
-#: ../smime/gui/certificate-manager.c:89 ../smime/gui/certificate-manager.c:109
-#: ../smime/gui/certificate-manager.c:127
+#: ../src/smime/gui/certificate-manager.c:87
+#: ../src/smime/gui/certificate-manager.c:107
+#: ../src/smime/gui/certificate-manager.c:125
 msgid "Issued By"
 msgstr "Issued By"
 
-#: ../smime/gui/certificate-manager.c:90 ../smime/gui/certificate-manager.c:110
-#: ../smime/gui/certificate-manager.c:128
+#: ../src/smime/gui/certificate-manager.c:88
+#: ../src/smime/gui/certificate-manager.c:108
+#: ../src/smime/gui/certificate-manager.c:126
 msgid "Issued By Organization"
 msgstr "Issued By Organisation"
 
-#: ../smime/gui/certificate-manager.c:91 ../smime/gui/certificate-manager.c:111
-#: ../smime/gui/certificate-manager.c:129
+#: ../src/smime/gui/certificate-manager.c:89
+#: ../src/smime/gui/certificate-manager.c:109
+#: ../src/smime/gui/certificate-manager.c:127
 msgid "Issued By Organizational Unit"
 msgstr "Issued By Organisational Unit"
 
-#: ../smime/gui/certificate-manager.c:92 ../smime/gui/certificate-manager.c:112
-#: ../smime/gui/certificate-manager.c:130
+#: ../src/smime/gui/certificate-manager.c:90
+#: ../src/smime/gui/certificate-manager.c:110
+#: ../src/smime/gui/certificate-manager.c:128
 msgid "Issued"
 msgstr "Issued"
 
-#: ../smime/gui/certificate-manager.c:93 ../smime/gui/certificate-manager.c:113
-#: ../smime/gui/certificate-manager.c:131
+#: ../src/smime/gui/certificate-manager.c:91
+#: ../src/smime/gui/certificate-manager.c:111
+#: ../src/smime/gui/certificate-manager.c:129
 msgid "Expires"
 msgstr "Expires"
 
-#: ../smime/gui/certificate-manager.c:94 ../smime/gui/certificate-manager.c:114
-#: ../smime/gui/certificate-manager.c:132
+#: ../src/smime/gui/certificate-manager.c:92
+#: ../src/smime/gui/certificate-manager.c:112
+#: ../src/smime/gui/certificate-manager.c:130
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 Fingerprint"
 
-#: ../smime/gui/certificate-manager.c:95 ../smime/gui/certificate-manager.c:115
-#: ../smime/gui/certificate-manager.c:133
+#: ../src/smime/gui/certificate-manager.c:93
+#: ../src/smime/gui/certificate-manager.c:113
+#: ../src/smime/gui/certificate-manager.c:131
 msgid "MD5 Fingerprint"
 msgstr "MD5 Fingerprint"
 
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:124
+#: ../src/smime/gui/certificate-manager.c:102
+#: ../src/smime/gui/certificate-manager.c:122
 msgid "Email Address"
 msgstr "E-mail Address"
 
-#: ../smime/gui/certificate-manager.c:665
+#: ../src/smime/gui/certificate-manager.c:663
 msgid "Select a file to backup your key and certificate..."
 msgstr "Select a file to backup your key and certificate..."
 
@@ -24581,31 +26819,31 @@ msgstr "Select a file to backup your key and certificate..."
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../smime/gui/certificate-manager.c:677
+#: ../src/smime/gui/certificate-manager.c:675
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-backup.p12"
 
-#: ../smime/gui/certificate-manager.c:743
+#: ../src/smime/gui/certificate-manager.c:741
 msgid "Backup Certificate"
 msgstr "Backup Certificate"
 
 #. filename selection
-#: ../smime/gui/certificate-manager.c:757
+#: ../src/smime/gui/certificate-manager.c:755
 msgid "_File name:"
 msgstr "_File name:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../smime/gui/certificate-manager.c:762
+#: ../src/smime/gui/certificate-manager.c:760
 msgid "Please select a file..."
 msgstr "Please select a file..."
 
-#: ../smime/gui/certificate-manager.c:776
+#: ../src/smime/gui/certificate-manager.c:774
 msgid "_Include certificate chain in the backup"
 msgstr "_Include certificate chain in the backup"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:782
+#: ../src/smime/gui/certificate-manager.c:780
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
@@ -24615,16 +26853,16 @@ msgstr ""
 "you are about to create.\n"
 "You must set this password to proceed with the backup."
 
-#: ../smime/gui/certificate-manager.c:801
+#: ../src/smime/gui/certificate-manager.c:799
 msgid "_Repeat Password:"
 msgstr "_Repeat Password:"
 
-#: ../smime/gui/certificate-manager.c:820
+#: ../src/smime/gui/certificate-manager.c:818
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:828
+#: ../src/smime/gui/certificate-manager.c:826
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -24636,92 +26874,93 @@ msgstr ""
 "restore this backup later.\n"
 "Please record it in a safe location."
 
-#: ../smime/gui/certificate-manager.c:873
+#: ../src/smime/gui/certificate-manager.c:871
 msgid "No file name provided"
 msgstr "No file name provided"
 
-#: ../smime/gui/certificate-manager.c:877
+#: ../src/smime/gui/certificate-manager.c:875
 msgid "Failed to backup key and certificate"
 msgstr "Failed to backup key and certificate"
 
-#: ../smime/gui/certificate-manager.c:966
+#: ../src/smime/gui/certificate-manager.c:964
 msgid "Select a certificate to import..."
 msgstr "Select a certificate to import…"
 
-#: ../smime/gui/certificate-manager.c:1016
+#: ../src/smime/gui/certificate-manager.c:1014
 msgid "Failed to import certificate"
 msgstr "Failed to import certificate"
 
-#: ../smime/gui/certificate-manager.c:1132
+#: ../src/smime/gui/certificate-manager.c:1130
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "Ask when used"
 
-#: ../smime/gui/certificate-manager.c:1134
+#: ../src/smime/gui/certificate-manager.c:1132
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Never"
 
-#: ../smime/gui/certificate-manager.c:1136
+#: ../src/smime/gui/certificate-manager.c:1134
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr "Marginally"
 
-#: ../smime/gui/certificate-manager.c:1138
+#: ../src/smime/gui/certificate-manager.c:1136
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "Fully"
 
-#: ../smime/gui/certificate-manager.c:1140
+#: ../src/smime/gui/certificate-manager.c:1138
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr "Ultimately"
 
-#: ../smime/gui/certificate-manager.c:1142
+#: ../src/smime/gui/certificate-manager.c:1140
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr "Temporarily"
 
-#: ../smime/gui/certificate-manager.c:1348
+#: ../src/smime/gui/certificate-manager.c:1346
 msgid "Change certificate trust"
 msgstr "Change certificate trust"
 
-#: ../smime/gui/certificate-manager.c:1360
+#: ../src/smime/gui/certificate-manager.c:1358
 #, c-format
-msgid "Change trust for the host '%s':"
-msgstr "Change trust for the host '%s':"
+#| msgid "Change trust for the host '%s':"
+msgid "Change trust for the host “%s”:"
+msgstr "Change trust for the host “%s”:"
 
-#: ../smime/gui/certificate-manager.c:1384
+#: ../src/smime/gui/certificate-manager.c:1382
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "_Ask when used"
 
-#: ../smime/gui/certificate-manager.c:1385
+#: ../src/smime/gui/certificate-manager.c:1383
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "_Never trust this certificate"
 
-#: ../smime/gui/certificate-manager.c:1386
+#: ../src/smime/gui/certificate-manager.c:1384
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
 msgstr "_Temporarily trusted (this session only)"
 
-#: ../smime/gui/certificate-manager.c:1387
+#: ../src/smime/gui/certificate-manager.c:1385
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr "_Marginally trusted"
 
-#: ../smime/gui/certificate-manager.c:1388
+#: ../src/smime/gui/certificate-manager.c:1386
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "_Fully trusted"
 
-#: ../smime/gui/certificate-manager.c:1389
+#: ../src/smime/gui/certificate-manager.c:1387
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "_Ultimately trusted"
 
-#: ../smime/gui/certificate-manager.c:1393
+#: ../src/smime/gui/certificate-manager.c:1391
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
@@ -24729,47 +26968,47 @@ msgstr ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
 
-#: ../smime/gui/certificate-manager.c:1408
+#: ../src/smime/gui/certificate-manager.c:1406
 msgid "_Display certificate"
 msgstr "_Display certificate"
 
-#: ../smime/gui/certificate-manager.c:1613
+#: ../src/smime/gui/certificate-manager.c:1611
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "You have certificates on file that identify these mail servers:"
 
-#: ../smime/gui/certificate-manager.c:1644
+#: ../src/smime/gui/certificate-manager.c:1642
 msgid "Host name"
 msgstr "Host name"
 
-#: ../smime/gui/certificate-manager.c:1646
+#: ../src/smime/gui/certificate-manager.c:1644
 msgid "Issuer"
 msgstr "Issuer"
 
-#: ../smime/gui/certificate-manager.c:1647
+#: ../src/smime/gui/certificate-manager.c:1645
 msgid "Fingerprint"
 msgstr "Fingerprint"
 
-#: ../smime/gui/certificate-manager.c:1648
+#: ../src/smime/gui/certificate-manager.c:1646
 msgid "Trust"
 msgstr "Trust"
 
-#: ../smime/gui/certificate-manager.c:1669
+#: ../src/smime/gui/certificate-manager.c:1667
 msgid "_Edit Trust"
 msgstr "_Edit Trust"
 
-#: ../smime/gui/certificate-manager.c:2123
+#: ../src/smime/gui/certificate-manager.c:2121
 msgid "All PKCS12 files"
 msgstr "All PKCS12 files"
 
-#: ../smime/gui/certificate-manager.c:2140
+#: ../src/smime/gui/certificate-manager.c:2138
 msgid "All email certificate files"
 msgstr "All e-mail certificate files"
 
-#: ../smime/gui/certificate-manager.c:2157
+#: ../src/smime/gui/certificate-manager.c:2155
 msgid "All CA certificate files"
 msgstr "All CA certificate files"
 
-#: ../smime/gui/cert-trust-dialog.c:152
+#: ../src/smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -24779,7 +27018,7 @@ msgstr ""
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 
-#: ../smime/gui/cert-trust-dialog.c:157
+#: ../src/smime/gui/cert-trust-dialog.c:155
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -24789,85 +27028,87 @@ msgstr ""
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 
-#: ../smime/gui/component.c:55
+#: ../src/smime/gui/component.c:53
 #, c-format
-msgid "Enter the password for '%s', token '%s'"
-msgstr "Enter the password for '%s', token '%s'"
+#| msgid "Enter the password for '%s', token '%s'"
+msgid "Enter the password for “%s”, token “%s”"
+msgstr "Enter the password for “%s”, token “%s”"
 
-#: ../smime/gui/component.c:57
+#: ../src/smime/gui/component.c:55
 #, c-format
-msgid "Enter the password for '%s'"
-msgstr "Enter the password for '%s'"
+#| msgid "Enter the password for %s"
+msgid "Enter the password for “%s”"
+msgstr "Enter the password for “%s”"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:85
+#: ../src/smime/gui/component.c:83
 msgid "Enter new password for certificate database"
 msgstr "Enter new password for certificate database"
 
-#: ../smime/gui/component.c:88
+#: ../src/smime/gui/component.c:86
 msgid "Enter new password"
 msgstr "Enter new password"
 
-#: ../smime/gui/e-cert-selector.c:180
+#: ../src/smime/gui/e-cert-selector.c:178
 msgid "Select certificate"
 msgstr "Select certificate"
 
-#: ../smime/gui/smime-ui.ui.h:3
+#: ../src/smime/gui/smime-ui.ui.h:1
 msgid "You have certificates from these organizations that identify you:"
 msgstr "You have certificates from these organisations that identify you:"
 
-#: ../smime/gui/smime-ui.ui.h:4
+#: ../src/smime/gui/smime-ui.ui.h:2
 msgid "Certificates Table"
 msgstr "Certificates Table"
 
 #. This is a verb, as in "make a backup".
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../src/smime/gui/smime-ui.ui.h:5
 msgid "_Backup"
 msgstr "_Backup"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../src/smime/gui/smime-ui.ui.h:6
 msgid "Backup _All"
 msgstr "Back Up _All"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../src/smime/gui/smime-ui.ui.h:9
 msgid "Your Certificates"
 msgstr "Your Certificates"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../src/smime/gui/smime-ui.ui.h:10
 msgid "You have certificates on file that identify these people:"
 msgstr "You have certificates on file that identify these people:"
 
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../src/smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Contact Certificates"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../src/smime/gui/smime-ui.ui.h:13
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "You have certificates on file that identify these certificate authorities:"
 
-#: ../smime/gui/smime-ui.ui.h:16
+#: ../src/smime/gui/smime-ui.ui.h:14
 msgid "Authorities"
 msgstr "Authorities"
 
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../src/smime/gui/smime-ui.ui.h:15
 msgid "Certificate Authority Trust"
 msgstr "Certificate Authority Trust"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../src/smime/gui/smime-ui.ui.h:19
 msgid "Trust this CA to identify _websites."
 msgstr "Trust this CA to identify _websites."
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../src/smime/gui/smime-ui.ui.h:20
 msgid "Trust this CA to identify _email users."
 msgstr "Trust this CA to identify _e-mail users."
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../src/smime/gui/smime-ui.ui.h:21
 msgid "Trust this CA to identify _software developers."
 msgstr "Trust this CA to identify _software developers."
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../src/smime/gui/smime-ui.ui.h:22
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -24875,151 +27116,153 @@ msgstr ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "C_ertificate:"
-msgstr "C_ertificate:"
-
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../src/smime/gui/smime-ui.ui.h:23
 msgid "Email Certificate Trust Settings"
 msgstr "E-mail Certificate Trust Settings"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../src/smime/gui/smime-ui.ui.h:24
+msgid "_Edit CA Trust"
+msgstr "_Edit CA Trust"
+
+#: ../src/smime/gui/smime-ui.ui.h:25
 msgid "Trust the authenticity of this certificate"
 msgstr "Trust the authenticity of this certificate"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../src/smime/gui/smime-ui.ui.h:26
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Do not trust the authenticity of this certificate"
 
-#: ../smime/gui/smime-ui.ui.h:29
-msgid "_Edit CA Trust"
-msgstr "_Edit CA Trust"
+#: ../src/smime/gui/smime-ui.ui.h:29
+msgid "C_ertificate:"
+msgstr "C_ertificate:"
 
-#: ../smime/lib/e-cert.c:236 ../smime/lib/e-cert.c:248
+#: ../src/smime/lib/e-cert.c:235 ../src/smime/lib/e-cert.c:247
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:404
+#: ../src/smime/lib/e-cert.c:403
 msgid "Sign"
 msgstr "Sign"
 
-#: ../smime/lib/e-cert.c:405
+#: ../src/smime/lib/e-cert.c:404
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: ../smime/lib/e-cert-db.c:787
+#: ../src/smime/lib/e-cert-db.c:788
 msgid "Certificate already exists"
 msgstr "Certificate already exists"
 
-#: ../smime/lib/e-pkcs12.c:201
+#: ../src/smime/lib/e-pkcs12.c:200
 msgid "PKCS12 File Password"
 msgstr "PKCS12 File Password"
 
-#: ../smime/lib/e-pkcs12.c:202
+#: ../src/smime/lib/e-pkcs12.c:201
 msgid "Enter password for PKCS12 file:"
 msgstr "Enter password for PKCS12 file:"
 
-#: ../smime/lib/e-pkcs12.c:328
+#: ../src/smime/lib/e-pkcs12.c:327
 #, c-format
 msgid "Unable to create export context, err_code: %i"
 msgstr "Unable to create export context, err_code: %i"
 
-#: ../smime/lib/e-pkcs12.c:335
+#: ../src/smime/lib/e-pkcs12.c:334
 #, c-format
 msgid "Unable to setup password integrity, err_code: %i"
 msgstr "Unable to set up password integrity, err_code: %i"
 
-#: ../smime/lib/e-pkcs12.c:345
+#: ../src/smime/lib/e-pkcs12.c:344
 #, c-format
 msgid "Unable to create safe bag, err_code: %i"
 msgstr "Unable to create safe bag, err_code: %i"
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../src/smime/lib/e-pkcs12.c:362
 #, c-format
 msgid "Unable to add key/cert to the store, err_code: %i"
 msgstr "Unable to add key/cert to the store, err_code: %i"
 
-#: ../smime/lib/e-pkcs12.c:381
+#: ../src/smime/lib/e-pkcs12.c:380
 #, c-format
 msgid "Unable to write store to disk, err_code: %i"
 msgstr "Unable to write store to disk, err_code: %i"
 
-#: ../smime/lib/e-pkcs12.c:408
+#: ../src/smime/lib/e-pkcs12.c:407
 msgid "Imported Certificate"
 msgstr "Imported Certificate"
 
-#: ../views/addressbook/galview.xml.h:1
-msgid "_Address Cards"
-msgstr "_Address Cards"
+#~ msgid "Delete address book '{0}'?"
+#~ msgstr "Delete address book '{0}'?"
 
-#: ../views/addressbook/galview.xml.h:2 ../views/calendar/galview.xml.h:5
-msgid "_List View"
-msgstr "_List View"
+#~ msgid "Delete calendar '{0}'?"
+#~ msgstr "Delete calendar '{0}'?"
 
-#: ../views/addressbook/galview.xml.h:3
-msgid "By _Company"
-msgstr "By _Company"
+#~ msgid "Delete task list '{0}'?"
+#~ msgstr "Delete task list '{0}'?"
 
-#: ../views/calendar/galview.xml.h:1
-msgid "_Day View"
-msgstr "_Day View"
+#~ msgid "Delete memo list '{0}'?"
+#~ msgstr "Delete memo list '{0}'?"
 
-#: ../views/calendar/galview.xml.h:2
-msgid "_Work Week View"
-msgstr "_Work Week View"
+#~ msgid "Delete remote calendar '{0}'?"
+#~ msgstr "Delete remote calendar '{0}'?"
 
-#: ../views/calendar/galview.xml.h:3
-msgid "W_eek View"
-msgstr "W_eek View"
+#~ msgid "Delete remote task list '{0}'?"
+#~ msgstr "Delete remote task list '{0}'?"
 
-#: ../views/calendar/galview.xml.h:4
-msgid "_Month View"
-msgstr "_Month View"
+#~ msgid "Delete remote memo list '{0}'?"
+#~ msgstr "Delete remote memo list '{0}'?"
 
-#: ../views/mail/galview.xml.h:1
-msgid "_Messages"
-msgstr "_Messages"
+#~ msgid "Because &quot;{1}&quot;."
+#~ msgstr "Because &quot;{1}&quot;."
 
-#: ../views/mail/galview.xml.h:2
-msgid "As _Sent Folder"
-msgstr "As _Sent Folder"
+#~ msgid "Logfile to log filter actions."
+#~ msgstr "Logfile to log filter actions."
 
-#: ../views/mail/galview.xml.h:3
-msgid "By Su_bject"
-msgstr "By Su_bject"
+#~ msgid ""
+#~ "This can have three possible values. \"0\" for errors. \"1\" for "
+#~ "warnings. \"2\" for debug messages."
+#~ msgstr ""
+#~ "This can have three possible values. \"0\" for errors. \"1\" for "
+#~ "warnings. \"2\" for debug messages."
 
-#: ../views/mail/galview.xml.h:4
-msgid "By Se_nder"
-msgstr "By Se_nder"
+#~ msgid "Could not open '%s'"
+#~ msgstr "Could not open '%s'"
 
-#: ../views/mail/galview.xml.h:5
-msgid "By S_tatus"
-msgstr "By S_tatus"
+#~ msgid "Header _1"
+#~ msgstr "Header _1"
 
-#: ../views/mail/galview.xml.h:6
-msgid "By _Follow Up Flag"
-msgstr "By _Follow Up Flag"
+#~ msgid "Header _2"
+#~ msgstr "Header _2"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "For _Wide View"
+#~ msgid "Header _3"
+#~ msgstr "Header _3"
 
-#: ../views/mail/galview.xml.h:8
-msgid "As Sent Folder for Wi_de View"
-msgstr "As Sent Folder for Wi_de View"
+#~ msgid "Header _4"
+#~ msgstr "Header _4"
 
-#: ../views/memos/galview.xml.h:1
-msgid "_Memos"
-msgstr "_Memos"
+#~ msgid "Header _5"
+#~ msgstr "Header _5"
 
-#: ../views/tasks/galview.xml.h:2
-msgid "With _Due Date"
-msgstr "With _Due Date"
+#~ msgid "Header _6"
+#~ msgstr "Header _6"
 
-#: ../views/tasks/galview.xml.h:3
-msgid "With _Status"
-msgstr "With _Status"
+#~ msgctxt "PGPKeyDescription"
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
+
+#~ msgid "Failed to connect account &quot;{0}&quot;."
+#~ msgstr "Failed to connect account &quot;{0}&quot;."
+
+#~ msgid "Address formatting"
+#~ msgstr "Address formatting"
+
+#~ msgid "Selected Calendars for Alarms"
+#~ msgstr "Selected Calendars for Alarms"
+
+#~ msgid "Sh_ow a reminder"
+#~ msgstr "Sh_ow a reminder"
+
+#~ msgid "Enter the password for '%s'"
+#~ msgstr "Enter the password for '%s'"
 
 #~ msgid "Web addresses"
 #~ msgstr "Web addresses"
@@ -26027,9 +28270,6 @@ msgstr "With _Status"
 #~ msgid "Loading calendars"
 #~ msgstr "Loading calendars"
 
-#~ msgid "IMAP Headers"
-#~ msgstr "IMAP Headers"
-
 #~ msgid ""
 #~ "Select a predefined set of IMAP headers to fetch.\n"
 #~ "Note, larger sets of headers take longer to download."
@@ -26216,9 +28456,6 @@ msgstr "With _Status"
 #~ msgid "_Type:"
 #~ msgstr "_Type:"
 
-#~ msgid "Sh_ow reminder notifications"
-#~ msgstr "Sh_ow reminder notifications"
-
 #~ msgid "You are acting on behalf of %s"
 #~ msgstr "You are acting on behalf of %s"
 
@@ -26397,9 +28634,6 @@ msgstr "With _Status"
 #~ msgid "Account management"
 #~ msgstr "Account management"
 
-#~ msgid "Settings"
-#~ msgstr "Settings"
-
 #~ msgid "List of selected calendars"
 #~ msgstr "List of selected calendars"
 
@@ -26665,9 +28899,6 @@ msgstr "With _Status"
 #~ msgid "Mail browser width"
 #~ msgstr "Mail browser width"
 
-#~ msgid "Default width of the mail browser window."
-#~ msgstr "Default width of the mail browser window."
-
 #~ msgid "Mail browser height"
 #~ msgstr "Mail browser height"
 
@@ -27043,9 +29274,6 @@ msgstr "With _Status"
 #~ "Whether addresses should be formatted according to standard in their "
 #~ "destination country."
 
-#~ msgid "On LDAP Servers"
-#~ msgstr "On LDAP Servers"
-
 #~ msgid ""
 #~ "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 #~ "\"Calendar\" view."
@@ -27148,9 +29376,6 @@ msgstr "With _Status"
 #~ "memo list. \"1\" (Vertical View) places the preview pane next to the memo "
 #~ "list."
 
-#~ msgid "If \"true\", show the memo preview pane in the main window."
-#~ msgstr "If \"true\", show the memo preview pane in the main window."
-
 #~ msgid "Position of the task preview pane when oriented horizontally."
 #~ msgstr "Position of the task preview pane when oriented horizontally."
 
@@ -27287,9 +29512,6 @@ msgstr "With _Status"
 #~ msgid "Time the last reminder ran, in time_t."
 #~ msgstr "Time the last reminder ran, in time_t."
 
-#~ msgid "Calendars to run reminders for"
-#~ msgstr "Calendars to run reminders for"
-
 #~ msgid "Programs that are allowed to be run by reminders."
 #~ msgstr "Programs that are allowed to be run by reminders."
 
@@ -27306,13 +29528,6 @@ msgstr "With _Status"
 #~ "The URL template to use as a free/busy data fallback, %u is replaced by "
 #~ "the user part of the mail address and %d is replaced by the domain."
 
-#~ msgid ""
-#~ "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-#~ "debug messages."
-#~ msgstr ""
-#~ "This can have three possible values: 0 for errors, 1 for warnings, 2 for "
-#~ "debug messages."
-
 #~ msgid "On The Web"
 #~ msgstr "On The Web"
 
@@ -27380,15 +29595,9 @@ msgstr "With _Status"
 #~ msgid "Failed to parse server response."
 #~ msgstr "Failed to parse server response."
 
-#~ msgid "Events"
-#~ msgstr "Events"
-
 #~ msgid "User's calendars"
 #~ msgstr "User's calendars"
 
-#~ msgid "Searching for user's calendars..."
-#~ msgstr "Searching for user's calendars…"
-
 #~ msgid "Previous attempt failed: %s"
 #~ msgstr "Previous attempt failed: %s"
 
@@ -27401,9 +29610,6 @@ msgstr "With _Status"
 #~ msgid "Cannot create soup message for URL '%s'"
 #~ msgstr "Cannot create soup message for URL '%s'"
 
-#~ msgid "Searching folder content..."
-#~ msgstr "Searching folder contents…"
-
 #~ msgid "List of available calendars:"
 #~ msgstr "List of available calendars:"
 
@@ -27498,9 +29704,6 @@ msgstr "With _Status"
 #~ msgid "Imperial (Fahrenheit, inches, etc)"
 #~ msgstr "Imperial (Fahrenheit, inches, etc)"
 
-#~ msgid "Weather Calendars"
-#~ msgstr "Weather Calendars"
-
 #~ msgid "Add weather calendars to Evolution."
 #~ msgstr "Add weather calendars to Evolution."
 
@@ -27514,9 +29717,6 @@ msgstr "With _Status"
 #~ msgstr ""
 #~ "Automatically launch editor when key is pressed in the mail composer"
 
-#~ msgid "Server"
-#~ msgstr "Server"
-
 #~ msgid "Enter password for user %s to access list of subscribed calendars."
 #~ msgstr "Enter password for user %s to access list of subscribed calendars."
 
@@ -27600,9 +29800,6 @@ msgstr "With _Status"
 #~ msgid "Default window Y coordinate"
 #~ msgstr "Default window Y coordinate"
 
-#~ msgid "The default Y coordinate for the main window."
-#~ msgstr "The default Y coordinate for the main window."
-
 #~ msgid "Default window X coordinate"
 #~ msgstr "Default window X coordinate"
 
@@ -27925,9 +30122,6 @@ msgstr "With _Status"
 #~ msgid "Run Anjal in a window"
 #~ msgstr "Run Anjal in a window"
 
-#~ msgid "Make Anjal the default email client"
-#~ msgstr "Make Anjal the default e-mail client"
-
 #~ msgid "Anjal email client"
 #~ msgstr "Anjal e-mail client"
 
@@ -28255,9 +30449,6 @@ msgstr "With _Status"
 #~ msgid "Advanced send options"
 #~ msgstr "Advanced send options"
 
-#~ msgid "Users"
-#~ msgstr "Users"
-
 #~ msgid "Enter the users and set permissions"
 #~ msgstr "Enter the users and set permissions"
 
@@ -28303,9 +30494,6 @@ msgstr "With _Status"
 #~ msgid "Declined: "
 #~ msgstr "Declined: "
 
-#~ msgid "Completed: "
-#~ msgstr "Completed: "
-
 #~ msgid "Undelivered: "
 #~ msgstr "Undelivered: "
 
@@ -28387,9 +30575,6 @@ msgstr "With _Status"
 #~ msgid "SpamAssassin not found, code: %d"
 #~ msgstr "SpamAssassin not found, code: %d"
 
-#~ msgid "Failed to create pipe: %s"
-#~ msgstr "Failed to create pipe: %s"
-
 #~ msgid "Error after fork: %s"
 #~ msgstr "Error after fork: %s"
 
@@ -28602,18 +30787,12 @@ msgstr "With _Status"
 #~ msgid "Meeting Update Request"
 #~ msgstr "Meeting Update Request"
 
-#~ msgid "%s has replied to a meeting request."
-#~ msgstr "%s has replied to a meeting request."
-
 #~ msgid "Meeting Reply"
 #~ msgstr "Meeting Reply"
 
 #~ msgid "%s has canceled a meeting."
 #~ msgstr "%s has cancelled a meeting."
 
-#~ msgid "Meeting Cancelation"
-#~ msgstr "Meeting Cancellation"
-
 #~ msgid "%s has sent an unintelligible message."
 #~ msgstr "%s has sent an unintelligible message."
 
@@ -29024,9 +31203,6 @@ msgstr "With _Status"
 #~ msgid "Could not cancel"
 #~ msgstr "Could not cancel"
 
-#~ msgid "Authentication Required"
-#~ msgstr "Authentication Required"
-
 #~ msgid "TLS not Available"
 #~ msgstr "TLS not Available"
 
@@ -29207,9 +31383,6 @@ msgstr "With _Status"
 #~ msgid "Source Book"
 #~ msgstr "Source Book"
 
-#~ msgid "Target Book"
-#~ msgstr "Target Book"
-
 #~ msgid "Is New Contact"
 #~ msgstr "Is New Contact"
 
@@ -29351,9 +31524,6 @@ msgstr "With _Status"
 #~ msgid "Show Deleted"
 #~ msgstr "Show Deleted"
 
-#~ msgid "To Do"
-#~ msgstr "To Do"
-
 #~ msgid "Later"
 #~ msgstr "Later"
 
@@ -29465,9 +31635,6 @@ msgstr "With _Status"
 #~ msgid "Whether the preview pane is visible"
 #~ msgstr "Whether the preview pane is visible"
 
-#~ msgid "LDAP Servers"
-#~ msgstr "LDAP Servers"
-
 #~ msgid "Autocompletion Settings"
 #~ msgstr "Autocompletion Settings"
 
@@ -29731,9 +31898,6 @@ msgstr "With _Status"
 #~ msgid "Whether the shell window's task bar is visible"
 #~ msgstr "Whether the shell window's task bar is visible"
 
-#~ msgid "Whether the shell window's tool bar is visible"
-#~ msgstr "Whether the shell window's tool bar is visible"
-
 #~ msgid "UI Manager"
 #~ msgstr "UI Manager"
 
@@ -29819,9 +31983,6 @@ msgstr "With _Status"
 #~ msgid "_Remind Me Later"
 #~ msgstr "_Remind Me Later"
 
-#~ msgid "Collection"
-#~ msgstr "Collection"
-
 #~ msgid "Instance"
 #~ msgstr "Instance"
 
@@ -30693,9 +32854,6 @@ msgstr "With _Status"
 #~ msgid "Folders Size"
 #~ msgstr "Folders Size"
 
-#~ msgid "Exchange Settings"
-#~ msgstr "Exchange Settings"
-
 #~ msgid "_OWA URL:"
 #~ msgstr "_OWA URL:"
 
@@ -30806,9 +32964,6 @@ msgstr "With _Status"
 #~ msgid "Error reading delegates list."
 #~ msgstr "Error reading delegates list."
 
-#~ msgid "C_alendar:"
-#~ msgstr "C_alendar:"
-
 #~ msgid "Delegates"
 #~ msgstr "Delegates"
 
@@ -31549,9 +33704,6 @@ msgstr "With _Status"
 #~ msgid "Memo_s"
 #~ msgstr "Memo_s"
 
-#~ msgid "_Calendars"
-#~ msgstr "_Calendars"
-
 #~ msgid "Evolution Calendar alarm notification service"
 #~ msgstr "Evolution Calendar alarm notification service"
 
@@ -31687,9 +33839,6 @@ msgstr "With _Status"
 #~ msgid "New task"
 #~ msgstr "New task"
 
-#~ msgid "New assigned task"
-#~ msgstr "New assigned task"
-
 #~ msgid "New task list"
 #~ msgstr "New task list"
 
@@ -31697,9 +33846,6 @@ msgstr "With _Status"
 #~ msgid "Tas_k list"
 #~ msgstr "Tas_k list"
 
-#~ msgid "Component"
-#~ msgstr "Component"
-
 #~ msgid ""
 #~ "A label having the same tag already exists on the server. Please rename "
 #~ "your label."
@@ -32065,9 +34211,6 @@ msgstr "With _Status"
 #~ msgid "Select all and only the messages that are not currently selected"
 #~ msgstr "Select all and only the messages that are not currently selected"
 
-#~ msgid "Not Junk"
-#~ msgstr "Not Junk"
-
 #~ msgid "Paste messages from the clipboard"
 #~ msgstr "Paste messages from the clipboard"
 
@@ -32935,9 +35078,6 @@ msgstr "With _Status"
 #~ msgid "Header/Footer"
 #~ msgstr "Header/Footer"
 
-#~ msgid "Headings"
-#~ msgstr "Headings"
-
 #~ msgid "Headings for each letter"
 #~ msgstr "Headings for each letter"
 
@@ -33238,9 +35378,6 @@ msgstr "With _Status"
 #~ "A plugin which allows the creation of meetings from the contents of a "
 #~ "mail message."
 
-#~ msgid "Con_vert to Meeting"
-#~ msgstr "Con_vert to Meeting"
-
 #~ msgid "Mail to meeting"
 #~ msgstr "Mail to meeting"
 
@@ -33526,9 +35663,6 @@ msgstr "With _Status"
 #~ msgid "A plugin that handles the Startup wizard."
 #~ msgstr "A plugin that handles the Startup wizard."
 
-#~ msgid "Startup wizard"
-#~ msgstr "Startup wizard"
-
 #~ msgid "A string description of the current printer settings."
 #~ msgstr "A string description of the current printer settings."
 
@@ -33670,9 +35804,6 @@ msgstr "With _Status"
 #~ msgid "Send the mail in HTML format"
 #~ msgstr "Send the mail in HTML format"
 
-#~ msgid "_Open..."
-#~ msgstr "_Open..."
-
 #~ msgid "C_lose"
 #~ msgstr "C_lose"
 
@@ -33804,9 +35935,6 @@ msgstr "With _Status"
 #~ msgid "Memo sort"
 #~ msgstr "Memo sort"
 
-#~ msgid "Enter the password for %s"
-#~ msgstr "Enter the password for %s"
-
 #~ msgid "Journal information"
 #~ msgstr "Journal information"