[evolution] Updated British English translation



commit b83f3a49f4487143f212d810fe5852ca2a29209d
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Mon Aug 29 23:34:17 2016 +0000

    Updated British English translation

 po/en_GB.po |20784 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 13036 insertions(+), 7748 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index a8a15cb..49dc8a6 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,16 +2,18 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Robert Brady <rwb197 zepler org>, 2000.
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
-# Bruce Cowan <bruce bcowan me uk>, 2009, 2010, 2011, 2012, 2013.
 # Philip Withnall <philip tecnocode co uk>, 2010.
 # Chris Leonard <cjlhomeaddress gmail com>, 2012.
-#: ../shell/main.c:573
+# Bruce Cowan <bruce bcowan me uk>, 2009, 2010, 2011, 2012, 2013, 2016.
+#
+#: ../shell/main.c:522
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-16 13:21+0000\n"
-"PO-Revision-Date: 2013-03-16 13:28+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-08-15 07:31+0000\n"
+"PO-Revision-Date: 2016-08-30 00:29+0100\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
@@ -19,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Gtranslator 2.91.7\n"
 "X-Project-Style: gnome\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
@@ -87,8 +89,8 @@ msgstr "Delete address book '{0}'?"
 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:66
+#: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
+#: ../mail/mail.error.xml.h:69
 msgid "Do _Not Delete"
 msgstr "Do _Not Delete"
 
@@ -105,7 +107,7 @@ msgstr ""
 "server. Are you sure you want to proceed?"
 
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 msgid "_Delete From Server"
 msgstr "_Delete From Server"
 
@@ -114,18 +116,24 @@ msgid "Category editor not available."
 msgstr "Category editor not available."
 
 #: ../addressbook/addressbook.error.xml.h:18
-msgid "Unable to open address book"
-msgstr "Unable to open address book"
+#| msgid "Unable to open address book"
+msgid "Unable to open address book '{0}'"
+msgstr "Unable to open address book '{0}'"
 
 #: ../addressbook/addressbook.error.xml.h:19
 msgid "Unable to perform search."
 msgstr "Unable to perform search."
 
 #: ../addressbook/addressbook.error.xml.h:20
+#| msgid "Delete address book '{0}'?"
+msgid "Failed to refresh address book '{0}'"
+msgstr "Failed to refresh address book '{0}'"
+
+#: ../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:21
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
@@ -133,15 +141,15 @@ msgstr ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "_Discard"
 msgstr "_Discard"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Cannot move contact."
 msgstr "Cannot move contact."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../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?"
@@ -149,37 +157,37 @@ 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:25
+#: ../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:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "_Resize"
 msgstr "_Resize"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "_Use as it is"
 msgstr "_Use as it is"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "_Do not save"
 msgstr "_Do not save"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "Unable to save {0}."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../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:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Address '{0}' already exists."
 msgstr "Address '{0}' already exists."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../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?"
@@ -187,16 +195,27 @@ 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:33 ../e-util/e-table-config.ui.h:6
-#: ../e-util/e-name-selector-dialog.c:977 ../mail/em-vfolder-editor-rule.c:397
+#: ../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
 msgid "_Add"
 msgstr "_Add"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../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:35
+#: ../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?"
@@ -204,19 +223,19 @@ 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:36
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Skip duplicates"
 msgstr "Skip duplicates"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "Add with duplicates"
 msgstr "Add with duplicates"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "List '{0}' is already in this contact list."
 msgstr "List '{0}' is already in this contact list."
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../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?"
@@ -224,21 +243,21 @@ msgstr ""
 "A contact list named '{0}' is already in this contact list. Would you like "
 "to add it anyway?"
 
-#: ../addressbook/addressbook.error.xml.h:40
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1237
+#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
 msgid "Failed to delete contact"
 msgstr "Failed to delete contact"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../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:42
+#: ../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:44
+#: ../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."
@@ -246,10 +265,23 @@ msgstr ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
 
+#: ../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
+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."
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:635
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:657
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2949
+#: ../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
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
@@ -271,9 +303,6 @@ msgid "_Where:"
 msgstr "_Where:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#: ../calendar/gui/dialogs/event-page.ui.h:16
-#: ../calendar/gui/dialogs/memo-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Ca_tegories..."
 msgstr "Ca_tegories…"
 
@@ -282,84 +311,82 @@ msgid "Full _Name..."
 msgstr "Full _Name…"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-msgid "_Wants to receive HTML mail"
-msgstr "_Wants to receive HTML mail"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:396
+#: ../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
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:971
-#: ../smime/lib/e-asn1-object.c:395
 msgid "Email"
 msgstr "E-mail"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+msgid "_Wants to receive HTML mail"
+msgstr "_Wants to receive HTML mail"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Telephone"
 msgstr "Telephone"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#| msgid "Address"
+msgid "SIP Address"
+msgstr "SIP Address"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Instant Messaging"
 msgstr "Instant Messaging"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:1001
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/importers/evolution-vcard-importer.c:983
 msgid "Contact"
 msgstr "Contact"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "_Home Page:"
 msgstr "_Home Page:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../calendar/gui/dialogs/event-page.c:709
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1877
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../calendar/gui/e-comp-editor-event.c:729
+#: ../modules/itip-formatter/itip-view.c:2099
 msgid "_Calendar:"
 msgstr "_Calendar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "_Free/Busy:"
 msgstr "_Free/Busy:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "_Video Chat:"
 msgstr "_Video Chat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 msgid "Home Page:"
 msgstr "Home Page:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:97
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../modules/cal-config-google/e-cal-config-google.c:94
 msgid "Calendar:"
 msgstr "Calendar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Free/Busy:"
 msgstr "Free/Busy:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Video Chat:"
 msgstr "Video Chat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "_Blog:"
 msgstr "_Blog:"
 
 #. Translators: an accessibility name
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Blog:"
 msgstr "Blog:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "Web Addresses"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-msgid "Web addresses"
-msgstr "Web addresses"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 msgid "_Profession:"
 msgstr "_Profession:"
@@ -378,21 +405,21 @@ msgid "_Department:"
 msgstr "_Department:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+msgid "_Office:"
+msgstr "_Office:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Manager:"
 msgstr "_Manager:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Assistant:"
 msgstr "_Assistant:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "Job"
 msgstr "Job"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-msgid "_Office:"
-msgstr "_Office:"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Spouse:"
 msgstr "_Spouse:"
@@ -406,24 +433,21 @@ msgid "_Anniversary:"
 msgstr "_Anniversary:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
-#: ../calendar/gui/e-calendar-view.c:2193
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:875
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
+#: ../calendar/gui/e-calendar-view.c:2044
 msgid "Anniversary"
 msgstr "Anniversary"
 
-#. XXX Allow the category icons to be referenced as named
-#. *     icons, since GtkAction does not support GdkPixbufs.
-#. Get the icon file for some default category.  Doesn't matter
-#. * which, so long as it has an icon.  We're just interested in
-#. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
-#: ../calendar/gui/e-calendar-view.c:2192 ../shell/main.c:127
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:874
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
+#: ../calendar/gui/e-calendar-view.c:2043
 msgid "Birthday"
 msgstr "Birthday"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
 
@@ -452,31 +476,30 @@ msgid "_PO Box:"
 msgstr "_PO Box:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../composer/e-composer-from-header.c:123
 msgid "_Address:"
 msgstr "_Address:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/e-contact-map.c:308
-#: ../addressbook/gui/widgets/eab-contact-display.c:389
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:356
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/e-contact-map.c:369
 msgid "Home"
 msgstr "Home"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/e-contact-map.c:316
-#: ../addressbook/gui/widgets/eab-contact-display.c:386
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:68
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
+#: ../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
 msgid "Work"
 msgstr "Work"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:70
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:379
-#: ../calendar/gui/e-cal-model.c:3466
+#: ../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
 msgid "Other"
 msgstr "Other"
 
@@ -485,82 +508,307 @@ 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
 msgid "Notes"
 msgstr "Notes"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:609
-msgid "AIM"
-msgstr "AIM"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
+#| msgid "_Add "
+msgid "Add _PGP"
+msgstr "Add _PGP"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:612
-msgid "Jabber"
-msgstr "Jabber"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+msgid "Add _X.509"
+msgstr "Add _X.509"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:613
-msgid "MSN"
-msgstr "MSN"
+#: ../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
+msgid "_Remove"
+msgstr "_Remove"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:611
-msgid "ICQ"
-msgstr "ICQ"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
+msgid "Load P_GP"
+msgstr "Load P_GP"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+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:2106
+#: ../composer/e-composer-actions.c:230 ../composer/e-composer-actions.c:347
+#: ../e-util/e-attachment-store.c:809
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3846
+#: ../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/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:610
-msgid "GroupWise"
-msgstr "GroupWise"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+#: ../modules/addressbook/e-book-shell-backend.c:314
+msgid "Certificates"
+msgstr "Certificates"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
-msgid "Skype"
-msgstr "Skype"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
+#: ../calendar/gui/e-comp-editor.c:2003 ../calendar/gui/e-comp-editor.c:2075
+#: ../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/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
-msgid "Twitter"
-msgstr "Twitter"
+#: ../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"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:227
-#: ../addressbook/gui/widgets/eab-gui-util.c:493
+#. 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:664
+#: ../e-util/e-attachment-store.c:808 ../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:299 ../e-util/e-html-editor-actions.c:390
+#: ../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:3845
+#: ../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"
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
+#| msgid "Telephone"
+msgid "Show Telephone"
+msgstr "Show Telephone"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
+#| msgid "_To This Address"
+msgid "Show SIP Address"
+msgstr "Show SIP Address"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
+#| msgid "Instant Messaging"
+msgid "Show Instant Messaging"
+msgstr "Show Instant Messaging"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
+#| msgid "Web Addresses"
+msgid "Show Web Addresses"
+msgstr "Show Web Addresses"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:66
+#| msgid "Show the second time zone"
+msgid "Show Job section"
+msgstr "Show Job section"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:67
+#| msgid "Miscellaneous"
+msgid "Show Miscellaneous"
+msgstr "Show Miscellaneous"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:68
+#| msgid "Mailing Address"
+msgid "Show Home Mailing Address"
+msgstr "Show Home Mailing Address"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:69
+#| msgid "Mailing Address"
+msgid "Show Work Mailing Address"
+msgstr "Show Work Mailing Address"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:70
+#| msgid "Mailing Address"
+msgid "Show Other Mailing Address"
+msgstr "Show Other Mailing Address"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:71
+#| msgid "Show %s"
+msgid "Show Notes"
+msgstr "Show Notes"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:72
+#| msgid "Certificates"
+msgid "Show Certificates"
+msgstr "Show Certificates"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:262
+#: ../calendar/gui/e-comp-editor.c:2038 ../e-util/e-html-editor-actions.c:875
+msgid "_Undo"
+msgstr "_Undo"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../calendar/gui/e-comp-editor.c:2040 ../e-util/e-focus-tracker.c:122
+msgid "Undo"
+msgstr "Undo"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:269
+#: ../calendar/gui/e-comp-editor.c:2045 ../e-util/e-html-editor-actions.c:861
+msgid "_Redo"
+msgstr "_Redo"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
+#: ../calendar/gui/e-comp-editor.c:2047 ../e-util/e-focus-tracker.c:138
+msgid "Redo"
+msgstr "Redo"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
+#: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:323
 msgid "Error modifying contact"
 msgstr "Error modifying contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:343
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:651
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2943
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:743
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Contact Editor — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3476
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3240
+#| msgid "Certificates"
+msgid "X.509 certificates"
+msgstr "X.509 certificates"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
+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
+msgid "All files"
+msgstr "All files"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#| msgid "OpenPGP _Key ID:"
+msgid "Open PGP key"
+msgstr "Open PGP key"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#| msgid "Select certificate"
+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:662 ../e-util/e-category-editor.c:146
+#: ../e-util/e-html-editor-actions.c:300 ../e-util/e-html-editor-actions.c:391
+#: ../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
+msgid "_Open"
+msgstr "_Open"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3291
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3522
+#| msgid "Cannot attach file %s: not a regular file"
+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
+#, c-format
+#| msgid "Failed to import certificate"
+msgid "Failed to load certificate: %s"
+msgstr "Failed to load certificate: %s"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+msgctxt "cert-kind"
+msgid "X.509"
+msgstr "X.509"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+msgctxt "cert-kind"
+msgid "PGP"
+msgstr "PGP"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+msgid "Save PGP key"
+msgstr "Save PGP key"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+#| msgid "Select certificate"
+msgid "Save X.509 certificate"
+msgstr "Save X.509 certificate"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3534
+#, c-format
+#| msgid "Failed to import certificate"
+msgid "Failed to save certificate: %s"
+msgstr "Failed to save certificate: %s"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4318
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3477
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4323
 msgid "_No image"
 msgstr "_No image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3810
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4672
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -568,48 +816,75 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3816
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4678
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3824
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4686
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "'%s' cannot be a future date"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3832
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4694
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3845
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3859
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4707
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4721
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' is empty"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3874
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4736
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
+#: ../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:258 ../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
+#| msgid "OK"
+msgid "_OK"
+msgstr "_OK"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:451
 msgid "Contact Quick-Add"
 msgstr "Contact Quick-Add"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:457
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
 msgid "_Edit Full"
 msgstr "_Edit Full"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:505
 msgid "_Full name"
 msgstr "_Full name"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:523
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:518
 msgid "E_mail"
 msgstr "E_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:536
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:531
 msgid "_Select Address Book"
 msgstr "_Select Address Book"
 
@@ -662,29 +937,29 @@ msgstr "Esq."
 msgid "Full Name"
 msgstr "Full Name"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_First:"
 msgstr "_First:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgctxt "FullName"
 msgid "_Title:"
 msgstr "_Title:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Middle:"
 msgstr "_Middle:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:18
 msgid "_Last:"
 msgstr "_Last:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
+#: ../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:818
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
 msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
@@ -708,177 +983,531 @@ msgstr "_Hide addresses when sending mail to this list"
 msgid "Add an email to the List"
 msgstr "Add an email to the List"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 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:9
+#: ../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:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
 msgid "_Select..."
 msgstr "_Select…"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:941
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:13
+#: ../e-util/filter.ui.h:19
+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
+#| msgid "_Update"
+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
+#| msgid "Move _Down"
+msgid "_Down"
+msgstr "_Down"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
+#: ../e-util/filter.ui.h:22
+#| msgid "Bottom:"
+msgid "_Bottom"
+msgstr "_Bottom"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:942
 msgid "Contact List Members"
 msgstr "Contact List Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1475
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1487
 msgid "_Members"
 msgstr "_Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1594
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1627
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1609
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1647
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1624
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1667
 msgid "Error removing list"
 msgstr "Error removing list"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
-msgid "Duplicate Contact Detected"
-msgstr "Duplicate Contact Detected"
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../modules/addressbook/e-book-shell-view-actions.c:1221
+msgid "Name contains"
+msgstr "Name contains"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
-msgid ""
-"The name or email of this contact already exists in this folder. Would you "
-"like to save the changes anyway?"
-msgstr ""
-"The name or e-mail of this contact already exists in this folder. Would you "
-"like to save the changes anyway?"
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../modules/addressbook/e-book-shell-view-actions.c:1214
+msgid "Email begins with"
+msgstr "E-mail begins with"
 
-#. Translators: Heading of the contact which has same name or email address in this folder already.
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
-msgid "Conflicting Contact:"
-msgstr "Conflicting Contact:"
+#: ../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
+msgid "Any field contains"
+msgstr "Any field contains"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
-msgid "Changed Contact:"
-msgstr "Changed Contact:"
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
+#: ../addressbook/gui/widgets/ea-minicard-view.c:225
+msgid "evolution address book"
+msgstr "evolution address book"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:149
+msgid "Copy _Email Address"
+msgstr "Copy _E-mail Address"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:151
+#: ../e-util/e-web-view.c:359
+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
+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
+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:1289
+#, c-format
+msgid "Click to mail %s"
+msgstr "Click to mail %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
+msgid "Open map"
+msgstr "Open map"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
+#| msgid "VIP"
+msgid "SIP"
+msgstr "SIP"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+msgid "List Members:"
+msgstr "List Members:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:342
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Nickname"
+msgstr "Nickname"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:762
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Company"
+msgstr "Company"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
+msgid "Department"
+msgstr "Department"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "Office"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
+msgid "Profession"
+msgstr "Profession"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
+msgid "Position"
+msgstr "Position"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
+#: ../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
+msgid "Assistant"
+msgstr "Assistant"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
+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
+msgid "Free/Busy"
+msgstr "Free/Busy"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
+msgid "Phone"
+msgstr "Phone"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:830
+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
+msgid "Address"
+msgstr "Address"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
+msgid "Home Page"
+msgstr "Home Page"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
+msgid "Web Log"
+msgstr "Web Log"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:871
+#: ../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
+msgid "Spouse"
+msgstr "Spouse"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:886
+msgid "Personal"
+msgstr "Personal"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:931
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Note"
+msgstr "Note"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
+msgid "List Members"
+msgstr "List Members"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
+msgid "Job Title"
+msgstr "Job Title"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1189
+msgid "Home page"
+msgstr "Home page"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1199
+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
+msgid "Cancelled"
+msgstr "Cancelled"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:457
+msgid "Merge Contact"
+msgstr "Merge Contact"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:475
+#: ../addressbook/gui/widgets/eab-contact-merging.c:724
 msgid "_Merge"
 msgstr "_Merge"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
+#: ../addressbook/gui/widgets/eab-contact-merging.c:713
+msgid "Duplicate Contact Detected"
+msgstr "Duplicate Contact Detected"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:771
+#| msgid ""
+#| "The name or email of this contact already exists in this folder. Would "
+#| "you like to save the changes anyway?"
 msgid ""
 "The name or email address of this contact already exists\n"
-"in this folder.  Would you like to add it anyway?"
+"in this folder. Would you like to save the changes anyway?"
 msgstr ""
 "The name or e-mail address of this contact already exists\n"
-"in this folder.  Would you like to add it anyway?"
+"in this folder. Would you like to save the changes anyway?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:5
-msgid "Original Contact:"
-msgstr "Original Contact:"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:774
+#| msgid ""
+#| "The name or email address of this contact already exists\n"
+#| "in this folder.  Would you like to add it anyway?"
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder. Would you like to add it anyway?"
+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/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/widgets/eab-contact-merging.c:789
+msgid "Changed Contact:"
+msgstr "Changed Contact:"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:791
 msgid "New Contact:"
 msgstr "New Contact:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:324
-msgid "Merge Contact"
-msgstr "Merge Contact"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:830
+msgid "Conflicting Contact:"
+msgstr "Conflicting Contact:"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1104
-msgid "Name contains"
-msgstr "Name contains"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:832
+#| msgid "Contact: "
+msgid "Old Contact:"
+msgstr "Old Contact:"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1097
-msgid "Email begins with"
-msgstr "E-mail begins with"
+#: ../addressbook/gui/widgets/eab-gui-util.c:121
+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 "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"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 "
+"load the address book once in online mode to download its contents."
 
-#: ../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:1090
-#: ../modules/calendar/e-cal-shell-view-actions.c:1795
-#: ../modules/calendar/e-memo-shell-view-actions.c:812
-#: ../modules/calendar/e-task-shell-view-actions.c:1011
-msgid "Any field contains"
-msgstr "Any field contains"
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#, c-format
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+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
+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."
+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
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+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
+msgid "Detailed error message:"
+msgstr "Detailed error message:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"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
+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"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"configured for this address book.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"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
+#, 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
+#, 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
+#, 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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
+msgid "Select Address Book"
+msgstr "Select Address Book"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:398
+msgid "list"
+msgstr "list"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
+msgid "Move contact to"
+msgstr "Move contact to"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
+msgid "Copy contact to"
+msgstr "Copy contact to"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:592
+msgid "Move contacts to"
+msgstr "Move contacts to"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
+msgid "Copy contacts to"
+msgstr "Copy contacts to"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "No contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:167
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contact"
 msgstr[1] "%d contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:367
+#: ../addressbook/gui/widgets/e-addressbook-model.c:372
 msgid "Error getting book view"
 msgstr "Error getting book view"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:814
+#: ../addressbook/gui/widgets/e-addressbook-model.c:819
 msgid "Search Interrupted"
 msgstr "Search Interrupted"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:161
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:221
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../addressbook/gui/widgets/e-addressbook-view.c:682
 msgid "Cut selected contacts to the clipboard"
 msgstr "Cut selected contacts to the clipboard"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:688
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copy selected contacts to the clipboard"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:646
+#: ../addressbook/gui/widgets/e-addressbook-view.c:694
 msgid "Paste contacts from the clipboard"
 msgstr "Paste contacts from the clipboard"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:652
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../addressbook/gui/widgets/e-addressbook-view.c:700
+#: ../modules/addressbook/e-book-shell-view-actions.c:1017
 msgid "Delete selected contacts"
 msgstr "Delete selected contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:658
+#: ../addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Select all visible contacts"
 msgstr "Select all visible contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1333
 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:1289
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1337
 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:1293
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1341
 #, 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:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1347
 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:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1351
 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:1307
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1355
 #, 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:1996 ../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:1737
+#: ../shell/e-shell-window-actions.c:813
+#: ../smime/gui/certificate-manager.c:1674 ../smime/gui/smime-ui.ui.h:10
+msgid "_Delete"
+msgstr "_Delete"
+
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1463
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -893,11 +1522,11 @@ 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:1471
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1521
 msgid "_Don't Display"
 msgstr "_Don't Display"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1522
 msgid "Display _All Contacts"
 msgstr "Display _All Contacts"
 
@@ -913,11 +1542,6 @@ msgstr "Given Name"
 msgid "Family Name"
 msgstr "Family Name"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:608
-msgid "Nickname"
-msgstr "Nickname"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "E-mail 2"
@@ -970,11 +1594,6 @@ msgstr "Home Fax"
 msgid "ISDN Phone"
 msgstr "ISDN Phone"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:700
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Other Phone"
@@ -1009,39 +1628,20 @@ msgstr "Telex"
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:663
-msgid "Company"
-msgstr "Company"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "Unit"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Office"
-msgstr "Office"
-
 #: ../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:663
+#: ../calendar/gui/e-meeting-list-view.c:660
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Role"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:667
-msgid "Manager"
-msgstr "Manager"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:668
-msgid "Assistant"
-msgstr "Assistant"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Website"
@@ -1051,28 +1651,69 @@ msgid "Journal"
 msgstr "Journal"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../calendar/gui/dialogs/event-page.ui.h:20
-#: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:89
+#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-task-table.etspec.h:12 ../e-util/e-categories-dialog.c:87
 msgid "Categories"
 msgstr "Categories"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
-msgid "Spouse"
-msgstr "Spouse"
+#: ../addressbook/gui/widgets/ea-minicard.c:33
+msgid "Open"
+msgstr "Open"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:738
-msgid "Note"
-msgstr "Note"
+#: ../addressbook/gui/widgets/ea-minicard.c:159
+msgid "Contact List: "
+msgstr "Contact List: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:160
+msgid "Contact: "
+msgstr "Contact: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:182
+msgid "evolution minicard"
+msgstr "evolution minicard"
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:364
+#: ../addressbook/gui/widgets/ea-minicard-view.c:35
+msgid "New Contact"
+msgstr "New Contact"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact List"
+msgstr "New Contact List"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:208
+#, 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
 msgid "Contacts Map"
 msgstr "Contacts Map"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#. Zoom-in button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:412
+#| msgid "_Zoom In"
+msgid "Zoom _In"
+msgstr "Zoom _In"
+
+#. Zoom-out button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:420
+#: ../mail/e-mail-reader.c:2424
+msgid "Zoom _Out"
+msgstr "Zoom _Out"
+
+#. Search button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:450
+#: ../e-util/e-html-editor-actions.c:1834
+#: ../e-util/e-html-editor-find-dialog.c:252
+#: ../shell/e-shell-window-actions.c:890
+#| msgid "_Find Now"
+msgid "_Find"
+msgstr "_Find"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -1082,7 +1723,7 @@ msgstr ""
 "\n"
 "Searching for the Contacts…"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:194
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1096,7 +1737,7 @@ msgstr ""
 "\n"
 "or double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:197
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1110,7 +1751,7 @@ msgstr ""
 "\n"
 "Double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:201
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1120,7 +1761,7 @@ msgstr ""
 "\n"
 "Search for the Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:203
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1130,405 +1771,234 @@ msgstr ""
 "\n"
 "There are no items to show in this view."
 
-#: ../addressbook/gui/widgets/e-minicard.c:93
-msgid "Work Email"
-msgstr "Work E-mail"
-
-#: ../addressbook/gui/widgets/e-minicard.c:94
-msgid "Home Email"
-msgstr "Home E-mail"
-
-#: ../addressbook/gui/widgets/e-minicard.c:95
-#: ../addressbook/gui/widgets/e-minicard.c:828
-msgid "Other Email"
-msgstr "Other E-mail"
-
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:194
-msgid "evolution address book"
-msgstr "evolution address book"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact"
-msgstr "New Contact"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:37
-msgid "New Contact List"
-msgstr "New Contact List"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:177
-#, 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/ea-minicard.c:34
-msgid "Open"
-msgstr "Open"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:160
-msgid "Contact List: "
-msgstr "Contact List: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:161
-msgid "Contact: "
-msgstr "Contact: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:188
-msgid "evolution minicard"
-msgstr "evolution minicard"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:152
-msgid "Copy _Email Address"
-msgstr "Copy _E-mail Address"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:154
-#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:295
-msgid "Copy the email address to the clipboard"
-msgstr "Copy the e-mail address to the clipboard"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:159
-#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:300
-msgid "_Send New Message To..."
-msgstr "_Send New Message To…"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:161
-#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:302
-msgid "Send a mail message to this address"
-msgstr "Send a mail message to this address"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:323
-#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:1084
-#, c-format
-msgid "Click to mail %s"
-msgstr "Click to mail %s"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:148
-msgid "Open map"
-msgstr "Open map"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:544
-msgid "List Members:"
-msgstr "List Members:"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:664
-msgid "Department"
-msgstr "Department"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:665
-msgid "Profession"
-msgstr "Profession"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
-msgid "Position"
-msgstr "Position"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:669
-msgid "Video Chat"
-msgstr "Video Chat"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
-#: ../e-util/e-send-options.c:546
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:548
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "Calendar"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
-#: ../calendar/gui/dialogs/event-editor.c:122
-#: ../calendar/gui/dialogs/event-editor.c:349
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Free/Busy"
-msgstr "Free/Busy"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:699
-msgid "Phone"
-msgstr "Phone"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
-msgid "Fax"
-msgstr "Fax"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:701
-msgid "Address"
-msgstr "Address"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:697
-msgid "Home Page"
-msgstr "Home Page"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:698
-msgid "Web Log"
-msgstr "Web Log"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:714
-msgid "Personal"
-msgstr "Personal"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:935
-msgid "List Members"
-msgstr "List Members"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:956
-msgid "Job Title"
-msgstr "Job Title"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:997
-msgid "Home page"
-msgstr "Home page"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1007
-msgid "Blog"
-msgstr "Blog"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
-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 "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"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 "
-"load the address book once in online mode to download its contents."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
-#, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
-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:150
-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."
-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:159
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
-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:167
-msgid "Detailed error message:"
-msgstr "Detailed error message:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:204
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
-msgstr ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"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:211
-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"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this address book."
-msgstr ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"configured for this address book.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"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:219
-#, 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:224
-#, 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:230
-#: ../addressbook/gui/widgets/eab-gui-util.c:236
-#, 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:258
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:309
-msgid "Select Address Book"
-msgstr "Select Address Book"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:391
-msgid "list"
-msgstr "list"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:581
-msgid "Move contact to"
-msgstr "Move contact to"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:583
-msgid "Copy contact to"
-msgstr "Copy contact to"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:586
-msgid "Move contacts to"
-msgstr "Move contacts to"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:588
-msgid "Copy contacts to"
-msgstr "Copy contacts to"
-
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
-msgid "Card View"
-msgstr "Card View"
-
-#: ../addressbook/importers/evolution-csv-importer.c:744
-#: ../addressbook/importers/evolution-ldif-importer.c:543
-#: ../addressbook/importers/evolution-vcard-importer.c:279
-#: ../calendar/importers/icalendar-importer.c:440
-#: ../calendar/importers/icalendar-importer.c:935
-#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
+#: ../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
 msgid "Importing..."
 msgstr "Importing…"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1079
+#: ../addressbook/importers/evolution-csv-importer.c:929
+#| msgid "Can not open file"
+msgid "Can't open .csv file"
+msgstr "Can't open .csv file"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1098
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlook Contacts CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1080
+#: ../addressbook/importers/evolution-csv-importer.c:1099
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlook Contacts CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1088
+#: ../addressbook/importers/evolution-csv-importer.c:1107
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozilla Contacts CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1089
+#: ../addressbook/importers/evolution-csv-importer.c:1108
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilla Contacts CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1097
+#: ../addressbook/importers/evolution-csv-importer.c:1116
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolution Contacts CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1098
+#: ../addressbook/importers/evolution-csv-importer.c:1117
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolution Contacts CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:801
+#: ../addressbook/importers/evolution-ldif-importer.c:719
+#| msgid "Can not open file"
+msgid "Can't open .ldif file"
+msgstr "Can't open .ldif file"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:821
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:802
+#: ../addressbook/importers/evolution-ldif-importer.c:822
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF importer"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:664
+#: ../addressbook/importers/evolution-vcard-importer.c:646
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:665
+#: ../addressbook/importers/evolution-vcard-importer.c:647
 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:764
+#: ../addressbook/printing/e-contact-print.c:874
 #, c-format
 msgid "Page %d"
 msgstr "Page %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
-msgid "Specify the output file instead of standard output"
-msgstr "Specify the output file instead of standard output"
+#: ../addressbook/util/eab-book-util.c:36
+#| msgid "Work Email"
+msgctxt "addressbook-label"
+msgid "Work Email"
+msgstr "Work E-mail"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
-msgid "OUTPUTFILE"
-msgstr "OUTPUTFILE"
+#: ../addressbook/util/eab-book-util.c:37
+#| msgid "Home Email"
+msgctxt "addressbook-label"
+msgid "Home Email"
+msgstr "Home E-mail"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid "List local address book folders"
-msgstr "List local address book folders"
+#: ../addressbook/util/eab-book-util.c:38
+#| msgid "Other Email"
+msgctxt "addressbook-label"
+msgid "Other Email"
+msgstr "Other E-mail"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
-msgid "Show cards as vcard or csv file"
-msgstr "Show cards as vcard or csv file"
+#: ../addressbook/util/eab-book-util.c:44
+#| msgid "Work"
+msgctxt "addressbook-label"
+msgid "Work SIP"
+msgstr "Work SIP"
+
+#: ../addressbook/util/eab-book-util.c:45
+#| msgid "Home Page"
+msgctxt "addressbook-label"
+msgid "Home SIP"
+msgstr "Home SIP"
+
+#: ../addressbook/util/eab-book-util.c:46
+#| msgid "Other"
+msgctxt "addressbook-label"
+msgid "Other SIP"
+msgstr "Other SIP"
+
+#: ../addressbook/util/eab-book-util.c:74
+#| msgid "AIM"
+msgctxt "addressbook-label"
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
-msgid "[vcard|csv]"
-msgstr "[vcard|csv]"
+#: ../addressbook/util/eab-book-util.c:75
+#| msgid "Jabber"
+msgctxt "addressbook-label"
+msgid "Jabber"
+msgstr "Jabber"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:136
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-"Command line arguments error, please use --help option to see the usage."
+#: ../addressbook/util/eab-book-util.c:76
+#| msgid "Yahoo"
+msgctxt "addressbook-label"
+msgid "Yahoo"
+msgstr "Yahoo"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:150
-msgid "Only support csv or vcard format."
-msgstr "Only support csv or vcard format."
+#: ../addressbook/util/eab-book-util.c:77
+#| msgid "Gadu-Gadu"
+msgctxt "addressbook-label"
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:181
-msgid "Unhandled error"
-msgstr "Unhandled error"
+#: ../addressbook/util/eab-book-util.c:78
+#| msgid "MSN"
+msgctxt "addressbook-label"
+msgid "MSN"
+msgstr "MSN"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:625
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:46
-msgid "Can not open file"
-msgstr "Can not open file"
+#: ../addressbook/util/eab-book-util.c:79
+#| msgid "ICQ"
+msgctxt "addressbook-label"
+msgid "ICQ"
+msgstr "ICQ"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:76
-#, c-format
-msgid "Failed to open client '%s': %s"
-msgstr "Failed to open client '%s': %s"
+#: ../addressbook/util/eab-book-util.c:80
+#| msgid "GroupWise"
+msgctxt "addressbook-label"
+msgid "GroupWise"
+msgstr "GroupWise"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:106
+#: ../addressbook/util/eab-book-util.c:81
+#| msgid "Skype"
+msgctxt "addressbook-label"
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/util/eab-book-util.c:82
+#| msgid "Twitter"
+msgctxt "addressbook-label"
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/util/eab-book-util.c:83
+#| msgid "Google"
+msgctxt "addressbook-label"
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#. To Translators:
+#. * 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
+#| msgid "Email"
+msgctxt "addressbook-label"
+msgid "Email"
+msgstr "E-mail"
+
+#. To Translators:
+#. * if a SIP address type is not one of the predefined types,
+#. * 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
+#| msgid "VIP"
+msgctxt "addressbook-label"
+msgid "SIP"
+msgstr "SIP"
+
+#. To Translators:
+#. * if an IM address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * IM=Instant Messaging
+#.
+#: ../addressbook/util/eab-book-util.c:216
+#| msgid "AIM"
+msgctxt "addressbook-label"
+msgid "IM"
+msgstr "IM"
+
+#. To Translators:
+#. * 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
+#| msgid "Phone"
+msgctxt "addressbook-label"
+msgid "Phone"
+msgstr "Phone"
+
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:119
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:118
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#. 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/alarm-notify/alarm-notify-dialog.c:132
-#: ../calendar/gui/dialogs/recurrence-page.c:1204
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:131
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:329
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:358
 msgid "Start time"
 msgstr "Start time"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
+#: ../calendar/alarm-notify/alarm-queue.c:1947
 msgid "Appointments"
 msgstr "Appointments"
 
@@ -1540,97 +2010,108 @@ msgstr "Dismiss _All"
 msgid "_Snooze"
 msgstr "_Snooze"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:162
+#: ../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:2061 ../e-util/e-html-editor-actions.c:884
+#: ../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
+msgid "_Edit"
+msgstr "_Edit"
+
+#: ../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
 msgid "_Dismiss"
 msgstr "_Dismiss"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/alarm-notify/alarm-queue.c:1766
-#: ../calendar/alarm-notify/alarm-queue.c:1776
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:190
-#: ../modules/itip-formatter/itip-view.c:1489
-#: ../modules/itip-formatter/itip-view.c:1600
+#: ../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:1724
+#: ../modules/itip-formatter/itip-view.c:1835
 msgid "Location:"
 msgstr "Location:"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
 msgstr "location of appointment"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../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:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../e-util/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:143
-#: ../modules/calendar/e-cal-shell-view-actions.c:352
+#: ../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
 msgid "days"
 msgstr "days"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
-#: ../e-util/e-interval-chooser.c:141
+#: ../calendar/alarm-notify/alarm-notify.ui.h:11
+#: ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
 msgid "hours"
 msgstr "hours"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
-#: ../e-util/e-interval-chooser.c:139
-#: ../mail/e-mail-config-provider-page.c:527
+#: ../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
 msgid "minutes"
 msgstr "minutes"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1612
-#: ../calendar/alarm-notify/alarm-queue.c:1746
+#: ../calendar/alarm-notify/alarm-queue.c:1715
+#: ../calendar/alarm-notify/alarm-queue.c:1895
 msgid "No summary available."
 msgstr "No summary available."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1621
-#: ../calendar/alarm-notify/alarm-queue.c:1623
+#: ../calendar/alarm-notify/alarm-queue.c:1724
+#: ../calendar/alarm-notify/alarm-queue.c:1726
 msgid "No description available."
 msgstr "No description available."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1631
+#: ../calendar/alarm-notify/alarm-queue.c:1734
 msgid "No location information available."
 msgstr "No location information available."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1636
-#: ../calendar/alarm-notify/alarm-queue.c:1737
-#: ../calendar/alarm-notify/alarm-queue.c:2099
+#: ../calendar/alarm-notify/alarm-queue.c:1739
+#: ../calendar/alarm-notify/alarm-queue.c:1886
+#: ../calendar/alarm-notify/alarm-queue.c:2237
 msgid "Evolution Reminders"
 msgstr "Evolution Reminders"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1679
+#: ../calendar/alarm-notify/alarm-queue.c:1782
 #, 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:1884
-#: ../calendar/alarm-notify/alarm-queue.c:1919
+#: ../calendar/alarm-notify/alarm-queue.c:2055
 msgid "Warning"
 msgstr "Warning"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1888
-msgid ""
-"Evolution does not support calendar reminders with\n"
-"email notifications yet, but this reminder was\n"
-"configured to send an email.  Evolution will display\n"
-"a normal reminder dialog box instead."
-msgstr ""
-"Evolution does not support calendar reminders with\n"
-"e-mail notifications yet, but this reminder was\n"
-"configured to send an e-mail.  Evolution will display\n"
-"a normal reminder dialogue box instead."
+#: ../calendar/alarm-notify/alarm-queue.c:2056 ../mail/mail-dialogs.ui.h:21
+#: ../modules/mailto-handler/evolution-mailto-handler.c:114
+msgid "_No"
+msgstr "_No"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1925
+#: ../calendar/alarm-notify/alarm-queue.c:2057
+#: ../modules/mailto-handler/evolution-mailto-handler.c:115
+msgid "_Yes"
+msgstr "_Yes"
+
+#: ../calendar/alarm-notify/alarm-queue.c:2061
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1647,26 +2128,35 @@ msgstr ""
 "\n"
 "Are you sure you want to run this program?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1940
+#: ../calendar/alarm-notify/alarm-queue.c:2076
 msgid "Do not ask me about this program again."
 msgstr "Do not ask me about this program again."
 
-#: ../calendar/alarm-notify/util.c:44
+#: ../calendar/alarm-notify/util.c:67
 msgid "invalid time"
 msgstr "invalid time"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:70 ../calendar/gui/e-alarm-list.c:370
-#: ../calendar/gui/misc.c:96
+#. 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
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d day"
+msgstr[1] "%d days"
+
+#. Translator: Entire string is like "Pop up an alert %d hours before start"
+#: ../calendar/alarm-notify/util.c:99 ../calendar/gui/e-alarm-list.c:382
+#: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hour"
 msgstr[1] "%d hours"
 
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:376
-#: ../calendar/gui/misc.c:102
+#. 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
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1674,10 +2164,10 @@ msgstr[0] "%d minute"
 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 of appointment"
+#. 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:80 ../calendar/gui/e-alarm-list.c:382
-#: ../calendar/gui/misc.c:106
+#: ../calendar/alarm-notify/util.c:109 ../calendar/gui/e-alarm-list.c:394
+#: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1704,8 +2194,7 @@ msgstr "Do _not Send"
 msgid "_Send Notice"
 msgstr "_Send Notice"
 
-#: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:193
+#: ../calendar/calendar.error.xml.h:5 ../calendar/gui/e-cal-dialogs.c:502
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Are you sure you want to delete this meeting?"
@@ -1724,8 +2213,7 @@ 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/dialogs/delete-comp.c:196
+#: ../calendar/calendar.error.xml.h:9 ../calendar/gui/e-cal-dialogs.c:505
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Are you sure you want to delete this task?"
@@ -1746,8 +2234,7 @@ 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/dialogs/delete-comp.c:199
+#: ../calendar/calendar.error.xml.h:13 ../calendar/gui/e-cal-dialogs.c:508
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Are you sure you want to delete this memo?"
@@ -1827,14 +2314,13 @@ 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
-#: ../composer/mail-composer.error.xml.h:16
-msgid "_Discard Changes"
-msgstr "_Discard Changes"
-
-#: ../calendar/calendar.error.xml.h:31
 msgid "_Save Changes"
 msgstr "_Save Changes"
 
+#: ../calendar/calendar.error.xml.h:31 ../composer/mail-composer.error.xml.h:13
+msgid "_Discard Changes"
+msgstr "_Discard Changes"
+
 #: ../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?"
@@ -1873,8 +2359,8 @@ msgid ""
 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:13 ../mail/mail.error.xml.h:8
+#: ../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
 msgid "_Send"
 msgstr "_Send"
@@ -1915,10 +2401,6 @@ msgstr ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 
-#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:315
-msgid "_Save"
-msgstr "_Save"
-
 #: ../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?"
@@ -1944,38 +2426,70 @@ msgstr ""
 "lists up to date."
 
 #: ../calendar/calendar.error.xml.h:52
+#| msgid "Would you like to send this task to participants?"
+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
+#| msgid ""
+#| "Email invitations will be sent to all participants and allow them to "
+#| "accept this task."
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this memo."
+msgstr ""
+"E-mail invitations will be sent to all participants and allow them to accept "
+"this memo."
+
+#: ../calendar/calendar.error.xml.h:54
+#| msgid "Would you like to send updated meeting information to participants?"
+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
+#| msgid ""
+#| "Sending updated information allows other participants to keep their task "
+#| "lists up to date."
+msgid ""
+"Sending updated information allows other participants to keep their memo "
+"lists up to date."
+msgstr ""
+"Sending updated information allows other participants to keep their memo "
+"lists up to date."
+
+#: ../calendar/calendar.error.xml.h:56
 msgid "Editor could not be loaded."
 msgstr "Editor could not be loaded."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "Delete calendar '{0}'?"
 msgstr "Delete calendar '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../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:55
+#: ../calendar/calendar.error.xml.h:59
 msgid "Delete task list '{0}'?"
 msgstr "Delete task list '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../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:57
+#: ../calendar/calendar.error.xml.h:61
 msgid "Delete memo list '{0}'?"
 msgstr "Delete memo list '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../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:59
+#: ../calendar/calendar.error.xml.h:63
 msgid "Delete remote calendar '{0}'?"
 msgstr "Delete remote calendar '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:64
 msgid ""
 "This will permanently remove the calendar '{0}' from the server. Are you "
 "sure you want to proceed?"
@@ -1983,11 +2497,11 @@ msgstr ""
 "This will permanently remove the calendar '{0}' from the server. Are you "
 "sure you want to proceed?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:66
 msgid "Delete remote task list '{0}'?"
 msgstr "Delete remote task list '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../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?"
@@ -1995,11 +2509,11 @@ msgstr ""
 "This will permanently remove the task list '{0}' from the server. Are you "
 "sure you want to proceed?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:68
 msgid "Delete remote memo list '{0}'?"
 msgstr "Delete remote memo list '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../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?"
@@ -2007,11 +2521,11 @@ msgstr ""
 "This will permanently remove the memo list '{0}' from the server. Are you "
 "sure you want to proceed?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../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:67
+#: ../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."
@@ -2019,11 +2533,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:68
+#: ../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:69
+#: ../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."
@@ -2031,25 +2545,25 @@ msgstr ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../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:72
+#: ../calendar/calendar.error.xml.h:76
 msgid "Error loading calendar '{0}'"
 msgstr "Error loading calendar '{0}'"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../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:74
+#: ../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:76
+#: ../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."
@@ -2057,73 +2571,309 @@ msgstr ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../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:79
+#: ../calendar/calendar.error.xml.h:83
 msgid ""
 "'{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."
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:85
 msgid "Error loading task list '{0}'"
 msgstr "Error loading task list '{0}'"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../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:84
+#: ../calendar/calendar.error.xml.h:88
 msgid "Error loading memo list '{0}'"
 msgstr "Error loading memo list '{0}'"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../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."
 
-#: ../calendar/gui/calendar-view-factory.c:88
-msgid "Day View"
-msgstr "Day View"
+#. Translators: {0} is the name of the calendar/memo list/task list.
+#: ../calendar/calendar.error.xml.h:91
+#| msgid "Failed to load part '%s'"
+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
+#| msgid "Could not save attachments"
+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 client '%s': %s"
+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 "Delete 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 "Delete 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 "Found the appointment in the calendar '%s'"
+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 "Delete remote 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 "Delete remote 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 "Found the appointment in the calendar '%s'"
+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 "Delete remote 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 "Unable to find this task in any task list"
+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 "Found the appointment in the calendar '%s'"
+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 "Delete remote 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 "Unable to find this task in any task list"
+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 "Found the appointment in the calendar '%s'"
+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 "Delete remote 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 "Unable to find this task in any task list"
+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 load the calendar '%s' (%s)"
+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 "Delete remote 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 "Delete remote 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 loading 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 loading 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 loading 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 load the calendar '%s' (%s)"
+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 "Unable to find this task in any task list"
+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 "Delete remote 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}'"
 
-#: ../calendar/gui/calendar-view-factory.c:91
-msgid "Work Week View"
-msgstr "Work Week View"
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:143
+#| msgid "Found the appointment in the calendar '%s'"
+msgid "Failed to move an event into the calendar '{0}'"
+msgstr "Failed to move an event into the calendar '{0}'"
 
-#: ../calendar/gui/calendar-view-factory.c:94
-msgid "Week View"
-msgstr "Week View"
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:145
+#| msgid "Delete remote 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}'"
 
-#: ../calendar/gui/calendar-view-factory.c:97
-msgid "Month View"
-msgstr "Month View"
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:147
+#| msgid "Delete remote 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}'"
 
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:376
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:149
+#| msgid "Failed to load the calendar '%s' (%s)"
+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 "Delete remote 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 "Delete remote 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 "Found the appointment in the calendar '%s'"
+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 "Error loading 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 "Delete remote 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 "Found the appointment in the calendar '%s'"
+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 "Error loading 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 "Delete remote 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 "Delete remote 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 "Delete remote 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 "Delete remote memo list '{0}'?"
+msgid "Failed to refresh memo list '{0}'"
+msgstr "Failed to refresh memo list '{0}'"
+
+#: ../calendar/calendar.error.xml.h:172
+#| msgid "Make this Occurrence _Movable"
+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
 msgid "Summary"
 msgstr "Summary"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:11
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/filtertypes.xml.in.h:2
+#: ../mail/searchtypes.xml.in.h:2 ../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/em-filter-i18n.h:17
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/filtertypes.xml.in.h:3
+#: ../mail/searchtypes.xml.in.h:3 ../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-table-config.ui.h:24 ../e-util/e-attachment-tree-view.c:528
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../e-util/e-attachment-tree-view.c:149 ../e-util/e-table-config.ui.h:7
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Description"
 
@@ -2137,30 +2887,33 @@ msgid "Classification"
 msgstr "Classification"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/filtertypes.xml.in.h:4
+#: ../mail/searchtypes.xml.in.h:4 ../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/em-filter-i18n.h:40
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/filtertypes.xml.in.h:5
+#: ../mail/searchtypes.xml.in.h:5 ../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:234
-#: ../calendar/gui/e-cal-model.c:841 ../calendar/gui/e-cal-model.c:848
-#: ../calendar/gui/e-task-table.c:545 ../calendar/gui/memotypes.xml.h:10
+#: ../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
 msgid "Public"
 msgstr "Public"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:850 ../calendar/gui/e-task-table.c:546
+#: ../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
 msgid "Private"
 msgstr "Private"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:236
-#: ../calendar/gui/e-cal-model.c:852 ../calendar/gui/e-task-table.c:547
-#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-send-options.ui.h:7
+#: ../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
 msgid "Confidential"
 msgstr "Confidential"
 
@@ -2175,40 +2928,41 @@ msgstr "Organiser"
 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:883
+#: ../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:390
+#: ../plugins/save-calendar/csv-format.c:389
 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:328
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:327
 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:56
-#: ../em-format/e-mail-formatter-print-headers.c:189
-#: ../mail/em-filter-i18n.h:6
+#: ../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
 msgid "Attachments"
 msgstr "Attachments"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:27
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:48
+#: ../mail/searchtypes.xml.in.h:50 ../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/em-filter-i18n.h:24
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:49
+#: ../mail/searchtypes.xml.in.h:51 ../mail/vfoldertypes.xml.in.h:52
 msgid "Do Not Exist"
 msgstr "Do Not Exist"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:316
-#: ../calendar/gui/dialogs/event-editor.c:337
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2005
 msgid "Recurrence"
 msgstr "Recurrence"
 
@@ -2238,912 +2992,1322 @@ msgstr "Summary Contains"
 msgid "Description Contains"
 msgstr "Description Contains"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:629
-msgid "Edit Reminder"
-msgstr "Edit Reminder"
+#: ../calendar/gui/ea-cal-view.c:283
+msgid "New Appointment"
+msgstr "New Appointment"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:820
-#: ../calendar/gui/e-alarm-list.c:412
-msgid "Pop up an alert"
-msgstr "Pop up an alert"
+#: ../calendar/gui/ea-cal-view.c:284
+msgid "New All Day Event"
+msgstr "New All Day Event"
+
+#: ../calendar/gui/ea-cal-view.c:285
+msgid "New Meeting"
+msgstr "New Meeting"
+
+#: ../calendar/gui/ea-cal-view.c:286
+msgid "Go to Today"
+msgstr "Go to Today"
+
+#: ../calendar/gui/ea-cal-view.c:287
+msgid "Go to Date"
+msgstr "Go to Date"
+
+#: ../calendar/gui/ea-cal-view-event.c:234
+msgid "It has reminders."
+msgstr "It has reminders."
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:821
-#: ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/ea-cal-view-event.c:237
+msgid "It has recurrences."
+msgstr "It has recurrences."
+
+#: ../calendar/gui/ea-cal-view-event.c:240
+msgid "It is a meeting."
+msgstr "It is a meeting."
+
+#: ../calendar/gui/ea-cal-view-event.c:247
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr "Calendar Event: Summary is %s."
+
+#: ../calendar/gui/ea-cal-view-event.c:250
+msgid "Calendar Event: It has no summary."
+msgstr "Calendar Event: It has no summary."
+
+#: ../calendar/gui/ea-cal-view-event.c:273
+msgid "calendar view event"
+msgstr "calendar view event"
+
+#: ../calendar/gui/ea-cal-view-event.c:505
+msgid "Grab Focus"
+msgstr "Grab Focus"
+
+#: ../calendar/gui/ea-day-view.c:107 ../calendar/gui/ea-week-view.c:107
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "It has %d event."
+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
+msgid "It has no events."
+msgstr "It has no events."
+
+#: ../calendar/gui/ea-day-view.c:121
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "Work Week View: %s. %s"
+
+#: ../calendar/gui/ea-day-view.c:128
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "Day View: %s. %s"
+
+#: ../calendar/gui/ea-day-view.c:157
+msgid "calendar view for a work week"
+msgstr "calendar view for a work week"
+
+#: ../calendar/gui/ea-day-view.c:159
+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
+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
+msgid "Jump button"
+msgstr "Jump button"
+
+#: ../calendar/gui/ea-jump-button.c:159
+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
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+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
+#| msgid "Play a sound"
+msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "Play a sound"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:822
-#: ../calendar/gui/e-alarm-list.c:420
-msgid "Run a program"
-msgstr "Run a program"
+#. 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
+#| msgid "Pop up an alert"
+msgctxt "cal-reminders"
+msgid "Pop up an alert"
+msgstr "Pop up an alert"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:823
-#: ../calendar/gui/e-alarm-list.c:416
+#. 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
+#| msgid "Send an email"
+msgctxt "cal-reminders"
 msgid "Send an email"
 msgstr "Send an e-mail"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "minute(s)"
-msgstr "minute(s)"
+#. 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
+#| msgid "Run a program"
+msgctxt "cal-reminders"
+msgid "Run a program"
+msgstr "Run a program"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-msgid "hour(s)"
-msgstr "hour(s)"
+#: ../calendar/gui/e-alarm-list.c:439
+#| msgid "Unknown action to be performed"
+msgctxt "cal-reminders"
+msgid "Unknown action to be performed"
+msgstr "Unknown action to be performed"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "day(s)"
-msgstr "day(s)"
+#: ../calendar/gui/e-alarm-list.c:454
+#, c-format
+#| msgid "%s %s before the start of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s before the start"
+msgstr "%s %s before the start"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "before"
-msgstr "before"
+#: ../calendar/gui/e-alarm-list.c:460
+#, c-format
+#| msgid "%s %s after the start of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s after the start"
+msgstr "%s %s after the start"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-msgid "after"
-msgstr "after"
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:467
+#, c-format
+#| msgid "%s attachment"
+msgctxt "cal-reminders"
+msgid "%s at the start"
+msgstr "%s at the start"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
-msgid "start of appointment"
-msgstr "start of appointment"
+#: ../calendar/gui/e-alarm-list.c:479
+#, c-format
+#| msgid "%s %s before the end of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s before the end"
+msgstr "%s %s before the end"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "end of appointment"
-msgstr "end of appointment"
+#: ../calendar/gui/e-alarm-list.c:485
+#, c-format
+#| msgid "%s %s after the end of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s after the end"
+msgstr "%s %s after the end"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
-msgid "Add Reminder"
-msgstr "Add Reminder"
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:492
+#, c-format
+#| msgid "%s attachment"
+msgctxt "cal-reminders"
+msgid "%s at the end"
+msgstr "%s at the end"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-#: ../calendar/gui/dialogs/event-editor.c:359
-msgid "Reminder"
-msgstr "Reminder"
+#. 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
+#, c-format
+#| msgid "%s at %s"
+msgctxt "cal-reminders"
+msgid "%s at %s"
+msgstr "%s at %s"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
-msgid "Repeat"
-msgstr "Repeat"
+#. 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
+#, c-format
+#| msgid "%s for an unknown trigger type"
+msgctxt "cal-reminders"
+msgid "%s for an unknown trigger type"
+msgstr "%s for an unknown trigger type"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-msgid "_Repeat the reminder"
-msgstr "_Repeat the reminder"
+#: ../calendar/gui/ea-week-view.c:114
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "Month View: %s. %s"
 
-#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-msgid "extra times every"
-msgstr "extra times every"
+#: ../calendar/gui/ea-week-view.c:119
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "Week View: %s. %s"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:25
-msgid "Options"
-msgstr "Options"
+#: ../calendar/gui/ea-week-view.c:148
+msgid "calendar view for a month"
+msgstr "calendar view for a month"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-msgid "Custom _message"
-msgstr "Custom _message"
+#: ../calendar/gui/ea-week-view.c:150
+msgid "calendar view for one or more weeks"
+msgstr "calendar view for one or more weeks"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
-msgid "Mes_sage:"
-msgstr "Mes_sage:"
+#: ../calendar/gui/e-cal-component-preview.c:214 ../e-util/e-filter-rule.c:768
+#: ../mail/e-mail-config-page.c:125
+msgid "Untitled"
+msgstr "Untitled"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
-msgid "Custom reminder sound"
-msgstr "Custom reminder sound"
+#: ../calendar/gui/e-cal-component-preview.c:222
+msgid "Categories:"
+msgstr "Categories:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-msgid "_Sound:"
-msgstr "_Sound:"
+#: ../calendar/gui/e-cal-component-preview.c:256
+msgid "Summary:"
+msgstr "Summary:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-msgid "Select A File"
-msgstr "Select A File"
+#: ../calendar/gui/e-cal-component-preview.c:264
+msgid "Start Date:"
+msgstr "Start Date:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-msgid "_Program:"
-msgstr "_Program:"
+#: ../calendar/gui/e-cal-component-preview.c:275
+msgid "End Date:"
+msgstr "End Date:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-msgid "_Arguments:"
-msgstr "_Arguments:"
+#: ../calendar/gui/e-cal-component-preview.c:286
+msgid "Due Date:"
+msgstr "Due Date:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
-msgid "Send To:"
-msgstr "Send To:"
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../modules/itip-formatter/itip-view.c:1727
+#: ../modules/itip-formatter/itip-view.c:1844
+msgid "Status:"
+msgstr "Status:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
-msgid "Action/Trigger"
-msgstr "Action/Trigger"
+#: ../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
+msgid "In Progress"
+msgstr "In Progress"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-#: ../calendar/gui/dialogs/event-page.ui.h:25
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
-msgid "Reminders"
-msgstr "Reminders"
+#: ../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
+msgid "Completed"
+msgstr "Completed"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-msgid "A_dd"
-msgstr "A_dd"
+#: ../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
+msgid "Not Started"
+msgstr "Not Started"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
-msgid "This event has been deleted."
-msgstr "This event has been deleted."
+#: ../calendar/gui/e-cal-component-preview.c:325
+msgid "Priority:"
+msgstr "Priority:"
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
-msgid "This task has been deleted."
-msgstr "This task has been deleted."
+#: ../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
+msgid "High"
+msgstr "High"
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
-msgid "This memo has been deleted."
-msgstr "This memo has been deleted."
+#: ../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
+msgid "Normal"
+msgstr "Normal"
 
-#: ../calendar/gui/dialogs/changed-comp.c:78
+#: ../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
+msgid "Low"
+msgstr "Low"
+
+#: ../calendar/gui/e-cal-component-preview.c:350
+#: ../mail/e-mail-config-service-page.c:670
+msgid "Description:"
+msgstr "Description:"
+
+#: ../calendar/gui/e-cal-component-preview.c:381
+msgid "Web Page:"
+msgstr "Web Page:"
+
+#: ../calendar/gui/e-cal-data-model.c:1633
 #, c-format
-msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  You have made changes. Forget those changes and close the editor?"
+#| msgid "Creating folder '%s'"
+msgid "Creating view for calendar '%s'"
+msgstr "Creating view for calendar '%s'"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/e-cal-data-model.c:1637
 #, c-format
-msgid "%s  You have made no changes, close the editor?"
-msgstr "%s  You have made no changes, close the editor?"
+#| msgid "Opening task list '%s'"
+msgid "Creating view for task list '%s'"
+msgstr "Creating view for task list '%s'"
 
-#: ../calendar/gui/dialogs/changed-comp.c:85
-msgid "This event has been changed."
-msgstr "This event has been changed."
+#: ../calendar/gui/e-cal-data-model.c:1641
+#, c-format
+#| msgid "Opening memo list '%s'"
+msgid "Creating view for memo list '%s'"
+msgstr "Creating view for memo list '%s'"
 
-#: ../calendar/gui/dialogs/changed-comp.c:89
-msgid "This task has been changed."
-msgstr "This task has been changed."
+#: ../calendar/gui/e-cal-dialogs.c:214 ../calendar/gui/e-cal-ops.c:1957
+msgid "Destination is read only"
+msgstr "Destination is read only"
 
-#: ../calendar/gui/dialogs/changed-comp.c:93
-msgid "This memo has been changed."
-msgstr "This memo has been changed."
+#: ../calendar/gui/e-cal-dialogs.c:294
+#, c-format
+#| msgid "Found the appointment in the calendar '%s'"
+msgid "Copying events to the calendar '%s'"
+msgstr "Copying events to the calendar '%s'"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/e-cal-dialogs.c:300
 #, c-format
-msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  You have made changes. Forget those changes and update the editor?"
+#| msgid "Opening memo list '%s'"
+msgid "Copying memos to the memo list '%s'"
+msgstr "Copying memos to the memo list '%s'"
 
-#: ../calendar/gui/dialogs/changed-comp.c:105
+#: ../calendar/gui/e-cal-dialogs.c:306
 #, c-format
-msgid "%s  You have made no changes, update the editor?"
-msgstr "%s  You have made no changes, update the editor?"
+#| msgid "Opening 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?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:272
-msgid "Could not save attachments"
-msgstr "Could not save attachments"
+#: ../calendar/gui/e-cal-dialogs.c:528
+msgid "_Retract comment"
+msgstr "_Retract comment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:624
-msgid "Could not update object"
-msgstr "Could not update object"
+#: ../calendar/gui/e-cal-dialogs.c:687
+msgid "Select Date"
+msgstr "Select Date"
 
-#: ../calendar/gui/dialogs/comp-editor.c:758
-msgid "Edit Appointment"
-msgstr "Edit Appointment"
+#: ../calendar/gui/e-cal-dialogs.c:688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+msgid "Select _Today"
+msgstr "Select _Today"
 
-#: ../calendar/gui/dialogs/comp-editor.c:765
-#, c-format
-msgid "Meeting - %s"
-msgstr "Meeting — %s"
+#: ../calendar/gui/e-cal-dialogs.c:707
+msgid "January"
+msgstr "January"
+
+#: ../calendar/gui/e-cal-dialogs.c:708
+msgid "February"
+msgstr "February"
+
+#: ../calendar/gui/e-cal-dialogs.c:709
+msgid "March"
+msgstr "March"
+
+#: ../calendar/gui/e-cal-dialogs.c:710
+msgid "April"
+msgstr "April"
+
+#: ../calendar/gui/e-cal-dialogs.c:711
+msgid "May"
+msgstr "May"
+
+#: ../calendar/gui/e-cal-dialogs.c:712
+msgid "June"
+msgstr "June"
+
+#: ../calendar/gui/e-cal-dialogs.c:713
+msgid "July"
+msgstr "July"
 
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/e-cal-dialogs.c:714
+msgid "August"
+msgstr "August"
+
+#: ../calendar/gui/e-cal-dialogs.c:715
+msgid "September"
+msgstr "September"
+
+#: ../calendar/gui/e-cal-dialogs.c:716
+msgid "October"
+msgstr "October"
+
+#: ../calendar/gui/e-cal-dialogs.c:717
+msgid "November"
+msgstr "November"
+
+#: ../calendar/gui/e-cal-dialogs.c:718
+msgid "December"
+msgstr "December"
+
+#: ../calendar/gui/e-cal-dialogs.c:868
 #, c-format
-msgid "Appointment - %s"
-msgstr "Appointment — %s"
+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/dialogs/comp-editor.c:773
+#: ../calendar/gui/e-cal-dialogs.c:870
 #, c-format
-msgid "Assigned Task - %s"
-msgstr "Assigned Task — %s"
+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/dialogs/comp-editor.c:775
+#: ../calendar/gui/e-cal-dialogs.c:874
 #, c-format
-msgid "Task - %s"
-msgstr "Task — %s"
+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/dialogs/comp-editor.c:780
+#: ../calendar/gui/e-cal-dialogs.c:878
 #, c-format
-msgid "Memo - %s"
-msgstr "Memo — %s"
+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/dialogs/comp-editor.c:796
-msgid "No Summary"
-msgstr "No Summary"
+#: ../calendar/gui/e-cal-dialogs.c:904
+msgid "This Instance Only"
+msgstr "This Instance Only"
 
-#: ../calendar/gui/dialogs/comp-editor.c:917
-msgid "Keep original item?"
-msgstr "Keep original item?"
+#: ../calendar/gui/e-cal-dialogs.c:908
+msgid "This and Prior Instances"
+msgstr "This and Prior Instances"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1154
-msgid "Close the current window"
-msgstr "Close the current window"
+#: ../calendar/gui/e-cal-dialogs.c:914
+msgid "This and Future Instances"
+msgstr "This and Future Instances"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1161 ../e-util/e-focus-tracker.c:121
-#: ../e-util/e-focus-tracker.c:558 ../e-util/e-web-view-gtkhtml.c:455
-#: ../e-util/e-web-view-gtkhtml.c:1296 ../e-util/e-web-view.c:322
-#: ../e-util/e-web-view.c:1407 ../mail/e-mail-browser.c:130
-#: ../shell/e-shell-window-actions.c:876
-msgid "Copy the selection"
-msgstr "Copy the selection"
+#: ../calendar/gui/e-cal-dialogs.c:919
+msgid "All Instances"
+msgstr "All Instances"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168 ../e-util/e-focus-tracker.c:114
-#: ../e-util/e-focus-tracker.c:553 ../e-util/e-web-view-gtkhtml.c:1290
-#: ../e-util/e-web-view.c:1401 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:883
-msgid "Cut the selection"
-msgstr "Cut the selection"
+#: ../calendar/gui/e-cal-dialogs.c:1169 ../calendar/gui/e-cal-dialogs.c:1251
+msgid "Send my reminders with this event"
+msgstr "Send my reminders with this event"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1175 ../e-util/e-focus-tracker.c:135
-#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:890
-msgid "Delete the selection"
-msgstr "Delete the selection"
+#: ../calendar/gui/e-cal-dialogs.c:1171 ../calendar/gui/e-cal-dialogs.c:1253
+msgid "Notify new attendees _only"
+msgstr "Notify new attendees _only"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
-msgid "View help"
-msgstr "View help"
+#: ../calendar/gui/e-calendar-view.c:452
+msgid "Cut selected events to the clipboard"
+msgstr "Cut selected events to the clipboard"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1189 ../e-util/e-focus-tracker.c:128
-#: ../e-util/e-focus-tracker.c:563 ../e-util/e-web-view-gtkhtml.c:1302
-#: ../e-util/e-web-view.c:1413 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:911
-msgid "Paste the clipboard"
-msgstr "Paste the clipboard"
+#: ../calendar/gui/e-calendar-view.c:458
+msgid "Copy selected events to the clipboard"
+msgstr "Copy selected events to the clipboard"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1210
-msgid "Save current changes"
-msgstr "Save current changes"
+#: ../calendar/gui/e-calendar-view.c:464
+msgid "Paste events from the clipboard"
+msgstr "Paste events from the clipboard"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1215
-#: ../e-util/e-mail-signature-editor.c:312
-msgid "Save and Close"
-msgstr "Save and Close"
+#: ../calendar/gui/e-calendar-view.c:470
+msgid "Delete selected events"
+msgstr "Delete selected events"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1217
-msgid "Save current changes and close editor"
-msgstr "Save current changes and close editor"
+#: ../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"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1224 ../e-util/e-focus-tracker.c:142
-#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:151
-#: ../shell/e-shell-window-actions.c:988
-msgid "Select all text"
-msgstr "Select all text"
+#: ../calendar/gui/e-calendar-view.c:863 ../calendar/gui/e-cal-ops.c:1554
+#| msgid "Default Calendar Client"
+msgid "Default calendar not found"
+msgstr "Default calendar not found"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1231
-msgid "_Classification"
-msgstr "_Classification"
+#: ../calendar/gui/e-calendar-view.c:868 ../calendar/gui/e-cal-ops.c:1557
+#| msgid "Default Memo Client"
+msgid "Default memo list not found"
+msgstr "Default memo list not found"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1238
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
-#: ../e-util/gal-define-views.ui.h:5 ../mail/e-mail-browser.c:165
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1016
-msgid "_Edit"
-msgstr "_Edit"
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-cal-ops.c:1560
+#| msgid "Default Task Client"
+msgid "Default task list not found"
+msgstr "Default task list not found"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1245
-#: ../e-util/e-mail-signature-editor.c:317 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1023
-msgid "_File"
-msgstr "_File"
+#: ../calendar/gui/e-calendar-view.c:962
+msgid "No suitable component found"
+msgstr "No suitable component found"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1252
-#: ../shell/e-shell-window-actions.c:1030
-msgid "_Help"
-msgstr "_Help"
+#: ../calendar/gui/e-calendar-view.c:1032
+#| msgid "Loading Calendar"
+msgid "Pasting iCalendar data"
+msgstr "Pasting iCalendar data"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259
-msgid "_Insert"
-msgstr "_Insert"
+#. To Translators: It will display "Organiser: 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
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organiser: %s <%s>"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1266
-#: ../composer/e-composer-actions.c:338
-msgid "_Options"
-msgstr "_Options"
+#. 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
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organiser: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1273 ../mail/e-mail-browser.c:172
-#: ../shell/e-shell-window-actions.c:1065 ../smime/gui/smime-ui.ui.h:5
-msgid "_View"
-msgstr "_View"
+#. 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
+#, c-format
+msgid "Location: %s"
+msgstr "Location: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
-#: ../composer/e-composer-actions.c:287
-msgid "_Attachment..."
-msgstr "_Attachment…"
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:1890
+#, c-format
+msgid "Time: %s %s"
+msgstr "Time: %s %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
-#: ../composer/e-composer-actions.c:289 ../e-util/e-attachment-view.c:413
-msgid "Attach a file"
-msgstr "Attach a file"
+#: ../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
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1293
-msgid "_Categories"
-msgstr "_Categories"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../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
+msgid "%d %b"
+msgstr "%d %b"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1295
-msgid "Toggles whether to display categories"
-msgstr "Toggles whether to display categories"
+#: ../calendar/gui/e-calendar-view.c:2303
+msgid "%A %d %b %Y"
+msgstr "%A %d %b %Y"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1301
-msgid "Time _Zone"
-msgstr "Time _Zone"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../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
+msgid "%a %d %b"
+msgstr "%a %d %b"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1303
-msgid "Toggles whether the time zone is displayed"
-msgstr "Toggles whether the time zone is displayed"
+#: ../calendar/gui/e-calendar-view.c:2310
+#: ../calendar/gui/e-calendar-view.c:2316
+#: ../calendar/gui/e-calendar-view.c:2319
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
-msgid "Pu_blic"
-msgstr "Pu_blic"
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
+#: ../calendar/gui/e-memo-table.etspec.h:5
+msgid "Start Date"
+msgstr "Start Date"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1314
-msgid "Classify as public"
-msgstr "Classify as public"
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "End Date"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
-msgid "_Private"
-msgstr "_Private"
+#: ../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
+msgid "Created"
+msgstr "Created"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1321
-msgid "Classify as private"
-msgstr "Classify as private"
+#: ../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
+msgid "Last modified"
+msgstr "Last modified"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
-msgid "_Confidential"
-msgstr "_Confidential"
+#: ../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
+msgid "Source"
+msgstr "Source"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1328
-msgid "Classify as confidential"
-msgstr "Classify as confidential"
+#: ../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:3425
+#: ../modules/itip-formatter/itip-view.c:5999
+#: ../modules/plugin-manager/evolution-plugin-manager.c:99
+msgid "Unknown"
+msgstr "Unknown"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1336
-msgid "R_ole Field"
-msgstr "R_ole Field"
+#: ../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
+#, c-format
+msgid "Source with UID '%s' not found"
+msgstr "Source with UID '%s' not found"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1338
-msgid "Toggles whether the Role field is displayed"
-msgstr "Toggles whether the Role field is displayed"
+#: ../calendar/gui/e-cal-model.c:1507 ../calendar/gui/e-cal-ops.c:187
+#: ../calendar/gui/e-cal-ops.c:1368
+#| msgid "Create an _Event"
+msgid "Creating an event"
+msgstr "Creating an event"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1344
-msgid "_RSVP"
-msgstr "_RSVP"
+#: ../calendar/gui/e-cal-model.c:1511 ../calendar/gui/e-cal-ops.c:191
+#: ../calendar/gui/e-cal-ops.c:1372
+#| msgid "Create a Mem_o"
+msgid "Creating a memo"
+msgstr "Creating a memo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1346
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Toggles whether the RSVP field is displayed"
+#: ../calendar/gui/e-cal-model.c:1515 ../calendar/gui/e-cal-ops.c:195
+#: ../calendar/gui/e-cal-ops.c:1376
+#| msgid "Create a _Task"
+msgid "Creating a task"
+msgstr "Creating a task"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1352
-msgid "_Status Field"
-msgstr "_Status Field"
+#: ../calendar/gui/e-cal-model.c:1892
+msgid "Recurring"
+msgstr "Recurring"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1354
-msgid "Toggles whether the Status field is displayed"
-msgstr "Toggles whether the Status field is displayed"
+#: ../calendar/gui/e-cal-model.c:1894
+msgid "Assigned"
+msgstr "Assigned"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
-msgid "_Type Field"
-msgstr "_Type Field"
+#: ../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
+msgid "Yes"
+msgstr "Yes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1362
-msgid "Toggles whether the Attendee Type is displayed"
-msgstr "Toggles whether the Attendee Type is displayed"
+#: ../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
+msgid "No"
+msgstr "No"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2148
-#: ../composer/e-composer-actions.c:506
-msgid "Attach"
-msgstr "Attach"
+#: ../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:5987
+msgid "Accepted"
+msgstr "Accepted"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2498
-#: ../calendar/gui/dialogs/comp-editor.c:2708
-#: ../calendar/gui/dialogs/comp-editor.c:3714
-msgid "Changes made to this item may be discarded if an update arrives"
-msgstr "Changes made to this item may be discarded if an update arrives"
+#: ../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:5993
+msgid "Declined"
+msgstr "Declined"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3678
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:115
-msgid "attachment"
-msgstr "attachment"
+#: ../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
+msgid "Tentative"
+msgstr "Tentative"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3746
-msgid "Unable to use current version!"
-msgstr "Unable to use current version!"
+#: ../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:5996
+msgid "Delegated"
+msgstr "Delegated"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:441
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validation error: %s"
+#: ../calendar/gui/e-cal-model.c:3824
+msgid "Needs action"
+msgstr "Needs action"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:118
-msgid "Could not open destination"
-msgstr "Could not open destination"
+#. 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
+msgid "Status"
+msgstr "Status"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:128
-msgid "Destination is read only"
-msgstr "Destination is read only"
+#: ../calendar/gui/e-cal-model-calendar.c:150
+#: ../calendar/gui/e-task-table.c:582
+msgid "Free"
+msgstr "Free"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:162
-msgid "Cannot create object"
-msgstr "Cannot create object"
+#: ../calendar/gui/e-cal-model-calendar.c:153
+#: ../calendar/gui/e-meeting-time-sel.c:536 ../calendar/gui/e-task-table.c:583
+msgid "Busy"
+msgstr "Busy"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:194
-msgid "Could not open source"
-msgstr "Could not open source"
+#: ../calendar/gui/e-cal-model-tasks.c:498
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
 
-#: ../calendar/gui/dialogs/delete-comp.c:216
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Delete this item from all other recipient's mailboxes?"
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:550
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "None"
 
-#: ../calendar/gui/dialogs/delete-comp.c:219
-msgid "_Retract comment"
-msgstr "_Retract comment"
+#: ../calendar/gui/e-cal-ops.c:306
+msgid "Modifying an event"
+msgstr "Modifying an event"
+
+#: ../calendar/gui/e-cal-ops.c:310
+#| msgid "Loading memos"
+msgid "Modifying a memo"
+msgstr "Modifying a memo"
+
+#: ../calendar/gui/e-cal-ops.c:314
+#| msgid "Loading tasks"
+msgid "Modifying a task"
+msgstr "Modifying a task"
+
+#: ../calendar/gui/e-cal-ops.c:413
+#| msgid "Removing attachments"
+msgid "Removing an event"
+msgstr "Removing an event"
+
+#: ../calendar/gui/e-cal-ops.c:417
+#| msgid "Removing attachments"
+msgid "Removing a memo"
+msgstr "Removing a memo"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/e-cal-ops.c:421
+#| msgid "Removing attachments"
+msgid "Removing a task"
+msgstr "Removing a task"
+
+#: ../calendar/gui/e-cal-ops.c:512
 #, c-format
-msgid "The event could not be deleted due to a dbus error: %s"
-msgstr "The event could not be deleted due to a D-Bus error: %s"
+#| msgid "Meeting information sent"
+msgid "Deleting an event"
+msgid_plural "Deleting %d events"
+msgstr[0] "Deleting an event"
+msgstr[1] "Deleting %d events"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/e-cal-ops.c:516
 #, c-format
-msgid "The task could not be deleted due to a dbus error: %s"
-msgstr "The task could not be deleted due to a D-Bus error: %s"
+#| msgid "Delete Memo"
+msgid "Deleting a memo"
+msgid_plural "Deleting %d memos"
+msgstr[0] "Deleting a memo"
+msgstr[1] "Deleting %d memos"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/e-cal-ops.c:520
 #, c-format
-msgid "The memo could not be deleted due to a dbus error: %s"
-msgstr "The memo could not be deleted due to a D-Bus error: %s"
+#| msgid "Meetings and Tasks"
+msgid "Deleting a task"
+msgid_plural "Deleting %d tasks"
+msgstr[0] "Deleting a task"
+msgstr[1] "Deleting %d tasks"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:67
+#: ../calendar/gui/e-cal-ops.c:723
 #, c-format
-msgid "The item could not be deleted due to a dbus error: %s"
-msgstr "The item could not be deleted due to a D-Bus error: %s"
+#| msgid "Print this event"
+msgid "Pasting an event"
+msgid_plural "Pasting %d events"
+msgstr[0] "Pasting an event"
+msgstr[1] "Pasting %d events"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
-msgid "The event could not be deleted because permission was denied"
-msgstr "The event could not be deleted because permission was denied"
+#: ../calendar/gui/e-cal-ops.c:738
+#, c-format
+#| msgid "Loading memos"
+msgid "Pasting a memo"
+msgid_plural "Pasting %d memos"
+msgstr[0] "Pasting a memo"
+msgstr[1] "Pasting %d memos"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
-msgid "The task could not be deleted because permission was denied"
-msgstr "The task could not be deleted because permission was denied"
+#: ../calendar/gui/e-cal-ops.c:753
+#, c-format
+#| msgid "Loading tasks"
+msgid "Pasting a task"
+msgid_plural "Pasting %d tasks"
+msgstr[0] "Pasting a task"
+msgstr[1] "Pasting %d tasks"
 
-#: ../calendar/gui/dialogs/delete-error.c:80
-msgid "The memo could not be deleted because permission was denied"
-msgstr "The memo could not be deleted because permission was denied"
+#: ../calendar/gui/e-cal-ops.c:852
+#| msgid "Updating objects"
+msgid "Updating an event"
+msgstr "Updating an event"
 
-#: ../calendar/gui/dialogs/delete-error.c:83
-msgid "The item could not be deleted because permission was denied"
-msgstr "The item could not be deleted because permission was denied"
+#: ../calendar/gui/e-cal-ops.c:856
+#| msgid "Updating query"
+msgid "Updating a memo"
+msgstr "Updating a memo"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:91
-#, c-format
-msgid "The event could not be deleted due to an error: %s"
-msgstr "The event could not be deleted due to an error: %s"
+#: ../calendar/gui/e-cal-ops.c:860
+#| msgid "Updating objects"
+msgid "Updating a task"
+msgstr "Updating a task"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/e-cal-ops.c:968
 #, c-format
-msgid "The task could not be deleted due to an error: %s"
-msgstr "The task could not be deleted due to an error: %s"
+#| msgid "Unable to open the calendar '%s': %s"
+msgid "Getting events to purge in the calendar '%s'"
+msgstr "Getting events to purge in the calendar '%s'"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:99
+#: ../calendar/gui/e-cal-ops.c:972
 #, c-format
-msgid "The memo could not be deleted due to an error: %s"
-msgstr "The memo could not be deleted due to an error: %s"
+msgid "Getting memos to purge in the memo list '%s'"
+msgstr "Getting memos to purge in the memo list '%s'"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:103
+#: ../calendar/gui/e-cal-ops.c:976
 #, c-format
-msgid "The item could not be deleted due to an error: %s"
-msgstr "The item could not be deleted due to an error: %s"
+msgid "Getting tasks to purge in the task list '%s'"
+msgstr "Getting tasks to purge in the task list '%s'"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
-msgid "Enter Delegate"
-msgstr "Enter Delegate"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
-msgid "Delegate To:"
-msgstr "Delegate To:"
+#: ../calendar/gui/e-cal-ops.c:1002
+#, c-format
+#| msgid "Found the appointment in the calendar '%s'"
+msgid "Purging events in the calendar '%s'"
+msgstr "Purging events in the calendar '%s'"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
-msgid "Contacts..."
-msgstr "Contacts…"
+#: ../calendar/gui/e-cal-ops.c:1006
+#, c-format
+#| msgid "Opening memo list '%s'"
+msgid "Purging memos in the memo list '%s'"
+msgstr "Purging memos in the memo list '%s'"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
-msgid "_Reminders"
-msgstr "_Reminders"
+#: ../calendar/gui/e-cal-ops.c:1010
+#, c-format
+#| msgid "Opening task list '%s'"
+msgid "Purging tasks in the task list '%s'"
+msgstr "Purging tasks in the task list '%s'"
 
-#: ../calendar/gui/dialogs/event-editor.c:213
-msgid "Set or unset reminders for this event"
-msgstr "Set or unset reminders for this event"
+#: ../calendar/gui/e-cal-ops.c:1110
+#| msgid "Purging"
+msgid "Purging events"
+msgstr "Purging events"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
-msgid "Show Time as _Busy"
-msgstr "Show Time as _Busy"
+#: ../calendar/gui/e-cal-ops.c:1114
+#| msgid "Print Memos"
+msgid "Purging memos"
+msgstr "Purging memos"
 
-#: ../calendar/gui/dialogs/event-editor.c:223
-msgid "Toggles whether to show time as busy"
-msgstr "Toggles whether to show time as busy"
+#: ../calendar/gui/e-cal-ops.c:1118
+#| msgid "Print Tasks"
+msgid "Purging tasks"
+msgstr "Purging tasks"
 
-#: ../calendar/gui/dialogs/event-editor.c:232
-msgid "_Recurrence"
-msgstr "_Recurrence"
+#: ../calendar/gui/e-cal-ops.c:1220
+#| msgid "Hide completed tasks"
+msgid "Expunging completed tasks"
+msgstr "Expunging completed tasks"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
-msgid "Make this a recurring event"
-msgstr "Make this a recurring event"
+#: ../calendar/gui/e-cal-ops.c:2051
+#, c-format
+msgid "Moving an event"
+msgid_plural "Moving %d events"
+msgstr[0] "Moving an event"
+msgstr[1] "Moving %d events"
 
-#: ../calendar/gui/dialogs/event-editor.c:239 ../e-util/e-send-options.ui.h:14
-msgid "Send Options"
-msgstr "Send Options"
+#: ../calendar/gui/e-cal-ops.c:2052
+#, c-format
+#| msgid "Copying Items"
+msgid "Copying an event"
+msgid_plural "Copying %d events"
+msgstr[0] "Copying an event"
+msgstr[1] "Copying %d events"
 
-#: ../calendar/gui/dialogs/event-editor.c:241
-#: ../calendar/gui/dialogs/task-editor.c:125
-msgid "Insert advanced send options"
-msgstr "Insert advanced send options"
+#: ../calendar/gui/e-cal-ops.c:2058
+#, c-format
+#| msgid "Moving Items"
+msgid "Moving a memo"
+msgid_plural "Moving %d memos"
+msgstr[0] "Moving a memo"
+msgstr[1] "Moving %d memos"
 
-#: ../calendar/gui/dialogs/event-editor.c:249
-msgid "All _Day Event"
-msgstr "All _Day Event"
+#: ../calendar/gui/e-cal-ops.c:2059
+#, c-format
+#| msgid "Copying Items"
+msgid "Copying a memo"
+msgid_plural "Copying %d memos"
+msgstr[0] "Copying a memo"
+msgstr[1] "Copying %d memos"
 
-#: ../calendar/gui/dialogs/event-editor.c:251
-msgid "Toggles whether to have All Day Event"
-msgstr "Toggles whether to have All Day Event"
+#: ../calendar/gui/e-cal-ops.c:2065
+#, c-format
+#| msgid "Moving Items"
+msgid "Moving a task"
+msgid_plural "Moving %d tasks"
+msgstr[0] "Moving a task"
+msgstr[1] "Moving %d tasks"
 
-#: ../calendar/gui/dialogs/event-editor.c:260
-msgid "_Free/Busy"
-msgstr "_Free/Busy"
+#: ../calendar/gui/e-cal-ops.c:2066
+#, c-format
+#| msgid "Copying Items"
+msgid "Copying a task"
+msgid_plural "Copying %d tasks"
+msgstr[0] "Copying a task"
+msgstr[1] "Copying %d tasks"
 
-#: ../calendar/gui/dialogs/event-editor.c:262
-msgid "Query free / busy information for the attendees"
-msgstr "Query free / busy information for the attendees"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:165
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
 
-#: ../calendar/gui/dialogs/event-editor.c:313 ../calendar/gui/print.c:3468
-msgid "Appointment"
-msgstr "Appointment"
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:168
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/dialogs/event-editor.c:383
-#: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/e-meeting-list-view.c:165
-msgid "Attendees"
-msgstr "Attendees"
+#: ../calendar/gui/e-cell-date-edit-text.c:176
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"%s"
+msgstr ""
+"The date must be entered in the format: \n"
+"%s"
 
-#: ../calendar/gui/dialogs/event-editor.c:580
-msgid "Print this event"
-msgstr "Print this event"
+#: ../calendar/gui/e-comp-editor-event.c:101
+#| msgid "Event's start time is in the past"
+msgid "Event's time is in the past"
+msgstr "Event's time is in the past"
 
-#: ../calendar/gui/dialogs/event-page.c:557
-msgid "Event's start time is in the past"
-msgstr "Event's start time is in the past"
+#: ../calendar/gui/e-comp-editor-event.c:202
+#| msgid "Event cannot be edited, because the selected calendar is read only"
+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/dialogs/event-page.c:634
+#: ../calendar/gui/e-comp-editor-event.c:204
 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/dialogs/event-page.c:638
+#: ../calendar/gui/e-comp-editor-event.c:206
 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/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3165
-msgid "This event has reminders"
-msgstr "This event has reminders"
+#: ../calendar/gui/e-comp-editor-event.c:438
+#: ../calendar/gui/e-comp-editor-task.c:348
+#| msgid "File is not a valid .desktop file"
+msgid "Start date is not a valid date"
+msgstr "Start date is not a valid date"
+
+#: ../calendar/gui/e-comp-editor-event.c:440
+#| msgid "File is not a valid .desktop file"
+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:339 ../mail/e-mail-display.c:2008
+#: ../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
+msgid "Unknown error"
+msgstr "Unknown error"
 
-#: ../calendar/gui/dialogs/event-page.c:717
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-msgid "Or_ganizer:"
-msgstr "Or_ganiser:"
+#: ../calendar/gui/e-comp-editor-event.c:454
+#| msgid "File is not a valid .desktop file"
+msgid "End date is not a valid date"
+msgstr "End date is not a valid date"
 
-#: ../calendar/gui/dialogs/event-page.c:1299
-msgid "Event with no start date"
-msgstr "Event with no start date"
+#: ../calendar/gui/e-comp-editor-event.c:456
+#| msgid "File is not a valid .desktop file"
+msgid "End time is not a valid time"
+msgstr "End time is not a valid time"
 
-#: ../calendar/gui/dialogs/event-page.c:1302
-msgid "Event with no end date"
-msgstr "Event with no end date"
+#: ../calendar/gui/e-comp-editor-event.c:588
+#: ../calendar/gui/e-comp-editor-memo.c:106
+#: ../calendar/gui/e-comp-editor-task.c:406
+msgid "_Categories"
+msgstr "_Categories"
 
-#: ../calendar/gui/dialogs/event-page.c:1475
-#: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:853
-msgid "Start date is wrong"
-msgstr "Start date is wrong"
+#: ../calendar/gui/e-comp-editor-event.c:590
+#: ../calendar/gui/e-comp-editor-memo.c:108
+#: ../calendar/gui/e-comp-editor-task.c:408
+msgid "Toggles whether to display categories"
+msgstr "Toggles whether to display categories"
 
-#: ../calendar/gui/dialogs/event-page.c:1486
-msgid "End date is wrong"
-msgstr "End date is wrong"
+#: ../calendar/gui/e-comp-editor-event.c:596
+msgid "Time _Zone"
+msgstr "Time _Zone"
 
-#: ../calendar/gui/dialogs/event-page.c:1510
-msgid "Start time is wrong"
-msgstr "Start time is wrong"
+#: ../calendar/gui/e-comp-editor-event.c:598
+msgid "Toggles whether the time zone is displayed"
+msgstr "Toggles whether the time zone is displayed"
 
-#: ../calendar/gui/dialogs/event-page.c:1518
-msgid "End time is wrong"
-msgstr "End time is wrong"
+#: ../calendar/gui/e-comp-editor-event.c:604
+msgid "All _Day Event"
+msgstr "All _Day Event"
 
-#: ../calendar/gui/dialogs/event-page.c:1682
-#: ../calendar/gui/dialogs/memo-page.c:765
-#: ../calendar/gui/dialogs/task-page.c:907
-msgid "An organizer is required."
-msgstr "An organiser is required."
+#: ../calendar/gui/e-comp-editor-event.c:606
+msgid "Toggles whether to have All Day Event"
+msgstr "Toggles whether to have All Day Event"
 
-#: ../calendar/gui/dialogs/event-page.c:1717
-#: ../calendar/gui/dialogs/task-page.c:942
-msgid "At least one attendee is required."
-msgstr "At least one attendee is required."
+#: ../calendar/gui/e-comp-editor-event.c:612
+msgid "Show Time as _Busy"
+msgstr "Show Time as _Busy"
 
-#: ../calendar/gui/dialogs/event-page.c:1923
-msgid "_Delegatees"
-msgstr "_Delegatees"
+#: ../calendar/gui/e-comp-editor-event.c:614
+msgid "Toggles whether to show time as busy"
+msgstr "Toggles whether to show time as busy"
 
-#: ../calendar/gui/dialogs/event-page.c:1925
-msgid "Atte_ndees"
-msgstr "Atte_ndees"
+#: ../calendar/gui/e-comp-editor-event.c:623
+msgid "Pu_blic"
+msgstr "Pu_blic"
 
-#: ../calendar/gui/dialogs/event-page.c:3445
-#, c-format
-msgid "%d day before appointment"
-msgid_plural "%d days before appointment"
-msgstr[0] "%d day before appointment"
-msgstr[1] "%d days before appointment"
+#: ../calendar/gui/e-comp-editor-event.c:625
+msgid "Classify as public"
+msgstr "Classify as public"
 
-#: ../calendar/gui/dialogs/event-page.c:3451
-#, c-format
-msgid "%d hour before appointment"
-msgid_plural "%d hours before appointment"
-msgstr[0] "%d hour before appointment"
-msgstr[1] "%d hours before appointment"
+#: ../calendar/gui/e-comp-editor-event.c:630
+msgid "_Private"
+msgstr "_Private"
 
-#: ../calendar/gui/dialogs/event-page.c:3457
-#, c-format
-msgid "%d minute before appointment"
-msgid_plural "%d minutes before appointment"
-msgstr[0] "%d minute before appointment"
-msgstr[1] "%d minutes before appointment"
+#: ../calendar/gui/e-comp-editor-event.c:632
+msgid "Classify as private"
+msgstr "Classify as private"
 
-#: ../calendar/gui/dialogs/event-page.c:3478
-msgid "Customize"
-msgstr "Customise"
+#: ../calendar/gui/e-comp-editor-event.c:637
+msgid "_Confidential"
+msgstr "_Confidential"
 
-#. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3485
-msgctxt "cal-reminders"
-msgid "None"
-msgstr "None"
+#: ../calendar/gui/e-comp-editor-event.c:639
+msgid "Classify as confidential"
+msgstr "Classify as confidential"
 
-#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] 
minutes
-#: ../calendar/gui/dialogs/event-page.ui.h:2
-msgctxt "eventpage"
-msgid "for"
-msgstr "for"
+#: ../calendar/gui/e-comp-editor-event.c:740
+#| msgid "_Start time:"
+msgctxt "ECompEditor"
+msgid "_Start time:"
+msgstr "_Start time:"
 
-#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-msgctxt "eventpage"
-msgid "until"
-msgstr "until"
+#: ../calendar/gui/e-comp-editor-event.c:745
+#| msgid "_End time:"
+msgctxt "ECompEditor"
+msgid "_End time:"
+msgstr "_End time:"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgctxt "eventpage"
-msgid "15 minutes before appointment"
-msgstr "15 minutes before appointment"
-
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:8
-msgctxt "eventpage"
-msgid "1 hour before appointment"
-msgstr "1 hour before appointment"
-
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgctxt "eventpage"
-msgid "1 day before appointment"
-msgstr "1 day before appointment"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-msgid "_Location:"
-msgstr "_Location:"
+#: ../calendar/gui/e-comp-editor-event.c:755
+#| msgid "All Day Event"
+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
+#| msgid "General"
+msgctxt "ECompEditorPage"
+msgid "General"
+msgstr "General"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:2
-#: ../calendar/gui/dialogs/task-page.ui.h:7
-#: ../e-util/e-attachment-dialog.c:350
-msgid "_Description:"
-msgstr "_Description:"
+#: ../calendar/gui/e-comp-editor-event.c:811
+#: ../calendar/gui/e-comp-editor-task.c:535
+#| msgid "Reminders"
+msgctxt "ECompEditorPage"
+msgid "Reminders"
+msgstr "Reminders"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:14
-msgid "_Time:"
-msgstr "_Time:"
+#: ../calendar/gui/e-comp-editor-event.c:814
+#| msgid "Recurrence"
+msgctxt "ECompEditorPage"
+msgid "Recurrence"
+msgstr "Recurrence"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
-msgid "Time _zone:"
-msgstr "Time _zone:"
+#: ../calendar/gui/e-comp-editor-event.c:817
+#: ../calendar/gui/e-comp-editor-memo.c:195
+#: ../calendar/gui/e-comp-editor-task.c:538
+#| msgid "Attachments"
+msgctxt "ECompEditorPage"
+msgid "Attachments"
+msgstr "Attachments"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-msgid "_Summary:"
-msgstr "_Summary:"
+#: ../calendar/gui/e-comp-editor-event.c:827
+#| msgid "Scheduling"
+msgctxt "ECompEditorPage"
+msgid "Schedule"
+msgstr "Schedule"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:21
-msgid "Event Description"
-msgstr "Event Description"
+#: ../calendar/gui/e-comp-editor-event.c:859
+#, c-format
+msgid "Meeting - %s"
+msgstr "Meeting - %s"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-meeting-time-sel.c:547
-msgid "Atte_ndees..."
-msgstr "Atte_ndees…"
+#: ../calendar/gui/e-comp-editor-event.c:860
+#, c-format
+msgid "Appointment - %s"
+msgstr "Appointment - %s"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:26
-msgid "_Reminder"
-msgstr "_Reminder"
+#: ../calendar/gui/e-comp-editor-memo.c:68
+#| msgid "Memo cannot be edited, because the selected memo list is read only"
+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/dialogs/event-page.ui.h:27
-msgid "Custom Reminder:"
-msgstr "Custom Reminder:"
+#: ../calendar/gui/e-comp-editor-memo.c:70
+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/dialogs/goto-dialog.ui.h:1
-msgid "January"
-msgstr "January"
+#: ../calendar/gui/e-comp-editor-memo.c:72
+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/dialogs/goto-dialog.ui.h:2
-msgid "February"
-msgstr "February"
+#: ../calendar/gui/e-comp-editor-memo.c:168
+#: ../calendar/gui/e-comp-editor-task.c:468
+msgid "_List:"
+msgstr "_List:"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
-msgid "March"
-msgstr "March"
+#: ../calendar/gui/e-comp-editor-memo.c:175
+#: ../calendar/gui/e-comp-editor-task.c:475
+#| msgid "Sta_rt date:"
+msgctxt "ECompEditor"
+msgid "Sta_rt date:"
+msgstr "Sta_rt date:"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
-msgid "April"
-msgstr "April"
+#: ../calendar/gui/e-comp-editor-memo.c:223
+#, c-format
+#| msgid "Assigned Task - %s"
+msgid "Assigned Memo - %s"
+msgstr "Assigned Memo - %s"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
-msgid "May"
-msgstr "May"
+#: ../calendar/gui/e-comp-editor-memo.c:224
+#, c-format
+msgid "Memo - %s"
+msgstr "Memo — %s"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
-msgid "June"
-msgstr "June"
+#: ../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
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Attachment"
+msgstr[1] "Attachments"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
-msgid "July"
-msgstr "July"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:196
+#: ../e-util/e-attachment.c:2401
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Could not load '%s'"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
-msgid "August"
-msgstr "August"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:198
+#: ../e-util/e-attachment.c:2404
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Could not load the attachment"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
-msgid "September"
-msgstr "September"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:403
+#| msgid ""
+#| "Some attachments are being downloaded. Saving the task would result in "
+#| "the loss of these attachments."
+msgid ""
+"Some attachments are still being downloaded. Please wait until the download "
+"is finished."
+msgstr ""
+"Some attachments are still being downloaded. Please wait until the download "
+"is finished."
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
-msgid "October"
-msgstr "October"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:430
+#, 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"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
-msgid "November"
-msgstr "November"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:447
+#, c-format
+msgid "Attachment '%s' doesn't have valid URI, remove it from the list, please"
+msgstr ""
+"Attachment '%s' doesn't have valid URI, remove it from the list, please"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
-msgid "December"
-msgstr "December"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:608
+#: ../composer/e-composer-actions.c:319
+msgid "_Attachment..."
+msgstr "_Attachment…"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-msgid "Select Date"
-msgstr "Select Date"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:610
+#: ../composer/e-composer-actions.c:321 ../e-util/e-attachment-view.c:345
+msgid "Attach a file"
+msgstr "Attach a file"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
-msgid "Select _Today"
-msgstr "Select _Today"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:617
+#| msgid "Attachments"
+msgid "_Attachments"
+msgstr "_Attachments"
 
-#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3472
-msgid "Memo"
-msgstr "Memo"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:619
+#| msgid "Show Attachments"
+msgid "Show attachments"
+msgstr "Show attachments"
 
-#: ../calendar/gui/dialogs/memo-editor.c:156
-msgid "Print this memo"
-msgstr "Print this memo"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:772
+#: ../e-util/e-attachment-bar.c:766 ../e-util/e-attachment-paned.c:735
+msgid "Icon View"
+msgstr "Icon View"
 
-#: ../calendar/gui/dialogs/memo-page.c:421
-msgid "Memo's start date is in the past"
-msgstr "Memo's start date is in the past"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:774
+#: ../e-util/e-attachment-bar.c:768 ../e-util/e-attachment-paned.c:737
+msgid "List View"
+msgstr "List View"
 
-#: ../calendar/gui/dialogs/memo-page.c:457
-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-page-general.c:313
+#, c-format
+#| msgid "Cannot find matching event in the next %d year"
+#| msgid_plural "Cannot find matching event in the next %d years"
+msgid "Cannot find attendee '%s' in the list of attendees"
+msgstr "Cannot find attendee '%s' in the list of attendees"
 
-#: ../calendar/gui/dialogs/memo-page.c:461
-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-page-general.c:320
+#, c-format
+msgid "Not enough rights to delete attendee '%s'"
+msgstr "Not enough rights to delete attendee '%s'"
 
-#: ../calendar/gui/dialogs/memo-page.c:1161
-#: ../em-format/e-mail-formatter.c:1387
-#: ../em-format/e-mail-formatter-utils.c:194
-#: ../em-format/e-mail-formatter-utils.c:218 ../mail/em-filter-i18n.h:78
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:63
-msgid "To"
-msgstr "To"
+#: ../calendar/gui/e-comp-editor-page-general.c:350
+#| msgid "Failed to delete contact"
+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/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:336
-#: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_List:"
-msgstr "_List:"
+#: ../calendar/gui/e-comp-editor-page-general.c:583
+#| msgid "Attendees"
+msgid "A_ttendees"
+msgstr "A_ttendees"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:344
-#: ../calendar/gui/dialogs/task-page.ui.h:2
-msgid "Organi_zer:"
-msgstr "Organi_ser:"
+#: ../calendar/gui/e-comp-editor-page-general.c:585
+#| msgid "Toggles whether the Attendee Type is displayed"
+msgid "Toggles whether the Attendees are displayed"
+msgstr "Toggles whether the Attendees are displayed"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:5
-msgid "T_o:"
-msgstr "T_o:"
+#: ../calendar/gui/e-comp-editor-page-general.c:594
+msgid "R_ole Field"
+msgstr "R_ole Field"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:4
-msgid "Sta_rt date:"
-msgstr "Sta_rt date:"
+#: ../calendar/gui/e-comp-editor-page-general.c:596
+msgid "Toggles whether the Role field is displayed"
+msgstr "Toggles whether the Role field is displayed"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Su_mmary:"
-msgstr "Su_mmary:"
+#: ../calendar/gui/e-comp-editor-page-general.c:602
+msgid "_RSVP"
+msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
-#, 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-comp-editor-page-general.c:604
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Toggles whether the RSVP field is displayed"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
-#, 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-comp-editor-page-general.c:610
+msgid "_Status Field"
+msgstr "_Status Field"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
-#, 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-comp-editor-page-general.c:612
+msgid "Toggles whether the Status field is displayed"
+msgstr "Toggles whether the Status field is displayed"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
-#, 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-comp-editor-page-general.c:618
+msgid "_Type Field"
+msgstr "_Type Field"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
-msgid "This Instance Only"
-msgstr "This Instance Only"
+#: ../calendar/gui/e-comp-editor-page-general.c:620
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Toggles whether the Attendee Type is displayed"
 
-#: ../calendar/gui/dialogs/recur-comp.c:93
-msgid "This and Prior Instances"
-msgstr "This and Prior Instances"
+#: ../calendar/gui/e-comp-editor-page-general.c:945
+msgid "An organizer is required."
+msgstr "An organiser is required."
 
-#: ../calendar/gui/dialogs/recur-comp.c:99
-msgid "This and Future Instances"
-msgstr "This and Future Instances"
+#: ../calendar/gui/e-comp-editor-page-general.c:955
+#: ../calendar/gui/e-comp-editor-page-general.c:1086
+msgid "At least one attendee is required."
+msgstr "At least one attendee is required."
 
-#: ../calendar/gui/dialogs/recur-comp.c:104
-msgid "All Instances"
-msgstr "All Instances"
+#: ../calendar/gui/e-comp-editor-page-general.c:1209
+msgid "Or_ganizer:"
+msgstr "Or_ganiser:"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:573
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "This appointment contains recurrences that Evolution cannot edit."
+#: ../calendar/gui/e-comp-editor-page-general.c:1288
+#| msgid "Atte_ndees..."
+msgctxt "ECompEditor"
+msgid "Atte_ndees..."
+msgstr "Atte_ndees..."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:976
-msgid "Recurrence date is invalid"
-msgstr "Recurrence date is invalid"
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:327
+msgid "Add exception"
+msgstr "Add exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1020
-msgid "End time of the recurrence was before event's start"
-msgstr "End time of the recurrence was before event's start"
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:365
+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/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:490
 msgid "on"
 msgstr "on"
 
@@ -3151,7 +4315,9 @@ 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/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:571
+#| msgid "first"
+msgctxt "ECompEditorPageRecur"
 msgid "first"
 msgstr "first"
 
@@ -3160,7 +4326,9 @@ 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/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:577
+#| msgid "second"
+msgctxt "ECompEditorPageRecur"
 msgid "second"
 msgstr "second"
 
@@ -3168,7 +4336,9 @@ 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/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:582
+#| msgid "third"
+msgctxt "ECompEditorPageRecur"
 msgid "third"
 msgstr "third"
 
@@ -3176,7 +4346,9 @@ 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/dialogs/recurrence-page.c:1126
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:587
+#| msgid "fourth"
+msgctxt "ECompEditorPageRecur"
 msgid "fourth"
 msgstr "fourth"
 
@@ -3184,7 +4356,9 @@ 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/dialogs/recurrence-page.c:1131
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:592
+#| msgid "fifth"
+msgctxt "ECompEditorPageRecur"
 msgid "fifth"
 msgstr "fifth"
 
@@ -3192,13 +4366,17 @@ 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/dialogs/recurrence-page.c:1136
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:597
+#| msgid "last"
+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/dialogs/recurrence-page.c:1160
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:624
+#| msgid "Other Date"
+msgctxt "ECompEditorPageRecur"
 msgid "Other Date"
 msgstr "Other Date"
 
@@ -3206,7 +4384,9 @@ 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/dialogs/recurrence-page.c:1166
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:630
+#| msgid "1st to 10th"
+msgctxt "ECompEditorPageRecur"
 msgid "1st to 10th"
 msgstr "1st to 10th"
 
@@ -3214,7 +4394,9 @@ 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/dialogs/recurrence-page.c:1172
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:636
+#| msgid "11th to 20th"
+msgctxt "ECompEditorPageRecur"
 msgid "11th to 20th"
 msgstr "11th to 20th"
 
@@ -3222,839 +4404,784 @@ 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/dialogs/recurrence-page.c:1178
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:642
+#| msgid "21st to 31st"
+msgctxt "ECompEditorPageRecur"
 msgid "21st to 31st"
 msgstr "21st to 31st"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1205
-#: ../modules/calendar/e-calendar-preferences.ui.h:1
+#. 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
+#| msgid "day"
+#| msgid_plural "days"
+msgctxt "ECompEditorPageRecur"
+msgid "day"
+msgstr "day"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
+#| msgid "Monday"
+msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "Monday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1206
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
+#| msgid "Tuesday"
+msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1207
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
+#| msgid "Wednesday"
+msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
+#| msgid "Thursday"
+msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "Thursday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1209
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
+#| msgid "Friday"
+msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "Friday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1210
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
+#| msgid "Saturday"
+msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "Saturday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1211
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:675
+#| msgid "Sunday"
+msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
 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/dialogs/recurrence-page.c:1342
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:804
+#| msgid "on the"
+msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "on the"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1527
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:994
+#| msgid "occurrences"
+msgctxt "ECompEditorPageRecur"
 msgid "occurrences"
 msgstr "occurrences"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2253
-msgid "Add exception"
-msgstr "Add exception"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2295
-msgid "Could not get a selection to modify."
-msgstr "Could not get a selection to modify."
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2301
-msgid "Modify exception"
-msgstr "Modify exception"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2347
-msgid "Could not get a selection to delete."
-msgstr "Could not get a selection to delete."
+#. 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
+#| msgid "This appointment rec_urs"
+msgctxt "ECompEditorPageRecur"
+msgid "This appointment rec_urs"
+msgstr "This appointment rec_urs"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2488
-msgid "Date/Time"
-msgstr "Date/Time"
+#. 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
+#| msgid "This task recurs"
+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
+#| msgid "This memo recurs"
+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
+#| msgid "This appointment rec_urs"
+msgctxt "ECompEditorPageRecur"
+msgid "This component rec_urs"
+msgstr "This component rec_urs"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1863
+#| msgid "Recurrence date is invalid"
+msgid "Recurrence exception date is invalid"
+msgstr "Recurrence exception date is invalid"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1911
+#| msgid "End time of the recurrence was before event's start"
+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
+#| msgid "Recurrence"
+msgid "R_ecurrence"
+msgstr "R_ecurrence"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1956
+#| msgid "It has recurrences."
+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
+#| msgid "Every"
+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/dialogs/recurrence-page.ui.h:2
-msgctxt "recurrpage"
+#. 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
+#| msgid "day(s)"
+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/dialogs/recurrence-page.ui.h:4
-msgctxt "recurrpage"
+#. 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
+#| msgctxt "recurrpage"
+#| msgid "week(s)"
+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/dialogs/recurrence-page.ui.h:6
-msgctxt "recurrpage"
+#. 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
+#| msgctxt "recurrpage"
+#| msgid "month(s)"
+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/dialogs/recurrence-page.ui.h:8
-msgctxt "recurrpage"
+#. 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
+#| msgctxt "recurrpage"
+#| msgid "year(s)"
+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/dialogs/recurrence-page.ui.h:10
-msgctxt "recurrpage"
+#. 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
+#| msgctxt "eventpage"
+#| msgid "for"
+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/dialogs/recurrence-page.ui.h:12
-msgctxt "recurrpage"
+#. 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
+#| msgctxt "eventpage"
+#| msgid "until"
+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/dialogs/recurrence-page.ui.h:14
-msgctxt "recurrpage"
+#. 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
+#| msgctxt "recurrpage"
+#| msgid "forever"
+msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "forever"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-msgid "This appointment rec_urs"
-msgstr "This appointment rec_urs"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:17
-msgid "Every"
-msgstr "Every"
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2147
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2164
 msgid "Exceptions"
 msgstr "Exceptions"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-msgid "Preview"
-msgstr "Preview"
-
-#: ../calendar/gui/dialogs/send-comp.c:223
-msgid "Send my reminders with this event"
-msgstr "Send my reminders with this event"
-
-#: ../calendar/gui/dialogs/send-comp.c:225
-msgid "Notify new attendees _only"
-msgstr "Notify new attendees _only"
-
-#: ../calendar/gui/dialogs/task-details-page.c:352
-#: ../calendar/gui/dialogs/task-details-page.c:377
-msgid "Completed date is wrong"
-msgstr "Completed date is wrong"
-
-#: ../calendar/gui/dialogs/task-details-page.c:490
-msgid "Web Page"
-msgstr "Web Page"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:348
-#: ../calendar/gui/e-task-table.c:571 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:1257
-msgid "High"
-msgstr "High"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:350
-#: ../calendar/gui/e-cal-model.c:1681 ../calendar/gui/e-task-table.c:572
-#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:1256
-msgid "Normal"
-msgstr "Normal"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:352
-#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:1255
-msgid "Low"
-msgstr "Low"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:22
-#: ../e-util/e-send-options.ui.h:1
-msgid "Undefined"
-msgstr "Undefined"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:333
-#: ../calendar/gui/e-cal-model-tasks.c:491
-#: ../calendar/gui/e-cal-model-tasks.c:777 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:654
-#: ../calendar/gui/print.c:3554 ../calendar/gui/tasktypes.xml.h:11
-msgid "Not Started"
-msgstr "Not Started"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:323
-#: ../calendar/gui/e-cal-model-tasks.c:493
-#: ../calendar/gui/e-cal-model-tasks.c:779
-#: ../calendar/gui/e-cal-model-tasks.c:857 ../calendar/gui/e-task-table.c:216
-#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:655
-#: ../calendar/gui/print.c:3557
-msgid "In Progress"
-msgstr "In Progress"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:14
-#: ../calendar/gui/e-cal-component-preview.c:326
-#: ../calendar/gui/e-cal-model-tasks.c:495
-#: ../calendar/gui/e-cal-model-tasks.c:781
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:656 ../calendar/gui/print.c:3560
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:380
-msgid "Completed"
-msgstr "Completed"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:329
-#: ../calendar/gui/e-cal-model-tasks.c:497
-#: ../calendar/gui/e-cal-model-tasks.c:783 ../calendar/gui/e-task-table.c:220
-#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:657
-#: ../calendar/gui/print.c:3563 ../mail/mail-send-recv.c:878
-msgid "Canceled"
-msgstr "Cancelled"
-
-#. 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/dialogs/task-details-page.ui.h:17
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3520
-#: ../calendar/gui/e-meeting-list-view.c:692
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
-#: ../mail/message-list.etspec.h:1
-msgid "Status"
-msgstr "Status"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:18
-msgid "Stat_us:"
-msgstr "Stat_us:"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:19
-msgid "P_ercent complete:"
-msgstr "P_ercent complete:"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../e-util/e-send-options.ui.h:26
-msgid "_Priority:"
-msgstr "_Priority:"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:21
-msgid "_Date completed:"
-msgstr "_Date completed:"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:23
-msgid "_Web Page:"
-msgstr "_Web Page:"
-
-#: ../calendar/gui/dialogs/task-editor.c:113
-msgid "_Status Details"
-msgstr "_Status Details"
-
-#: ../calendar/gui/dialogs/task-editor.c:115
-msgid "Click to change or view the status details of the task"
-msgstr "Click to change or view the status details of the task"
-
-#: ../calendar/gui/dialogs/task-editor.c:123
-msgid "_Send Options"
-msgstr "_Send Options"
-
-#: ../calendar/gui/dialogs/task-editor.c:183 ../calendar/gui/print.c:3470
-#: ../e-util/e-send-options.c:553
-msgid "Task"
-msgstr "Task"
-
-#: ../calendar/gui/dialogs/task-editor.c:304
-msgid "Task Details"
-msgstr "Task Details"
-
-#: ../calendar/gui/dialogs/task-editor.c:348
-msgid "Print this task"
-msgstr "Print this task"
-
-#: ../calendar/gui/dialogs/task-page.c:249
-msgid "Task's start date is in the past"
-msgstr "Task's start date is in the past"
-
-#: ../calendar/gui/dialogs/task-page.c:250
-msgid "Task's due date is in the past"
-msgstr "Task's due date is in the past"
-
-#: ../calendar/gui/dialogs/task-page.c:283
-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/dialogs/task-page.c:287
-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/dialogs/task-page.c:291
-msgid ""
-"Task cannot be edited, because the selected task list does not support "
-"assigned tasks"
-msgstr ""
-"Task cannot be edited, because the selected task list does not support "
-"assigned tasks"
-
-#: ../calendar/gui/dialogs/task-page.c:834
-msgid "Due date is wrong"
-msgstr "Due date is wrong"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:3
-msgid "D_ue date:"
-msgstr "D_ue date:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Time zone:"
-msgstr "Time zone:"
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2233
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1779
+#: ../mail/mail-config.ui.h:62
+msgid "A_dd"
+msgstr "A_dd"
 
-#: ../calendar/gui/ea-cal-view.c:324
-msgid "New Appointment"
-msgstr "New Appointment"
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2249
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1787
+#: ../mail/mail-config.ui.h:64
+#| msgid "Remove"
+msgid "Re_move"
+msgstr "Re_move"
 
-#: ../calendar/gui/ea-cal-view.c:325
-msgid "New All Day Event"
-msgstr "New All Day Event"
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2257
+msgid "Preview"
+msgstr "Preview"
 
-#: ../calendar/gui/ea-cal-view.c:326
-msgid "New Meeting"
-msgstr "New Meeting"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:41
+#| msgid "Send To:"
+msgid "Send To"
+msgstr "Send To"
 
-#: ../calendar/gui/ea-cal-view.c:327
-msgid "Go to Today"
-msgstr "Go to Today"
-
-#: ../calendar/gui/ea-cal-view.c:328
-msgid "Go to Date"
-msgstr "Go to Date"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1556
+msgid "_Reminders"
+msgstr "_Reminders"
 
-#: ../calendar/gui/ea-cal-view-event.c:298
-msgid "It has reminders."
-msgstr "It has reminders."
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1558
+#| msgid "Set or unset reminders for this event"
+msgid "Set or unset reminders"
+msgstr "Set or unset reminders"
 
-#: ../calendar/gui/ea-cal-view-event.c:301
-msgid "It has recurrences."
-msgstr "It has recurrences."
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1611
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
+msgid "Reminders"
+msgstr "Reminders"
 
-#: ../calendar/gui/ea-cal-view-event.c:304
-msgid "It is a meeting."
-msgstr "It is a meeting."
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1640
+msgid "_Reminder"
+msgstr "_Reminder"
 
-#: ../calendar/gui/ea-cal-view-event.c:311
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1673
 #, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "Calendar Event: Summary is %s."
-
-#: ../calendar/gui/ea-cal-view-event.c:314
-msgid "Calendar Event: It has no summary."
-msgstr "Calendar Event: It has no summary."
+#| msgid "%d day ago"
+#| msgid_plural "%d days ago"
+msgid "%d day before"
+msgid_plural "%d days before"
+msgstr[0] "%d day before"
+msgstr[1] "%d days before"
 
-#: ../calendar/gui/ea-cal-view-event.c:337
-msgid "calendar view event"
-msgstr "calendar view event"
-
-#: ../calendar/gui/ea-cal-view-event.c:566
-msgid "Grab Focus"
-msgstr "Grab Focus"
-
-#: ../calendar/gui/ea-day-view.c:154 ../calendar/gui/ea-week-view.c:154
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1680
 #, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "It has %d event."
-msgstr[1] "It has %d events."
+#| msgid "%d hour before appointment"
+#| msgid_plural "%d hours before appointment"
+msgid "%d hour before"
+msgid_plural "%d hours before"
+msgstr[0] "%d hour before"
+msgstr[1] "%d hours before"
 
-#. 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:161 ../calendar/gui/ea-week-view.c:157
-msgid "It has no events."
-msgstr "It has no events."
-
-#: ../calendar/gui/ea-day-view.c:169
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1687
 #, c-format
-msgid "Work Week View: %s. %s"
-msgstr "Work Week View: %s. %s"
+#| msgid "%d minute before appointment"
+#| msgid_plural "%d minutes before appointment"
+msgid "%d minute before"
+msgid_plural "%d minutes before"
+msgstr[0] "%d minute before"
+msgstr[1] "%d minutes before"
 
-#: ../calendar/gui/ea-day-view.c:176
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "Day View: %s. %s"
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1695
+msgctxt "cal-reminders"
+msgid "None"
+msgstr "None"
 
-#: ../calendar/gui/ea-day-view.c:210
-msgid "calendar view for a work week"
-msgstr "calendar view for a work week"
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1697
+#| msgid "15 minutes"
+msgctxt "cal-reminders"
+msgid "15 minutes before"
+msgstr "15 minutes before"
 
-#: ../calendar/gui/ea-day-view.c:212
-msgid "calendar view for one or more days"
-msgstr "calendar view for one or more days"
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1699
+#| msgid "1 hour ago"
+#| msgid_plural "%d hours ago"
+msgctxt "cal-reminders"
+msgid "1 hour before"
+msgstr "1 hour before"
 
-#: ../calendar/gui/ea-day-view-main-item.c:327
-#: ../calendar/gui/ea-week-view-main-item.c:354
-msgid "a table to view and select the current time range"
-msgstr "a table to view and select the current time range"
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1701
+#| msgid "is before"
+msgctxt "cal-reminders"
+msgid "1 day before"
+msgstr "1 day before"
 
-#: ../calendar/gui/ea-gnome-calendar.c:48
-#: ../calendar/gui/ea-gnome-calendar.c:56
-#: ../calendar/importers/icalendar-importer.c:1114
-msgid "Gnome Calendar"
-msgstr "Gnome Calendar"
+#. Translators: "Custom" for "Custom reminder set"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1713
+#| msgid "Custom"
+msgctxt "cal-reminders"
+msgid "Custom"
+msgstr "Custom"
 
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1143
-msgid "%A %d %b %Y"
-msgstr "%A %d %b %Y"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1864
+#| msgid "minute(s)"
+msgctxt "cal-reminders"
+msgid "minute(s)"
+msgstr "minute(s)"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %d = day of month, %b = abbreviated month name.
-#. * You can change the order but don't change the
-#. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:2316
-#: ../calendar/gui/e-day-view-top-item.c:855
-#: ../calendar/gui/e-week-view-main-item.c:233
-#: ../modules/calendar/e-cal-shell-view-private.c:1147
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1866
+#| msgid "hour(s)"
+msgctxt "cal-reminders"
+msgid "hour(s)"
+msgstr "hour(s)"
 
-#: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../calendar/gui/ea-gnome-calendar.c:217
-#: ../calendar/gui/ea-gnome-calendar.c:220
-#: ../modules/calendar/e-cal-shell-view-private.c:1150
-#: ../modules/calendar/e-cal-shell-view-private.c:1156
-#: ../modules/calendar/e-cal-shell-view-private.c:1159
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1868
+#| msgid "day(s)"
+msgctxt "cal-reminders"
+msgid "day(s)"
+msgstr "day(s)"
 
-#: ../calendar/gui/ea-gnome-calendar.c:239
-#: ../calendar/gui/ea-gnome-calendar.c:247
-#: ../calendar/gui/ea-gnome-calendar.c:254
-#: ../calendar/gui/ea-gnome-calendar.c:257
-#: ../modules/calendar/e-cal-shell-view-private.c:1176
-#: ../modules/calendar/e-cal-shell-view-private.c:1187
-#: ../modules/calendar/e-cal-shell-view-private.c:1194
-#: ../modules/calendar/e-cal-shell-view-private.c:1197
-msgid "%d %b %Y"
-msgstr "%d %b %Y"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1885
+#| msgid "before"
+msgctxt "cal-reminders"
+msgid "before"
+msgstr "before"
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. * month name. You can change the order but don't
-#. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:2332
-#: ../calendar/gui/e-day-view-top-item.c:859
-#: ../calendar/gui/e-week-view-main-item.c:247
-#: ../modules/calendar/e-cal-shell-view-private.c:1183
-msgid "%d %b"
-msgstr "%d %b"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1887
+#| msgid "after"
+msgctxt "cal-reminders"
+msgid "after"
+msgstr "after"
 
-#: ../calendar/gui/ea-jump-button.c:151
-msgid "Jump button"
-msgstr "Jump button"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1903
+#| msgid "Start"
+msgctxt "cal-reminders"
+msgid "start"
+msgstr "start"
 
-#: ../calendar/gui/ea-jump-button.c:160
-msgid "Click here, you can find more events."
-msgstr "Click here, you can find more events."
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1905
+#| msgid "Send"
+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
+#| msgid "_Repeat the reminder"
+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
+#| msgid "extra times every"
+msgctxt "cal-reminders"
+msgid "extra times every"
+msgstr "extra times every"
 
-#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:358
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d day"
-msgstr[1] "%d days"
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1990
+#| msgid "minutes"
+msgctxt "cal-reminders"
+msgid "minutes"
+msgstr "minutes"
 
-#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:364
-#, c-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] "%d week"
-msgstr[1] "%d weeks"
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1992
+#| msgid "hours"
+msgctxt "cal-reminders"
+msgid "hours"
+msgstr "hours"
 
-#: ../calendar/gui/e-alarm-list.c:426
-msgid "Unknown action to be performed"
-msgstr "Unknown action to be performed"
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1994
+#| msgid "days"
+msgctxt "cal-reminders"
+msgid "days"
+msgstr "days"
 
-#: ../calendar/gui/e-alarm-list.c:441
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s before the start of the appointment"
+#. 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
+#| msgid "Custom _message"
+msgctxt "cal-reminders"
+msgid "Custom _message"
+msgstr "Custom _message"
 
-#: ../calendar/gui/e-alarm-list.c:447
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s after the start of the appointment"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2079
+#| msgid "Custom reminder sound"
+msgctxt "cal-reminders"
+msgid "Custom reminder _sound"
+msgstr "Custom reminder _sound"
 
-#. Translator: The %s refers to the base, which would be actions like
-#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:454
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s at the start of the appointment"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2090
+#| msgid "Select sound file"
+msgid "Select a sound file"
+msgstr "Select a sound file"
 
-#: ../calendar/gui/e-alarm-list.c:466
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s before the end of the appointment"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2118
+msgid "_Program:"
+msgstr "_Program:"
 
-#: ../calendar/gui/e-alarm-list.c:472
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s after the end of the appointment"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2143
+msgid "_Arguments:"
+msgstr "_Arguments:"
 
-#. Translator: The %s refers to the base, which would be actions like
-#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:479
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s at the end of the appointment"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2175
+#| msgid "Send To:"
+msgid "_Send To:"
+msgstr "_Send To:"
 
-#. 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:503
-#, c-format
-msgid "%s at %s"
-msgstr "%s at %s"
+#: ../calendar/gui/e-comp-editor-page-schedule.c:427
+#| msgid "Scheduling"
+msgid "_Schedule"
+msgstr "_Schedule"
 
-#. 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:511
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "%s for an unknown trigger type"
+#: ../calendar/gui/e-comp-editor-page-schedule.c:429
+msgid "Query free / busy information for the attendees"
+msgstr "Query free / busy information for the attendees"
 
-#: ../calendar/gui/ea-week-view.c:163
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "Month View: %s. %s"
+#: ../calendar/gui/e-comp-editor-property-parts.c:81
+#| msgid "_Summary:"
+msgctxt "ECompEditor"
+msgid "_Summary:"
+msgstr "_Summary:"
 
-#: ../calendar/gui/ea-week-view.c:168
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "Week View: %s. %s"
+#: ../calendar/gui/e-comp-editor-property-parts.c:325
+#| msgid "_Location:"
+msgctxt "ECompEditor"
+msgid "_Location:"
+msgstr "_Location:"
 
-#: ../calendar/gui/ea-week-view.c:202
-msgid "calendar view for a month"
-msgstr "calendar view for a month"
+#: ../calendar/gui/e-comp-editor-property-parts.c:458
+#| msgid "_Categories..."
+msgctxt "ECompEditor"
+msgid "_Categories..."
+msgstr "_Categories..."
 
-#: ../calendar/gui/ea-week-view.c:204
-msgid "calendar view for one or more weeks"
-msgstr "calendar view for one or more weeks"
+#: ../calendar/gui/e-comp-editor-property-parts.c:555
+#| msgid "_Description:"
+msgctxt "ECompEditor"
+msgid "_Description:"
+msgstr "_Description:"
 
-#: ../calendar/gui/e-cal-component-preview.c:234 ../e-util/e-filter-rule.c:750
-#: ../mail/e-mail-config-page.c:126
-msgid "Untitled"
-msgstr "Untitled"
+#: ../calendar/gui/e-comp-editor-property-parts.c:686
+#| msgid "_Web Page:"
+msgctxt "ECompEditor"
+msgid "_Web page:"
+msgstr "_Web page:"
 
-#: ../calendar/gui/e-cal-component-preview.c:242
-msgid "Categories:"
-msgstr "Categories:"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1057
+#| msgid "D_ue date:"
+msgctxt "ECompEditor"
+msgid "D_ue date:"
+msgstr "D_ue date:"
 
-#: ../calendar/gui/e-cal-component-preview.c:274
-msgid "Summary:"
-msgstr "Summary:"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1117
+#| msgid "_Date completed:"
+msgctxt "ECompEditor"
+msgid "Date _completed:"
+msgstr "Date _completed:"
 
-#: ../calendar/gui/e-cal-component-preview.c:283
-msgid "Start Date:"
-msgstr "Start Date:"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1133
+#| msgid "Public"
+msgctxt "ECompEditor"
+msgid "Public"
+msgstr "Public"
 
-#: ../calendar/gui/e-cal-component-preview.c:295
-msgid "End Date:"
-msgstr "End Date:"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1134
+#| msgid "Private"
+msgctxt "ECompEditor"
+msgid "Private"
+msgstr "Private"
 
-#: ../calendar/gui/e-cal-component-preview.c:307
-msgid "Due Date:"
-msgstr "Due Date:"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1135
+#| msgid "Confidential"
+msgctxt "ECompEditor"
+msgid "Confidential"
+msgstr "Confidential"
 
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../modules/itip-formatter/itip-view.c:1492
-#: ../modules/itip-formatter/itip-view.c:1609
-msgid "Status:"
-msgstr "Status:"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1151
+#| msgid "_Classification:"
+msgctxt "ECompEditor"
+msgid "C_lassification:"
+msgstr "C_lassification:"
 
-#: ../calendar/gui/e-cal-component-preview.c:346
-msgid "Priority:"
-msgstr "Priority:"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1170
+#| msgid "Not Started"
+msgctxt "ECompEditor"
+msgid "Not Started"
+msgstr "Not Started"
 
-#: ../calendar/gui/e-cal-component-preview.c:371
-#: ../mail/e-mail-config-service-page.c:672
-msgid "Description:"
-msgstr "Description:"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1171
+#| msgid "In Progress"
+msgctxt "ECompEditor"
+msgid "In Progress"
+msgstr "In Progress"
 
-#: ../calendar/gui/e-cal-component-preview.c:402
-msgid "Web Page:"
-msgstr "Web Page:"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1172
+#| msgid "Completed"
+msgctxt "ECompEditor"
+msgid "Completed"
+msgstr "Completed"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:1
-msgid "Click to add a task"
-msgstr "Click to add a task"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1173
+#| msgid "Cancelled"
+msgctxt "ECompEditor"
+msgid "Cancelled"
+msgstr "Cancelled"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:2
-msgid "Start date"
-msgstr "Start date"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1182
+#| msgid "Status:"
+msgctxt "ECompEditor"
+msgid "_Status:"
+msgstr "_Status:"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:649
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:586
-#: ../mail/e-mail-account-tree-view.c:159
-msgid "Type"
-msgstr "Type"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1212
+#| msgid "Undefined"
+msgctxt "ECompEditor"
+msgid "Undefined"
+msgstr "Undefined"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5
-msgid "Completion date"
-msgstr "Completion date"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1213
+#| msgid "High"
+msgctxt "ECompEditor"
+msgid "High"
+msgstr "High"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:880
-msgid "Complete"
-msgstr "Complete"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1214
+#| msgid "Normal"
+msgctxt "ECompEditor"
+msgid "Normal"
+msgstr "Normal"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
-msgid "Due date"
-msgstr "Due date"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1215
+#| msgid "Low"
+msgctxt "ECompEditor"
+msgid "Low"
+msgstr "Low"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
-#, no-c-format
-msgid "% Complete"
-msgstr "% Complete"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1224
+#| msgid "Priority:"
+msgctxt "ECompEditor"
+msgid "Priorit_y:"
+msgstr "Priorit_y:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1278
+#| msgid "P_ercent complete:"
+msgctxt "ECompEditor"
+msgid "Percent complete:"
+msgstr "Percent complete:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1359
+#| msgid "Time _zone:"
+msgctxt "ECompEditor"
+msgid "Time _zone:"
+msgstr "Time _zone:"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:387
-msgid "Priority"
-msgstr "Priority"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1484
+#| msgid "Show Time as _Busy"
+msgctxt "ECompEditor"
+msgid "Show time as _busy"
+msgstr "Show time as _busy"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:381
-msgid "Created"
-msgstr "Created"
+#: ../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"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-memo-table.etspec.h:7
-msgid "Last modified"
-msgstr "Last modified"
+#: ../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"
 
-#: ../calendar/gui/e-calendar-view.c:438
-msgid "Cut selected events to the clipboard"
-msgstr "Cut selected events to the clipboard"
+#: ../calendar/gui/e-comp-editor-task.c:308
+#| msgid "Task cannot be edited, because the selected task list is read only"
+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-calendar-view.c:444
-msgid "Copy selected events to the clipboard"
-msgstr "Copy selected events to the clipboard"
+#: ../calendar/gui/e-comp-editor-task.c:310
+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-calendar-view.c:450
-msgid "Paste events from the clipboard"
-msgstr "Paste events from the clipboard"
+#: ../calendar/gui/e-comp-editor-task.c:312
+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-calendar-view.c:456
-msgid "Delete selected events"
-msgstr "Delete selected events"
+#: ../calendar/gui/e-comp-editor-task.c:359
+#| msgid "File is not a valid .desktop file"
+msgid "Due date is not a valid date"
+msgstr "Due date is not a valid date"
 
-#: ../calendar/gui/e-calendar-view.c:476 ../calendar/gui/e-memo-table.c:183
-#: ../calendar/gui/e-task-table.c:270
-msgid "Deleting selected objects"
-msgstr "Deleting selected objects"
+#: ../calendar/gui/e-comp-editor-task.c:370
+#| msgid "Completed date is wrong"
+msgid "Completed date is not a valid date"
+msgstr "Completed date is not a valid date"
 
-#: ../calendar/gui/e-calendar-view.c:635 ../calendar/gui/e-memo-table.c:863
-#: ../calendar/gui/e-task-table.c:1161
-msgid "Updating objects"
-msgstr "Updating objects"
+#: ../calendar/gui/e-comp-editor-task.c:381
+#| msgid "1 minute in the future"
+#| msgid_plural "%d minutes in the future"
+msgid "Completed date cannot be in the future"
+msgstr "Completed date cannot be in the future"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#. To Translators: It will display
-#. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1999 ../calendar/gui/e-memo-table.c:540
-#: ../calendar/gui/e-task-table.c:827
+#: ../calendar/gui/e-comp-editor-task.c:566
 #, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organiser: %s <%s>"
+msgid "Assigned Task - %s"
+msgstr "Assigned Task - %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:2003 ../calendar/gui/e-memo-table.c:545
-#: ../calendar/gui/e-task-table.c:831
+#: ../calendar/gui/e-comp-editor-task.c:567
 #, c-format
-msgid "Organizer: %s"
-msgstr "Organiser: %s"
+msgid "Task - %s"
+msgstr "Task — %s"
 
-#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2019
-#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3508
-#, c-format
-msgid "Location: %s"
-msgstr "Location: %s"
+#: ../calendar/gui/e-comp-editor.c:254
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:127
+msgid "attachment"
+msgstr "attachment"
 
-#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2050
-#, c-format
-msgid "Time: %s %s"
-msgstr "Time: %s %s"
+#: ../calendar/gui/e-comp-editor.c:609
+#| msgid "Send _updates to attendees"
+msgid "Sending notifications to attendees..."
+msgstr "Sending notifications to attendees..."
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:1
-#: ../calendar/gui/e-memo-table.etspec.h:5
-msgid "Start Date"
-msgstr "Start Date"
+#: ../calendar/gui/e-comp-editor.c:994
+#| msgid "_Save Changes"
+msgid "Saving changes..."
+msgstr "Saving changes..."
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "End Date"
+#: ../calendar/gui/e-comp-editor.c:1250
+msgid "No Summary"
+msgstr "No Summary"
 
-#: ../calendar/gui/e-cal-model.c:854 ../calendar/gui/e-meeting-list-view.c:185
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1235
-#: ../calendar/gui/print.c:1252 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3505
-#: ../modules/itip-formatter/itip-view.c:5995
-#: ../modules/plugin-manager/evolution-plugin-manager.c:100
-msgid "Unknown"
-msgstr "Unknown"
+#. == Button box ==
+#: ../calendar/gui/e-comp-editor.c:1975 ../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
+msgid "_Close"
+msgstr "_Close"
 
-#: ../calendar/gui/e-cal-model.c:1683
-msgid "Recurring"
-msgstr "Recurring"
+#: ../calendar/gui/e-comp-editor.c:1977
+msgid "Close the current window"
+msgstr "Close the current window"
 
-#: ../calendar/gui/e-cal-model.c:1685
-msgid "Assigned"
-msgstr "Assigned"
+#. copy menu item
+#: ../calendar/gui/e-comp-editor.c:1982 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:840 ../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
+msgid "_Copy"
+msgstr "_Copy"
+
+#: ../calendar/gui/e-comp-editor.c:1984 ../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:1824 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:801
+msgid "Copy the selection"
+msgstr "Copy the selection"
 
-#: ../calendar/gui/e-cal-model.c:1687 ../calendar/gui/e-cal-model-tasks.c:1148
-#: ../calendar/gui/e-meeting-list-view.c:209
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:1024
-msgid "Yes"
-msgstr "Yes"
+#. cut menu item
+#: ../calendar/gui/e-comp-editor.c:1989 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:847 ../e-util/e-text.c:2095
+#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:806
+msgid "Cu_t"
+msgstr "Cu_t"
+
+#: ../calendar/gui/e-comp-editor.c:1991 ../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:1814
+#: ../mail/e-mail-browser.c:145 ../shell/e-shell-window-actions.c:808
+msgid "Cut the selection"
+msgstr "Cut the selection"
 
-#: ../calendar/gui/e-cal-model.c:1687 ../calendar/gui/e-cal-model-tasks.c:1148
-#: ../calendar/gui/e-meeting-list-view.c:210
-#: ../calendar/gui/e-meeting-store.c:189
-msgid "No"
-msgstr "No"
+#: ../calendar/gui/e-comp-editor.c:1998 ../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
+msgid "Delete the selection"
+msgstr "Delete the selection"
 
-#: ../calendar/gui/e-cal-model.c:3461
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
-#: ../modules/itip-formatter/itip-view.c:5983
-msgid "Accepted"
-msgstr "Accepted"
+#: ../calendar/gui/e-comp-editor.c:2005
+msgid "View help"
+msgstr "View help"
 
-#: ../calendar/gui/e-cal-model.c:3462
-#: ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../modules/itip-formatter/itip-view.c:5989
-msgid "Declined"
-msgstr "Declined"
+#. paste menu item
+#: ../calendar/gui/e-comp-editor.c:2010 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:854 ../e-util/e-text.c:2121
+#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:834
+#| msgid "Paste"
+msgid "_Paste"
+msgstr "_Paste"
+
+#: ../calendar/gui/e-comp-editor.c:2012 ../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:1834
+#: ../mail/e-mail-browser.c:152 ../shell/e-shell-window-actions.c:836
+msgid "Paste the clipboard"
+msgstr "Paste the clipboard"
 
-#: ../calendar/gui/e-cal-model.c:3463
-#: ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../calendar/gui/e-meeting-time-sel.c:526
-msgid "Tentative"
-msgstr "Tentative"
+#: ../calendar/gui/e-comp-editor.c:2017 ../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
+msgid "_Print..."
+msgstr "_Print…"
 
-#: ../calendar/gui/e-cal-model.c:3464
-#: ../calendar/gui/e-meeting-list-view.c:224
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../modules/itip-formatter/itip-view.c:5992
-msgid "Delegated"
-msgstr "Delegated"
+#: ../calendar/gui/e-comp-editor.c:2024 ../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
+#| msgid "Preview"
+msgid "Pre_view..."
+msgstr "Pre_view..."
+
+#: ../calendar/gui/e-comp-editor.c:2031 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:868 ../e-util/e-web-view.c:408
+#: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:911
+msgid "Select _All"
+msgstr "Select _All"
+
+#: ../calendar/gui/e-comp-editor.c:2033 ../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
+msgid "Select all text"
+msgstr "Select all text"
 
-#: ../calendar/gui/e-cal-model.c:3465
-msgid "Needs action"
-msgstr "Needs action"
+#: ../calendar/gui/e-comp-editor.c:2054
+msgid "_Classification"
+msgstr "_Classification"
 
-#: ../calendar/gui/e-cal-model-calendar.c:158
-#: ../calendar/gui/e-task-table.c:629
-msgid "Free"
-msgstr "Free"
+#: ../calendar/gui/e-comp-editor.c:2068 ../e-util/e-html-editor-actions.c:891
+#: ../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
+msgid "_File"
+msgstr "_File"
 
-#: ../calendar/gui/e-cal-model-calendar.c:161
-#: ../calendar/gui/e-meeting-time-sel.c:527 ../calendar/gui/e-task-table.c:630
-msgid "Busy"
-msgstr "Busy"
+#: ../calendar/gui/e-comp-editor.c:2082 ../e-util/e-html-editor-actions.c:912
+msgid "_Insert"
+msgstr "_Insert"
 
-#: ../calendar/gui/e-cal-model-tasks.c:723
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#: ../calendar/gui/e-comp-editor.c:2089 ../composer/e-composer-actions.c:370
+msgid "_Options"
+msgstr "_Options"
 
-#. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:775
-msgctxt "cal-task-status"
-msgid "None"
-msgstr "None"
+#: ../calendar/gui/e-comp-editor.c:2096 ../e-util/e-html-editor-actions.c:933
+#: ../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
+msgid "_View"
+msgstr "_View"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:159
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
+#: ../calendar/gui/e-comp-editor.c:2108
+msgid "Save current changes"
+msgstr "Save current changes"
 
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:162
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
+#: ../calendar/gui/e-comp-editor.c:2113 ../e-util/e-mail-signature-editor.c:317
+#: ../mail/e-mail-notes.c:940
+msgid "Save and Close"
+msgstr "Save and Close"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:170
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"%s"
-msgstr ""
-"The date must be entered in the format: \n"
-"%s"
+#: ../calendar/gui/e-comp-editor.c:2115
+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:1581 ../calendar/gui/e-week-view.c:1500
-#: ../calendar/gui/print.c:1058 ../calendar/gui/print.c:1077
-#: ../calendar/gui/print.c:2608 ../calendar/gui/print.c:2628
+#: ../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
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1584 ../calendar/gui/e-week-view.c:1503
-#: ../calendar/gui/print.c:1063 ../calendar/gui/print.c:1079
-#: ../calendar/gui/print.c:2613 ../calendar/gui/print.c:2630
+#: ../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
 msgid "pm"
 msgstr "pm"
 
@@ -4064,13 +5191,13 @@ 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:2299 ../calendar/gui/e-day-view-top-item.c:851
-#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2071
+#: ../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
 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:2942
+#: ../calendar/gui/e-day-view.c:3772
 #, c-format
 msgid "Week %d"
 msgstr "Week %d"
@@ -4081,27 +5208,27 @@ 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:794
+#: ../calendar/gui/e-day-view-time-item.c:806
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minute divisions"
 
-#: ../calendar/gui/e-day-view-time-item.c:819
+#: ../calendar/gui/e-day-view-time-item.c:831
 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:836
-#: ../modules/calendar/e-calendar-preferences.c:179
-#: ../modules/calendar/e-calendar-preferences.c:231
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../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
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "None"
 
-#: ../calendar/gui/e-day-view-time-item.c:870
+#: ../calendar/gui/e-day-view-time-item.c:882
 #: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:262
+#: ../modules/calendar/e-calendar-preferences.c:386
 msgid "Select..."
 msgstr "Select…"
 
@@ -4121,150 +5248,167 @@ msgstr "Optional Participants"
 msgid "Resources"
 msgstr "Resources"
 
+#: ../calendar/gui/e-meeting-list-view.c:165
+msgid "Attendees"
+msgstr "Attendees"
+
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:1018 ../calendar/gui/print.c:1231
+#: ../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
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
-#: ../calendar/gui/print.c:1232 ../e-util/e-table-config.ui.h:8
+#: ../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
 msgid "Group"
 msgstr "Group"
 
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/print.c:1233
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/print.c:1247
 msgid "Resource"
 msgstr "Resource"
 
 #: ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1234
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1248
 msgid "Room"
 msgstr "Room"
 
 #: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/print.c:1248
+#: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/print.c:1262
 msgid "Chair"
 msgstr "Chair"
 
 #: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1249
+#: ../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
 msgid "Required Participant"
 msgstr "Required Participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1250
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/print.c:1264
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/print.c:1251
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/print.c:1265
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/e-meeting-store.c:1031
+#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:1030
 msgid "Needs Action"
 msgstr "Needs Action"
 
-#: ../calendar/gui/e-meeting-list-view.c:623
+#: ../calendar/gui/e-meeting-list-view.c:620
 msgid "Attendee                          "
 msgstr "Attendee                          "
 
-#: ../calendar/gui/e-meeting-list-view.c:678
+#: ../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
+msgid "Type"
+msgstr "Type"
+
+#: ../calendar/gui/e-meeting-list-view.c:675
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 msgid "In Process"
 msgstr "In Process"
 
-#: ../calendar/gui/e-meeting-store.c:1905
+#: ../calendar/gui/e-meeting-store.c:1881
 #, 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:1915
+#: ../calendar/gui/e-meeting-store.c:1891
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Failure reason: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1920
-#: ../plugins/publish-calendar/publish-calendar.c:341
-#: ../smime/gui/component.c:55
+#: ../calendar/gui/e-meeting-store.c:1896
+#: ../plugins/publish-calendar/publish-calendar.c:351
+#: ../smime/gui/component.c:63
 msgid "Enter password"
 msgstr "Enter password"
 
-#: ../calendar/gui/e-meeting-time-sel.c:528
+#: ../calendar/gui/e-meeting-time-sel.c:537
 msgid "Out of Office"
 msgstr "Out of Office"
 
-#: ../calendar/gui/e-meeting-time-sel.c:530
+#: ../calendar/gui/e-meeting-time-sel.c:539
 msgid "No Information"
 msgstr "No Information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:555
+msgid "Atte_ndees..."
+msgstr "Atte_ndees…"
+
+#: ../calendar/gui/e-meeting-time-sel.c:574
 msgid "O_ptions"
 msgstr "O_ptions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:590
+#: ../calendar/gui/e-meeting-time-sel.c:595
 msgid "Show _only working hours"
 msgstr "Show _only working hours"
 
-#: ../calendar/gui/e-meeting-time-sel.c:603
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _zoomed out"
 msgstr "Show _zoomed out"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_Update free/busy"
 msgstr "_Update free/busy"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:643
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:658
+#: ../calendar/gui/e-meeting-time-sel.c:663
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: ../calendar/gui/e-meeting-time-sel.c:675
+#: ../calendar/gui/e-meeting-time-sel.c:680
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:696
+#: ../calendar/gui/e-meeting-time-sel.c:702
 msgid "_All people and resources"
 msgstr "_All people and resources"
 
-#: ../calendar/gui/e-meeting-time-sel.c:707
+#: ../calendar/gui/e-meeting-time-sel.c:713
 msgid "All _people and one resource"
 msgstr "All _people and one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:718
+#: ../calendar/gui/e-meeting-time-sel.c:724
 msgid "_Required people"
 msgstr "_Required people"
 
-#: ../calendar/gui/e-meeting-time-sel.c:728
+#: ../calendar/gui/e-meeting-time-sel.c:734
 msgid "Required people and _one resource"
 msgstr "Required people and _one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:767
+#: ../calendar/gui/e-meeting-time-sel.c:773
 msgid "_Start time:"
 msgstr "_Start time:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:796
+#: ../calendar/gui/e-meeting-time-sel.c:802
 msgid "_End time:"
 msgstr "_End time:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2660
+#: ../calendar/gui/e-meeting-time-sel.c:2723
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -4273,7 +5417,7 @@ msgstr ""
 "Summary: %s\n"
 "Location: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3497
+#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3522
 #, c-format
 msgid "Summary: %s"
 msgstr "Summary: %s"
@@ -4302,46 +5446,46 @@ msgstr "Common Name"
 msgid "Language"
 msgstr "Language"
 
-#: ../calendar/gui/e-memo-table.c:421
-#: ../modules/calendar/e-cal-shell-content.c:472
-#: ../modules/calendar/e-memo-shell-view-actions.c:232
-#: ../modules/calendar/e-memo-shell-view-actions.c:247
-#: ../modules/calendar/e-memo-shell-view.c:306
+#: ../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:502 ../calendar/gui/e-task-table.c:790
+#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:757
 msgid "* No Summary *"
 msgstr "* No Summary *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:589 ../calendar/gui/e-task-table.c:874
+#: ../calendar/gui/e-memo-table.c:542 ../calendar/gui/e-task-table.c:839
 msgid "Start: "
 msgstr "Start: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:608 ../calendar/gui/e-task-table.c:892
+#: ../calendar/gui/e-memo-table.c:562 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr "Due: "
 
-#: ../calendar/gui/e-memo-table.c:727
+#: ../calendar/gui/e-memo-table.c:720
 msgid "Cut selected memos to the clipboard"
 msgstr "Cut selected memos to the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:733
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Copy selected memos to the clipboard"
 msgstr "Copy selected memos to the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:739
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Paste memos from the clipboard"
 msgstr "Paste memos from the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:745
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../calendar/gui/e-memo-table.c:738
+#: ../modules/calendar/e-memo-shell-view-actions.c:560
 msgid "Delete selected memos"
 msgstr "Delete selected memos"
 
-#: ../calendar/gui/e-memo-table.c:751
+#: ../calendar/gui/e-memo-table.c:744
 msgid "Select all visible memos"
 msgstr "Select all visible memos"
 
@@ -4349,47 +5493,83 @@ msgstr "Select all visible memos"
 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
+msgid "Undefined"
+msgstr "Undefined"
+
 #. Translators: "%d%%" is the percentage of a task done.
 #. * %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:602
+#: ../calendar/gui/e-task-table.c:555
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:708 ../calendar/gui/print.c:2389
+#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2410
 #: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:1078
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:433
-#: ../modules/calendar/e-task-shell-view-actions.c:255
-#: ../modules/calendar/e-task-shell-view-actions.c:270
-#: ../modules/calendar/e-task-shell-view.c:461
+#: ../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:1025
+#: ../calendar/gui/e-task-table.c:1033
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cut selected tasks to the clipboard"
 
-#: ../calendar/gui/e-task-table.c:1031
+#: ../calendar/gui/e-task-table.c:1039
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copy selected tasks to the clipboard"
 
-#: ../calendar/gui/e-task-table.c:1037
+#: ../calendar/gui/e-task-table.c:1045
 msgid "Paste tasks from the clipboard"
 msgstr "Paste tasks from the clipboard"
 
-#: ../calendar/gui/e-task-table.c:1043
-#: ../modules/calendar/e-task-shell-view-actions.c:734
+#: ../calendar/gui/e-task-table.c:1051
+#: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "Delete selected tasks"
 msgstr "Delete selected tasks"
 
-#: ../calendar/gui/e-task-table.c:1049
+#: ../calendar/gui/e-task-table.c:1057
 msgid "Select all visible tasks"
 msgstr "Select all visible tasks"
 
+#: ../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
+msgid "Start date"
+msgstr "Start date"
+
+#: ../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
+msgid "Complete"
+msgstr "Complete"
+
+#: ../calendar/gui/e-task-table.etspec.h:7
+msgid "Due date"
+msgstr "Due date"
+
+#: ../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
+msgid "Priority"
+msgstr "Priority"
+
 #: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr "Select Timezone"
@@ -4397,40 +5577,36 @@ msgstr "Select Timezone"
 #. 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:241 ../calendar/gui/print.c:2050
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2074
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2319
-msgid "Purging"
-msgstr "Purging"
-
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
-#: ../calendar/gui/itip-utils.c:818
+#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:849
 msgid "An organizer must be set."
 msgstr "An organiser must be set."
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:706
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: ../calendar/gui/itip-utils.c:905 ../calendar/gui/itip-utils.c:1066
+#: ../calendar/gui/itip-utils.c:937 ../calendar/gui/itip-utils.c:1098
 msgid "Event information"
 msgstr "Event information"
 
-#: ../calendar/gui/itip-utils.c:908 ../calendar/gui/itip-utils.c:1069
+#: ../calendar/gui/itip-utils.c:940 ../calendar/gui/itip-utils.c:1101
 msgid "Task information"
 msgstr "Task information"
 
-#: ../calendar/gui/itip-utils.c:911 ../calendar/gui/itip-utils.c:1072
+#: ../calendar/gui/itip-utils.c:943 ../calendar/gui/itip-utils.c:1104
 msgid "Memo information"
 msgstr "Memo information"
 
-#: ../calendar/gui/itip-utils.c:914 ../calendar/gui/itip-utils.c:1090
+#: ../calendar/gui/itip-utils.c:946 ../calendar/gui/itip-utils.c:1122
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
-#: ../calendar/gui/itip-utils.c:917
+#: ../calendar/gui/itip-utils.c:949
 msgid "Calendar information"
 msgstr "Calendar information"
 
@@ -4438,7 +5614,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:954
+#: ../calendar/gui/itip-utils.c:986
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Accepted"
@@ -4447,7 +5623,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:961
+#: ../calendar/gui/itip-utils.c:993
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
@@ -4459,7 +5635,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:968 ../calendar/gui/itip-utils.c:1016
+#: ../calendar/gui/itip-utils.c:1000 ../calendar/gui/itip-utils.c:1048
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Declined"
@@ -4468,7 +5644,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:975
+#: ../calendar/gui/itip-utils.c:1007
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegated"
@@ -4476,7 +5652,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:988
+#: ../calendar/gui/itip-utils.c:1020
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Updated"
@@ -4484,7 +5660,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:995
+#: ../calendar/gui/itip-utils.c:1027
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancel"
@@ -4492,7 +5668,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:1002
+#: ../calendar/gui/itip-utils.c:1034
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Refresh"
@@ -4500,248 +5676,285 @@ 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:1009
+#: ../calendar/gui/itip-utils.c:1041
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
 
-#: ../calendar/gui/itip-utils.c:1087
+#: ../calendar/gui/itip-utils.c:1119
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy information (%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:1095
+#: ../calendar/gui/itip-utils.c:1127
 msgid "iCalendar information"
 msgstr "iCalendar information"
 
-#: ../calendar/gui/itip-utils.c:1122
+#: ../calendar/gui/itip-utils.c:1156
+#, 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:1127
-#, c-format
-msgid "Unable to book a resource, error: %s"
-msgstr "Unable to book a resource, error: %s"
+#: ../calendar/gui/itip-utils.c:1161
+#| msgid "Unable to book a resource, error: %s"
+msgid "Unable to book a resource, error: "
+msgstr "Unable to book a resource, error: "
 
-#: ../calendar/gui/itip-utils.c:1304
+#: ../calendar/gui/itip-utils.c:1332
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/itip-utils.c:1986
+#| msgid "Sending message"
+msgid "Sending an event"
+msgstr "Sending an event"
+
+#: ../calendar/gui/itip-utils.c:1990
+#| msgid "Sending mail"
+msgid "Sending a memo"
+msgstr "Sending a memo"
+
+#: ../calendar/gui/itip-utils.c:1994
+#| msgid "Sending mail"
+msgid "Sending a task"
+msgstr "Sending a task"
+
+#: ../calendar/gui/print.c:663
 msgid "1st"
 msgstr "1st"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:663
 msgid "2nd"
 msgstr "2nd"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:663
 msgid "3rd"
 msgstr "3rd"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:663
 msgid "4th"
 msgstr "4th"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:663
 msgid "5th"
 msgstr "5th"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:664
 msgid "6th"
 msgstr "6th"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:664
 msgid "7th"
 msgstr "7th"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:664
 msgid "8th"
 msgstr "8th"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:664
 msgid "9th"
 msgstr "9th"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:664
 msgid "10th"
 msgstr "10th"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:665
 msgid "11th"
 msgstr "11th"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:665
 msgid "12th"
 msgstr "12th"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:665
 msgid "13th"
 msgstr "13th"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:665
 msgid "14th"
 msgstr "14th"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:665
 msgid "15th"
 msgstr "15th"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:666
 msgid "16th"
 msgstr "16th"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:666
 msgid "17th"
 msgstr "17th"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:666
 msgid "18th"
 msgstr "18th"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:666
 msgid "19th"
 msgstr "19th"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:666
 msgid "20th"
 msgstr "20th"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:667
 msgid "21st"
 msgstr "21st"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:667
 msgid "22nd"
 msgstr "22nd"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:667
 msgid "23rd"
 msgstr "23rd"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:667
 msgid "24th"
 msgstr "24th"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:667
 msgid "25th"
 msgstr "25th"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:668
 msgid "26th"
 msgstr "26th"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:668
 msgid "27th"
 msgstr "27th"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:668
 msgid "28th"
 msgstr "28th"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:668
 msgid "29th"
 msgstr "29th"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:668
 msgid "30th"
 msgstr "30th"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:669
 msgid "31st"
 msgstr "31st"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:721
-msgid "Su"
-msgstr "Su"
-
-#: ../calendar/gui/print.c:721
+#. Translators: These are workday abbreviations,
+#. * e.g. Su=Sunday and Th=thursday
+#. G_DATE_BAD_WEEKDAY
+#. G_DATE_MONDAY
+#: ../calendar/gui/print.c:729
 msgid "Mo"
 msgstr "Mo"
 
-#: ../calendar/gui/print.c:721
+#. G_DATE_TUESDAY
+#: ../calendar/gui/print.c:730
 msgid "Tu"
 msgstr "Tu"
 
-#: ../calendar/gui/print.c:721
+#. G_DATE_WEDNESDAY
+#: ../calendar/gui/print.c:731
 msgid "We"
 msgstr "We"
 
-#: ../calendar/gui/print.c:722
+#. G_DATE_THURSDAY
+#: ../calendar/gui/print.c:732
 msgid "Th"
 msgstr "Th"
 
-#: ../calendar/gui/print.c:722
+#. G_DATE_FRIDAY
+#: ../calendar/gui/print.c:733
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:722
+#. G_DATE_SATURDAY
+#: ../calendar/gui/print.c:734
 msgid "Sa"
 msgstr "Sa"
 
+#. G_DATE_SUNDAY
+#: ../calendar/gui/print.c:735
+msgid "Su"
+msgstr "Su"
+
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3296
+#: ../calendar/gui/print.c:3315
 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:3306
+#: ../calendar/gui/print.c:3325
 msgid " (Completed "
 msgstr " (Completed "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3312
+#: ../calendar/gui/print.c:3331
 msgid "Completed "
 msgstr "Completed "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3322
+#: ../calendar/gui/print.c:3341
 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:3329
+#: ../calendar/gui/print.c:3348
 msgid "Due "
 msgstr "Due "
 
-#: ../calendar/gui/print.c:3527
+#: ../calendar/gui/print.c:3492
+msgid "Appointment"
+msgstr "Appointment"
+
+#: ../calendar/gui/print.c:3494 ../e-util/e-send-options.c:553
+msgid "Task"
+msgstr "Task"
+
+#: ../calendar/gui/print.c:3496
+msgid "Memo"
+msgstr "Memo"
+
+#: ../calendar/gui/print.c:3552
 msgid "Attendees: "
 msgstr "Attendees: "
 
-#: ../calendar/gui/print.c:3571
+#: ../calendar/gui/print.c:3596
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:3587
+#: ../calendar/gui/print.c:3612
 #, c-format
 msgid "Priority: %s"
 msgstr "Priority: %s"
 
-#: ../calendar/gui/print.c:3605
+#: ../calendar/gui/print.c:3630
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percent Complete: %i"
 
-#: ../calendar/gui/print.c:3619
+#: ../calendar/gui/print.c:3644
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3633
+#: ../calendar/gui/print.c:3658
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: ../calendar/gui/print.c:3644
+#: ../calendar/gui/print.c:3669
 msgid "Contacts: "
 msgstr "Contacts: "
 
@@ -4749,20 +5962,18 @@ msgstr "Contacts: "
 msgid "In progress"
 msgstr "In progress"
 
-#: ../calendar/gui/tasktypes.xml.h:14
-msgid "Cancelled"
-msgstr "Cancelled"
-
 #: ../calendar/gui/tasktypes.xml.h:25
 #, no-c-format
 msgid "% Completed"
 msgstr "% Completed"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:38
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:31
+#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
 msgid "is greater than"
 msgstr "is greater than"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:39
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:32
+#: ../mail/searchtypes.xml.in.h:34 ../mail/vfoldertypes.xml.in.h:34
 msgid "is less than"
 msgstr "is less than"
 
@@ -4770,195 +5981,221 @@ msgstr "is less than"
 msgid "Appointments and Meetings"
 msgstr "Appointments and Meetings"
 
-#: ../calendar/importers/icalendar-importer.c:462
-#: ../calendar/importers/icalendar-importer.c:901
+#: ../calendar/importers/icalendar-importer.c:308
+#: ../modules/calendar/e-cal-base-shell-backend.c:183
+#: ../modules/calendar/e-cal-shell-view-actions.c:180
+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
+msgid "New Task List"
+msgstr "New Task List"
+
+#: ../calendar/importers/icalendar-importer.c:353
+#| msgid "Create a new calendar"
+msgid "Cre_ate new calendar"
+msgstr "Cre_ate new calendar"
+
+#: ../calendar/importers/icalendar-importer.c:357
+#| msgid "Create a new task list"
+msgid "Cre_ate new task list"
+msgstr "Cre_ate new task list"
+
+#: ../calendar/importers/icalendar-importer.c:503
+#: ../calendar/importers/icalendar-importer.c:946
 msgid "Opening calendar"
 msgstr "Opening calendar"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:654
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar files (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:611
+#: ../calendar/importers/icalendar-importer.c:655
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:703
+#: ../calendar/importers/icalendar-importer.c:747
 msgid "Reminder!"
 msgstr "Reminder!"
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:832
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar files (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:788
+#: ../calendar/importers/icalendar-importer.c:833
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:1071
+#: ../calendar/importers/icalendar-importer.c:1109
 msgid "Calendar Events"
 msgstr "Calendar Events"
 
-#: ../calendar/importers/icalendar-importer.c:1115
+#: ../calendar/importers/icalendar-importer.c:1152
+#| msgid "New Calendar"
+msgid "GNOME Calendar"
+msgstr "GNOME Calendar"
+
+#: ../calendar/importers/icalendar-importer.c:1153
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution Calendar intelligent importer"
 
-#: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1224
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Meeting"
 
-#: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1224
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Event"
 
-#: ../calendar/importers/icalendar-importer.c:1189
-#: ../calendar/importers/icalendar-importer.c:1506
+#: ../calendar/importers/icalendar-importer.c:1227
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Task"
 
-#: ../calendar/importers/icalendar-importer.c:1192
-#: ../calendar/importers/icalendar-importer.c:1507
+#: ../calendar/importers/icalendar-importer.c:1230
+#: ../calendar/importers/icalendar-importer.c:1540
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/importers/icalendar-importer.c:1201
+#: ../calendar/importers/icalendar-importer.c:1239
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "has recurrences"
 
-#: ../calendar/importers/icalendar-importer.c:1206
+#: ../calendar/importers/icalendar-importer.c:1244
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "is an instance"
 
-#: ../calendar/importers/icalendar-importer.c:1211
+#: ../calendar/importers/icalendar-importer.c:1249
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "has reminders"
 
-#: ../calendar/importers/icalendar-importer.c:1216
+#: ../calendar/importers/icalendar-importer.c:1254
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "has attachments"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1229
+#: ../calendar/importers/icalendar-importer.c:1267
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Public"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1232
+#: ../calendar/importers/icalendar-importer.c:1270
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Private"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1235
+#: ../calendar/importers/icalendar-importer.c:1273
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Confidential"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1239
+#: ../calendar/importers/icalendar-importer.c:1277
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Classification"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1244
-#: ../calendar/importers/icalendar-importer.c:1549
+#: ../calendar/importers/icalendar-importer.c:1282
+#: ../calendar/importers/icalendar-importer.c:1582
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Summary"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1250
+#: ../calendar/importers/icalendar-importer.c:1288
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Location"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1258
-#: ../calendar/importers/icalendar-importer.c:1544
+#: ../calendar/importers/icalendar-importer.c:1296
+#: ../calendar/importers/icalendar-importer.c:1577
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Start"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1269
+#: ../calendar/importers/icalendar-importer.c:1307
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Due"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1281
+#: ../calendar/importers/icalendar-importer.c:1319
 msgctxt "iCalImp"
 msgid "End"
 msgstr "End"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1291
+#: ../calendar/importers/icalendar-importer.c:1329
 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:1315
+#: ../calendar/importers/icalendar-importer.c:1353
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Completed"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1323
+#: ../calendar/importers/icalendar-importer.c:1361
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1334
-#: ../calendar/importers/icalendar-importer.c:1337
+#: ../calendar/importers/icalendar-importer.c:1372
+#: ../calendar/importers/icalendar-importer.c:1375
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organiser"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1357
-#: ../calendar/importers/icalendar-importer.c:1360
+#: ../calendar/importers/icalendar-importer.c:1395
+#: ../calendar/importers/icalendar-importer.c:1398
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Attendees"
 
-#: ../calendar/importers/icalendar-importer.c:1374
+#: ../calendar/importers/icalendar-importer.c:1412
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Description"
 
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1572
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Type"
 
 #.
 #. *
-#. * This program is free software; you can redistribute it and/or
-#. * modify it under the terms of the GNU Lesser General Public
-#. * License as published by the Free Software Foundation; either
-#. * version 2 of the License, or (at your option) version 3.
+#. * This program is free software; you can redistribute it and/or modify it
+#. * under the terms of the GNU Lesser General Public License as published by
+#. * the Free Software Foundation.
 #. *
-#. * This program is distributed in the hope that it will be useful,
-#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
-#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#. * Lesser General Public License for more details.
+#. * This program is distributed in the hope that it will be useful, but
+#. * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#. * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#. * for more details.
 #. *
-#. * You should have received a copy of the GNU Lesser General Public
-#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. * You should have received a copy of the GNU Lesser General Public License
+#. * along with this program; if not, see <http://www.gnu.org/licenses/>.
 #. *
 #. *
 #. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -4969,1688 +6206,1712 @@ msgstr "Type"
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:25
 msgid "Africa/Abidjan"
 msgstr "Africa/Abidjan"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:26
 msgid "Africa/Accra"
 msgstr "Africa/Accra"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:27
 msgid "Africa/Addis_Ababa"
 msgstr "Africa/Addis_Ababa"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:28
 msgid "Africa/Algiers"
 msgstr "Africa/Algiers"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:29
 msgid "Africa/Asmera"
 msgstr "Africa/Asmera"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:30
 msgid "Africa/Bamako"
 msgstr "Africa/Bamako"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:31
 msgid "Africa/Bangui"
 msgstr "Africa/Bangui"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:32
 msgid "Africa/Banjul"
 msgstr "Africa/Banjul"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:33
 msgid "Africa/Bissau"
 msgstr "Africa/Bissau"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:34
 msgid "Africa/Blantyre"
 msgstr "Africa/Blantyre"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:35
 msgid "Africa/Brazzaville"
 msgstr "Africa/Brazzaville"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:36
 msgid "Africa/Bujumbura"
 msgstr "Africa/Bujumbura"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:37
 msgid "Africa/Cairo"
 msgstr "Africa/Cairo"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:38
 msgid "Africa/Casablanca"
 msgstr "Africa/Casablanca"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:39
 msgid "Africa/Ceuta"
 msgstr "Africa/Ceuta"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:40
 msgid "Africa/Conakry"
 msgstr "Africa/Conakry"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:41
 msgid "Africa/Dakar"
 msgstr "Africa/Dakar"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:42
 msgid "Africa/Dar_es_Salaam"
 msgstr "Africa/Dar_es_Salaam"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:43
 msgid "Africa/Djibouti"
 msgstr "Africa/Djibouti"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:44
 msgid "Africa/Douala"
 msgstr "Africa/Douala"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:45
 msgid "Africa/El_Aaiun"
 msgstr "Africa/El_Aaiun"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:46
 msgid "Africa/Freetown"
 msgstr "Africa/Freetown"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:47
 msgid "Africa/Gaborone"
 msgstr "Africa/Gaborone"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:48
 msgid "Africa/Harare"
 msgstr "Africa/Harare"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:49
 msgid "Africa/Johannesburg"
 msgstr "Africa/Johannesburg"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:50
 msgid "Africa/Kampala"
 msgstr "Africa/Kampala"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:51
 msgid "Africa/Khartoum"
 msgstr "Africa/Khartoum"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:52
 msgid "Africa/Kigali"
 msgstr "Africa/Kigali"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:53
 msgid "Africa/Kinshasa"
 msgstr "Africa/Kinshasa"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:54
 msgid "Africa/Lagos"
 msgstr "Africa/Lagos"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:55
 msgid "Africa/Libreville"
 msgstr "Africa/Libreville"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:56
 msgid "Africa/Lome"
 msgstr "Africa/Lome"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:57
 msgid "Africa/Luanda"
 msgstr "Africa/Luanda"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:58
 msgid "Africa/Lubumbashi"
 msgstr "Africa/Lubumbashi"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:59
 msgid "Africa/Lusaka"
 msgstr "Africa/Lusaka"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:60
 msgid "Africa/Malabo"
 msgstr "Africa/Malabo"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:61
 msgid "Africa/Maputo"
 msgstr "Africa/Maputo"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:62
 msgid "Africa/Maseru"
 msgstr "Africa/Maseru"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:63
 msgid "Africa/Mbabane"
 msgstr "Africa/Mbabane"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:64
 msgid "Africa/Mogadishu"
 msgstr "Africa/Mogadishu"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:65
 msgid "Africa/Monrovia"
 msgstr "Africa/Monrovia"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:66
 msgid "Africa/Nairobi"
 msgstr "Africa/Nairobi"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:67
 msgid "Africa/Ndjamena"
 msgstr "Africa/Ndjamena"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:68
 msgid "Africa/Niamey"
 msgstr "Africa/Niamey"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:69
 msgid "Africa/Nouakchott"
 msgstr "Africa/Nouakchott"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:70
 msgid "Africa/Ouagadougou"
 msgstr "Africa/Ouagadougou"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:71
 msgid "Africa/Porto-Novo"
 msgstr "Africa/Porto-Novo"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:72
 msgid "Africa/Sao_Tome"
 msgstr "Africa/Sao_Tome"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:73
 msgid "Africa/Timbuktu"
 msgstr "Africa/Timbuktu"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:74
 msgid "Africa/Tripoli"
 msgstr "Africa/Tripoli"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:75
 msgid "Africa/Tunis"
 msgstr "Africa/Tunis"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:76
 msgid "Africa/Windhoek"
 msgstr "Africa/Windhoek"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:77
 msgid "America/Adak"
 msgstr "America/Adak"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:78
 msgid "America/Anchorage"
 msgstr "America/Anchorage"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:79
 msgid "America/Anguilla"
 msgstr "America/Anguilla"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:80
 msgid "America/Antigua"
 msgstr "America/Antigua"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:81
 msgid "America/Araguaina"
 msgstr "America/Araguaina"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:82
 msgid "America/Aruba"
 msgstr "America/Aruba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:83
 msgid "America/Asuncion"
 msgstr "America/Asuncion"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:84
 msgid "America/Barbados"
 msgstr "America/Barbados"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:85
 msgid "America/Belem"
 msgstr "America/Belem"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:86
 msgid "America/Belize"
 msgstr "America/Belize"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:87
 msgid "America/Boa_Vista"
 msgstr "America/Boa_Vista"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:88
 msgid "America/Bogota"
 msgstr "America/Bogota"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:89
 msgid "America/Boise"
 msgstr "America/Boise"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:90
 msgid "America/Buenos_Aires"
 msgstr "America/Buenos_Aires"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:91
 msgid "America/Cambridge_Bay"
 msgstr "America/Cambridge_Bay"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:92
 msgid "America/Cancun"
 msgstr "America/Cancun"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:93
 msgid "America/Caracas"
 msgstr "America/Caracas"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:94
 msgid "America/Catamarca"
 msgstr "America/Catamarca"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:95
 msgid "America/Cayenne"
 msgstr "America/Cayenne"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:96
 msgid "America/Cayman"
 msgstr "America/Cayman"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:97
 msgid "America/Chicago"
 msgstr "America/Chicago"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:98
 msgid "America/Chihuahua"
 msgstr "America/Chihuahua"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:99
 msgid "America/Cordoba"
 msgstr "America/Cordoba"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:100
 msgid "America/Costa_Rica"
 msgstr "America/Costa_Rica"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:101
 msgid "America/Cuiaba"
 msgstr "America/Cuiaba"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:102
 msgid "America/Curacao"
 msgstr "America/Curacao"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:103
 msgid "America/Danmarkshavn"
 msgstr "America/Danmarkshavn"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:104
 msgid "America/Dawson"
 msgstr "America/Dawson"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:105
 msgid "America/Dawson_Creek"
 msgstr "America/Dawson_Creek"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:106
 msgid "America/Denver"
 msgstr "America/Denver"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:107
 msgid "America/Detroit"
 msgstr "America/Detroit"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:108
 msgid "America/Dominica"
 msgstr "America/Dominica"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:109
 msgid "America/Edmonton"
 msgstr "America/Edmonton"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:110
 msgid "America/Eirunepe"
 msgstr "America/Eirunepe"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:111
 msgid "America/El_Salvador"
 msgstr "America/El_Salvador"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:112
 msgid "America/Fortaleza"
 msgstr "America/Fortaleza"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:113
 msgid "America/Glace_Bay"
 msgstr "America/Glace_Bay"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:114
 msgid "America/Godthab"
 msgstr "America/Godthab"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:115
 msgid "America/Goose_Bay"
 msgstr "America/Goose_Bay"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:116
 msgid "America/Grand_Turk"
 msgstr "America/Grand_Turk"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:117
 msgid "America/Grenada"
 msgstr "America/Grenada"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:118
 msgid "America/Guadeloupe"
 msgstr "America/Guadeloupe"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:119
 msgid "America/Guatemala"
 msgstr "America/Guatemala"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:120
 msgid "America/Guayaquil"
 msgstr "America/Guayaquil"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:121
 msgid "America/Guyana"
 msgstr "America/Guyana"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:122
 msgid "America/Halifax"
 msgstr "America/Halifax"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:123
 msgid "America/Havana"
 msgstr "America/Havana"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:124
 msgid "America/Hermosillo"
 msgstr "America/Hermosillo"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:125
 msgid "America/Indiana/Indianapolis"
 msgstr "America/Indiana/Indianapolis"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Knox"
 msgstr "America/Indiana/Knox"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Marengo"
 msgstr "America/Indiana/Marengo"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Vevay"
 msgstr "America/Indiana/Vevay"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:129
 msgid "America/Indianapolis"
 msgstr "America/Indianapolis"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:130
 msgid "America/Inuvik"
 msgstr "America/Inuvik"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:131
 msgid "America/Iqaluit"
 msgstr "America/Iqaluit"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:132
 msgid "America/Jamaica"
 msgstr "America/Jamaica"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:133
 msgid "America/Jujuy"
 msgstr "America/Jujuy"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:134
 msgid "America/Juneau"
 msgstr "America/Juneau"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:135
 msgid "America/Kentucky/Louisville"
 msgstr "America/Kentucky/Louisville"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Monticello"
 msgstr "America/Kentucky/Monticello"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:137
 msgid "America/La_Paz"
 msgstr "America/La_Paz"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:138
 msgid "America/Lima"
 msgstr "America/Lima"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:139
 msgid "America/Los_Angeles"
 msgstr "America/Los_Angeles"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:140
 msgid "America/Louisville"
 msgstr "America/Louisville"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:141
 msgid "America/Maceio"
 msgstr "America/Maceio"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:142
 msgid "America/Managua"
 msgstr "America/Managua"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:143
 msgid "America/Manaus"
 msgstr "America/Manaus"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:144
 msgid "America/Martinique"
 msgstr "America/Martinique"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:145
 msgid "America/Mazatlan"
 msgstr "America/Mazatlan"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:146
 msgid "America/Mendoza"
 msgstr "America/Mendoza"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:147
 msgid "America/Menominee"
 msgstr "America/Menominee"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:148
 msgid "America/Merida"
 msgstr "America/Merida"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:149
 msgid "America/Mexico_City"
 msgstr "America/Mexico_City"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:150
 msgid "America/Miquelon"
 msgstr "America/Miquelon"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:151
 msgid "America/Monterrey"
 msgstr "America/Monterrey"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:152
 msgid "America/Montevideo"
 msgstr "America/Montevideo"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:153
 msgid "America/Montreal"
 msgstr "America/Montreal"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:154
 msgid "America/Montserrat"
 msgstr "America/Montserrat"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:155
 msgid "America/Nassau"
 msgstr "America/Nassau"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:156
 msgid "America/New_York"
 msgstr "America/New_York"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:157
 msgid "America/Nipigon"
 msgstr "America/Nipigon"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:158
 msgid "America/Nome"
 msgstr "America/Nome"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:159
 msgid "America/Noronha"
 msgstr "America/Noronha"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:160
 msgid "America/North_Dakota/Center"
 msgstr "America/North_Dakota/Centre"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:161
 msgid "America/Panama"
 msgstr "America/Panama"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:162
 msgid "America/Pangnirtung"
 msgstr "America/Pangnirtung"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:163
 msgid "America/Paramaribo"
 msgstr "America/Paramaribo"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:164
 msgid "America/Phoenix"
 msgstr "America/Phoenix"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:165
 msgid "America/Port-au-Prince"
 msgstr "America/Port-au-Prince"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:166
 msgid "America/Port_of_Spain"
 msgstr "America/Port_of_Spain"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:167
 msgid "America/Porto_Velho"
 msgstr "America/Porto_Velho"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:168
 msgid "America/Puerto_Rico"
 msgstr "America/Puerto_Rico"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:169
 msgid "America/Rainy_River"
 msgstr "America/Rainy_River"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:170
 msgid "America/Rankin_Inlet"
 msgstr "America/Rankin_Inlet"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:171
 msgid "America/Recife"
 msgstr "America/Recife"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:172
 msgid "America/Regina"
 msgstr "America/Regina"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:173
 msgid "America/Rio_Branco"
 msgstr "America/Rio_Branco"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:174
 msgid "America/Rosario"
 msgstr "America/Rosario"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:175
 msgid "America/Santiago"
 msgstr "America/Santiago"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:176
 msgid "America/Santo_Domingo"
 msgstr "America/Santo_Domingo"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:177
 msgid "America/Sao_Paulo"
 msgstr "America/Sao_Paulo"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:178
 msgid "America/Scoresbysund"
 msgstr "America/Scoresbysund"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:179
 msgid "America/Shiprock"
 msgstr "America/Shiprock"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:180
 msgid "America/St_Johns"
 msgstr "America/St_Johns"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:181
 msgid "America/St_Kitts"
 msgstr "America/St_Kitts"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:182
 msgid "America/St_Lucia"
 msgstr "America/St_Lucia"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:183
 msgid "America/St_Thomas"
 msgstr "America/St_Thomas"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:184
 msgid "America/St_Vincent"
 msgstr "America/St_Vincent"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:185
 msgid "America/Swift_Current"
 msgstr "America/Swift_Current"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:186
 msgid "America/Tegucigalpa"
 msgstr "America/Tegucigalpa"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:187
 msgid "America/Thule"
 msgstr "America/Thule"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:188
 msgid "America/Thunder_Bay"
 msgstr "America/Thunder_Bay"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:189
 msgid "America/Tijuana"
 msgstr "America/Tijuana"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:190
 msgid "America/Tortola"
 msgstr "America/Tortola"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:191
 msgid "America/Vancouver"
 msgstr "America/Vancouver"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:192
 msgid "America/Whitehorse"
 msgstr "America/Whitehorse"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:193
 msgid "America/Winnipeg"
 msgstr "America/Winnipeg"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:194
 msgid "America/Yakutat"
 msgstr "America/Yakutat"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:195
 msgid "America/Yellowknife"
 msgstr "America/Yellowknife"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:196
 msgid "Antarctica/Casey"
 msgstr "Antarctica/Casey"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:197
 msgid "Antarctica/Davis"
 msgstr "Antarctica/Davis"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:198
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarctica/DumontDUrville"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:199
 msgid "Antarctica/Mawson"
 msgstr "Antarctica/Mawson"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:200
 msgid "Antarctica/McMurdo"
 msgstr "Antarctica/McMurdo"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:201
 msgid "Antarctica/Palmer"
 msgstr "Antarctica/Palmer"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:202
 msgid "Antarctica/South_Pole"
 msgstr "Antarctica/South_Pole"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:203
 msgid "Antarctica/Syowa"
 msgstr "Antarctica/Syowa"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:204
 msgid "Antarctica/Vostok"
 msgstr "Antarctica/Vostok"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:205
 msgid "Arctic/Longyearbyen"
 msgstr "Arctic/Longyearbyen"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:206
 msgid "Asia/Aden"
 msgstr "Asia/Aden"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:207
 msgid "Asia/Almaty"
 msgstr "Asia/Almaty"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:208
 msgid "Asia/Amman"
 msgstr "Asia/Amman"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:209
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadyr"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:210
 msgid "Asia/Aqtau"
 msgstr "Asia/Aqtau"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aqtobe"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:212
 msgid "Asia/Ashgabat"
 msgstr "Asia/Ashgabat"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:213
 msgid "Asia/Baghdad"
 msgstr "Asia/Baghdad"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:214
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahrain"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:215
 msgid "Asia/Baku"
 msgstr "Asia/Baku"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:216
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:217
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:218
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:219
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:220
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcutta"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:221
 msgid "Asia/Choibalsan"
 msgstr "Asia/Choibalsan"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:222
 msgid "Asia/Chongqing"
 msgstr "Asia/Chongqing"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:223
 msgid "Asia/Colombo"
 msgstr "Asia/Colombo"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:224
 msgid "Asia/Damascus"
 msgstr "Asia/Damascus"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:225
 msgid "Asia/Dhaka"
 msgstr "Asia/Dhaka"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:226
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:227
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:228
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dushanbe"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:229
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:230
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:231
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong_Kong"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:232
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:233
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:234
 msgid "Asia/Istanbul"
 msgstr "Asia/Istanbul"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:235
 msgid "Asia/Jakarta"
 msgstr "Asia/Jakarta"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:236
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:237
 msgid "Asia/Jerusalem"
 msgstr "Asia/Jerusalem"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:238
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:239
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:240
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:241
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: ../calendar/zones.h:243
-msgid "Asia/Katmandu"
-msgstr "Asia/Katmandu"
+#: ../calendar/zones.h:242
+#| msgid "Asia/Katmandu"
+msgid "Asia/Kathmandu"
+msgstr "Asia/Kathmandu"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:243
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoyarsk"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:244
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala_Lumpur"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:245
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:246
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:247
 msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:248
 msgid "Asia/Macau"
 msgstr "Asia/Macau"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:249
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:250
 msgid "Asia/Makassar"
 msgstr "Asia/Makassar"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:251
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:252
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:253
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:254
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:255
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:256
 msgid "Asia/Oral"
 msgstr "Asia/Oral"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:257
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:258
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:259
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:260
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:261
 msgid "Asia/Qyzylorda"
 msgstr "Asia/Qyzylorda"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:262
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangoon"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:263
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:264
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:265
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:266
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkand"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:267
 msgid "Asia/Seoul"
 msgstr "Asia/Seoul"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:268
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:269
 msgid "Asia/Singapore"
 msgstr "Asia/Singapore"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:270
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:271
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:272
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:273
 msgid "Asia/Tehran"
 msgstr "Asia/Tehran"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:274
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:275
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:276
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:277
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:278
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:279
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:280
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:281
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:282
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:283
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:284
 msgid "Atlantic/Azores"
 msgstr "Atlantic/Azores"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:285
 msgid "Atlantic/Bermuda"
 msgstr "Atlantic/Bermuda"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:286
 msgid "Atlantic/Canary"
 msgstr "Atlantic/Canary"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:287
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantic/Cape_Verde"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:288
 msgid "Atlantic/Faeroe"
 msgstr "Atlantic/Faeroe"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:289
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantic/Jan_Mayen"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:290
 msgid "Atlantic/Madeira"
 msgstr "Atlantic/Madeira"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:291
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantic/Reykjavik"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:292
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantic/South_Georgia"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:293
 msgid "Atlantic/St_Helena"
 msgstr "Atlantic/St_Helena"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:294
 msgid "Atlantic/Stanley"
 msgstr "Atlantic/Stanley"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:295
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:296
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:297
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:298
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:299
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:300
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:301
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:302
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:303
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:304
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:305
 msgid "Europe/Amsterdam"
 msgstr "Europe/Amsterdam"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:306
 msgid "Europe/Andorra"
 msgstr "Europe/Andorra"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:307
 msgid "Europe/Athens"
 msgstr "Europe/Athens"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:308
 msgid "Europe/Belfast"
 msgstr "Europe/Belfast"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:309
 msgid "Europe/Belgrade"
 msgstr "Europe/Belgrade"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:310
 msgid "Europe/Berlin"
 msgstr "Europe/Berlin"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:311
 msgid "Europe/Bratislava"
 msgstr "Europe/Bratislava"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:312
 msgid "Europe/Brussels"
 msgstr "Europe/Brussels"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:313
 msgid "Europe/Bucharest"
 msgstr "Europe/Bucharest"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:314
 msgid "Europe/Budapest"
 msgstr "Europe/Budapest"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:315
 msgid "Europe/Chisinau"
 msgstr "Europe/Chisinau"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:316
 msgid "Europe/Copenhagen"
 msgstr "Europe/Copenhagen"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:317
 msgid "Europe/Dublin"
 msgstr "Europe/Dublin"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:318
 msgid "Europe/Gibraltar"
 msgstr "Europe/Gibraltar"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:319
 msgid "Europe/Helsinki"
 msgstr "Europe/Helsinki"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:320
 msgid "Europe/Istanbul"
 msgstr "Europe/Istanbul"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:321
 msgid "Europe/Kaliningrad"
 msgstr "Europe/Kaliningrad"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:322
 msgid "Europe/Kiev"
 msgstr "Europe/Kiev"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:323
 msgid "Europe/Lisbon"
 msgstr "Europe/Lisbon"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:324
 msgid "Europe/Ljubljana"
 msgstr "Europe/Ljubljana"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:325
 msgid "Europe/London"
 msgstr "Europe/London"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:326
 msgid "Europe/Luxembourg"
 msgstr "Europe/Luxembourg"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:327
 msgid "Europe/Madrid"
 msgstr "Europe/Madrid"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:328
 msgid "Europe/Malta"
 msgstr "Europe/Malta"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:329
 msgid "Europe/Minsk"
 msgstr "Europe/Minsk"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:330
 msgid "Europe/Monaco"
 msgstr "Europe/Monaco"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:331
 msgid "Europe/Moscow"
 msgstr "Europe/Moscow"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:332
 msgid "Europe/Nicosia"
 msgstr "Europe/Nicosia"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:333
 msgid "Europe/Oslo"
 msgstr "Europe/Oslo"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:334
 msgid "Europe/Paris"
 msgstr "Europe/Paris"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:335
 msgid "Europe/Prague"
 msgstr "Europe/Prague"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:336
 msgid "Europe/Riga"
 msgstr "Europe/Riga"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:337
 msgid "Europe/Rome"
 msgstr "Europe/Rome"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:338
 msgid "Europe/Samara"
 msgstr "Europe/Samara"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:339
 msgid "Europe/San_Marino"
 msgstr "Europe/San_Marino"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:340
 msgid "Europe/Sarajevo"
 msgstr "Europe/Sarajevo"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:341
 msgid "Europe/Simferopol"
 msgstr "Europe/Simferopol"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:342
 msgid "Europe/Skopje"
 msgstr "Europe/Skopje"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:343
 msgid "Europe/Sofia"
 msgstr "Europe/Sofia"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:344
 msgid "Europe/Stockholm"
 msgstr "Europe/Stockholm"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:345
 msgid "Europe/Tallinn"
 msgstr "Europe/Tallinn"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:346
 msgid "Europe/Tirane"
 msgstr "Europe/Tirane"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:347
 msgid "Europe/Uzhgorod"
 msgstr "Europe/Uzhgorod"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:348
 msgid "Europe/Vaduz"
 msgstr "Europe/Vaduz"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:349
 msgid "Europe/Vatican"
 msgstr "Europe/Vatican"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:350
 msgid "Europe/Vienna"
 msgstr "Europe/Vienna"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:351
 msgid "Europe/Vilnius"
 msgstr "Europe/Vilnius"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:352
 msgid "Europe/Warsaw"
 msgstr "Europe/Warsaw"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:353
 msgid "Europe/Zagreb"
 msgstr "Europe/Zagreb"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:354
 msgid "Europe/Zaporozhye"
 msgstr "Europe/Zaporozhye"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:355
 msgid "Europe/Zurich"
 msgstr "Europe/Zurich"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:356
 msgid "Indian/Antananarivo"
 msgstr "Indian/Antananarivo"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:357
 msgid "Indian/Chagos"
 msgstr "Indian/Chagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:358
 msgid "Indian/Christmas"
 msgstr "Indian/Christmas"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:359
 msgid "Indian/Cocos"
 msgstr "Indian/Cocos"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:360
 msgid "Indian/Comoro"
 msgstr "Indian/Comoro"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:361
 msgid "Indian/Kerguelen"
 msgstr "Indian/Kerguelen"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:362
 msgid "Indian/Mahe"
 msgstr "Indian/Mahe"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:363
 msgid "Indian/Maldives"
 msgstr "Indian/Maldives"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:364
 msgid "Indian/Mauritius"
 msgstr "Indian/Mauritius"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:365
 msgid "Indian/Mayotte"
 msgstr "Indian/Mayotte"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:366
 msgid "Indian/Reunion"
 msgstr "Indian/Reunion"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:367
 msgid "Pacific/Apia"
 msgstr "Pacific/Apia"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:368
 msgid "Pacific/Auckland"
 msgstr "Pacific/Auckland"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:369
 msgid "Pacific/Chatham"
 msgstr "Pacific/Chatham"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:370
 msgid "Pacific/Easter"
 msgstr "Pacific/Easter"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:371
 msgid "Pacific/Efate"
 msgstr "Pacific/Efate"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:372
 msgid "Pacific/Enderbury"
 msgstr "Pacific/Enderbury"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:373
 msgid "Pacific/Fakaofo"
 msgstr "Pacific/Fakaofo"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:374
 msgid "Pacific/Fiji"
 msgstr "Pacific/Fiji"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:375
 msgid "Pacific/Funafuti"
 msgstr "Pacific/Funafuti"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:376
 msgid "Pacific/Galapagos"
 msgstr "Pacific/Galapagos"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:377
 msgid "Pacific/Gambier"
 msgstr "Pacific/Gambier"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:378
 msgid "Pacific/Guadalcanal"
 msgstr "Pacific/Guadalcanal"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:379
 msgid "Pacific/Guam"
 msgstr "Pacific/Guam"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:380
 msgid "Pacific/Honolulu"
 msgstr "Pacific/Honolulu"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:381
 msgid "Pacific/Johnston"
 msgstr "Pacific/Johnston"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:382
 msgid "Pacific/Kiritimati"
 msgstr "Pacific/Kiritimati"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:383
 msgid "Pacific/Kosrae"
 msgstr "Pacific/Kosrae"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:384
 msgid "Pacific/Kwajalein"
 msgstr "Pacific/Kwajalein"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:385
 msgid "Pacific/Majuro"
 msgstr "Pacific/Majuro"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:386
 msgid "Pacific/Marquesas"
 msgstr "Pacific/Marquesas"
 
-#: ../calendar/zones.h:388
+#: ../calendar/zones.h:387
 msgid "Pacific/Midway"
 msgstr "Pacific/Midway"
 
-#: ../calendar/zones.h:389
+#: ../calendar/zones.h:388
 msgid "Pacific/Nauru"
 msgstr "Pacific/Nauru"
 
-#: ../calendar/zones.h:390
+#: ../calendar/zones.h:389
 msgid "Pacific/Niue"
 msgstr "Pacific/Niue"
 
-#: ../calendar/zones.h:391
+#: ../calendar/zones.h:390
 msgid "Pacific/Norfolk"
 msgstr "Pacific/Norfolk"
 
-#: ../calendar/zones.h:392
+#: ../calendar/zones.h:391
 msgid "Pacific/Noumea"
 msgstr "Pacific/Noumea"
 
-#: ../calendar/zones.h:393
+#: ../calendar/zones.h:392
 msgid "Pacific/Pago_Pago"
 msgstr "Pacific/Pago_Pago"
 
-#: ../calendar/zones.h:394
+#: ../calendar/zones.h:393
 msgid "Pacific/Palau"
 msgstr "Pacific/Palau"
 
-#: ../calendar/zones.h:395
+#: ../calendar/zones.h:394
 msgid "Pacific/Pitcairn"
 msgstr "Pacific/Pitcairn"
 
-#: ../calendar/zones.h:396
+#: ../calendar/zones.h:395
 msgid "Pacific/Ponape"
 msgstr "Pacific/Ponape"
 
-#: ../calendar/zones.h:397
+#: ../calendar/zones.h:396
 msgid "Pacific/Port_Moresby"
 msgstr "Pacific/Port_Moresby"
 
-#: ../calendar/zones.h:398
+#: ../calendar/zones.h:397
 msgid "Pacific/Rarotonga"
 msgstr "Pacific/Rarotonga"
 
-#: ../calendar/zones.h:399
+#: ../calendar/zones.h:398
 msgid "Pacific/Saipan"
 msgstr "Pacific/Saipan"
 
-#: ../calendar/zones.h:400
+#: ../calendar/zones.h:399
 msgid "Pacific/Tahiti"
 msgstr "Pacific/Tahiti"
 
-#: ../calendar/zones.h:401
+#: ../calendar/zones.h:400
 msgid "Pacific/Tarawa"
 msgstr "Pacific/Tarawa"
 
-#: ../calendar/zones.h:402
+#: ../calendar/zones.h:401
 msgid "Pacific/Tongatapu"
 msgstr "Pacific/Tongatapu"
 
-#: ../calendar/zones.h:403
+#: ../calendar/zones.h:402
 msgid "Pacific/Truk"
 msgstr "Pacific/Truk"
 
-#: ../calendar/zones.h:404
+#: ../calendar/zones.h:403
 msgid "Pacific/Wake"
 msgstr "Pacific/Wake"
 
-#: ../calendar/zones.h:405
+#: ../calendar/zones.h:404
 msgid "Pacific/Wallis"
 msgstr "Pacific/Wallis"
 
-#: ../calendar/zones.h:406
+#: ../calendar/zones.h:405
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: ../composer/e-composer-actions.c:207
+#: ../composer/e-composer-actions.c:227
 msgid "Save as..."
 msgstr "Save as…"
 
-#: ../composer/e-composer-actions.c:294
-#: ../e-util/e-mail-signature-editor.c:303
-msgid "_Close"
-msgstr "_Close"
-
-#: ../composer/e-composer-actions.c:296
+#: ../composer/e-composer-actions.c:328
 msgid "Close the current file"
 msgstr "Close the current file"
 
-#: ../composer/e-composer-actions.c:301
+#: ../composer/e-composer-actions.c:333
 msgid "New _Message"
 msgstr "New _Message"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:335
 msgid "Open New Message window"
 msgstr "Open New Message window"
 
-#: ../composer/e-composer-actions.c:310 ../shell/e-shell-window-actions.c:925
+#: ../composer/e-composer-actions.c:340 ../shell/e-shell.c:1217
+#: ../shell/e-shell-window-actions.c:848
+#| msgid "Prefere_nces"
+msgid "_Preferences"
+msgstr "_Preferences"
+
+#: ../composer/e-composer-actions.c:342 ../shell/e-shell-window-actions.c:850
 msgid "Configure Evolution"
 msgstr "Configure Evolution"
 
-#: ../composer/e-composer-actions.c:317
+#: ../composer/e-composer-actions.c:349
 msgid "Save the current file"
 msgstr "Save the current file"
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:354
 msgid "Save _As..."
 msgstr "Save _As…"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:356
 msgid "Save the current file with a different name"
 msgstr "Save the current file with a different name"
 
-#: ../composer/e-composer-actions.c:331
+#: ../composer/e-composer-actions.c:363
 msgid "Character _Encoding"
 msgstr "Character _Encoding"
 
-#: ../composer/e-composer-actions.c:348
-msgid "_Print..."
-msgstr "_Print…"
-
-#: ../composer/e-composer-actions.c:355
+#: ../composer/e-composer-actions.c:387
 msgid "Print Pre_view"
 msgstr "Print Pre_view"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:394
 msgid "Save as _Draft"
 msgstr "Save as _Draft"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:396
 msgid "Save as draft"
 msgstr "Save as draft"
 
-#: ../composer/e-composer-actions.c:369 ../composer/e-composer-private.c:318
+#: ../composer/e-composer-actions.c:401
 msgid "S_end"
 msgstr "S_end"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:403
 msgid "Send this message"
 msgstr "Send this message"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:411
 msgid "PGP _Encrypt"
 msgstr "PGP _Encrypt"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:413
 msgid "Encrypt this message with PGP"
 msgstr "Encrypt this message with PGP"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:419
 msgid "PGP _Sign"
 msgstr "PGP _Sign"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:421
 msgid "Sign this message with your PGP key"
 msgstr "Sign this message with your PGP key"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:427
 msgid "_Picture Gallery"
 msgstr "_Picture Gallery"
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:429
 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:403
+#: ../composer/e-composer-actions.c:435
 msgid "_Prioritize Message"
 msgstr "_Prioritise Message"
 
-#: ../composer/e-composer-actions.c:405
+#: ../composer/e-composer-actions.c:437
 msgid "Set the message priority to high"
 msgstr "Set the message priority to high"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:443
 msgid "Re_quest Read Receipt"
 msgstr "Re_quest Read Receipt"
 
-#: ../composer/e-composer-actions.c:413
+#: ../composer/e-composer-actions.c:445
 msgid "Get delivery notification when your message is read"
 msgstr "Get delivery notification when your message is read"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:451
 msgid "S/MIME En_crypt"
 msgstr "S/MIME En_crypt"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:453
 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:427
+#: ../composer/e-composer-actions.c:459
 msgid "S/MIME Sig_n"
 msgstr "S/MIME Sig_n"
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:461
 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:435
+#: ../composer/e-composer-actions.c:515
 msgid "_Bcc Field"
 msgstr "_Bcc Field"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:517
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Toggles whether the Bcc field is displayed"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:523
 msgid "_Cc Field"
 msgstr "_Cc Field"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:525
 msgid "Toggles whether the CC field is displayed"
 msgstr "Toggles whether the Cc field is displayed"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:531
+#| msgid "_From Field"
+msgid "_From Override Field"
+msgstr "_From Override Field"
+
+#: ../composer/e-composer-actions.c:533
+#| msgid "Toggles whether the Role field is displayed"
+msgid ""
+"Toggles whether the From override field to change name or email address is "
+"displayed"
+msgstr ""
+"Toggles whether the From override field to change name or e-mail address is "
+"displayed"
+
+#: ../composer/e-composer-actions.c:539
 msgid "_Reply-To Field"
 msgstr "_Reply-To Field"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:541
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Toggles whether the Reply-To field is displayed"
 
-#: ../composer/e-composer-actions.c:512
+#: ../composer/e-composer-actions.c:596
+msgid "Attach"
+msgstr "Attach"
+
+#: ../composer/e-composer-actions.c:602
 msgid "Save Draft"
 msgstr "Save Draft"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../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
+msgid "_Name:"
+msgstr "_Name:"
+
+#: ../composer/e-composer-header-table.c:38
 msgid "Enter the recipients of the message"
 msgstr "Enter the recipients of the message"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:40
 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:46
+#: ../composer/e-composer-header-table.c:43
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6658,59 +7919,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:837
+#: ../composer/e-composer-header-table.c:829
 msgid "Fr_om:"
 msgstr "Fr_om:"
 
-#: ../composer/e-composer-header-table.c:844
+#: ../composer/e-composer-header-table.c:836
 msgid "_Reply-To:"
 msgstr "_Reply-To:"
 
-#: ../composer/e-composer-header-table.c:849
+#: ../composer/e-composer-header-table.c:841
 msgid "_To:"
 msgstr "_To:"
 
-#: ../composer/e-composer-header-table.c:855
+#: ../composer/e-composer-header-table.c:847
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:861
+#: ../composer/e-composer-header-table.c:853
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:866
+#: ../composer/e-composer-header-table.c:858
 msgid "_Post To:"
 msgstr "_Post To:"
 
-#: ../composer/e-composer-header-table.c:870
+#: ../composer/e-composer-header-table.c:862
 msgid "S_ubject:"
 msgstr "S_ubject:"
 
-#: ../composer/e-composer-header-table.c:878
-#: ../mail/e-mail-config-identity-page.c:488
+#: ../composer/e-composer-header-table.c:870
+#: ../mail/e-mail-config-identity-page.c:534
 msgid "Si_gnature:"
 msgstr "Si_gnature:"
 
-#: ../composer/e-composer-name-header.c:235
+#: ../composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "Click here for the address book"
 
-#: ../composer/e-composer-post-header.c:184
+#: ../composer/e-composer-post-header.c:182
 msgid "Click here to select folders to post to"
 msgstr "Click here to select folders to post to"
 
-#: ../composer/e-composer-private.c:338
-msgid "Save draft"
-msgstr "Save draft"
-
-#: ../composer/e-msg-composer.c:862
+#: ../composer/e-msg-composer.c:876
 #, 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:871
+#: ../composer/e-msg-composer.c:885
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6719,18 +7976,15 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
-#: ../composer/e-msg-composer.c:1552 ../composer/e-msg-composer.c:1961
+#: ../composer/e-msg-composer.c:1621 ../composer/e-msg-composer.c:2409
+#: ../data/evolution.desktop.in.in.h:7
 msgid "Compose Message"
 msgstr "Compose Message"
 
-#: ../composer/e-msg-composer.c:4215
+#: ../composer/e-msg-composer.c:4731
 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/e-msg-composer.c:4890
-msgid "Untitled Message"
-msgstr "Untitled Message"
-
 #: ../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."
@@ -6776,18 +8030,6 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Error saving to autosave because &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:11
-msgid "Download in progress. Do you want to send the mail?"
-msgstr "Download in progress. Do you want to send the mail?"
-
-#: ../composer/mail-composer.error.xml.h:12
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr ""
-" There are a few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-
-#: ../composer/mail-composer.error.xml.h:14
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
@@ -6795,7 +8037,7 @@ msgstr ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../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 "
@@ -6806,48 +8048,55 @@ msgstr ""
 "continue the message at a later date."
 
 #. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:18
+#: ../composer/mail-composer.error.xml.h:15
 msgid "_Continue Editing"
 msgstr "_Continue Editing"
 
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:16
 msgid "_Save Draft"
 msgstr "_Save Draft"
 
-#: ../composer/mail-composer.error.xml.h:20
+#: ../composer/mail-composer.error.xml.h:17
+#| 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 you are composing?"
+msgstr "Are you sure you want to discard the message you are composing?"
+
+#: ../composer/mail-composer.error.xml.h:18
 msgid "Could not create message."
 msgstr "Could not create message."
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:19
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 "Because &quot;{0}&quot;, you may need to select different mail options."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../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;."
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:21
 msgid "All accounts have been removed."
 msgstr "All accounts have been removed."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:22
 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:25
+#: ../composer/mail-composer.error.xml.h:23
 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:26
+#: ../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."
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:25
 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:28
+#: ../composer/mail-composer.error.xml.h:26
 msgid ""
 "The reported error was &quot;{0}&quot;. The message has most likely not been "
 "saved."
@@ -6855,39 +8104,85 @@ msgstr ""
 "The reported error was &quot;{0}&quot;. The message has most likely not been "
 "saved."
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:27
 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:30 ../mail/mail.error.xml.h:152
+#: ../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;."
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Save to Outbox"
 msgstr "_Save to Outbox"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Try Again"
 msgstr "_Try Again"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:31
 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:34
+#: ../composer/mail-composer.error.xml.h:32
 msgid "Saving message to Outbox."
 msgstr "Saving message to Outbox."
 
+#: ../composer/mail-composer.error.xml.h:33
+#| msgid ""
+#| "Because you are working offline, the message will be saved to your local "
+#| "Outbox folder. When you are back online 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."
+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."
+
+#: ../composer/mail-composer.error.xml.h:34
+#| 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?"
+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
 msgid ""
-"Because you are working offline, the message will be saved to your local "
-"Outbox folder. When you are back online you can send the message by clicking "
-"the Send/Receive button in Evolution's toolbar."
+"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."
 msgstr ""
-"Because you are working offline, the message will be saved to your local "
-"Outbox folder. When you are back online you can send the message by clicking "
-"the Send/Receive button in Evolution's toolbar."
+"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 delete this memo?"
+msgid "Are you sure you want to change the composer mode?"
+msgstr "Are you sure you want to change the composer mode?"
+
+#: ../composer/mail-composer.error.xml.h:38
+msgid ""
+"Turning HTML mode off will cause the text to lose all formatting. Do you "
+"want to continue?"
+msgstr ""
+"Turning HTML mode off will cause the text to lose all formatting. Do you "
+"want to continue?"
+
+#: ../composer/mail-composer.error.xml.h:39
+#| msgid "Address formatting"
+msgid "_Don't lose formatting"
+msgstr "_Don't lose formatting"
+
+#: ../composer/mail-composer.error.xml.h:40
+#| msgid "Address formatting"
+msgid "Lose _formatting"
+msgstr "Lose _formatting"
+
+#: ../composer/mail-composer.error.xml.h:41
+#| msgid "An error occurred while saving to your Drafts folder."
+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"
@@ -6897,13 +8192,14 @@ msgstr "Evolution Alarm Notify"
 msgid "Calendar event notifications"
 msgstr "Calendar event notifications"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:932
-#: ../modules/mailto-handler/evolution-mailto-handler.c:214
-#: ../shell/e-shell-window-private.c:243
+#: ../data/evolution.desktop.in.in.h:1 ../evolution.appdata.xml.in.h:1
+#: ../mail/e-mail-browser.c:1096
+#: ../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-window-actions.c:83
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-utils.c:418
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
@@ -6911,21 +8207,33 @@ msgstr "Groupware Suite"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution Mail and Calendar"
 
-#: ../data/evolution.desktop.in.in.h:4
+#: ../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 "mail;calendar;contact;addressbook;task;"
-msgstr "mail;calendar;contact;addressbook;task;"
-
-#: ../data/evolution-settings.desktop.in.in.h:1
-msgid "Email Settings"
-msgstr "E-mail Settings"
+#| msgid "mail;calendar;contact;addressbook;task;"
+msgid "email;calendar;contact;addressbook;task;"
+msgstr "email;calendar;contact;addressbook;task;"
+
+#: ../data/evolution.desktop.in.in.h:6
+#| msgid "New _Window"
+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-settings.desktop.in.in.h:2
-msgid "Configure email accounts"
-msgstr "Configure e-mail accounts"
+#: ../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"
@@ -7031,6 +8339,65 @@ msgstr "Show preview pane"
 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 timezone field in the event/meeting editor"
+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 categories field in the event/meeting editor"
+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 categories field in the event/meeting editor"
+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 categories field in the event/meeting editor"
+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 categories field in the event/meeting editor"
+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 categories field in the event/meeting editor"
+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 categories field in the event/meeting editor"
+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 timezone field in the event/meeting editor"
+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 categories field in the event/meeting editor"
+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 categories field in the event/meeting editor"
+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 categories field in the event/meeting editor"
+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"
@@ -7043,6 +8410,20 @@ 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"
@@ -7144,10 +8525,107 @@ 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 hour"
+msgid "Workday start time for Monday"
+msgstr "Workday start time for Monday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+#| msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+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 hour"
+msgid "Workday end time for Monday"
+msgstr "Workday end time for Monday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+#| msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+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 minute"
+msgid "Workday start time for Tuesday"
+msgstr "Workday start time for Tuesday"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+#| msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+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 minute"
+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 minute"
+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 minute"
+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 hour"
+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 hour"
+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 hour"
+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 hour"
+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 hour"
+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 hour"
+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 hour"
+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 hour"
+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:24
+#: ../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"
@@ -7155,19 +8633,19 @@ 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:25
+#: ../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:26
+#: ../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:27
+#: ../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:28
+#: ../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"
@@ -7175,101 +8653,114 @@ msgstr ""
 "Maximum number of recently used timezones to remember in a 'day-second-"
 "zones' list"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+#: ../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:30
+#: ../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:31
+#: ../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:32
+#: ../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:33
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+#| msgid "Default reminder value"
+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:34
+#: ../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:35
+#: ../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:36
+#: ../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:37
+#: ../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:38
+#: ../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:39
+#: ../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:40
+#: ../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:41
+#: ../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:42
+#: ../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:43
+#: ../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:44
+#: ../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:45
+#: ../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:46
+#: ../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:47
+#: ../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:48
+#: ../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:49
+#: ../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:50
+#: ../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:51
+#: ../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:52
+#: ../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"
@@ -7277,54 +8768,54 @@ msgstr ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+#: ../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:54
+#: ../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:55
+#: ../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:56
+#: ../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:57
+#: ../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:58
+#: ../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:59
+#: ../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:60
+#: ../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:61
+#: ../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:62
+#: ../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:63
+#: ../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:64
+#: ../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 "
@@ -7334,19 +8825,19 @@ msgstr ""
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
 "list. \"1\" (Vertical View) places the preview pane next to the memo list"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+#: ../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:66
+#: ../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:67
+#: ../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:68
+#: ../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"
@@ -7354,43 +8845,43 @@ 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:69
+#: ../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:70
+#: ../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:71
+#: ../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:72
+#: ../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:73
+#: ../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:74
+#: ../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:75
+#: ../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:76
+#: ../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:77
+#: ../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:78
+#: ../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"
@@ -7398,11 +8889,11 @@ msgstr ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../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:80
+#: ../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"
@@ -7410,11 +8901,11 @@ msgstr ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../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:82
+#: ../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"
@@ -7422,11 +8913,11 @@ msgstr ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#: ../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:85
+#: ../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 "
@@ -7435,19 +8926,19 @@ msgstr ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../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:87
+#: ../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:88
+#: ../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:89
+#: ../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 "
@@ -7457,58 +8948,69 @@ msgstr ""
 "currently selected day when searching for another occurrence; default is ten "
 "years"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#: ../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:91
+#: ../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:92
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#| msgid "Show appointment end times in week and month views"
+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 display the end time of events in the week and month views"
+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:93
+#: ../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:94
+#: ../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:95
+#: ../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:96
+#: ../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:97
+#: ../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:98
+#: ../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:99
+#: ../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:100
+#: ../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:101
+#: ../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:102
+#: ../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"
@@ -7516,15 +9018,15 @@ msgstr ""
 "Background colour of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../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:104
+#: ../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:105
+#: ../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 "
@@ -7534,29 +9036,42 @@ msgstr ""
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../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:107
+#: ../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:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#| msgid "Hide completed tasks"
+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:109
+#: ../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:110
+#: ../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:111
+#: ../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."
@@ -7564,19 +9079,19 @@ msgstr ""
 "Background colour of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../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:113
+#: ../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:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Timezone"
 msgstr "Timezone"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../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\""
@@ -7584,54 +9099,101 @@ 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:116
+#: ../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:117
+#: ../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:118
+#: ../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:119
+#: ../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:120
+#: ../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:121
+#: ../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:122
+#: ../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:123
+#: ../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:124
-msgid "Week start"
-msgstr "Week start"
+#: ../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:125
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
-msgstr "Weekday the week starts on, from Sunday (0) to Saturday (6)"
+#: ../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:126
-msgid "Work days"
-msgstr "Work days"
+#: ../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:127
-msgid "Days on which the start and end of work hours should be indicated"
-msgstr "Days on which the start and end of work hours should be indicated"
+#: ../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 "Weekday the week starts on, from Sunday (0) to Saturday (6)"
+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"
@@ -7705,14 +9267,28 @@ 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."
-msgstr "Default charset in which to compose messages."
+#| msgid "Default charset in which to compose messages."
+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 "_Show the photograph of sender in the message preview"
+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:6
+#: ../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 "
@@ -7722,35 +9298,48 @@ msgstr ""
 "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:7
+#: ../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:8
+#: ../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:9
+#: ../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:10
+#: ../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:11
+#: ../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:12
-msgid "Recognize emoticons in text and replace them with images."
-msgstr "Recognise emoticons in text and replace them with images."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+#| msgid "Recognize emoticons in text and replace them with images."
+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:13
+#: ../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:14
+#: ../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"
@@ -7758,11 +9347,11 @@ 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:15
+#: ../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:16
+#: ../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"
@@ -7770,11 +9359,11 @@ 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:17
+#: ../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:18
+#: ../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"
@@ -7782,11 +9371,11 @@ 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:19
+#: ../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:20
+#: ../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 "
@@ -7798,11 +9387,11 @@ msgstr ""
 "which you happened to receive the copy of the message to which you're "
 "replying."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+#: ../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:22
+#: ../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 "
@@ -7812,43 +9401,35 @@ msgstr ""
 "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:23
+#: ../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:24
+#: ../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:25
+#: ../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:26
+#: ../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:27
-msgid "Spell checking color"
-msgstr "Spell checking colour"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-msgid "Underline color for misspelled words when using inline spelling."
-msgstr "Underline colour for misspelt words when using inline spelling."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
+#: ../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:30
+#: ../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:31
+#: ../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:32
+#: ../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."
@@ -7856,11 +9437,11 @@ msgstr ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+#: ../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:34
+#: ../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."
@@ -7868,11 +9449,27 @@ 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:35
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#| msgid "Show \"From\" 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\" 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"
 msgstr "Show \"Reply To\" field when sending a mail message"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h: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."
@@ -7880,11 +9477,11 @@ msgstr ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../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:38
+#: ../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."
@@ -7892,11 +9489,11 @@ msgstr ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../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:40
+#: ../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."
@@ -7904,11 +9501,11 @@ msgstr ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../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:42
+#: ../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."
@@ -7916,11 +9513,11 @@ msgstr ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../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:44
+#: ../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, "
@@ -7932,11 +9529,24 @@ msgstr ""
 "because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
 "standard."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#| msgid "Saving message to Outbox."
+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:46
+#: ../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 "
@@ -7946,11 +9556,11 @@ msgstr ""
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#: ../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:48
+#: ../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."
@@ -7958,11 +9568,11 @@ msgstr ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#: ../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:50
+#: ../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. "
@@ -7980,11 +9590,11 @@ msgstr ""
 "it will do that. It works by comparing the Reply-To: header with a List-"
 "Post: header, if there is one."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+#: ../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:52
+#: ../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\" "
@@ -7994,31 +9604,73 @@ msgstr ""
 "text when replying to a message, as an addition to the standard \"Re\" "
 "prefix. An example is 'SV,AV'."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
-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:59
+msgid "Number of characters for wrapping"
+msgstr "Number of characters for wrapping"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
-msgid "Can be either 'mbox' or 'pdf'."
-msgstr "Can be either 'mbox' or 'pdf'."
+#: ../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:55
-msgid "Save name format for drag-and-drop operation"
-msgstr "Save name format for drag-and-drop operation"
+#: ../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:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid ""
-"Can be either 2 to use current date and time or any other value for sent "
-"date of the message. This has a meaning only when dropping just one message."
+"When to ask, when the number of To and CC recipients reaches this value."
 msgstr ""
-"Can be either 2 to use current date and time or any other value for sent "
-"date of the message. This has a meaning only when dropping just one message."
+"When to ask, when the number of To and CC recipients reaches this value."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../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:58
+#: ../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."
@@ -8026,11 +9678,11 @@ msgstr ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../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:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -8038,20 +9690,11 @@ msgstr ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-msgid "Disable or enable ellipsizing of folder names in side bar"
-msgstr "Disable or enable ellipsizing of folder names in side bar"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-msgid "Whether disable ellipsizing feature of folder names in side bar."
-msgstr ""
-"Whether to disable ellipsizing feature of folder names in the side bar."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../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:64
+#: ../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."
@@ -8059,129 +9702,160 @@ 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:65
+#: ../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:66
+#: ../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:67
+#: ../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:68
+#: ../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:69
+#: ../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:70
+#: ../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:71
+#: ../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:72
+#: ../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:73
+#: ../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:74
+#: ../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:75
-msgid "Load images for HTML messages over HTTP"
-msgstr "Load images for HTML messages over HTTP"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#| msgid "Load images for HTML messages over HTTP"
+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:76
+#: ../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 ""
-"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
-"Never load images off the net. \"1\" - Load images in messages from "
-"contacts. \"2\" - Always load images off the net."
+"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 ""
-"Load images for HTML messages over HTTP(S). Possible values are: \"0\" — "
-"Never load images off the net. \"1\" — Load images in messages from "
-"contacts. \"2\" — Always load images off the net."
+"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:77
+#: ../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:78
+#: ../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:79
+#: ../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:80
+#: ../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:81
-msgid "List of custom headers and whether they are enabled."
-msgstr "List of custom headers and whether they are enabled."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#| msgid "Show all the headers when viewing a messages."
+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:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
+"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 ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; — set enabled if the header is to be displayed in the "
-"mail view."
+"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:83
+#: ../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:84
+#: ../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:85
-msgid "Search for the sender photo in local address books"
-msgstr "Search for the sender photo in local address books"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#| msgid "Show photo of the sender"
+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:86
-msgid "This option would help in improving the speed of fetching."
-msgstr "This option would help in improving the speed of fetching."
+#: ../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:87
+#: ../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:88
+#: ../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:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#| msgid "Mark as Seen after specified timeout"
+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:103
+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:90
+#: ../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:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#| msgid "Show Attachment _Bar"
+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:92
+#: ../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."
@@ -8189,35 +9863,29 @@ 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:93
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view"
-msgstr ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
-msgstr ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../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:96
+#: ../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:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#| msgid "Show deleted messages in the message-list"
+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 deleted messages (with a strike-through) in the message-list."
+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:98
+#: ../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."
@@ -8225,11 +9893,11 @@ msgstr ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../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:100
+#: ../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."
@@ -8237,39 +9905,31 @@ msgstr ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../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:102
+#: ../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:103
-msgid "State of message headers in paned view"
-msgstr "State of message headers in paned view"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded and \"1\" = collapsed"
-msgstr ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded and \"1\" = collapsed"
+#: ../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:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Width of the message-list pane"
 msgstr "Width of the message-list pane"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Width of the message-list pane."
 msgstr "Width of the message-list pane."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Layout style"
 msgstr "Layout style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 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 "
@@ -8281,35 +9941,35 @@ msgstr ""
 "message list. \"1\" (Vertical View) places the preview pane next to the "
 "message list."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Variable width font"
 msgstr "Variable width font"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../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."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../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:112
+#: ../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:113
+#: ../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:114
+#: ../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:115
+#: ../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:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -8317,11 +9977,11 @@ msgstr ""
 "Compress display of addresses in To/Cc/Bcc to the number specified in "
 "address_count."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../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:118
+#: ../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."
@@ -8329,11 +9989,11 @@ 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:119
+#: ../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"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -8341,11 +10001,11 @@ msgstr ""
 "Whether to fall back on threading by subjects when the messages do not "
 "contain In-Reply-To or References headers."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Default value for thread expand state"
 msgstr "Default value for thread expand state"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -8353,11 +10013,11 @@ msgstr ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../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:124
+#: ../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 "
@@ -8367,11 +10027,27 @@ msgstr ""
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../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 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 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:126
+#: ../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 "
@@ -8383,27 +10059,27 @@ msgstr ""
 "Computer and Search folders, otherwise accounts are sorted based on an order "
 "given by a user"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../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:128
+#: ../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:129
+#: ../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:130
+#: ../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:131
+#: ../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:132
+#: ../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 "
@@ -8413,41 +10089,59 @@ msgstr ""
 "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:133
+#: ../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:134
+#: ../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 without a Subject."
+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:135
+#: ../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:136
+#: ../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:137
+#: ../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:138
+#: ../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:139
+#: ../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:140
+#: ../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:141
+#: ../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"
@@ -8455,19 +10149,19 @@ msgstr ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../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:143
+#: ../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:144
+#: ../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:145
+#: ../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."
@@ -8475,11 +10169,11 @@ msgstr ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../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:147
+#: ../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."
@@ -8487,19 +10181,19 @@ msgstr ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../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:149
+#: ../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:150
+#: ../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:151
+#: ../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 "
@@ -8509,11 +10203,11 @@ msgstr ""
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../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:153
+#: ../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 "
@@ -8525,11 +10219,11 @@ msgstr ""
 "folders in folder tree without asking, or 'ask' - (or any other value) will "
 "ask user."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../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:155
+#: ../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 "
@@ -8541,11 +10235,11 @@ msgstr ""
 "folders in folder tree without asking, or 'ask' - (or any other value) will "
 "ask user."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../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:157
+#: ../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."
@@ -8553,11 +10247,11 @@ msgstr ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../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:159
+#: ../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 "
@@ -8567,11 +10261,11 @@ msgstr ""
 "a private reply to a message which arrived via a mailing list, but the list "
 "sets a Reply-To: header which redirects your reply back to the list."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../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:161
+#: ../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."
@@ -8579,58 +10273,82 @@ 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:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
+"Prompt when switching composer mode and the content needs to lose its "
+"formatting"
 msgstr ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
+"Prompt when switching composer mode and the content needs to lose its "
+"formatting"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#| msgid ""
+#| "It disables/enables the repeated prompts to warn that you are trying to "
+#| "send a message to recipients not entered as mail addresses"
 msgid ""
-"Possible values are: 'never' - to never close browser window, 'always' - to "
-"always close browser window or 'ask' - (or any other value) will ask user."
+"It disables/enables the repeated prompts to warn that you are switching "
+"composer mode and the content needs to lose its formatting."
 msgstr ""
-"Possible values are: 'never' - to never close browser window, 'always' - to "
-"always close browser window or 'ask' - (or any other value) will ask user."
+"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:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#| msgid "Prompt when replying to many recipients"
+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:165
+#: ../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:166
+#: ../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:167
+#: ../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:168
+#: ../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:169
+#: ../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:170
+#: ../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:171
+#: ../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:172
+#: ../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."
@@ -8638,11 +10356,11 @@ msgstr ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../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:174
+#: ../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 "
@@ -8652,11 +10370,11 @@ msgstr ""
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../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:176
+#: ../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."
@@ -8664,45 +10382,45 @@ msgstr ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../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:178
+#: ../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:179
+#: ../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:180
+#: ../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:181
+#: ../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:182
+#: ../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:183
+#: ../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:184
+#: ../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:185
+#: ../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:186
+#: ../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 "
@@ -8712,11 +10430,11 @@ msgstr ""
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../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:188
+#: ../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 "
@@ -8728,7 +10446,7 @@ msgstr ""
 "autocompletion. It can be slow, if remote address books (like LDAP) are "
 "marked for autocompletion."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../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"
@@ -8736,7 +10454,7 @@ msgstr ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../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 "
@@ -8746,11 +10464,11 @@ msgstr ""
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../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:192
+#: ../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 "
@@ -8760,11 +10478,11 @@ msgstr ""
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../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:194
+#: ../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\"."
@@ -8772,31 +10490,31 @@ 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:195
+#: ../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:196
+#: ../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:197
+#: ../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:198
+#: ../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:199
+#: ../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:200
+#: ../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:201
+#: ../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."
@@ -8804,11 +10522,11 @@ msgstr ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../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:203
+#: ../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 "
@@ -8818,11 +10536,11 @@ msgstr ""
 "account \"Check for new messages every X minutes\" option when Evolution is "
 "started. This option is used only together with 'send_recv_on_start' option."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../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:205
+#: ../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."
@@ -8830,6 +10548,120 @@ 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 "Confirm _when expunging a folder"
+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 "Whether to show local folders (On This Computer) in a folder tree."
+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 "Default forward style"
+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 "Default reply style"
+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 "List of custom headers and whether they are enabled."
+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 "Load images for HTML messages over HTTP"
+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 ""
+#| "Asks whether to close the message window when the user forwards or "
+#| "replies to the message shown in the window"
+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.
@@ -8936,7 +10768,6 @@ 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
-#: ../plugins/external-editor/external-editor.c:123
 msgid "Automatically launch when a new mail is edited"
 msgstr "Automatically launch when a new mail is edited"
 
@@ -9055,14 +10886,20 @@ 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, 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, "
-"and \"only_plain\" forces Evolution to only show plain text"
+"\"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, "
-"and \"only_plain\" forces Evolution to only show plain text"
+"\"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"
@@ -9118,7 +10955,7 @@ msgstr "Initial file chooser folder"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Initial folder for GtkFileChooser dialogues."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:309
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:320
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
@@ -9146,18 +10983,30 @@ 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:13
+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:14
+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:15
 msgid "Window buttons are visible"
 msgstr "Window buttons are visible"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
 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:15
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
 msgid "Window button style"
 msgstr "Window button style"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -9167,39 +11016,39 @@ msgstr ""
 "\"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:17
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
 msgid "Toolbar is visible"
 msgstr "Toolbar is visible"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
 msgid "Whether the toolbar should be visible."
 msgstr "Whether the toolbar should be visible."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
 msgid "Sidebar is visible"
 msgstr "Sidebar is visible"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
 msgid "Whether the sidebar should be visible."
 msgstr "Whether the sidebar should be visible."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
 msgid "Statusbar is visible"
 msgstr "Statusbar is visible"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
 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:23
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
 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:24
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
 msgid "Default sidebar width"
 msgstr "Default sidebar width"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
 msgid "The default width for the sidebar, in pixels."
 msgstr "The default width for the sidebar, in pixels."
 
@@ -9212,191 +11061,139 @@ 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 "Socket path for SpamAssassin"
-msgstr "Socket path for SpamAssassin"
+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 "Use SpamAssassin daemon and client"
-msgstr "Use SpamAssassin daemon and client"
+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 "Use spamc and spamd programs, if available."
-msgstr "Use spamc and spamd programs, if available."
+msgid "Full path command to run sa-learn"
+msgstr "Full path command to run sa-learn"
 
-#: ../em-format/e-mail-formatter-attachment.c:370
-#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
-#: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
-#: ../mail/message-list.etspec.h:4
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Attachment"
-msgstr[1] "Attachments"
+#: ../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:371
+#: ../em-format/e-mail-formatter-attachment.c:338
 msgid "Display as attachment"
 msgstr "Display as attachment"
 
-#: ../em-format/e-mail-formatter.c:1385 ../mail/e-mail-tag-editor.c:272
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:61
-msgid "From"
-msgstr "From"
-
-#: ../em-format/e-mail-formatter.c:1386 ../modules/mail/em-mailer-prefs.c:62
-msgid "Reply-To"
-msgstr "Reply-To"
-
-#: ../em-format/e-mail-formatter.c:1388
-#: ../em-format/e-mail-formatter-utils.c:196
-#: ../em-format/e-mail-formatter-utils.c:220
-#: ../modules/mail/em-mailer-prefs.c:64
-msgid "Cc"
-msgstr "Cc"
-
-#: ../em-format/e-mail-formatter.c:1389
-#: ../em-format/e-mail-formatter-utils.c:198
-#: ../em-format/e-mail-formatter-utils.c:222
-#: ../modules/mail/em-mailer-prefs.c:65
-msgid "Bcc"
-msgstr "Bcc"
-
-#: ../em-format/e-mail-formatter.c:1390
-#: ../em-format/e-mail-formatter-quote-headers.c:154
-#: ../mail/e-mail-tag-editor.c:277 ../mail/em-filter-i18n.h:77
-#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:66
-#: ../smime/lib/e-asn1-object.c:712
-msgid "Subject"
-msgstr "Subject"
-
-#: ../em-format/e-mail-formatter.c:1391 ../e-util/e-dateedit.c:549
-#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:67
-msgid "Date"
-msgstr "Date"
-
-#: ../em-format/e-mail-formatter.c:1392 ../modules/mail/em-mailer-prefs.c:68
-msgid "Newsgroups"
-msgstr "Newsgroups"
+#: ../em-format/e-mail-formatter-audio.c:152
+msgid "Audio Player"
+msgstr "Audio Player"
 
-#: ../em-format/e-mail-formatter.c:1393 ../modules/mail/em-mailer-prefs.c:69
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid "Face"
-msgstr "Face"
+#: ../em-format/e-mail-formatter-audio.c:153
+msgid "Play the attachment in embedded audio player"
+msgstr "Play the attachment in embedded audio player"
 
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../em-format/e-mail-formatter-headers.c:100
-#: ../plugins/mail-notification/mail-notification.c:395
-#, c-format
-msgid "From: %s"
-msgstr "From: %s"
+#: ../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
+msgid "From"
+msgstr "From"
 
-#: ../em-format/e-mail-formatter-headers.c:123
 #: ../em-format/e-mail-formatter-headers.c:128
 msgid "(no subject)"
 msgstr "(no subject)"
 
-#: ../em-format/e-mail-formatter-headers.c:332
+#: ../em-format/e-mail-formatter-headers.c:329
 #, 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:143
+#: ../em-format/e-mail-formatter-image.c:170
 msgid "Regular Image"
 msgstr "Regular Image"
 
-#: ../em-format/e-mail-formatter-image.c:144
+#: ../em-format/e-mail-formatter-image.c:171
 msgid "Display part as an image"
 msgstr "Display part as an image"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:242
+#: ../em-format/e-mail-formatter-message-rfc822.c:250
 msgid "RFC822 message"
 msgstr "RFC822 message"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:243
+#: ../em-format/e-mail-formatter-message-rfc822.c:251
 msgid "Format part as an RFC822 message"
 msgstr "Format part as an RFC822 message"
 
-#: ../em-format/e-mail-formatter-print.c:56
-#: ../e-util/gal-define-views-dialog.c:361
-#: ../e-util/gal-view-instance-save-as-dialog.c:95
-#: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1328
-#: ../modules/cal-config-google/e-google-chooser.c:209
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../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
 msgid "Name"
 msgstr "Name"
 
-#: ../em-format/e-mail-formatter-print.c:56
-#: ../e-util/e-attachment-tree-view.c:574 ../mail/message-list.etspec.h:10
+#: ../em-format/e-mail-formatter-print.c:51
+#: ../e-util/e-attachment-tree-view.c:195 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Size"
 
-#. Add encryption/signature header
-#: ../em-format/e-mail-formatter-print-headers.c:122
-#: ../mail/e-mail-config-security-page.c:642
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
-msgid "Security"
-msgstr "Security"
-
-#: ../em-format/e-mail-formatter-print-headers.c:140
-msgid "GPG signed"
-msgstr "GPG signed"
-
-#: ../em-format/e-mail-formatter-print-headers.c:146
-msgid "GPG encrpyted"
-msgstr "GPG encrypted"
-
-#: ../em-format/e-mail-formatter-print-headers.c:152
-msgid "S/MIME signed"
-msgstr "S/MIME signed"
-
-#: ../em-format/e-mail-formatter-print-headers.c:158
-msgid "S/MIME encrpyted"
-msgstr "S/MIME encrypted"
+#: ../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
+msgid "Subject"
+msgstr "Subject"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:165
-#: ../em-format/e-mail-formatter-utils.c:348
-#: ../modules/mail/em-mailer-prefs.c:1117
+#: ../em-format/e-mail-formatter-quote-headers.c:199
+#: ../em-format/e-mail-formatter-utils.c:343
+#: ../modules/mail/em-mailer-prefs.c:1490
 msgid "Mailer"
 msgstr "Mailer"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:88
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:94
 #: ../em-format/e-mail-formatter-text-enriched.c:102
 msgid "Richtext"
 msgstr "Richtext"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:89
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:95
 #: ../em-format/e-mail-formatter-text-enriched.c:103
 msgid "Display part as enriched text"
 msgstr "Display part as enriched text"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:90
-#: ../em-format/e-mail-formatter-text-html.c:353
+#: ../em-format/e-mail-formatter-quote-text-html.c:95
+#: ../em-format/e-mail-formatter-text-html.c:387
 msgid "HTML"
 msgstr "HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:91
-#: ../em-format/e-mail-formatter-text-html.c:354
+#: ../em-format/e-mail-formatter-quote-text-html.c:96
+#: ../em-format/e-mail-formatter-text-html.c:388
 msgid "Format part as HTML"
 msgstr "Format part as HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:111
-#: ../em-format/e-mail-formatter-text-plain.c:186
+#: ../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:1276
 msgid "Plain Text"
 msgstr "Plain Text"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:112
-#: ../em-format/e-mail-formatter-text-plain.c:187
+#: ../em-format/e-mail-formatter-quote-text-plain.c:124
+#: ../em-format/e-mail-formatter-text-plain.c:199
 msgid "Format part as plain text"
 msgstr "Format part as plain text"
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:46
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:46
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -9404,11 +11201,11 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:47
 msgid "Valid signature"
 msgstr "Valid signature"
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:47
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9416,11 +11213,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:54
+#: ../em-format/e-mail-formatter-secure-button.c:48
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../em-format/e-mail-formatter-secure-button.c:48
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -9428,11 +11225,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:55
+#: ../em-format/e-mail-formatter-secure-button.c:49
 msgid "Valid signature, but cannot verify sender"
 msgstr "Valid signature, but cannot verify sender"
 
-#: ../em-format/e-mail-formatter-secure-button.c:55
+#: ../em-format/e-mail-formatter-secure-button.c:49
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9440,23 +11237,32 @@ 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:56
-msgid "Signature exists, but need public key"
-msgstr "Signature exists, but need public key"
+#: ../em-format/e-mail-formatter-secure-button.c:50
+#| msgid ""
+#| "This message is signed with a signature, but there is no corresponding "
+#| "public key."
+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:56
+#: ../em-format/e-mail-formatter-secure-button.c:50
 msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+"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 "
+"of messages from this person, you should obtain the public key through a "
+"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."
 msgstr ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+"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 "
+"of messages from this person, you should obtain the public key through a "
+"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:63
+#: ../em-format/e-mail-formatter-secure-button.c:59
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../em-format/e-mail-formatter-secure-button.c:59
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9464,11 +11270,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:64
+#: ../em-format/e-mail-formatter-secure-button.c:60
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../em-format/e-mail-formatter-secure-button.c:60
 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 "
@@ -9478,11 +11284,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:65
+#: ../em-format/e-mail-formatter-secure-button.c:61
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:61
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -9490,11 +11296,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:66
+#: ../em-format/e-mail-formatter-secure-button.c:62
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:62
 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 "
@@ -9504,45 +11310,77 @@ msgstr ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 
-#: ../em-format/e-mail-formatter-secure-button.c:180
-#: ../smime/gui/smime-ui.ui.h:20
-msgid "_View Certificate"
-msgstr "_View Certificate"
+#: ../em-format/e-mail-formatter-source.c:121
+msgid "Display source of a MIME part"
+msgstr "Display source of a MIME part"
 
-#: ../em-format/e-mail-formatter-secure-button.c:195
-msgid "This certificate is not viewable"
-msgstr "This certificate is not viewable"
+#: ../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
+msgid "To"
+msgstr "To"
 
-#: ../em-format/e-mail-formatter-source.c:126
-msgid "Source"
-msgstr "Source"
+#: ../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
+msgid "Cc"
+msgstr "Cc"
 
-#: ../em-format/e-mail-formatter-source.c:127
-msgid "Display source of a MIME part"
-msgstr "Display source of a MIME part"
+#: ../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
+msgid "Bcc"
+msgstr "Bcc"
+
+#: ../em-format/e-mail-formatter-utils.c:566
+msgid "GPG signed"
+msgstr "GPG signed"
 
-#: ../em-format/e-mail-parser-application-mbox.c:88
+#: ../em-format/e-mail-formatter-utils.c:572
+#| msgid "GPG encrpyted"
+msgid "GPG encrypted"
+msgstr "GPG encrypted"
+
+#: ../em-format/e-mail-formatter-utils.c:578
+msgid "S/MIME signed"
+msgstr "S/MIME signed"
+
+#: ../em-format/e-mail-formatter-utils.c:584
+#| msgid "S/MIME encrpyted"
+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
+msgid "Security"
+msgstr "Security"
+
+#: ../em-format/e-mail-parser-application-mbox.c:87
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr "Error parsing MBOX part: %s"
 
-#: ../em-format/e-mail-parser-application-smime.c:84
+#: ../em-format/e-mail-parser-application-smime.c:83
 #, 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:80
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:77
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "Could not parse PGP message: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:83
-#: ../em-format/e-mail-parser-multipart-signed.c:128
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:80
+#: ../em-format/e-mail-parser-multipart-signed.c:135
 #, c-format
 msgid "Error verifying signature: %s"
 msgstr "Error verifying signature: %s"
 
-#: ../em-format/e-mail-parser-message-external.c:69
+#: ../em-format/e-mail-parser-message-external.c:68
 msgid "Malformed external-body part"
 msgstr "Malformed external-body part"
 
@@ -9566,731 +11404,442 @@ msgstr "Pointer to local file (%s)"
 msgid "Pointer to remote data (%s)"
 msgstr "Pointer to remote data (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:150
+#: ../em-format/e-mail-parser-message-external.c:151
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointer to unknown external data (\"%s\" type)"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:67
-#: ../em-format/e-mail-parser-multipart-signed.c:81
+#: ../em-format/e-mail-parser-multipart-encrypted.c:66
+#: ../em-format/e-mail-parser-multipart-signed.c:83
 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:83
+#: ../em-format/e-mail-parser-multipart-encrypted.c:82
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:102
+#: ../em-format/e-mail-parser-multipart-encrypted.c:101
 #, 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:114
+#: ../em-format/e-mail-parser-multipart-signed.c:121
 msgid "Unsupported signature format"
 msgstr "Unsupported signature format"
 
-#: ../em-format/e-mail-part-utils.c:500
-#, c-format
-msgid "%s attachment"
-msgstr "%s attachment"
-
-#: ../e-util/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "Standard"
-
-#: ../e-util/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr "Proprietary"
-
-#: ../e-util/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "Secret"
-
-#: ../e-util/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "Top Secret"
-
-#: ../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
-msgctxt "send-options"
-msgid "None"
-msgstr "None"
-
-#: ../e-util/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "Mail Receipt"
-
-#: ../e-util/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "R_eply requested"
-
-#: ../e-util/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "Wi_thin"
-
-#: ../e-util/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "days"
-
-#: ../e-util/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "_When convenient"
-
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:840
-msgid "Replies"
-msgstr "Replies"
-
-#: ../e-util/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "_Delay message delivery"
-
-#: ../e-util/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_After"
-
-#: ../e-util/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "days"
-
-#: ../e-util/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "_Set expiration date"
-
-#: ../e-util/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_Until"
-
-#: ../e-util/e-send-options.ui.h:25
-msgid "Delivery Options"
-msgstr "Delivery Options"
-
-#: ../e-util/e-send-options.ui.h:27
-msgid "_Classification:"
-msgstr "_Classification:"
-
-#: ../e-util/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "Gene_ral Options"
-
-#: ../e-util/e-send-options.ui.h:29
-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
-msgid "_Delivered"
-msgstr "_Delivered"
-
-#: ../e-util/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "Deli_vered and opened"
-
-#: ../e-util/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "_All information"
-
-#: ../e-util/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "A_uto-delete sent item"
-
-#: ../e-util/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "Status Tracking"
-
-#: ../e-util/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "_When opened:"
-
-#: ../e-util/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "When decli_ned:"
-
-#: ../e-util/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "When co_mpleted:"
-
-#: ../e-util/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "When acce_pted:"
-
-#: ../e-util/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr "Return Notification"
-
-#: ../e-util/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "Sta_tus Tracking"
-
-#: ../e-util/e-table-config.ui.h:1 ../e-util/e-table-config.c:670
-msgid "Show Fields"
-msgstr "Show Fields"
-
-#: ../e-util/e-table-config.ui.h:2
-msgid "A_vailable Fields:"
-msgstr "A_vailable Fields:"
-
-#: ../e-util/e-table-config.ui.h:3
-msgid "_Show these fields in order:"
-msgstr "_Show these fields in order:"
-
-#: ../e-util/e-table-config.ui.h:4
-msgid "Move _Up"
-msgstr "Move _Up"
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "Move _Down"
-msgstr "Move _Down"
-
-#: ../e-util/e-table-config.ui.h:7 ../e-util/e-name-selector-dialog.c:981
-msgid "_Remove"
-msgstr "_Remove"
-
-#: ../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:10 ../e-util/e-table-header-item.c:1751
-msgid "Ascending"
-msgstr "Ascending"
-
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1751
-msgid "Descending"
-msgstr "Descending"
-
-#: ../e-util/e-table-config.ui.h:12
-msgid "Group Items By"
-msgstr "Group Items By"
-
-#: ../e-util/e-table-config.ui.h:13
-msgid "Show _field in View"
-msgstr "Show _field in View"
-
-#: ../e-util/e-table-config.ui.h:14
-msgid "Then By"
-msgstr "Then By"
-
-#: ../e-util/e-table-config.ui.h:15
-msgid "Show field i_n View"
-msgstr "Show field i_n View"
-
-#: ../e-util/e-table-config.ui.h:16
-msgid "Show field in _View"
-msgstr "Show field in _View"
-
-#: ../e-util/e-table-config.ui.h:17
-msgid "Clear _All"
-msgstr "Clear _All"
-
-#: ../e-util/e-table-config.ui.h:18
-msgid "Sort"
-msgstr "Sort"
-
-#: ../e-util/e-table-config.ui.h:19
-msgid "Sort Items By"
-msgstr "Sort Items By"
-
-#: ../e-util/e-table-config.ui.h:20
-msgid "Clear All"
-msgstr "Clear All"
-
-#: ../e-util/e-table-config.ui.h:21
-msgid "_Sort..."
-msgstr "_Sort…"
-
-#: ../e-util/e-table-config.ui.h:22
-msgid "_Group By..."
-msgstr "_Group By…"
-
-#: ../e-util/e-table-config.ui.h:23
-msgid "_Fields Shown..."
-msgstr "_Fields Shown…"
-
-#: ../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:2
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-
-#: ../e-util/e-timezone-dialog.ui.h:4
-msgid "Time Zones"
-msgstr "Time Zones"
-
-#: ../e-util/e-timezone-dialog.ui.h:5
-msgid "_Selection"
-msgstr "_Selection"
-
-#: ../e-util/e-timezone-dialog.ui.h:6
-msgid "Timezone drop-down combination box"
-msgstr "Timezone drop-down combination box"
-
-#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1239
-#: ../mail/em-utils.c:293
-msgid "Incoming"
-msgstr "Incoming"
-
-#: ../e-util/filter.ui.h:2
-msgid "the current time"
-msgstr "the current time"
-
-#: ../e-util/filter.ui.h:3
-msgid "the time you specify"
-msgstr "the time you specify"
-
-#: ../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:78
-msgid "seconds"
-msgstr "seconds"
-
-#: ../e-util/filter.ui.h:9 ../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
-msgid "months"
-msgstr "months"
-
-#: ../e-util/filter.ui.h:11
-msgid "years"
-msgstr "years"
-
-#: ../e-util/filter.ui.h:12
-msgid "ago"
-msgstr "ago"
-
-#: ../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:166
-msgid "_Filter Rules"
-msgstr "_Filter Rules"
-
-#: ../e-util/filter.ui.h:17
-msgid "Compare against"
-msgstr "Compare against"
-
-#: ../e-util/filter.ui.h:18
-msgid ""
-"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 current time when filtering occurs."
-
-#: ../e-util/filter.ui.h:20
-msgid ""
-"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."
-
-#: ../e-util/filter.ui.h:22
-msgid ""
-"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"
-"a time relative to when filtering occurs."
+#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:63
+msgid "Reply-To"
+msgstr "Reply-To"
 
-#: ../e-util/gal-define-views.ui.h:2
-#, no-c-format
-msgid "Define Views for \"%s\""
-msgstr "Define Views for \"%s\""
+#: ../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
+msgid "Date"
+msgstr "Date"
 
-#: ../e-util/gal-define-views.ui.h:4 ../e-util/gal-define-views-dialog.c:375
-#, no-c-format
-msgid "Define Views for %s"
-msgstr "Define Views for %s"
+#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:69
+msgid "Newsgroups"
+msgstr "Newsgroups"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "_Create new view"
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:70
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Face"
+msgstr "Face"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../e-util/e-mail-signature-script-dialog.c:417
-#: ../mail/e-mail-config-identity-page.c:311
-#: ../mail/e-mail-config-summary-page.c:341
-msgid "_Name:"
-msgstr "_Name:"
+#: ../em-format/e-mail-part-secure-button.c:118 ../shell/shell.error.xml.h:28
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "_View Certificate"
+msgstr "_View Certificate"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "_Replace existing view"
+#: ../em-format/e-mail-part-secure-button.c:133
+msgid "This certificate is not viewable"
+msgstr "This certificate is not viewable"
 
-#: ../e-util/gal-view-new-dialog.ui.h:1
-msgid "Name of new view:"
-msgstr "Name of new view:"
+#: ../em-format/e-mail-part-utils.c:552
+#, c-format
+msgid "%s attachment"
+msgstr "%s attachment"
 
-#: ../e-util/gal-view-new-dialog.ui.h:2
-msgid "Type of view:"
-msgstr "Type of view:"
+#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
 
-#: ../e-util/gal-view-new-dialog.ui.h:3
-msgid "Type of View"
-msgstr "Type of View"
+#: ../e-util/ea-calendar-item.c:326
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Calendar: from %s to %s"
 
-#: ../e-util/e-activity-proxy.c:313
-#: ../modules/mail/e-mail-shell-view-actions.c:1484
-msgid "Cancel"
-msgstr "Cancel"
+#: ../e-util/ea-calendar-item.c:363
+msgid "evolution calendar item"
+msgstr "evolution calendar item"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:247
+#: ../e-util/e-activity.c:258
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (cancelled)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:250
+#: ../e-util/e-activity.c:261
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (completed)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:253
+#: ../e-util/e-activity.c:264
 #, 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:257
+#: ../e-util/e-activity.c:268
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (cancelling)"
 
-#: ../e-util/e-activity.c:259
+#: ../e-util/e-activity.c:270
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:264
+#. 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
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
-#: ../e-util/e-alert-bar.c:120
-msgid "Close this message"
-msgstr "Close this message"
+#: ../e-util/e-activity-proxy.c:352
+#: ../modules/mail/e-mail-shell-view-actions.c:1908
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
-msgid "Icon View"
-msgstr "Icon View"
+#. Translators: Escape is a keyboard binding.
+#: ../e-util/e-alert-bar.c:124
+#| msgid "Close this message"
+msgid "Close this message (Escape)"
+msgstr "Close this message (Escape)"
 
-#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
-msgid "List View"
-msgstr "List View"
+#: ../e-util/e-alert-sink.c:246
+#| msgid "Failed to create thread: %s"
+msgid "Failed to create a thread: "
+msgstr "Failed to create a thread: "
+
+#. To Translators: This text is set as a description of an attached
+#. * 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:1141
+msgid "Attached message"
+msgstr "Attached message"
+
+#: ../e-util/e-attachment.c:2043 ../e-util/e-attachment.c:3029
+#| msgid "Import cancelled."
+msgid "Operation was cancelled"
+msgstr "Operation was cancelled"
+
+#. Translators: Default attachment filename.
+#: ../e-util/e-attachment.c:2203 ../e-util/e-attachment.c:2891
+#: ../e-util/e-attachment.c:3262 ../e-util/e-attachment-store.c:864
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../e-util/e-attachment.c:2284 ../e-util/e-attachment.c:3322
+msgid "A load operation is already in progress"
+msgstr "A load operation is already in progress"
+
+#: ../e-util/e-attachment.c:2292 ../e-util/e-attachment.c:3330
+msgid "A save operation is already in progress"
+msgstr "A save operation is already in progress"
+
+#: ../e-util/e-attachment.c:2689
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Could not open '%s'"
+
+#: ../e-util/e-attachment.c:2692
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Could not open the attachment"
 
-#: ../e-util/e-attachment-dialog.c:311
+#: ../e-util/e-attachment.c:3339
+msgid "Attachment contents not loaded"
+msgstr "Attachment contents not loaded"
+
+#: ../e-util/e-attachment.c:3430
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Could not save '%s'"
+
+#: ../e-util/e-attachment.c:3433
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Could not save the attachment"
+
+#: ../e-util/e-attachment-dialog.c:317
 msgid "Attachment Properties"
 msgstr "Attachment Properties"
 
-#: ../e-util/e-attachment-dialog.c:333 ../e-util/e-import-assistant.c:273
+#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:278
 msgid "F_ilename:"
 msgstr "F_ilename:"
 
-#: ../e-util/e-attachment-dialog.c:368
+#: ../e-util/e-attachment-dialog.c:356
+#: ../e-util/e-html-editor-image-dialog.c:511
+#: ../e-util/e-html-editor-link-dialog.c:244
+msgid "_Description:"
+msgstr "_Description:"
+
+#: ../e-util/e-attachment-dialog.c:374
 msgid "MIME Type:"
 msgstr "MIME Type:"
 
-#: ../e-util/e-attachment-dialog.c:376 ../e-util/e-attachment-store.c:441
+#: ../e-util/e-attachment-dialog.c:382 ../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:97
+#: ../e-util/e-attachment-handler-image.c:98
 msgid "Could not set as background"
 msgstr "Could not set as background"
 
-#: ../e-util/e-attachment-handler-image.c:147
+#: ../e-util/e-attachment-handler-image.c:148
 msgid "Set as _Background"
 msgstr "Set as _Background"
 
-#: ../e-util/e-attachment-handler-sendto.c:93
-msgid "Could not send attachment"
-msgid_plural "Could not send attachments"
-msgstr[0] "Could not send attachment"
-msgstr[1] "Could not send attachments"
-
-#: ../e-util/e-attachment-handler-sendto.c:135
-msgid "_Send To..."
-msgstr "_Send To…"
-
-#: ../e-util/e-attachment-handler-sendto.c:137
-msgid "Send the selected attachments somewhere"
-msgstr "Send the selected attachments somewhere"
-
-#: ../e-util/e-attachment-icon-view.c:166
-#: ../e-util/e-attachment-tree-view.c:549
+#: ../e-util/e-attachment-icon-view.c:170
+#: ../e-util/e-attachment-tree-view.c:170
 msgid "Loading"
 msgstr "Loading"
 
-#: ../e-util/e-attachment-icon-view.c:178
-#: ../e-util/e-attachment-tree-view.c:561
+#: ../e-util/e-attachment-icon-view.c:182
+#: ../e-util/e-attachment-tree-view.c:182
 msgid "Saving"
 msgstr "Saving"
 
-#: ../e-util/e-attachment-paned.c:104
+#: ../e-util/e-attachment-paned.c:107
 msgid "Hide Attachment _Bar"
 msgstr "Hide Attachment _Bar"
 
-#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
+#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:751
 msgid "Show Attachment _Bar"
 msgstr "Show Attachment _Bar"
 
-#: ../e-util/e-attachment-store.c:429
+#: ../e-util/e-attachment-store.c:659
 msgid "Add Attachment"
 msgstr "Add Attachment"
 
-#: ../e-util/e-attachment-store.c:432
+#: ../e-util/e-attachment-store.c:666 ../e-util/e-attachment-store.c:668
 msgid "A_ttach"
 msgstr "A_ttach"
 
-#: ../e-util/e-attachment-store.c:495
+#: ../e-util/e-attachment-store.c:706
+msgid "Archive selected directories using this format:"
+msgstr "Archive selected directories using this format:"
+
+#: ../e-util/e-attachment-store.c:799
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Save Attachment"
 msgstr[1] "Save Attachments"
 
-#. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:524 ../e-util/e-attachment.c:1841
-#: ../e-util/e-attachment.c:2477
-msgid "attachment.dat"
-msgstr "attachment.dat"
+#: ../e-util/e-attachment-store.c:826
+#| msgid "Could not load the attachment"
+msgid "Do _not extract files from the attachment"
+msgstr "Do _not extract files from the attachment"
+
+#: ../e-util/e-attachment-store.c:831
+msgid "Save extracted files _only"
+msgstr "Save extracted files _only"
 
-#: ../e-util/e-attachment-view.c:378
+#: ../e-util/e-attachment-store.c:836
+msgid "Save extracted files and the original _archive"
+msgstr "Save extracted files and the original _archive"
+
+#: ../e-util/e-attachment-view.c:310
 msgid "Open With Other Application..."
 msgstr "Open With Other Application…"
 
-#: ../e-util/e-attachment-view.c:385
+#: ../e-util/e-attachment-view.c:317
 msgid "S_ave All"
 msgstr "S_ave All"
 
-#: ../e-util/e-attachment-view.c:411
-msgid "A_dd Attachment..."
-msgstr "A_dd Attachment…"
+#: ../e-util/e-attachment-view.c:324
+#| msgid "Save As..."
+msgid "Sa_ve As"
+msgstr "Sa_ve As"
 
-#: ../e-util/e-attachment-view.c:435
-msgid "_Hide"
-msgstr "_Hide"
+#: ../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
+#| msgid "Save _As..."
+msgid "Save _As"
+msgstr "Save _As"
 
-#: ../e-util/e-attachment-view.c:442
-msgid "Hid_e All"
-msgstr "Hid_e All"
-
-#: ../e-util/e-attachment-view.c:449
-msgid "_View Inline"
-msgstr "_View Inline"
+#: ../e-util/e-attachment-view.c:343
+msgid "A_dd Attachment..."
+msgstr "A_dd Attachment…"
 
-#: ../e-util/e-attachment-view.c:456
-msgid "Vie_w All Inline"
-msgstr "Vie_w All Inline"
+#: ../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:1702
+#: ../modules/mail/e-mail-shell-view-actions.c:1773
+msgid "_Properties"
+msgstr "_Properties"
 
-#: ../e-util/e-attachment-view.c:777
+#: ../e-util/e-attachment-view.c:660
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Open With \"%s\""
 
-#: ../e-util/e-attachment-view.c:780
+#: ../e-util/e-attachment-view.c:663
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Open this attachment in %s"
 
-#. To Translators: This text is set as a description of an attached
-#. * 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:978
-msgid "Attached message"
-msgstr "Attached message"
-
-#: ../e-util/e-attachment.c:1917 ../e-util/e-attachment.c:2779
-msgid "A load operation is already in progress"
-msgstr "A load operation is already in progress"
-
-#: ../e-util/e-attachment.c:1925 ../e-util/e-attachment.c:2787
-msgid "A save operation is already in progress"
-msgstr "A save operation is already in progress"
-
-#: ../e-util/e-attachment.c:2033
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Could not load '%s'"
-
-#: ../e-util/e-attachment.c:2036
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Could not load the attachment"
-
-#: ../e-util/e-attachment.c:2334
-#, c-format
-msgid "Could not open '%s'"
-msgstr "Could not open '%s'"
-
-#: ../e-util/e-attachment.c:2337
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Could not open the attachment"
-
-#: ../e-util/e-attachment.c:2795
-msgid "Attachment contents not loaded"
-msgstr "Attachment contents not loaded"
-
-#: ../e-util/e-attachment.c:2871
-#, c-format
-msgid "Could not save '%s'"
-msgstr "Could not save '%s'"
-
-#: ../e-util/e-attachment.c:2874
-#, c-format
-msgid "Could not save the attachment"
-msgstr "Could not save the attachment"
-
-#: ../e-util/e-book-source-config.c:98
+#: ../e-util/e-book-source-config.c:97
 msgid "Mark as default address book"
 msgstr "Mark as default address book"
 
-#: ../e-util/e-book-source-config.c:103
+#: ../e-util/e-book-source-config.c:102
 msgid "Autocomplete with this address book"
 msgstr "Autocomplete with this address book"
 
-#: ../e-util/e-book-source-config.c:277
+#: ../e-util/e-book-source-config.c:276
 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:410
+#: ../e-util/e-buffer-tagger.c:412
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-click to open a link"
 
-#: ../e-util/e-cal-source-config.c:170
-msgid "Mark as default calendar"
-msgstr "Mark as default calendar"
-
-#: ../e-util/e-cal-source-config.c:173
-msgid "Mark as default task list"
-msgstr "Mark as default task list"
-
-#: ../e-util/e-cal-source-config.c:176
-msgid "Mark as default memo list"
-msgstr "Mark as default memo list"
+#: ../e-util/e-calendar.c:272
+msgid "Previous month"
+msgstr "Previous month"
 
-#: ../e-util/e-cal-source-config.c:201
-msgid "Color:"
-msgstr "Colour:"
+#: ../e-util/e-calendar.c:291
+msgid "Next month"
+msgstr "Next month"
 
-#: ../e-util/e-cal-source-config.c:406
-msgid "Copy calendar contents locally for offline operation"
-msgstr "Copy calendar contents locally for offline operation"
+#: ../e-util/e-calendar.c:311
+msgid "Previous year"
+msgstr "Previous year"
 
-#: ../e-util/e-cal-source-config.c:410
-msgid "Copy task list contents locally for offline operation"
-msgstr "Copy task list contents locally for offline operation"
+#: ../e-util/e-calendar.c:330
+msgid "Next year"
+msgstr "Next year"
 
-#: ../e-util/e-cal-source-config.c:414
-msgid "Copy memo list contents locally for offline operation"
-msgstr "Copy memo list contents locally for offline operation"
+#: ../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:1324 ../e-util/e-calendar-item.c:2186
+#: ../e-util/e-calendar-item.c:1340 ../e-util/e-calendar-item.c:2220
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1326
+#: ../e-util/e-calendar-item.c:1342
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1363
+#: ../e-util/e-calendar-item.c:1379
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../e-util/e-calendar.c:190
-msgid "Previous month"
-msgstr "Previous month"
+#: ../e-util/e-cal-source-config.c:169
+msgid "Mark as default calendar"
+msgstr "Mark as default calendar"
 
-#: ../e-util/e-calendar.c:215
-msgid "Next month"
-msgstr "Next month"
+#: ../e-util/e-cal-source-config.c:172
+msgid "Mark as default task list"
+msgstr "Mark as default task list"
 
-#: ../e-util/e-calendar.c:241
-msgid "Previous year"
-msgstr "Previous year"
+#: ../e-util/e-cal-source-config.c:175
+msgid "Mark as default memo list"
+msgstr "Mark as default memo list"
 
-#: ../e-util/e-calendar.c:266
-msgid "Next year"
-msgstr "Next year"
+#: ../e-util/e-cal-source-config.c:200
+msgid "Color:"
+msgstr "Colour:"
 
-#: ../e-util/e-calendar.c:290
-msgid "Month Calendar"
-msgstr "Month Calendar"
+#: ../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
+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
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Copy memo list contents locally for offline operation"
 
-#: ../e-util/e-categories-editor.c:224
+#: ../e-util/e-categories-editor.c:223
 msgid "Currently _used categories:"
 msgstr "Currently _used categories:"
 
-#: ../e-util/e-categories-editor.c:235
+#: ../e-util/e-categories-editor.c:234
 msgid "_Available Categories:"
 msgstr "_Available Categories:"
 
-#: ../e-util/e-categories-selector.c:323
+#: ../e-util/e-categories-editor.c:274
+#| msgid "_New"
+msgctxt "category"
+msgid "_New"
+msgstr "_New"
+
+#: ../e-util/e-categories-editor.c:278
+#| msgid "_Edit"
+msgctxt "category"
+msgid "_Edit"
+msgstr "_Edit"
+
+#: ../e-util/e-categories-editor.c:282
+#| msgid "_Delete"
+msgctxt "category"
+msgid "_Delete"
+msgstr "_Delete"
+
+#: ../e-util/e-categories-selector.c:322
 msgid "Icon"
 msgstr "Icon"
 
-#: ../e-util/e-category-completion.c:300
+#: ../e-util/e-category-completion.c:307
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Create category \"%s\""
 
-#: ../e-util/e-category-editor.c:137
+#: ../e-util/e-category-editor.c:136
 msgid "Category Icon"
 msgstr "Category Icon"
 
-#: ../e-util/e-category-editor.c:141
+#: ../e-util/e-category-editor.c:140
 msgid "_No Image"
 msgstr "_No Image"
 
-#: ../e-util/e-category-editor.c:178
+#: ../e-util/e-category-editor.c:173
 msgid "Category _Name"
 msgstr "Category _Name"
 
-#: ../e-util/e-category-editor.c:190
+#: ../e-util/e-category-editor.c:185
 msgid "Category _Icon"
 msgstr "Category _Icon"
 
-#: ../e-util/e-category-editor.c:216
+#: ../e-util/e-category-editor.c:211
 msgid "Category Properties"
 msgstr "Category Properties"
 
-#: ../e-util/e-category-editor.c:277
+#: ../e-util/e-category-editor.c:272
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
@@ -10299,202 +11848,383 @@ msgstr ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 
-#: ../e-util/e-cell-combo.c:186
+#: ../e-util/e-cell-combo.c:185
 msgid "popup list"
 msgstr "popup list"
 
-#: ../e-util/e-cell-date-edit.c:299
+#: ../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
+msgid "?"
+msgstr "?"
+
+#: ../e-util/e-cell-date-edit.c:303
 msgid "Now"
 msgstr "Now"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-cell-date-edit.c:307 ../e-util/e-datetime-format.c:209
-#: ../modules/calendar/e-cal-shell-view-actions.c:1924
-#: ../modules/itip-formatter/itip-view.c:230
+#: ../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:317
+#: ../e-util/e-cell-date-edit.c:321
 msgctxt "table-date"
 msgid "None"
 msgstr "None"
 
-#: ../e-util/e-cell-date-edit.c:325
+#: ../e-util/e-cell-date-edit.c:329 ../mail/e-mail-label-dialog.c:200
 msgid "OK"
 msgstr "OK"
 
-#: ../e-util/e-cell-date-edit.c:873
+#: ../e-util/e-cell-date-edit.c:878
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "The time must be in the format: %s"
 
-#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1882
-msgid "?"
-msgstr "?"
-
-#: ../e-util/e-cell-percent.c:80
+#: ../e-util/e-cell-percent.c:81
 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-combo-box.c:100
-msgid "Character Encoding"
-msgstr "Character Encoding"
-
-#: ../e-util/e-charset-combo-box.c:123
-msgid "Enter the character set to use"
-msgstr "Enter the character set to use"
-
-#: ../e-util/e-charset-combo-box.c:342
-msgid "Other..."
-msgstr "Other…"
-
-#: ../e-util/e-charset.c:53
+#: ../e-util/e-charset.c:52
 msgid "Arabic"
 msgstr "Arabic"
 
-#: ../e-util/e-charset.c:54
+#: ../e-util/e-charset.c:53
 msgid "Baltic"
 msgstr "Baltic"
 
-#: ../e-util/e-charset.c:55
+#: ../e-util/e-charset.c:54
 msgid "Central European"
 msgstr "Central European"
 
-#: ../e-util/e-charset.c:56
+#: ../e-util/e-charset.c:55
 msgid "Chinese"
 msgstr "Chinese"
 
-#: ../e-util/e-charset.c:57
+#: ../e-util/e-charset.c:56
 msgid "Cyrillic"
 msgstr "Cyrillic"
 
-#: ../e-util/e-charset.c:58
+#: ../e-util/e-charset.c:57
 msgid "Greek"
 msgstr "Greek"
 
-#: ../e-util/e-charset.c:59
+#: ../e-util/e-charset.c:58
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: ../e-util/e-charset.c:60
+#: ../e-util/e-charset.c:59
 msgid "Japanese"
 msgstr "Japanese"
 
-#: ../e-util/e-charset.c:61
+#: ../e-util/e-charset.c:60
 msgid "Korean"
 msgstr "Korean"
 
-#: ../e-util/e-charset.c:62
+#: ../e-util/e-charset.c:61
 msgid "Thai"
 msgstr "Thai"
 
-#: ../e-util/e-charset.c:63
+#: ../e-util/e-charset.c:62
 msgid "Turkish"
 msgstr "Turkish"
 
-#: ../e-util/e-charset.c:64
+#: ../e-util/e-charset.c:63
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../e-util/e-charset.c:65
+#: ../e-util/e-charset.c:64
 msgid "Western European"
 msgstr "Western European"
 
-#: ../e-util/e-charset.c:66
+#: ../e-util/e-charset.c:65
 msgid "Western European, New"
 msgstr "Western European, New"
 
 #. Translators: Character set "Chinese, Traditional"
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
+#: ../e-util/e-charset.c:84 ../e-util/e-charset.c:86 ../e-util/e-charset.c:88
 msgid "Traditional"
 msgstr "Traditional"
 
 #. Translators: Character set "Chinese, Simplified"
-#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
-#: ../e-util/e-charset.c:97
+#: ../e-util/e-charset.c:90 ../e-util/e-charset.c:92 ../e-util/e-charset.c:94
+#: ../e-util/e-charset.c:96
 msgid "Simplified"
 msgstr "Simplified"
 
 #. Translators: Character set "Cyrillic, Ukrainian"
-#: ../e-util/e-charset.c:101
+#: ../e-util/e-charset.c:100
 msgid "Ukrainian"
 msgstr "Ukrainian"
 
 #. Translators: Character set "Hebrew, Visual"
-#: ../e-util/e-charset.c:105
+#: ../e-util/e-charset.c:104
 msgid "Visual"
 msgstr "Visual"
 
-#: ../e-util/e-client-cache.c:1067
+#: ../e-util/e-charset-combo-box.c:99
+msgid "Character Encoding"
+msgstr "Character Encoding"
+
+#: ../e-util/e-charset-combo-box.c:119
+msgid "Enter the character set to use"
+msgstr "Enter the character set to use"
+
+#: ../e-util/e-charset-combo-box.c:365
+msgid "Other..."
+msgstr "Other…"
+
+#: ../e-util/e-client-cache.c:1148 ../e-util/e-client-cache.c:1279
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "Cannot create a client object from extension name '%s'"
 
-#: ../e-util/e-dateedit.c:523
+#: ../e-util/e-color-chooser-widget.c:124
+#| msgid "Use custom fonts"
+msgid "Choose custom color"
+msgstr "Choose custom colour"
+
+#: ../e-util/e-color-combo.c:81
+msgid "black"
+msgstr "black"
+
+#: ../e-util/e-color-combo.c:82
+msgid "light brown"
+msgstr "light brown"
+
+#: ../e-util/e-color-combo.c:83
+msgid "brown gold"
+msgstr "brown gold"
+
+#: ../e-util/e-color-combo.c:84
+msgid "dark green #2"
+msgstr "dark green #2"
+
+#: ../e-util/e-color-combo.c:85
+msgid "navy"
+msgstr "navy"
+
+#: ../e-util/e-color-combo.c:86
+msgid "dark blue"
+msgstr "dark blue"
+
+#: ../e-util/e-color-combo.c:87
+msgid "purple #2"
+msgstr "purple #2"
+
+#: ../e-util/e-color-combo.c:88
+#| msgid "Every day"
+#| msgid_plural "Every %d days"
+msgid "very dark gray"
+msgstr "very dark gray"
+
+#: ../e-util/e-color-combo.c:90
+#| msgid "Mark as _Unread"
+msgid "dark red"
+msgstr "dark red"
+
+#: ../e-util/e-color-combo.c:91
+#| msgid "range"
+msgid "red-orange"
+msgstr "red-orange"
+
+#: ../e-util/e-color-combo.c:92
+msgid "gold"
+msgstr "gold"
+
+#: ../e-util/e-color-combo.c:93
+msgid "dark green"
+msgstr "dark green"
+
+#: ../e-util/e-color-combo.c:94
+msgid "dull blue"
+msgstr "dull blue"
+
+#: ../e-util/e-color-combo.c:95
+msgid "blue"
+msgstr "blue"
+
+#: ../e-util/e-color-combo.c:96
+msgid "dull purple"
+msgstr "dull purple"
+
+#: ../e-util/e-color-combo.c:97
+msgid "dark grey"
+msgstr "dark grey"
+
+#: ../e-util/e-color-combo.c:99
+#| msgid "3rd"
+msgid "red"
+msgstr "red"
+
+#: ../e-util/e-color-combo.c:100
+#| msgid "range"
+msgid "orange"
+msgstr "orange"
+
+#: ../e-util/e-color-combo.c:101
+msgid "lime"
+msgstr "lime"
+
+#: ../e-util/e-color-combo.c:102
+msgid "dull green"
+msgstr "dull green"
+
+#: ../e-util/e-color-combo.c:103
+msgid "dull blue #2"
+msgstr "dull blue #2"
+
+#: ../e-util/e-color-combo.c:104
+msgid "sky blue #2"
+msgstr "sky blue #2"
+
+#: ../e-util/e-color-combo.c:105
+msgid "purple"
+msgstr "purple"
+
+#: ../e-util/e-color-combo.c:106
+msgid "gray"
+msgstr "gray"
+
+#: ../e-util/e-color-combo.c:108
+#| msgid "Image"
+msgid "magenta"
+msgstr "magenta"
+
+#: ../e-util/e-color-combo.c:109
+msgid "bright orange"
+msgstr "bright orange"
+
+#: ../e-util/e-color-combo.c:110
+msgid "yellow"
+msgstr "yellow"
+
+#: ../e-util/e-color-combo.c:111
+msgid "green"
+msgstr "green"
+
+#: ../e-util/e-color-combo.c:112
+msgid "cyan"
+msgstr "cyan"
+
+#: ../e-util/e-color-combo.c:113
+msgid "bright blue"
+msgstr "bright blue"
+
+#: ../e-util/e-color-combo.c:114
+#| msgid "_Required people"
+msgid "red purple"
+msgstr "red purple"
+
+#: ../e-util/e-color-combo.c:115
+msgid "light grey"
+msgstr "light grey"
+
+#: ../e-util/e-color-combo.c:117
+msgid "pink"
+msgstr "pink"
+
+#: ../e-util/e-color-combo.c:118
+#| msgid "daylight savings time"
+msgid "light orange"
+msgstr "light orange"
+
+#: ../e-util/e-color-combo.c:119
+msgid "light yellow"
+msgstr "light yellow"
+
+#: ../e-util/e-color-combo.c:120
+msgid "light green"
+msgstr "light green"
+
+#: ../e-util/e-color-combo.c:121
+msgid "light cyan"
+msgstr "light cyan"
+
+#: ../e-util/e-color-combo.c:122
+msgid "light blue"
+msgstr "light blue"
+
+#: ../e-util/e-color-combo.c:123
+msgid "light purple"
+msgstr "light purple"
+
+#: ../e-util/e-color-combo.c:124
+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
+msgid "Default"
+msgstr "Default"
+
+#: ../e-util/e-dateedit.c:526
 msgid "Date and Time"
 msgstr "Date and Time"
 
-#: ../e-util/e-dateedit.c:548
+#: ../e-util/e-dateedit.c:551
 msgid "Text entry to input date"
 msgstr "Text entry to input date"
 
-#: ../e-util/e-dateedit.c:571
+#: ../e-util/e-dateedit.c:574
 msgid "Click this button to show a calendar"
 msgstr "Click this button to show a calendar"
 
-#: ../e-util/e-dateedit.c:625
+#: ../e-util/e-dateedit.c:628
 msgid "Drop-down combination box to select time"
 msgstr "Drop-down combination box to select time"
 
-#: ../e-util/e-dateedit.c:626
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../e-util/e-dateedit.c:629 ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Time"
 
-#: ../e-util/e-dateedit.c:700
+#: ../e-util/e-dateedit.c:703
 msgid "No_w"
 msgstr "No_w"
 
-#: ../e-util/e-dateedit.c:707
+#: ../e-util/e-dateedit.c:710
 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:716
+#: ../e-util/e-dateedit.c:719
 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:1811 ../e-util/e-dateedit.c:2059
+#: ../e-util/e-dateedit.c:1841 ../e-util/e-dateedit.c:2089
 msgctxt "date"
 msgid "None"
 msgstr "None"
 
-#: ../e-util/e-dateedit.c:1951
+#: ../e-util/e-dateedit.c:1981
 msgid "Invalid Date Value"
 msgstr "Invalid Date Value"
 
-#: ../e-util/e-dateedit.c:1996
+#: ../e-util/e-dateedit.c:2026
 msgid "Invalid Time Value"
 msgstr "Invalid Time Value"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:258
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:283
 msgid "Tomorrow"
 msgstr "Tomorrow"
 
-#: ../e-util/e-datetime-format.c:222
+#: ../e-util/e-datetime-format.c:221
 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:230
+#: ../e-util/e-datetime-format.c:229
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Next Mon"
@@ -10502,7 +12232,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:236
+#: ../e-util/e-datetime-format.c:235
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Next Tue"
@@ -10510,7 +12240,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:242
+#: ../e-util/e-datetime-format.c:241
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Next Wed"
@@ -10518,7 +12248,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:248
+#: ../e-util/e-datetime-format.c:247
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Next Thu"
@@ -10526,7 +12256,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:254
+#: ../e-util/e-datetime-format.c:253
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Next Fri"
@@ -10534,7 +12264,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:260
+#: ../e-util/e-datetime-format.c:259
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Next Sat"
@@ -10542,176 +12272,284 @@ 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:266
+#: ../e-util/e-datetime-format.c:265
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Next Sun"
 
-#: ../e-util/e-datetime-format.c:353 ../e-util/e-datetime-format.c:363
-#: ../e-util/e-datetime-format.c:372
+#: ../e-util/e-datetime-format.c:351 ../e-util/e-datetime-format.c:361
+#: ../e-util/e-datetime-format.c:370
 msgid "Use locale default"
 msgstr "Use locale default"
 
-#: ../e-util/e-datetime-format.c:577
+#: ../e-util/e-datetime-format.c:575
 msgid "Format:"
 msgstr "Format:"
 
-#: ../e-util/e-file-utils.c:150
+#. Translators: :-)
+#: ../e-util/e-emoticon-chooser.c:40
+msgid "_Smile"
+msgstr "_Smile"
+
+#. Translators: :-(
+#: ../e-util/e-emoticon-chooser.c:42
+msgid "S_ad"
+msgstr "S_ad"
+
+#. Translators: ;-)
+#: ../e-util/e-emoticon-chooser.c:44
+#| msgid "_Window"
+msgid "_Wink"
+msgstr "_Wink"
+
+#. Translators: :-P
+#: ../e-util/e-emoticon-chooser.c:46
+msgid "Ton_gue"
+msgstr "Ton_gue"
+
+#. Translators: :-))
+#: ../e-util/e-emoticon-chooser.c:48
+msgid "Laug_h"
+msgstr "Laug_h"
+
+#. Translators: :-|
+#: ../e-util/e-emoticon-chooser.c:50
+#| msgid "_Plain text"
+msgid "_Plain"
+msgstr "_Plain"
+
+#. Translators: :-!
+#: ../e-util/e-emoticon-chooser.c:52
+msgid "Smi_rk"
+msgstr "Smi_rk"
+
+#. Translators: :"-)
+#: ../e-util/e-emoticon-chooser.c:54
+msgid "_Embarrassed"
+msgstr "_Embarrassed"
+
+#. Translators: :-D
+#: ../e-util/e-emoticon-chooser.c:56
+msgid "_Big Smile"
+msgstr "_Big Smile"
+
+#. Translators: :-/
+#: ../e-util/e-emoticon-chooser.c:58
+msgid "Uncer_tain"
+msgstr "Uncer_tain"
+
+#. Translators: :-O
+#: ../e-util/e-emoticon-chooser.c:60
+msgid "S_urprise"
+msgstr "S_urprise"
+
+#. Translators: :-S
+#: ../e-util/e-emoticon-chooser.c:62
+msgid "W_orried"
+msgstr "W_orried"
+
+#. Translators: :-*
+#: ../e-util/e-emoticon-chooser.c:64
+msgid "_Kiss"
+msgstr "_Kiss"
+
+#. Translators: X-(
+#: ../e-util/e-emoticon-chooser.c:66
+msgid "A_ngry"
+msgstr "A_ngry"
+
+#. Translators: B-)
+#: ../e-util/e-emoticon-chooser.c:68
+msgid "_Cool"
+msgstr "_Cool"
+
+#. Translators: O:-)
+#: ../e-util/e-emoticon-chooser.c:70
+msgid "Ange_l"
+msgstr "Ange_l"
+
+#. Translators: :'(
+#: ../e-util/e-emoticon-chooser.c:72
+msgid "Cr_ying"
+msgstr "Cr_ying"
+
+#. Translators: :-Q
+#: ../e-util/e-emoticon-chooser.c:74
+msgid "S_ick"
+msgstr "S_ick"
+
+#. Translators: |-)
+#: ../e-util/e-emoticon-chooser.c:76
+msgid "Tire_d"
+msgstr "Tire_d"
+
+#. Translators: >:-)
+#: ../e-util/e-emoticon-chooser.c:78
+msgid "De_vilish"
+msgstr "De_vilish"
+
+#. Translators: :-(|)
+#: ../e-util/e-emoticon-chooser.c:80
+#| msgid "_Mon"
+msgid "_Monkey"
+msgstr "_Monkey"
+
+#: ../e-util/e-file-utils.c:120
 msgid "(Unknown Filename)"
 msgstr "(Unknown Filename)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:154
+#: ../e-util/e-file-utils.c:124
 #, c-format
 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:159
+#: ../e-util/e-file-utils.c:129
 #, c-format
 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:67
+#: ../e-util/e-filter-datespec.c:66
 #, 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:68
+#: ../e-util/e-filter-datespec.c:67
 #, 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:69
+#: ../e-util/e-filter-datespec.c:68
 #, 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:70
+#: ../e-util/e-filter-datespec.c:69
 #, 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:71
+#: ../e-util/e-filter-datespec.c:70
 #, 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:72
+#: ../e-util/e-filter-datespec.c:71
 #, 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:73
+#: ../e-util/e-filter-datespec.c:72
 #, 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:74
+#: ../e-util/e-filter-datespec.c:73
 #, 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:75
+#: ../e-util/e-filter-datespec.c:74
 #, 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:76
+#: ../e-util/e-filter-datespec.c:75
 #, 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:77
+#: ../e-util/e-filter-datespec.c:76
 #, 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:78
+#: ../e-util/e-filter-datespec.c:77
 #, 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:79
+#: ../e-util/e-filter-datespec.c:78
 #, 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:80
+#: ../e-util/e-filter-datespec.c:79
 #, 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:130
+#: ../e-util/e-filter-datespec.c:129
 msgid "<click here to select a date>"
 msgstr "<click here to select a date>"
 
-#: ../e-util/e-filter-datespec.c:133 ../e-util/e-filter-datespec.c:144
-#: ../e-util/e-filter-datespec.c:155
+#: ../e-util/e-filter-datespec.c:132 ../e-util/e-filter-datespec.c:143
+#: ../e-util/e-filter-datespec.c:154
 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:140
+#: ../e-util/e-filter-datespec.c:139
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../e-util/e-filter-datespec.c:289
+#: ../e-util/e-filter-datespec.c:288
 msgid "Select a time to compare against"
 msgstr "Select a time to compare against"
 
-#: ../e-util/e-filter-file.c:187
+#: ../e-util/e-filter-file.c:186
 msgid "Choose a File"
 msgstr "Choose a File"
 
-#: ../e-util/e-filter-rule.c:743
+#: ../e-util/e-filter-rule.c:761
 msgid "R_ule name:"
 msgstr "R_ule name:"
 
-#: ../e-util/e-filter-rule.c:793
+#: ../e-util/e-filter-rule.c:811
 msgid "all the following conditions"
 msgstr "all the following conditions"
 
-#: ../e-util/e-filter-rule.c:794
+#: ../e-util/e-filter-rule.c:812
 msgid "any of the following conditions"
 msgstr "any of the following conditions"
 
-#: ../e-util/e-filter-rule.c:800
+#: ../e-util/e-filter-rule.c:818
 msgid "_Find items which match:"
 msgstr "_Find items which match:"
 
-#: ../e-util/e-filter-rule.c:823
+#: ../e-util/e-filter-rule.c:841
 msgid "Find items that meet the following conditions"
 msgstr "Find items that meet the following conditions"
 
@@ -10719,38 +12557,1159 @@ msgstr "Find items that meet the following conditions"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:838 ../e-util/e-mail-signature-combo-box.c:369
-#: ../libemail-engine/camel-null-store.c:28
+#: ../e-util/e-filter-rule.c:856 ../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:622
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
 msgid "None"
 msgstr "None"
 
-#: ../e-util/e-filter-rule.c:839
+#: ../e-util/e-filter-rule.c:857
 msgid "All related"
 msgstr "All related"
 
-#: ../e-util/e-filter-rule.c:841
+#: ../e-util/e-filter-rule.c:858 ../e-util/e-send-options.ui.h:19
+msgid "Replies"
+msgstr "Replies"
+
+#: ../e-util/e-filter-rule.c:859
 msgid "Replies and parents"
 msgstr "Replies and parents"
 
-#: ../e-util/e-filter-rule.c:842
+#: ../e-util/e-filter-rule.c:860
 msgid "No reply or parent"
 msgstr "No reply or parent"
 
-#: ../e-util/e-filter-rule.c:845
+#: ../e-util/e-filter-rule.c:863
 msgid "I_nclude threads:"
 msgstr "I_nclude threads:"
 
-#: ../e-util/e-filter-rule.c:922
+#: ../e-util/e-filter-rule.c:942
 msgid "A_dd Condition"
 msgstr "A_dd Condition"
 
-#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:294
+#: ../e-util/e-filter-rule.c:1256 ../e-util/filter.ui.h:1
+#: ../mail/em-utils.c:165
+msgid "Incoming"
+msgstr "Incoming"
+
+#: ../e-util/e-filter-rule.c:1256 ../mail/em-utils.c:166
 msgid "Outgoing"
 msgstr "Outgoing"
 
-#: ../e-util/e-import-assistant.c:256
+#: ../e-util/e-html-editor-actions.c:58
+#| msgid "Failed to open folder."
+msgid "Failed to insert HTML file."
+msgstr "Failed to insert HTML file."
+
+#: ../e-util/e-html-editor-actions.c:96
+#| msgid "Failed to import certificate"
+msgid "Failed to insert text file."
+msgstr "Failed to insert text file."
+
+#: ../e-util/e-html-editor-actions.c:297
+#| msgid "Input File"
+msgid "Insert HTML File"
+msgstr "Insert HTML File"
+
+#: ../e-util/e-html-editor-actions.c:303
+#| msgid "HTML _Mode"
+msgid "HTML file"
+msgstr "HTML file"
+
+#: ../e-util/e-html-editor-actions.c:330
+#| msgid "Inline Image"
+msgctxt "dialog-title"
+msgid "Insert Image"
+msgstr "Insert Image"
+
+#: ../e-util/e-html-editor-actions.c:388
+#| msgid "Increase the text size"
+msgid "Insert text file"
+msgstr "Insert text file"
+
+#: ../e-util/e-html-editor-actions.c:394
+#| msgid "Select a file"
+msgid "Text file"
+msgstr "Text file"
+
+#: ../e-util/e-html-editor-actions.c:842
+#| msgid "Copy selected events to the clipboard"
+msgid "Copy selected text to the clipboard"
+msgstr "Copy selected text to the clipboard"
+
+#: ../e-util/e-html-editor-actions.c:849
+#| msgid "Cut selected events to the clipboard"
+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:856
+#| msgid "Paste events from the clipboard"
+msgid "Paste text from the clipboard"
+msgstr "Paste text from the clipboard"
+
+#: ../e-util/e-html-editor-actions.c:863
+msgid "Redo the last undone action"
+msgstr "Redo the last undone action"
+
+#: ../e-util/e-html-editor-actions.c:877
+msgid "Undo the last action"
+msgstr "Undo the last action"
+
+#: ../e-util/e-html-editor-actions.c:898
+msgid "For_mat"
+msgstr "For_mat"
+
+#: ../e-util/e-html-editor-actions.c:905
+#| msgid "Tool_bar Style"
+msgid "_Paragraph Style"
+msgstr "_Paragraph Style"
+
+#: ../e-util/e-html-editor-actions.c:919
+#: ../e-util/e-html-editor-image-dialog.c:588
+#| msgid "A_lignment"
+msgid "_Alignment"
+msgstr "_Alignment"
+
+#: ../e-util/e-html-editor-actions.c:926
+#| msgid "_Languages"
+msgid "Current _Languages"
+msgstr "Current _Languages"
+
+#: ../e-util/e-html-editor-actions.c:943
+msgid "_Increase Indent"
+msgstr "_Increase Indent"
+
+#: ../e-util/e-html-editor-actions.c:945
+msgid "Increase Indent"
+msgstr "Increase Indent"
+
+#: ../e-util/e-html-editor-actions.c:950
+msgid "_HTML File..."
+msgstr "_HTML File..."
+
+#: ../e-util/e-html-editor-actions.c:957
+msgid "Te_xt File..."
+msgstr "Te_xt File..."
+
+#: ../e-util/e-html-editor-actions.c:964
+msgid "Paste _Quotation"
+msgstr "Paste _Quotation"
+
+#: ../e-util/e-html-editor-actions.c:971
+#| msgid "_Find in Memo..."
+msgid "_Find..."
+msgstr "_Find..."
+
+#: ../e-util/e-html-editor-actions.c:973
+msgid "Search for text"
+msgstr "Search for text"
+
+#: ../e-util/e-html-editor-actions.c:978
+#| msgid "Find _next"
+msgid "Find A_gain"
+msgstr "Find A_gain"
+
+#: ../e-util/e-html-editor-actions.c:985
+#| msgid "_Replace"
+msgid "Re_place..."
+msgstr "Re_place..."
+
+#: ../e-util/e-html-editor-actions.c:987
+msgid "Search for and replace text"
+msgstr "Search for and replace text"
+
+#: ../e-util/e-html-editor-actions.c:992
+#| msgid "Canceling..."
+msgid "Check _Spelling..."
+msgstr "Check _Spelling..."
+
+#: ../e-util/e-html-editor-actions.c:999
+msgid "_Decrease Indent"
+msgstr "_Decrease Indent"
+
+#: ../e-util/e-html-editor-actions.c:1001
+msgid "Decrease Indent"
+msgstr "Decrease Indent"
+
+#: ../e-util/e-html-editor-actions.c:1006
+#| msgid "Max lines"
+msgid "_Wrap Lines"
+msgstr "_Wrap Lines"
+
+#. Center
+#: ../e-util/e-html-editor-actions.c:1016
+#: ../e-util/e-html-editor-paragraph-dialog.c:110
+msgid "_Center"
+msgstr "_Centre"
+
+#: ../e-util/e-html-editor-actions.c:1018
+#| msgid "A_lignment"
+msgid "Center Alignment"
+msgstr "Centre Alignment"
+
+#. Left
+#: ../e-util/e-html-editor-actions.c:1023
+#: ../e-util/e-html-editor-paragraph-dialog.c:101
+#| msgid "Left:"
+msgid "_Left"
+msgstr "_Left"
+
+#: ../e-util/e-html-editor-actions.c:1025
+#| msgid "A_lignment"
+msgid "Left Alignment"
+msgstr "Left Alignment"
+
+#. Right
+#: ../e-util/e-html-editor-actions.c:1030
+#: ../e-util/e-html-editor-paragraph-dialog.c:119
+#| msgid "Right:"
+msgid "_Right"
+msgstr "_Right"
+
+#: ../e-util/e-html-editor-actions.c:1032
+#| msgid "A_lignment"
+msgid "Right Alignment"
+msgstr "Right Alignment"
+
+#: ../e-util/e-html-editor-actions.c:1040
+#: ../modules/text-highlight/languages.c:72
+msgid "_HTML"
+msgstr "_HTML"
+
+#: ../e-util/e-html-editor-actions.c:1042
+msgid "HTML editing mode"
+msgstr "HTML editing mode"
+
+#: ../e-util/e-html-editor-actions.c:1047
+#| msgid "Plain Text"
+msgid "Plain _Text"
+msgstr "Plain _Text"
+
+#: ../e-util/e-html-editor-actions.c:1049
+#| msgid "Plain Text Mode"
+msgid "Plain text editing mode"
+msgstr "Plain text editing mode"
+
+#: ../e-util/e-html-editor-actions.c:1057
+#| msgid "Normal"
+msgid "_Normal"
+msgstr "_Normal"
+
+#: ../e-util/e-html-editor-actions.c:1064
+#| msgid "Header"
+msgid "Header _1"
+msgstr "Header _1"
+
+#: ../e-util/e-html-editor-actions.c:1071
+#| msgid "Header"
+msgid "Header _2"
+msgstr "Header _2"
+
+#: ../e-util/e-html-editor-actions.c:1078
+#| msgid "Header"
+msgid "Header _3"
+msgstr "Header _3"
+
+#: ../e-util/e-html-editor-actions.c:1085
+#| msgid "Header"
+msgid "Header _4"
+msgstr "Header _4"
+
+#: ../e-util/e-html-editor-actions.c:1092
+#| msgid "Header"
+msgid "Header _5"
+msgstr "Header _5"
+
+#: ../e-util/e-html-editor-actions.c:1099
+#| msgid "Header"
+msgid "Header _6"
+msgstr "Header _6"
+
+#: ../e-util/e-html-editor-actions.c:1106
+#| msgid "View _Unformatted"
+msgid "_Preformatted"
+msgstr "_Preformatted"
+
+#: ../e-util/e-html-editor-actions.c:1113
+#| msgid "Address"
+msgid "A_ddress"
+msgstr "A_ddress"
+
+#: ../e-util/e-html-editor-actions.c:1120
+#| msgid "D_elete Memo List"
+msgid "_Bulleted List"
+msgstr "_Bulleted List"
+
+#: ../e-util/e-html-editor-actions.c:1127
+msgid "_Roman Numeral List"
+msgstr "_Roman Numeral List"
+
+#: ../e-util/e-html-editor-actions.c:1134
+#| msgid "Retrieve _List"
+msgid "Numbered _List"
+msgstr "Numbered _List"
+
+#: ../e-util/e-html-editor-actions.c:1141
+msgid "_Alphabetical List"
+msgstr "_Alphabetical List"
+
+#: ../e-util/e-html-editor-actions.c:1157
+#: ../e-util/e-html-editor-actions.c:1195
+#| msgid "Save _Image..."
+msgid "_Image..."
+msgstr "_Image..."
+
+#. Translators: This is an action tooltip
+#: ../e-util/e-html-editor-actions.c:1160
+#| msgid "Inline Image"
+msgid "Insert Image"
+msgstr "Insert Image"
+
+#: ../e-util/e-html-editor-actions.c:1165
+#: ../e-util/e-html-editor-actions.c:1202
+msgid "_Link..."
+msgstr "_Link..."
+
+#: ../e-util/e-html-editor-actions.c:1167
+#| msgid "_Insert"
+msgid "Insert Link"
+msgstr "Insert Link"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1173
+#: ../e-util/e-html-editor-actions.c:1217
+#| msgid "_Rename..."
+msgid "_Rule..."
+msgstr "_Rule..."
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1176
+#| msgid "_Insert"
+msgid "Insert Rule"
+msgstr "Insert Rule"
+
+#: ../e-util/e-html-editor-actions.c:1181
+#: ../e-util/e-html-editor-actions.c:1224
+#| msgid "Table"
+msgid "_Table..."
+msgstr "_Table..."
+
+#: ../e-util/e-html-editor-actions.c:1183
+#| msgid "Task Table"
+msgid "Insert Table"
+msgstr "Insert Table"
+
+#: ../e-util/e-html-editor-actions.c:1188
+msgid "_Cell..."
+msgstr "_Cell..."
+
+#: ../e-util/e-html-editor-actions.c:1209
+#| msgid "Save _Image..."
+msgid "Pa_ge..."
+msgstr "Pa_ge..."
+
+#: ../e-util/e-html-editor-actions.c:1233
+#| msgid "Folder Size"
+msgid "Font _Size"
+msgstr "Font _Size"
+
+#: ../e-util/e-html-editor-actions.c:1240
+#| msgid "_Forward style:"
+msgid "_Font Style"
+msgstr "_Font Style"
+
+#: ../e-util/e-html-editor-actions.c:1247
+msgid "Paste As _Text"
+msgstr "Paste As _Text"
+
+#: ../e-util/e-html-editor-actions.c:1258
+#: ../e-util/e-html-editor-text-dialog.c:203
+#| msgid "Bold"
+msgid "_Bold"
+msgstr "_Bold"
+
+#: ../e-util/e-html-editor-actions.c:1260
+msgid "Bold"
+msgstr "Bold"
+
+#: ../e-util/e-html-editor-actions.c:1266
+#: ../e-util/e-html-editor-text-dialog.c:214
+#| msgid "Italy"
+msgid "_Italic"
+msgstr "_Italic"
+
+#: ../e-util/e-html-editor-actions.c:1268
+#| msgid "Italy"
+msgid "Italic"
+msgstr "Italic"
+
+#: ../e-util/e-html-editor-actions.c:1274
+#| msgid "Plain Text"
+msgid "_Plain Text"
+msgstr "_Plain Text"
+
+#: ../e-util/e-html-editor-actions.c:1282
+#: ../e-util/e-html-editor-text-dialog.c:235
+#| msgid "Strikeout"
+msgid "_Strikethrough"
+msgstr "_Strikethrough"
+
+#: ../e-util/e-html-editor-actions.c:1284
+#| msgid "Strikeout"
+msgid "Strikethrough"
+msgstr "Strikethrough"
+
+#: ../e-util/e-html-editor-actions.c:1290
+#: ../e-util/e-html-editor-text-dialog.c:225
+#| msgid "Undefined"
+msgid "_Underline"
+msgstr "_Underline"
+
+#: ../e-util/e-html-editor-actions.c:1292
+#| msgid "Undefined"
+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:1302
+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:1310
+#| msgid "1"
+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:1318
+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:1326
+#| msgid "1"
+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:1334
+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:1342
+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:1350
+msgid "+4"
+msgstr "+4"
+
+#: ../e-util/e-html-editor-actions.c:1369
+#| msgid "_Contents"
+msgid "Cell Contents"
+msgstr "Cell Contents"
+
+#: ../e-util/e-html-editor-actions.c:1376
+#| msgid "Bold Column"
+msgid "Column"
+msgstr "Column"
+
+#: ../e-util/e-html-editor-actions.c:1383
+#| msgid "Low"
+msgid "Row"
+msgstr "Row"
+
+#: ../e-util/e-html-editor-actions.c:1390
+msgid "Table"
+msgstr "Table"
+
+#. Translators: Popup menu item caption, containing all the Delete options for a table
+#: ../e-util/e-html-editor-actions.c:1400
+#| msgid "Table Cell"
+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:1408
+#| msgid "Table Cell"
+msgid "Table Insert"
+msgstr "Table Insert"
+
+#: ../e-util/e-html-editor-actions.c:1415
+#| msgid "_Properties"
+msgid "Properties"
+msgstr "Properties"
+
+#: ../e-util/e-html-editor-actions.c:1433
+#| msgid "Column Width"
+msgid "Column After"
+msgstr "Column After"
+
+#: ../e-util/e-html-editor-actions.c:1440
+msgid "Column Before"
+msgstr "Column Before"
+
+#: ../e-util/e-html-editor-actions.c:1447
+#| msgid "_Insert"
+msgid "Insert _Link"
+msgstr "Insert _Link"
+
+#: ../e-util/e-html-editor-actions.c:1454
+msgid "Row Above"
+msgstr "Row Above"
+
+#: ../e-util/e-html-editor-actions.c:1461
+msgid "Row Below"
+msgstr "Row Below"
+
+#: ../e-util/e-html-editor-actions.c:1468
+msgid "Cell..."
+msgstr "Cell..."
+
+#: ../e-util/e-html-editor-actions.c:1475
+#| msgid "Image"
+msgid "Image..."
+msgstr "Image..."
+
+#: ../e-util/e-html-editor-actions.c:1482
+msgid "Link..."
+msgstr "Link..."
+
+#: ../e-util/e-html-editor-actions.c:1489
+#| msgid "Pager"
+msgid "Page..."
+msgstr "Page..."
+
+#: ../e-util/e-html-editor-actions.c:1496
+#| msgid "Paraguay"
+msgid "Paragraph..."
+msgstr "Paragraph..."
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1504
+#| msgid "Full _Name..."
+msgid "Rule..."
+msgstr "Rule..."
+
+#: ../e-util/e-html-editor-actions.c:1511
+#| msgid "Table"
+msgid "Table..."
+msgstr "Table..."
+
+#: ../e-util/e-html-editor-actions.c:1518
+#| msgid "Text"
+msgid "Text..."
+msgstr "Text..."
+
+#: ../e-util/e-html-editor-actions.c:1525
+#| msgid "Remove"
+msgid "Remove Link"
+msgstr "Remove Link"
+
+#: ../e-util/e-html-editor-actions.c:1542
+#| msgid "Add \"%s\" to Dictionary"
+msgid "Add Word to Dictionary"
+msgstr "Add Word to Dictionary"
+
+#: ../e-util/e-html-editor-actions.c:1549
+#| msgid "Color for _misspelled words:"
+msgid "Ignore Misspelled Word"
+msgstr "Ignore Misspelt Word"
+
+#: ../e-util/e-html-editor-actions.c:1556
+msgid "Add Word To"
+msgstr "Add Word To"
+
+#: ../e-util/e-html-editor-actions.c:1565
+#| msgid "(no suggestions)"
+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:1689
+#, c-format
+#| msgid "Add \"%s\" to Dictionary"
+msgid "%s Dictionary"
+msgstr "%s Dictionary"
+
+#: ../e-util/e-html-editor-actions.c:1768
+msgid "_Emoticon"
+msgstr "_Emoticon"
+
+#: ../e-util/e-html-editor-actions.c:1769
+#| msgid "Insert Send options"
+msgid "Insert Emoticon"
+msgstr "Insert Emoticon"
+
+#: ../e-util/e-html-editor-actions.c:1837
+#| msgid "_Replace"
+msgid "Re_place"
+msgstr "Re_place"
+
+#: ../e-util/e-html-editor-actions.c:1840
+#| msgid "Image"
+msgid "_Image"
+msgstr "_Image"
+
+#: ../e-util/e-html-editor-actions.c:1843
+msgid "_Link"
+msgstr "_Link"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1847
+#| msgid "Add Rule"
+msgid "_Rule"
+msgstr "_Rule"
+
+#: ../e-util/e-html-editor-actions.c:1850
+#: ../e-util/e-html-editor-cell-dialog.c:450
+#| msgid "Table"
+msgid "_Table"
+msgstr "_Table"
+
+#: ../e-util/e-html-editor.c:689
+#| msgid "Paraguay"
+msgid "Paragraph Style"
+msgstr "Paragraph Style"
+
+#: ../e-util/e-html-editor.c:703
+#| msgid "Edit Reminder"
+msgid "Editing Mode"
+msgstr "Editing Mode"
+
+#: ../e-util/e-html-editor.c:715
+#| msgid "Unset Color"
+msgid "Font Color"
+msgstr "Font Colour"
+
+#: ../e-util/e-html-editor.c:725
+#| msgid "Folder Size"
+msgid "Font Size"
+msgstr "Font Size"
+
+#: ../e-util/e-html-editor-cell-dialog.c:410
+#| msgid "<b>Home</b>"
+msgid "<b>Scope</b>"
+msgstr "<b>Scope</b>"
+
+#: ../e-util/e-html-editor-cell-dialog.c:424
+msgid "C_ell"
+msgstr "C_ell"
+
+#: ../e-util/e-html-editor-cell-dialog.c:437
+msgid "_Row"
+msgstr "_Row"
+
+#: ../e-util/e-html-editor-cell-dialog.c:463
+msgid "Col_umn"
+msgstr "Col_umn"
+
+#: ../e-util/e-html-editor-cell-dialog.c:473
+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
+#| msgid "Left:"
+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
+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
+#| msgid "Right:"
+msgid "Right"
+msgstr "Right"
+
+#: ../e-util/e-html-editor-cell-dialog.c:496
+#| msgid "Horizontal Position"
+msgid "_Horizontal:"
+msgstr "_Horizontal:"
+
+#: ../e-util/e-html-editor-cell-dialog.c:504
+#: ../e-util/e-html-editor-image-dialog.c:578
+#| msgid "Top:"
+msgid "Top"
+msgstr "Top"
+
+#: ../e-util/e-html-editor-cell-dialog.c:505
+#: ../e-util/e-html-editor-image-dialog.c:579
+#| msgid "_Middle:"
+msgid "Middle"
+msgstr "Middle"
+
+#: ../e-util/e-html-editor-cell-dialog.c:506
+#: ../e-util/e-html-editor-image-dialog.c:580
+#| msgid "Bottom:"
+msgid "Bottom"
+msgstr "Bottom"
+
+#: ../e-util/e-html-editor-cell-dialog.c:514
+#| msgid "_Vertical View"
+msgid "_Vertical:"
+msgstr "_Vertical:"
+
+#. Wrap Text
+#: ../e-util/e-html-editor-cell-dialog.c:520
+#| msgid "Plain Text"
+msgid "_Wrap Text"
+msgstr "_Wrap Text"
+
+#. Header Style
+#: ../e-util/e-html-editor-cell-dialog.c:528
+#| msgid "Header Value"
+msgid "_Header Style"
+msgstr "_Header Style"
+
+#: ../e-util/e-html-editor-cell-dialog.c:542
+#: ../e-util/e-html-editor-image-dialog.c:518
+#: ../e-util/e-html-editor-table-dialog.c:563
+#| msgid "<b>Notes</b>"
+msgid "<b>Layout</b>"
+msgstr "<b>Layout</b>"
+
+#. Width
+#: ../e-util/e-html-editor-cell-dialog.c:553
+#| msgid "Width"
+msgid "_Width"
+msgstr "_Width"
+
+#: ../e-util/e-html-editor-cell-dialog.c:593
+msgid "Row S_pan:"
+msgstr "Row S_pan:"
+
+#: ../e-util/e-html-editor-cell-dialog.c:607
+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
+#| msgid "<b>Basics</b>"
+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
+#| msgid "Event Transparency"
+msgid "Transparent"
+msgstr "Transparent"
+
+#: ../e-util/e-html-editor-cell-dialog.c:635
+#| msgid "Color:"
+msgid "C_olor:"
+msgstr "C_olour:"
+
+#: ../e-util/e-html-editor-cell-dialog.c:643
+#: ../e-util/e-html-editor-image-dialog.c:480
+#: ../e-util/e-html-editor-table-dialog.c:696
+#| msgid "Choose Image"
+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:486
+#: ../e-util/e-html-editor-table-dialog.c:701
+#| msgid "Image"
+msgid "Images"
+msgstr "Images"
+
+#: ../e-util/e-html-editor-cell-dialog.c:661
+#| msgid "Image"
+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
+#| msgid "_No image"
+msgid "_Remove image"
+msgstr "_Remove image"
+
+#: ../e-util/e-html-editor-cell-dialog.c:688
+#| msgid "_Properties"
+msgid "Cell Properties"
+msgstr "Cell Properties"
+
+#: ../e-util/e-html-editor-find-dialog.c:94
+#: ../e-util/e-html-editor-replace-dialog.c:70
+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
+#| msgid "Search _base:"
+msgid "Search _backwards"
+msgstr "Search _backwards"
+
+#: ../e-util/e-html-editor-find-dialog.c:224
+#| msgid "Case _sensitive"
+msgid "Case _Sensitive"
+msgstr "Case _Sensitive"
+
+#: ../e-util/e-html-editor-find-dialog.c:231
+#| msgid "_Search"
+msgid "_Wrap Search"
+msgstr "_Wrap Search"
+
+#: ../e-util/e-html-editor-find-dialog.c:270
+#| msgid "_Find Now"
+msgid "Find"
+msgstr "Find"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:265
+#| msgid "<b>Time</b>"
+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:536
+#: ../e-util/e-html-editor-table-dialog.c:574
+#| msgid "Width:"
+msgid "_Width:"
+msgstr "_Width:"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:310
+#| msgid "Size:"
+msgid "_Size:"
+msgstr "_Size:"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:317
+#| msgid "<b>Notes</b>"
+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
+#| msgid "A_lignment"
+msgid "_Alignment:"
+msgstr "_Alignment:"
+
+#. Shaded
+#: ../e-util/e-html-editor-hrule-dialog.c:348
+msgid "S_haded"
+msgstr "S_haded"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:365
+#| msgid "Folder Properties"
+msgid "Rule properties"
+msgstr "Rule properties"
+
+#: ../e-util/e-html-editor-image-dialog.c:468
+#: ../e-util/e-html-editor-paragraph-dialog.c:66
+#: ../e-util/e-html-editor-table-dialog.c:517
+msgid "<b>General</b>"
+msgstr "<b>General</b>"
+
+#: ../e-util/e-html-editor-image-dialog.c:497
+#| msgid "Source"
+msgid "_Source:"
+msgstr "_Source:"
+
+#: ../e-util/e-html-editor-image-dialog.c:560
+#| msgid "Height:"
+msgid "_Height:"
+msgstr "_Height:"
+
+#: ../e-util/e-html-editor-image-dialog.c:601
+msgid "_X-Padding:"
+msgstr "_X-Padding:"
+
+#: ../e-util/e-html-editor-image-dialog.c:617
+msgid "_Y-Padding:"
+msgstr "_Y-Padding:"
+
+#: ../e-util/e-html-editor-image-dialog.c:633
+#: ../e-util/e-html-editor-table-dialog.c:641
+msgid "_Border:"
+msgstr "_Border:"
+
+#: ../e-util/e-html-editor-image-dialog.c:643
+#| msgid "<b>Action</b>"
+msgid "<b>Link</b>"
+msgstr "<b>Link</b>"
+
+#: ../e-util/e-html-editor-image-dialog.c:661
+#: ../e-util/e-html-editor-link-dialog.c:222
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../e-util/e-html-editor-image-dialog.c:666
+#: ../e-util/e-html-editor-link-dialog.c:227
+msgid "_Test URL..."
+msgstr "_Test URL..."
+
+#: ../e-util/e-html-editor-image-dialog.c:683
+#| msgid "Category Properties"
+msgid "Image Properties"
+msgstr "Image Properties"
+
+#: ../e-util/e-html-editor-link-dialog.c:251
+#| msgid "_Remove"
+msgid "_Remove Link"
+msgstr "_Remove Link"
+
+#: ../e-util/e-html-editor-link-dialog.c:276
+#| msgid "Font Properties"
+msgid "Link Properties"
+msgstr "Link Properties"
+
+#: ../e-util/e-html-editor-page-dialog.c:70
+msgid "Perforated Paper"
+msgstr "Perforated Paper"
+
+#: ../e-util/e-html-editor-page-dialog.c:79
+msgid "Blue Ink"
+msgstr "Blue Ink"
+
+#: ../e-util/e-html-editor-page-dialog.c:88
+msgid "Paper"
+msgstr "Paper"
+
+#: ../e-util/e-html-editor-page-dialog.c:97
+msgid "Ribbon"
+msgstr "Ribbon"
+
+#: ../e-util/e-html-editor-page-dialog.c:106
+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
+msgid "Draft"
+msgstr "Draft"
+
+#: ../e-util/e-html-editor-page-dialog.c:133
+#| msgid "Paper"
+msgid "Graph Paper"
+msgstr "Graph Paper"
+
+#: ../e-util/e-html-editor-page-dialog.c:381
+#| msgid "<b>Work</b>"
+msgid "<b>Colors</b>"
+msgstr "<b>Colours</b>"
+
+#: ../e-util/e-html-editor-page-dialog.c:400
+#| msgid "Text"
+msgid "_Text:"
+msgstr "_Text:"
+
+#: ../e-util/e-html-editor-page-dialog.c:415
+msgid "_Link:"
+msgstr "_Link:"
+
+#: ../e-util/e-html-editor-page-dialog.c:430
+msgid "_Visited Link:"
+msgstr "_Visited Link:"
+
+#: ../e-util/e-html-editor-page-dialog.c:445
+#| msgid "Set as _Background"
+msgid "_Background:"
+msgstr "_Background:"
+
+#: ../e-util/e-html-editor-page-dialog.c:453
+#| msgid "<b>Account Name</b>"
+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
+#| msgid "Template:"
+msgid "_Template:"
+msgstr "_Template:"
+
+#: ../e-util/e-html-editor-page-dialog.c:483 ../e-util/e-import-assistant.c:288
+msgid "Select a file"
+msgstr "Select a file"
+
+#: ../e-util/e-html-editor-page-dialog.c:490
+#| msgid "_Custom"
+msgid "_Custom:"
+msgstr "_Custom:"
+
+#: ../e-util/e-html-editor-page-dialog.c:517
+#| msgid "_Properties"
+msgid "Page Properties"
+msgstr "Page Properties"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:83
+#| msgid "Style name:"
+msgid "_Style:"
+msgstr "_Style:"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:90
+#| msgid "<b>Time</b>"
+msgid "<b>Alignment</b>"
+msgstr "<b>Alignment</b>"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:155
+#| msgid "Category Properties"
+msgid "Paragraph Properties"
+msgstr "Paragraph Properties"
+
+#: ../e-util/e-html-editor-replace-dialog.c:92
+#, c-format
+#| msgid "occurrences"
+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
+#| msgid "_Replace"
+msgid "R_eplace:"
+msgstr "R_eplace:"
+
+#: ../e-util/e-html-editor-replace-dialog.c:289
+#| msgid "O_pen With"
+msgid "_With:"
+msgstr "_With:"
+
+#: ../e-util/e-html-editor-replace-dialog.c:301
+#| msgid "Case _sensitive"
+msgid "_Case sensitive"
+msgstr "_Case sensitive"
+
+#: ../e-util/e-html-editor-replace-dialog.c:305
+#| msgid "Always search"
+msgid "Wra_p search"
+msgstr "Wra_p search"
+
+#: ../e-util/e-html-editor-replace-dialog.c:315
+msgid "_Skip"
+msgstr "_Skip"
+
+#: ../e-util/e-html-editor-replace-dialog.c:323
+#: ../e-util/e-system.error.xml.h:3
+msgid "_Replace"
+msgstr "_Replace"
+
+#: ../e-util/e-html-editor-replace-dialog.c:331
+#| msgid "Reply to _All"
+msgid "Replace _All"
+msgstr "Replace _All"
+
+#: ../e-util/e-html-editor-replace-dialog.c:351
+#| msgid "_Replace"
+msgctxt "dialog-title"
+msgid "Replace"
+msgstr "Replace"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:85
+#, c-format
+msgid "<b>Suggestions for '%s'</b>"
+msgstr "<b>Suggestions for '%s'</b>"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:390
+#| msgid "<b>Options</b>"
+msgid "<b>Suggestions</b>"
+msgstr "<b>Suggestions</b>"
+
+#. Replace
+#: ../e-util/e-html-editor-spell-check-dialog.c:425
+#| msgid "_Replace"
+msgid "Replace"
+msgstr "Replace"
+
+#. Replace All
+#: ../e-util/e-html-editor-spell-check-dialog.c:434
+#| msgid "_Replace"
+msgid "Replace All"
+msgstr "Replace All"
+
+#. Ignore
+#: ../e-util/e-html-editor-spell-check-dialog.c:443
+#: ../mail/mail.error.xml.h:116
+msgid "Ignore"
+msgstr "Ignore"
+
+#. Skip
+#: ../e-util/e-html-editor-spell-check-dialog.c:452
+msgid "Skip"
+msgstr "Skip"
+
+#. Back
+#: ../e-util/e-html-editor-spell-check-dialog.c:461
+#| msgid "Go Back"
+msgid "Back"
+msgstr "Back"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:470
+#| msgid "<b>Action</b>"
+msgid "<b>Dictionary</b>"
+msgstr "<b>Dictionary</b>"
+
+#. Add Word button
+#: ../e-util/e-html-editor-spell-check-dialog.c:490
+#| msgid "Add Folder"
+msgid "Add word"
+msgstr "Add word"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:507 ../mail/mail-config.ui.h:39
+msgid "Spell Checking"
+msgstr "Spell Checking"
+
+#: ../e-util/e-html-editor-table-dialog.c:539
+msgid "_Rows:"
+msgstr "_Rows:"
+
+#: ../e-util/e-html-editor-table-dialog.c:556
+#| msgid "_Table column:"
+msgid "C_olumns:"
+msgstr "C_olumns:"
+
+#: ../e-util/e-html-editor-table-dialog.c:607
+#| msgid "Spacing"
+msgid "_Spacing:"
+msgstr "_Spacing:"
+
+#: ../e-util/e-html-editor-table-dialog.c:624
+#| msgid "Loading"
+msgid "_Padding:"
+msgstr "_Padding:"
+
+#: ../e-util/e-html-editor-table-dialog.c:688
+#: ../e-util/e-html-editor-text-dialog.c:250
+#| msgid "Color:"
+msgid "_Color:"
+msgstr "_Colour:"
+
+#: ../e-util/e-html-editor-table-dialog.c:714
+#| msgid "Image"
+msgid "Image:"
+msgstr "Image:"
+
+#: ../e-util/e-html-editor-table-dialog.c:741
+#| msgid "Calendar Properties"
+msgid "Table Properties"
+msgstr "Table Properties"
+
+#: ../e-util/e-html-editor-text-dialog.c:270
+msgid "Si_ze:"
+msgstr "Si_ze:"
+
+#: ../e-util/e-html-editor-text-dialog.c:285
+#| msgid "Font Properties"
+msgid "Text Properties"
+msgstr "Text Properties"
+
+#: ../e-util/e-import-assistant.c:261
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -10758,79 +13717,79 @@ 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:283
-msgid "Select a file"
-msgstr "Select a file"
-
-#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
+#: ../e-util/e-import-assistant.c:302 ../e-util/e-import-assistant.c:477
 msgid "File _type:"
 msgstr "File _type:"
 
-#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:921
+#: ../e-util/e-import-assistant.c:345 ../e-util/e-import-assistant.c:925
 msgid "Choose the destination for this import"
 msgstr "Choose the destination for this import"
 
-#: ../e-util/e-import-assistant.c:365
+#: ../e-util/e-import-assistant.c:370
 msgid "Choose the type of importer to run:"
 msgstr "Choose the type of importer to run:"
 
-#: ../e-util/e-import-assistant.c:373
+#: ../e-util/e-import-assistant.c:378
 msgid "Import data and settings from _older programs"
 msgstr "Import data and settings from _older programs"
 
-#: ../e-util/e-import-assistant.c:381
+#: ../e-util/e-import-assistant.c:386
 msgid "Import a _single file"
 msgstr "Import a _single file"
 
-#: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:202
+#: ../e-util/e-import-assistant.c:408
+#: ../modules/startup-wizard/e-mail-config-import-page.c:210
 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:533
+#: ../e-util/e-import-assistant.c:538
+#| msgid ""
+#| "Evolution checked for settings to import from the following applications: "
+#| "Pine, Netscape, Elm, iCalendar. 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. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
+"Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
+"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. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
+"Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
+"would like to try again, please click the \"Back\" button."
 
-#: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:231
+#: ../e-util/e-import-assistant.c:564
+#: ../modules/startup-wizard/e-mail-config-import-page.c:239
 #, c-format
 msgid "From %s:"
 msgstr "From %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../e-util/e-import-assistant.c:775
+#: ../e-util/e-import-assistant.c:783
 msgid "_Cancel Import"
 msgstr "_Cancel Import"
 
-#: ../e-util/e-import-assistant.c:920
+#: ../e-util/e-import-assistant.c:924
 msgid "Preview data to be imported"
 msgstr "Preview data to be imported"
 
-#: ../e-util/e-import-assistant.c:926 ../e-util/e-import-assistant.c:939
-#: ../e-util/e-import-assistant.c:1292 ../e-util/e-import-assistant.c:1368
-#: ../e-util/e-import-assistant.c:1377
+#: ../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
 msgid "Import Data"
 msgstr "Import Data"
 
-#: ../e-util/e-import-assistant.c:934
+#: ../e-util/e-import-assistant.c:938
 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:1282 ../e-util/e-import-assistant.c:1317
+#: ../e-util/e-import-assistant.c:1286 ../e-util/e-import-assistant.c:1321
 msgid "Evolution Import Assistant"
 msgstr "Evolution Import Assistant"
 
-#: ../e-util/e-import-assistant.c:1299 ../e-util/e-import-assistant.c:1355
+#: ../e-util/e-import-assistant.c:1303 ../e-util/e-import-assistant.c:1359
 msgid "Import Location"
 msgstr "Import Location"
 
-#: ../e-util/e-import-assistant.c:1310
+#: ../e-util/e-import-assistant.c:1314
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -10840,59 +13799,59 @@ msgstr ""
 "With this assistant you will be guided through the process of importing "
 "external files into Evolution."
 
-#: ../e-util/e-import-assistant.c:1327
+#: ../e-util/e-import-assistant.c:1331
 msgid "Importer Type"
 msgstr "Importer Type"
 
-#: ../e-util/e-import-assistant.c:1337
+#: ../e-util/e-import-assistant.c:1341
 msgid "Select Information to Import"
 msgstr "Select Information to Import"
 
-#: ../e-util/e-import-assistant.c:1346
+#: ../e-util/e-import-assistant.c:1350
 msgid "Select a File"
 msgstr "Select a File"
 
-#: ../e-util/e-import-assistant.c:1363
+#: ../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."
 
-#: ../e-util/e-mail-signature-combo-box.c:378
+#: ../e-util/e-mail-signature-combo-box.c:376
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: ../e-util/e-mail-signature-editor.c:305
+#: ../e-util/e-mail-signature-editor.c:310 ../mail/e-mail-notes.c:933
 msgid "Close"
 msgstr "Close"
 
-#: ../e-util/e-mail-signature-editor.c:310
+#: ../e-util/e-mail-signature-editor.c:315 ../mail/e-mail-notes.c:938
 msgid "_Save and Close"
 msgstr "_Save and Close"
 
-#: ../e-util/e-mail-signature-editor.c:524
+#: ../e-util/e-mail-signature-editor.c:558
 msgid "Edit Signature"
 msgstr "Edit Signature"
 
-#: ../e-util/e-mail-signature-editor.c:544
+#: ../e-util/e-mail-signature-editor.c:591
 msgid "_Signature Name:"
 msgstr "_Signature Name:"
 
-#: ../e-util/e-mail-signature-editor.c:590
+#: ../e-util/e-mail-signature-editor.c:627
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: ../e-util/e-mail-signature-manager.c:337
+#: ../e-util/e-mail-signature-manager.c:338
 msgid "Add _Script"
 msgstr "Add _Script"
 
-#: ../e-util/e-mail-signature-manager.c:422
+#: ../e-util/e-mail-signature-manager.c:444
 msgid "Add Signature Script"
 msgstr "Add Signature Script"
 
-#: ../e-util/e-mail-signature-manager.c:492
+#: ../e-util/e-mail-signature-manager.c:538
 msgid "Edit Signature Script"
 msgstr "Edit Signature Script"
 
-#: ../e-util/e-mail-signature-script-dialog.c:395
+#: ../e-util/e-mail-signature-script-dialog.c:393
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -10902,19 +13861,19 @@ msgstr ""
 "signature. The name you specify will be used\n"
 "for display purposes only."
 
-#: ../e-util/e-mail-signature-script-dialog.c:446
+#: ../e-util/e-mail-signature-script-dialog.c:444
 msgid "S_cript:"
 msgstr "S_cript:"
 
-#: ../e-util/e-mail-signature-script-dialog.c:477
+#: ../e-util/e-mail-signature-script-dialog.c:475
 msgid "Script file must be executable."
 msgstr "Script file must be executable."
 
-#: ../e-util/e-map.c:886
+#: ../e-util/e-map.c:885
 msgid "World Map"
 msgstr "World Map"
 
-#: ../e-util/e-map.c:889
+#: ../e-util/e-map.c:888
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -10922,100 +13881,119 @@ 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:242
+#: ../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:289
+#: ../e-util/e-misc-utils.c:336
 msgid "Could not display help for Evolution."
 msgstr "Could not display help for Evolution."
 
-#: ../e-util/e-name-selector-dialog.c:278
+#: ../e-util/e-misc-utils.c:2501
+#, c-format
+msgid "Opening calendar '%s'"
+msgstr "Opening calendar '%s'"
+
+#: ../e-util/e-misc-utils.c:2504
+#, c-format
+msgid "Opening memo list '%s'"
+msgstr "Opening memo list '%s'"
+
+#: ../e-util/e-misc-utils.c:2507
+#, c-format
+msgid "Opening task list '%s'"
+msgstr "Opening task list '%s'"
+
+#: ../e-util/e-misc-utils.c:2510
+#, c-format
+#| msgid "Opening store '%s'"
+msgid "Opening address book '%s'"
+msgstr "Opening address book '%s'"
+
+#: ../e-util/e-misc-utils.c:3288
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "_Do not show this message again"
+
+#: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "Show Contacts"
 
-#: ../e-util/e-name-selector-dialog.c:310
+#: ../e-util/e-name-selector-dialog.c:309
 msgid "Address B_ook:"
 msgstr "Address B_ook:"
 
-#: ../e-util/e-name-selector-dialog.c:317
+#: ../e-util/e-name-selector-dialog.c:316
 msgid "Cat_egory:"
 msgstr "Cat_egory:"
 
-#: ../e-util/e-name-selector-dialog.c:341
+#: ../e-util/e-name-selector-dialog.c:340
 msgid "_Search:"
 msgstr "_Search:"
 
-#: ../e-util/e-name-selector-dialog.c:367
-#: ../e-util/e-name-selector-dialog.c:1256
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
-#: ../modules/calendar/e-cal-shell-view-actions.c:1757
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../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
 msgid "Any Category"
 msgstr "Any Category"
 
-#: ../e-util/e-name-selector-dialog.c:369
+#: ../e-util/e-name-selector-dialog.c:368
 msgid "Co_ntacts"
 msgstr "Co_ntacts"
 
-#: ../e-util/e-name-selector-dialog.c:446
+#: ../e-util/e-name-selector-dialog.c:445
 msgid "Search"
 msgstr "Search"
 
-#: ../e-util/e-name-selector-dialog.c:449
-#: ../mail/importers/pine-importer.c:426
+#: ../e-util/e-name-selector-dialog.c:448 ../mail/importers/pine-importer.c:429
 msgid "Address Book"
 msgstr "Address Book"
 
-#: ../e-util/e-name-selector-dialog.c:452
-#: ../modules/addressbook/e-book-shell-backend.c:305
-#: ../modules/addressbook/e-book-shell-view.c:356
-msgid "Contacts"
-msgstr "Contacts"
-
-#: ../e-util/e-name-selector-dialog.c:580
+#: ../e-util/e-name-selector-dialog.c:576
 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:3032
+#: ../e-util/e-name-selector-entry.c:3186
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "E_xpand %s Inline"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3048
+#: ../e-util/e-name-selector-entry.c:3202
 #, c-format
 msgid "Cop_y %s"
 msgstr "Cop_y %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3059
+#: ../e-util/e-name-selector-entry.c:3213
 #, c-format
 msgid "C_ut %s"
 msgstr "C_ut %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3077
+#: ../e-util/e-name-selector-entry.c:3231
 #, c-format
 msgid "_Edit %s"
 msgstr "_Edit %s"
 
-#: ../e-util/e-name-selector-list.c:583
+#: ../e-util/e-name-selector-list.c:584
 #, c-format
 msgid "_Delete %s"
 msgstr "_Delete %s"
 
-#: ../e-util/e-online-button.c:31
+#: ../e-util/e-online-button.c:32
 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:34
+#: ../e-util/e-online-button.c:35
 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:37
+#: ../e-util/e-online-button.c:38
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution is currently offline because the network is unavailable."
 
@@ -11043,142 +14021,421 @@ msgstr "_Remember this password"
 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:318
+#: ../e-util/e-preferences-window.c:321
 msgid "Evolution Preferences"
 msgstr "Evolution Preferences"
 
-#: ../e-util/e-print.c:161
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "An error occurred while printing"
 
-#: ../e-util/e-print.c:168
+#: ../e-util/e-print.c:167
 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:174
+#: ../e-util/e-print.c:173
 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-rule-editor.c:288
+#: ../e-util/e-proxy-editor.c:325
+#| msgid "Method:"
+msgid "_Method:"
+msgstr "_Method:"
+
+#: ../e-util/e-proxy-editor.c:347
+msgid "Defer to Desktop Settings"
+msgstr "Defer to Desktop Settings"
+
+#: ../e-util/e-proxy-editor.c:351
+#| msgid "Junk Settings"
+msgid "_Open Desktop Settings"
+msgstr "_Open Desktop Settings"
+
+#: ../e-util/e-proxy-editor.c:377
+#| msgid "_Manual"
+msgid "Manual"
+msgstr "Manual"
+
+#: ../e-util/e-proxy-editor.c:396
+#| msgid "H_TTP Proxy:"
+msgid "_HTTP Proxy:"
+msgstr "_HTTP Proxy:"
+
+#: ../e-util/e-proxy-editor.c:427
+#| msgid "H_TTP Proxy:"
+msgid "H_TTPS Proxy:"
+msgstr "H_TTPS Proxy:"
+
+#: ../e-util/e-proxy-editor.c:458
+#| msgid "SOC_KS Proxy:"
+msgid "_Socks Proxy:"
+msgstr "_Socks Proxy:"
+
+#: ../e-util/e-proxy-editor.c:489
+#| msgid "Ignore"
+msgid "_Ignore Hosts:"
+msgstr "_Ignore Hosts:"
+
+#: ../e-util/e-proxy-editor.c:515
+#| msgid "Automatic Contacts"
+msgid "Automatic"
+msgstr "Automatic"
+
+#: ../e-util/e-proxy-editor.c:534
+#| msgid "Configuration"
+msgid "Configuration _URL:"
+msgstr "Configuration _URL:"
+
+#: ../e-util/e-proxy-editor.c:560
+#| msgid "No _Proxy for:"
+msgid "No proxy"
+msgstr "No proxy"
+
+#: ../e-util/e-proxy-editor.c:563
+msgid "Use a direct connection, no proxying required."
+msgstr "Use a direct connection, no proxying required."
+
+#: ../e-util/e-proxy-preferences.c:213
+msgid "Switch to Basic Proxy Preferences"
+msgstr "Switch to Basic Proxy Preferences"
+
+#: ../e-util/e-proxy-preferences.c:215
+msgid "Switch to Advanced Proxy Preferences"
+msgstr "Switch to Advanced Proxy Preferences"
+
+#: ../e-util/e-proxy-preferences.c:526
+msgid "Apply custom proxy settings to these accounts:"
+msgstr "Apply custom proxy settings to these accounts:"
+
+#: ../e-util/e-proxy-preferences.c:561
+msgid ""
+"<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
+"and apply them to specific accounts"
+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
+#| msgid "_Custom binary:"
+msgid "Custom Proxy"
+msgstr "Custom Proxy"
+
+#: ../e-util/e-proxy-selector.c:487
+#| msgid "Create a new appointment"
+msgid "Create a new proxy profile"
+msgstr "Create a new proxy profile"
+
+#: ../e-util/e-proxy-selector.c:492
+#| msgid "Delete the selected memo list"
+msgid "Delete the selected proxy profile"
+msgstr "Delete the selected proxy profile"
+
+#: ../e-util/e-rule-editor.c:184
 msgid "Add Rule"
 msgstr "Add Rule"
 
-#: ../e-util/e-rule-editor.c:395
+#: ../e-util/e-rule-editor.c:286
 msgid "Edit Rule"
 msgstr "Edit Rule"
 
-#: ../e-util/e-search-bar.c:79
+#: ../e-util/e-search-bar.c:84
 #, c-format
 msgid "Matches: %u"
 msgstr "Matches: %u"
 
-#: ../e-util/e-search-bar.c:527
+#: ../e-util/e-search-bar.c:611
 msgid "Close the find bar"
 msgstr "Close the find bar"
 
-#: ../e-util/e-search-bar.c:535
+#: ../e-util/e-search-bar.c:619
 msgid "Fin_d:"
 msgstr "Fin_d:"
 
-#: ../e-util/e-search-bar.c:547
+#: ../e-util/e-search-bar.c:631
 msgid "Clear the search"
 msgstr "Clear the search"
 
-#: ../e-util/e-search-bar.c:571
+#: ../e-util/e-search-bar.c:655
 msgid "_Previous"
 msgstr "_Previous"
 
-#: ../e-util/e-search-bar.c:577
+#: ../e-util/e-search-bar.c:658
 msgid "Find the previous occurrence of the phrase"
 msgstr "Find the previous occurrence of the phrase"
 
-#: ../e-util/e-search-bar.c:590
+#: ../e-util/e-search-bar.c:667
 msgid "_Next"
 msgstr "_Next"
 
-#: ../e-util/e-search-bar.c:596
+#: ../e-util/e-search-bar.c:670
 msgid "Find the next occurrence of the phrase"
 msgstr "Find the next occurrence of the phrase"
 
-#: ../e-util/e-search-bar.c:609
+#: ../e-util/e-search-bar.c:679
 msgid "Mat_ch case"
 msgstr "Mat_ch case"
 
-#: ../e-util/e-search-bar.c:637
+#: ../e-util/e-search-bar.c:707
 msgid "Reached bottom of page, continued from top"
 msgstr "Reached bottom of page, continued from top"
 
-#: ../e-util/e-search-bar.c:659
+#: ../e-util/e-search-bar.c:729
 msgid "Reached top of page, continued from bottom"
 msgstr "Reached top of page, continued from bottom"
 
-#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:331
-#: ../mail/importers/pine-importer.c:419
-#: ../modules/mail/e-mail-shell-view.c:1045
-msgid "Mail"
-msgstr "Mail"
-
 #: ../e-util/e-send-options.c:570
 msgid "When de_leted:"
 msgstr "When de_leted:"
 
-#: ../e-util/e-source-config.c:679 ../e-util/e-source-config.c:683
+#: ../e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "Standard"
+
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "Proprietary"
+
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "Secret"
+
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "Top Secret"
+
+#: ../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
+msgctxt "send-options"
+msgid "None"
+msgstr "None"
+
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "Mail Receipt"
+
+#: ../e-util/e-send-options.ui.h:14
+msgid "Send Options"
+msgstr "Send Options"
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "R_eply requested"
+
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "Wi_thin"
+
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "days"
+
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr "_When convenient"
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr "_Delay message delivery"
+
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_After"
+
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "days"
+
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr "_Set expiration date"
+
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Until"
+
+#: ../e-util/e-send-options.ui.h:25
+msgid "Delivery Options"
+msgstr "Delivery Options"
+
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "_Priority:"
+
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "_Classification:"
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "Gene_ral Options"
+
+#: ../e-util/e-send-options.ui.h:29
+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
+msgid "_Delivered"
+msgstr "_Delivered"
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr "Deli_vered and opened"
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "_All information"
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr "A_uto-delete sent item"
+
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr "Status Tracking"
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "_When opened:"
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr "When decli_ned:"
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr "When co_mpleted:"
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr "When acce_pted:"
+
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "Return Notification"
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr "Sta_tus Tracking"
+
+#: ../e-util/e-source-config.c:690 ../e-util/e-source-config.c:694
 msgid "Type:"
 msgstr "Type:"
 
-#: ../e-util/e-source-config.c:691 ../e-util/e-source-config.c:695
+#: ../e-util/e-source-config.c:702 ../e-util/e-source-config.c:706
 msgid "Name:"
 msgstr "Name:"
 
+#: ../e-util/e-source-config.c:813
+#| msgid "Label name cannot be empty."
+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:1293
+#: ../e-util/e-source-config.c:1313
 msgid "Refresh every"
 msgstr "Refresh every"
 
-#: ../e-util/e-source-config.c:1323 ../e-util/e-source-config.c:1392
+#: ../e-util/e-source-config.c:1343 ../e-util/e-source-config.c:1413
 msgid "Use a secure connection"
 msgstr "Use a secure connection"
 
-#: ../e-util/e-source-config.c:1416
-msgid "Unset _trust for SSL certificate"
-msgstr "Unset _trust for SSL certificate"
+#: ../e-util/e-source-config.c:1439
+#| msgid "Unset _trust for SSL certificate"
+msgid "Unset _trust for SSL/TLS certificate"
+msgstr "Unset _trust for SSL/TLS certificate"
 
-#: ../e-util/e-source-config.c:1450
+#: ../e-util/e-source-config.c:1475
 msgid "User"
 msgstr "User"
 
-#: ../e-util/e-source-selector-dialog.c:229
+#: ../e-util/e-source-selector.c:3214
+#| msgid "Show %s"
+msgid "Show"
+msgstr "Show"
+
+#: ../e-util/e-source-selector.c:3221
+#| msgid "Group Reply"
+msgid "Group name"
+msgstr "Group name"
+
+#: ../e-util/e-source-selector.c:3376 ../mail/e-mail-display.c:746
+msgid "_Hide"
+msgstr "_Hide"
+
+#: ../e-util/e-source-selector.c:3376 ../e-util/e-source-selector.c:3475
+#| msgid "Show %s"
+msgid "_Show"
+msgstr "_Show"
+
+#: ../e-util/e-source-selector.c:3428
+#| msgid "Manager"
+msgid "Manage Groups"
+msgstr "Manage Groups"
+
+#: ../e-util/e-source-selector.c:3440
+#| msgid "A_vailable Fields:"
+msgid "Available Groups:"
+msgstr "Available Groups:"
+
+#: ../e-util/e-source-selector-dialog.c:236
 msgid "_Destination"
 msgstr "_Destination"
 
-#: ../e-util/e-source-selector-dialog.c:342
+#: ../e-util/e-source-selector-dialog.c:364
 msgid "Select destination"
 msgstr "Select destination"
 
+#. Translators: %s is the language ISO code.
+#: ../e-util/e-spell-dictionary.c:266
+#, c-format
+#| msgid "Unknown"
+msgctxt "language"
+msgid "Unknown (%s)"
+msgstr "Unknown (%s)"
+
+#. Translators: The first %s is the language name, and the
+#. * second is the country name. Example: "French (France)"
+#: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
+#, c-format
+#| msgctxt "folder-display"
+#| msgid "%s (%u%s)"
+msgctxt "language"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:384
+#: ../e-util/e-spell-entry.c:478
 msgid "(no suggestions)"
 msgstr "(no suggestions)"
 
-#: ../e-util/e-spell-entry.c:408
+#: ../e-util/e-spell-entry.c:502
 msgid "More..."
 msgstr "More…"
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:479
+#: ../e-util/e-spell-entry.c:587
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Add \"%s\" to Dictionary"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:530
+#: ../e-util/e-spell-entry.c:636
 msgid "Ignore All"
 msgstr "Ignore All"
 
-#: ../e-util/e-spell-entry.c:558
+#: ../e-util/e-spell-entry.c:668
 msgid "Spelling Suggestions"
 msgstr "Spelling Suggestions"
 
@@ -11192,10 +14449,6 @@ msgid ""
 msgstr ""
 "The file already exists in \"{0}\". Replacing it will overwrite its contents."
 
-#: ../e-util/e-system.error.xml.h:3
-msgid "_Replace"
-msgstr "_Replace"
-
 #: ../e-util/e-system.error.xml.h:4
 msgid "Cannot save file \"{0}\"."
 msgstr "Cannot save file \"{0}\"."
@@ -11212,7 +14465,7 @@ msgstr "Cannot open file \"{0}\"."
 msgid "Failed to remove data source &quot;{0}&quot;."
 msgstr "Failed to remove data source &quot;{0}&quot;."
 
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
+#: ../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;."
 
@@ -11280,37 +14533,128 @@ msgstr "The memo list backend servicing &quot;{0}&quot; encountered an error."
 msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr "The task list backend servicing &quot;{0}&quot; encountered an error."
 
-#: ../e-util/e-table-click-to-add.c:643
-#: ../e-util/gal-a11y-e-table-click-to-add.c:62
-#: ../e-util/gal-a11y-e-table-click-to-add.c:143
+#: ../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
 msgid "click to add"
 msgstr "click to add"
 
-#: ../e-util/e-table-config.c:397 ../e-util/e-table-config.c:439
+#: ../e-util/e-table-column-selector.c:264
+#| msgid "Move selected messages to another folder"
+msgid "Move selected column names to top"
+msgstr "Move selected column names to top"
+
+#: ../e-util/e-table-column-selector.c:269
+#| msgid "Move selected contacts to another address book"
+msgid "Move selected column names up one row"
+msgstr "Move selected column names up one row"
+
+#: ../e-util/e-table-column-selector.c:274
+#| msgid "Move selected contacts to another address book"
+msgid "Move selected column names down one row"
+msgstr "Move selected column names down one row"
+
+#: ../e-util/e-table-column-selector.c:279
+#| msgid "Move selected messages to another folder"
+msgid "Move selected column names to bottom"
+msgstr "Move selected column names to bottom"
+
+#: ../e-util/e-table-column-selector.c:284
+#| msgid "Select all visible memos"
+msgid "Select all column names"
+msgstr "Select all column names"
+
+#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
 msgid "(Ascending)"
 msgstr "(Ascending)"
 
-#: ../e-util/e-table-config.c:397 ../e-util/e-table-config.c:439
+#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
 msgid "(Descending)"
 msgstr "(Descending)"
 
-#: ../e-util/e-table-config.c:404
+#: ../e-util/e-table-config.c:395
 msgid "Not sorted"
 msgstr "Not sorted"
 
-#: ../e-util/e-table-config.c:445
+#: ../e-util/e-table-config.c:440
 msgid "No grouping"
 msgstr "No grouping"
 
-#: ../e-util/e-table-config.c:690
-msgid "Available Fields"
-msgstr "Available Fields"
+#: ../e-util/e-table-config.c:545
+msgid "Show Fields"
+msgstr "Show Fields"
 
-#: ../e-util/e-table-field-chooser-dialog.c:227
-msgid "Add a Column"
-msgstr "Add a Column"
+#: ../e-util/e-table-config.c:559
+#| msgid "Choose a folder for saving sent messages."
+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 "_Append"
+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
+msgid "Clear _All"
+msgstr "Clear _All"
+
+#: ../e-util/e-table-config.ui.h:10
+msgid "_Show field in View"
+msgstr "_Show field in View"
 
-#: ../e-util/e-table-field-chooser.c:164
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1796
+msgid "Ascending"
+msgstr "Ascending"
+
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1796
+msgid "Descending"
+msgstr "Descending"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Group Items By"
+msgstr "Group Items By"
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Show _field in View"
+msgstr "Show _field in View"
+
+#: ../e-util/e-table-config.ui.h:15
+msgid "Then By"
+msgstr "Then By"
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Show field i_n View"
+msgstr "Show field i_n View"
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Show field in _View"
+msgstr "Show field in _View"
+
+#: ../e-util/e-table-config.ui.h:18
+msgid "Sort"
+msgstr "Sort"
+
+#: ../e-util/e-table-config.ui.h:19
+msgid "Clear All"
+msgstr "Clear All"
+
+#: ../e-util/e-table-config.ui.h:20
+msgid "Sort Items By"
+msgstr "Sort Items By"
+
+#: ../e-util/e-table-field-chooser.c:166
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -11318,175 +14662,261 @@ 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-group-container.c:363
+#: ../e-util/e-table-field-chooser-dialog.c:226
+msgid "Add a Column"
+msgstr "Add a Column"
+
+#: ../e-util/e-table-group-container.c:368
 #, 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:377
+#: ../e-util/e-table-group-container.c:382
 #, 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:1579
+#: ../e-util/e-table-header-item.c:1619
 msgid "Customize Current View"
 msgstr "Customise Current View"
 
-#: ../e-util/e-table-header-item.c:1602
+#: ../e-util/e-table-header-item.c:1642
 msgid "Sort _Ascending"
 msgstr "Sort _Ascending"
 
-#: ../e-util/e-table-header-item.c:1605
+#: ../e-util/e-table-header-item.c:1645
 msgid "Sort _Descending"
 msgstr "Sort _Descending"
 
-#: ../e-util/e-table-header-item.c:1608
-msgid "_Unsort"
-msgstr "_Unsort"
+#: ../e-util/e-table-header-item.c:1648
+#| msgid "Task sort"
+msgid "_Reset sort"
+msgstr "_Reset sort"
 
-#: ../e-util/e-table-header-item.c:1611
+#: ../e-util/e-table-header-item.c:1651
 msgid "Group By This _Field"
 msgstr "Group By This _Field"
 
-#: ../e-util/e-table-header-item.c:1614
+#: ../e-util/e-table-header-item.c:1654
 msgid "Group By _Box"
 msgstr "Group By _Box"
 
-#: ../e-util/e-table-header-item.c:1618
+#: ../e-util/e-table-header-item.c:1658
 msgid "Remove This _Column"
 msgstr "Remove This _Column"
 
-#: ../e-util/e-table-header-item.c:1621
+#: ../e-util/e-table-header-item.c:1661
 msgid "Add a C_olumn..."
 msgstr "Add a C_olumn…"
 
-#: ../e-util/e-table-header-item.c:1625
+#: ../e-util/e-table-header-item.c:1665
 msgid "A_lignment"
 msgstr "A_lignment"
 
-#: ../e-util/e-table-header-item.c:1628
+#: ../e-util/e-table-header-item.c:1668
 msgid "B_est Fit"
 msgstr "B_est Fit"
 
-#: ../e-util/e-table-header-item.c:1631
+#: ../e-util/e-table-header-item.c:1671
 msgid "Format Column_s..."
 msgstr "Format Column_s…"
 
-#: ../e-util/e-table-header-item.c:1635
+#: ../e-util/e-table-header-item.c:1675
 msgid "Custo_mize Current View..."
 msgstr "Custo_mise Current View…"
 
-#: ../e-util/e-table-header-item.c:1706
+#: ../e-util/e-table-header-item.c:1746
 msgid "_Sort By"
 msgstr "_Sort By"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1724
+#: ../e-util/e-table-header-item.c:1769
 msgid "_Custom"
 msgstr "_Custom"
 
-#: ../e-util/e-text.c:2098
+#: ../e-util/e-text.c:2134
 msgid "Select All"
 msgstr "Select All"
 
-#: ../e-util/e-text.c:2111
+#: ../e-util/e-text.c:2147
 msgid "Input Methods"
 msgstr "Input Methods"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../e-util/e-timezone-dialog.c:207 ../e-util/e-timezone-dialog.c:429
-#: ../e-util/e-timezone-dialog.c:433 ../e-util/e-timezone-dialog.c:437
-#: ../e-util/e-timezone-dialog.c:803
+#: ../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
 msgid "UTC"
 msgstr "UTC"
 
-#: ../e-util/e-url-entry.c:80
-msgid "Click here to go to URL"
-msgstr "Click here to go to URL"
+#: ../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
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Time Zones"
+msgstr "Time Zones"
+
+#: ../e-util/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "_Selection"
+
+#: ../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
+#| msgid "Click here to go to URL"
+msgid "Click here to open the URL"
+msgstr "Click here to open the URL"
+
+#: ../e-util/e-url-entry.c:110
+#| msgid "Enter Passphrase"
+msgid "Enter a URL here"
+msgstr "Enter a URL here"
+
+#: ../e-util/evolution-source-viewer.c:637
+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
+msgid "Display Name"
+msgstr "Display Name"
+
+#: ../e-util/evolution-source-viewer.c:676
+msgid "Flags"
+msgstr "Flags"
+
+#: ../e-util/evolution-source-viewer.c:728
+#: ../mail/e-mail-config-identity-page.c:779
+msgid "Identity"
+msgstr "Identity"
 
-#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:273
+#: ../e-util/e-web-view.c:337
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:275
+#: ../e-util/e-web-view.c:339
 msgid "Copy the link to the clipboard"
 msgstr "Copy the link to the clipboard"
 
-#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:283
+#: ../e-util/e-web-view.c:347
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:285
+#: ../e-util/e-web-view.c:349
 msgid "Open the link in a web browser"
 msgstr "Open the link in a web browser"
 
-#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:293
+#: ../e-util/e-web-view.c:357
 msgid "_Copy Email Address"
 msgstr "_Copy E-mail Address"
 
-#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:310
+#: ../e-util/e-web-view.c:364
+#| msgid "Copy _Email Address"
+msgid "Copy _Raw Email Address"
+msgstr "Copy _Raw E-mail Address"
+
+#: ../e-util/e-web-view.c:366
+#| msgid "Copy the email address to the clipboard"
+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
 msgid "_Copy Image"
 msgstr "_Copy Image"
 
-#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:312
+#: ../e-util/e-web-view.c:383
 msgid "Copy the image to the clipboard"
 msgstr "Copy the image to the clipboard"
 
-#: ../e-util/e-web-view-gtkhtml.c:465 ../e-util/e-web-view-gtkhtml.c:1308
-#: ../e-util/e-web-view.c:332 ../e-util/e-web-view.c:1419
+#: ../e-util/e-web-view.c:388
+msgid "Save _Image..."
+msgstr "Save _Image…"
+
+#: ../e-util/e-web-view.c:390
+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:1839
 msgid "Select all text and images"
 msgstr "Select all text and images"
 
-#: ../e-util/e-web-view-gtkhtml.c:972 ../e-util/e-web-view-gtkhtml.c:974
-#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:1086
-#: ../e-util/e-web-view.c:1088 ../e-util/e-web-view.c:1090
+#: ../e-util/e-web-view.c:1294
 #, c-format
 msgid "Click to call %s"
 msgstr "Click to call %s"
 
-#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:1092
+#: ../e-util/e-web-view.c:1296
 msgid "Click to hide/unhide addresses"
 msgstr "Click to hide/unhide addresses"
 
-#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:1094
+#: ../e-util/e-web-view.c:1307
+#, c-format
+#| msgid "Enter the recipients of the message"
+msgid "Go to the section %s of the message"
+msgstr "Go to the section %s of the message"
+
+#: ../e-util/e-web-view.c:1309
+#| msgid "Enter the recipients of the message"
+msgid "Go to the beginning of the message"
+msgstr "Go to the beginning of the message"
+
+#: ../e-util/e-web-view.c:1313
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
-#: ../e-util/ea-calendar-item.c:315 ../e-util/ea-calendar-item.c:324
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
+#: ../e-util/e-web-view.c:3655
+#| msgid "Copy the image to the clipboard"
+msgid "Copying image to clipboard"
+msgstr "Copying image to clipboard"
 
-#: ../e-util/ea-calendar-item.c:327
+#: ../e-util/e-web-view.c:3843
+msgid "Save Image"
+msgstr "Save Image"
+
+#: ../e-util/e-web-view.c:3879
 #, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Calendar: from %s to %s"
+#| msgid "Moving messages to '%s'"
+msgid "Saving image to '%s'"
+msgstr "Saving image to '%s'"
 
-#: ../e-util/ea-calendar-item.c:364
-msgid "evolution calendar item"
-msgstr "evolution calendar item"
+#: ../e-util/e-web-view.c:3974
+#, 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."
 
-#: ../e-util/evolution-source-viewer.c:635
-msgid "Evolution Source Viewer"
-msgstr "Evolution Source Viewer"
+#: ../e-util/e-widget-undo.c:430
+msgid "Undo 'Insert text'"
+msgstr "Undo 'Insert text'"
 
-#. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:665
-msgid "Display Name"
-msgstr "Display Name"
+#: ../e-util/e-widget-undo.c:432
+msgid "Redo 'Insert text'"
+msgstr "Redo 'Insert text'"
 
-#: ../e-util/evolution-source-viewer.c:674
-msgid "Flags"
-msgstr "Flags"
+#: ../e-util/e-widget-undo.c:446
+msgid "Undo 'Delete text'"
+msgstr "Undo 'Delete text'"
 
-#: ../e-util/evolution-source-viewer.c:726
-#: ../mail/e-mail-config-identity-page.c:677
-msgid "Identity"
-msgstr "Identity"
+#: ../e-util/e-widget-undo.c:448
+msgid "Redo 'Delete text'"
+msgstr "Redo 'Delete text'"
 
 #: ../e-util/filter.error.xml.h:1
 msgid "Missing date."
@@ -11516,7 +14946,7 @@ msgstr "Bad regular expression &quot;{0}&quot;."
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "Could not compile regular expression &quot;{1}&quot;."
 
-#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:107
 msgid "Missing name."
 msgstr "Missing name."
 
@@ -11532,13 +14962,123 @@ msgstr "Name &quot;{0}&quot; already used."
 msgid "Please choose another name."
 msgstr "Please choose another name."
 
+#: ../e-util/filter.error.xml.h:12
+#| msgid "Missing date."
+msgid "Missing condition."
+msgstr "Missing condition."
+
+#: ../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
+#| msgid "Missing date."
+msgid "Missing value."
+msgstr "Missing value."
+
+#: ../e-util/filter.error.xml.h:15
+#| msgid "Label name cannot be empty."
+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 delete the '{0}' task?"
+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
+#| msgid "_Keep Data"
+msgid "_Keep"
+msgstr "_Keep"
+
+#: ../e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "the current time"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr "the time you specify"
+
+#: ../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
+msgid "seconds"
+msgstr "seconds"
+
+#: ../e-util/filter.ui.h:9 ../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
+msgid "months"
+msgstr "months"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr "years"
+
+#: ../e-util/filter.ui.h:12
+msgid "ago"
+msgstr "ago"
+
+#: ../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
+msgid "Compare against"
+msgstr "Compare against"
+
+#: ../e-util/filter.ui.h:24
+msgid ""
+"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 current time when filtering occurs."
+
+#: ../e-util/filter.ui.h:26
+msgid ""
+"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."
+
+#: ../e-util/filter.ui.h:28
+msgid ""
+"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"
+"a time relative to when filtering occurs."
+
+#: ../e-util/gal-a11y-e-cell.c:130
+msgid "Table Cell"
+msgstr "Table Cell"
+
 #. Translators: description of a "popup" action
-#: ../e-util/gal-a11y-e-cell-popup.c:128
+#: ../e-util/gal-a11y-e-cell-popup.c:127
 msgid "popup a child"
 msgstr "pop up a child"
 
+#. Translators: description of an "edit" action
+#: ../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:180
+#: ../e-util/gal-a11y-e-cell-toggle.c:185
 msgid "toggle the cell"
 msgstr "toggle the cell"
 
@@ -11552,36 +15092,27 @@ msgstr "expands the row in the ETree containing this cell"
 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-cell.c:123
-msgid "Table Cell"
-msgstr "Table Cell"
-
-#: ../e-util/gal-a11y-e-table-click-to-add.c:72
+#: ../e-util/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "click"
 
-#: ../e-util/gal-a11y-e-table-column-header.c:163
+#: ../e-util/gal-a11y-e-table-column-header.c:162
 msgid "sort"
 msgstr "sort"
 
-#: ../e-util/gal-define-views-dialog.c:385
-#: ../e-util/gal-define-views-dialog.c:388
-msgid "Define Views"
-msgstr "Define Views"
-
-#: ../e-util/gal-view-factory-etable.c:114
-msgid "Table"
-msgstr "Table"
-
-#: ../e-util/gal-view-instance-save-as-dialog.c:296
+#: ../e-util/gal-view-instance-save-as-dialog.c:295
 msgid "Save Current View"
 msgstr "Save Current View"
 
-#: ../e-util/gal-view-new-dialog.c:173
-msgid "Define New View"
-msgstr "Define New View"
+#: ../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
+msgid "_Replace existing view"
+msgstr "_Replace existing view"
 
-#: ../e-util/widgets.error.xml.h:1
+#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:201
 msgid "Do you wish to save your changes?"
 msgstr "Do you wish to save your changes?"
 
@@ -11589,7 +15120,7 @@ msgstr "Do you wish to save your changes?"
 msgid "This signature has been changed, but has not been saved."
 msgstr "This signature has been changed, but has not been saved."
 
-#: ../e-util/widgets.error.xml.h:3
+#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:203
 msgid "_Discard changes"
 msgstr "_Discard changes"
 
@@ -11602,165 +15133,162 @@ 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
+#| msgid "Copy the image to the clipboard"
+msgid "Unable to copy image to clipboard."
+msgstr "Unable to copy image to clipboard."
+
+#: ../e-util/widgets.error.xml.h:7
+#| msgid "Unable to save {0}."
+msgid "Unable to save image."
+msgstr "Unable to save image."
+
+#: ../e-util/widgets.error.xml.h:8
 msgid "Could not load signature."
 msgstr "Could not load signature."
 
-#: ../e-util/widgets.error.xml.h:7
+#: ../e-util/widgets.error.xml.h:9
 msgid "Could not save signature."
 msgstr "Could not save signature."
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:27
+#: ../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
+#| msgid "OAuth2"
+msgid "OAuth2 Google"
+msgstr "OAuth2 Google"
+
+#: ../libemail-engine/camel-sasl-oauth2-google.c:30
+#| msgid ""
+#| "This option will use an OAuth 2.0 access token to connect to the server"
+msgid ""
+"This option will use an OAuth 2.0 access token to connect to the Google "
+"server"
+msgstr ""
+"This option will use an OAuth 2.0 access token to connect to the Google "
+"server"
+
+#: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:28
+#: ../libemail-engine/camel-sasl-xoauth2.c:27
 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-authenticator.c:182
-#, c-format
-msgid "Invalid authentication result code (%d)"
-msgstr "Invalid authentication result code (%d)"
+msgstr ""
+"This option will use an OAuth 2.0 access token to connect to the server"
 
-#: ../libemail-engine/e-mail-folder-utils.c:114
+#: ../libemail-engine/e-mail-folder-utils.c:115
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Saving message to folder '%s'"
 
-#: ../libemail-engine/e-mail-folder-utils.c:573
+#: ../libemail-engine/e-mail-folder-utils.c:574
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: ../libemail-engine/e-mail-folder-utils.c:683
-#: ../libemail-engine/e-mail-folder-utils.c:934
+#: ../libemail-engine/e-mail-folder-utils.c:684
+#: ../libemail-engine/e-mail-folder-utils.c:938
 #, 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:777
+#: ../libemail-engine/e-mail-folder-utils.c:778
 msgid "Scanning messages for duplicates"
 msgstr "Scanning messages for duplicates"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1185
+#: ../libemail-engine/e-mail-folder-utils.c:1151
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Removing folder '%s'"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1322
+#: ../libemail-engine/e-mail-folder-utils.c:1332
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "File \"%s\" has been removed."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1326
+#: ../libemail-engine/e-mail-folder-utils.c:1336
 msgid "File has been removed."
 msgstr "File has been removed."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1385
+#: ../libemail-engine/e-mail-folder-utils.c:1413
 msgid "Removing attachments"
 msgstr "Removing attachments"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1549
+#: ../libemail-engine/e-mail-folder-utils.c:1577
 #, 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:1905 ../mail/em-folder-utils.c:610
+#: ../libemail-engine/e-mail-folder-utils.c:1955
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Invalid folder URI '%s'"
 
-#: ../libemail-engine/e-mail-session-utils.c:540
-#, c-format
-msgid "No mail service found with UID '%s'"
-msgstr "No mail service found with UID '%s'"
-
-#: ../libemail-engine/e-mail-session-utils.c:549
-#, c-format
-msgid "UID '%s' is not a mail transport"
-msgstr "UID '%s' is not a mail transport"
-
-#: ../libemail-engine/e-mail-session-utils.c:647
-#: ../libemail-engine/mail-ops.c:765
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Failed to apply outgoing filters: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:676
-#: ../libemail-engine/e-mail-session-utils.c:710
-#: ../libemail-engine/mail-ops.c:784 ../libemail-engine/mail-ops.c:817
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-
-#: ../libemail-engine/e-mail-session-utils.c:730
-#: ../libemail-engine/mail-ops.c:839
-#, c-format
-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:973
-#: ../libemail-engine/mail-ops.c:971 ../libemail-engine/mail-ops.c:1073
-msgid "Sending message"
-msgstr "Sending message"
-
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:336
-#: ../mail/em-folder-tree-model.c:764
-#: ../modules/mail/e-mail-shell-view-private.c:1094
-#: ../modules/mail/e-mail-shell-view-private.c:1105
+#. 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:1048
+#: ../modules/mail/e-mail-shell-view-private.c:1059
 msgid "Inbox"
 msgstr "Inbox"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:757
-#: ../modules/mail/e-mail-shell-view-private.c:1092
+#: ../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:1046
 msgid "Drafts"
 msgstr "Drafts"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:768
-#: ../modules/mail/e-mail-shell-view-private.c:1096
+#: ../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:1050
 msgid "Outbox"
 msgstr "Outbox"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:772
-#: ../modules/mail/e-mail-shell-view-private.c:1098
+#: ../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:1052
 msgid "Sent"
 msgstr "Sent"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:760
-#: ../modules/mail/e-mail-shell-view-private.c:1100
+#: ../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:1054
+#: ../plugins/templates/e-templates-store.c:2214
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1071 ../plugins/templates/templates.c:1368
-#: ../plugins/templates/templates.c:1378
 msgid "Templates"
 msgstr "Templates"
 
-#: ../libemail-engine/e-mail-session.c:1344
+#: ../libemail-engine/e-mail-session.c:1305
 #, c-format
 msgid "User cancelled operation"
 msgstr "User cancelled operation"
 
-#: ../libemail-engine/e-mail-session.c:1533
-#, c-format
-msgid "%s authentication failed"
-msgstr "%s authentication failed"
-
-#: ../libemail-engine/e-mail-session.c:1578
-#, c-format
-msgid "No data source found for UID '%s'"
-msgstr "No data source found for UID '%s'"
-
-#: ../libemail-engine/e-mail-session.c:1629
+#: ../libemail-engine/e-mail-session.c:1362
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
@@ -11769,37 +15297,85 @@ msgstr ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 
-#: ../libemail-engine/e-mail-session.c:1642
+#: ../libemail-engine/e-mail-session.c:1375
 #, 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-store-utils.c:171
+#: ../libemail-engine/e-mail-session.c:2405
+#, c-format
+#| msgid "Creating folder '%s'"
+msgid "Waiting for '%s'"
+msgstr "Waiting for '%s'"
+
+#: ../libemail-engine/e-mail-session-utils.c:540
+#| msgid "No HTML stream available"
+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
+#, c-format
+#| msgid "Moving messages 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
+#, 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
+#, c-format
+#| msgid "Moving messages 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
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+
+#: ../libemail-engine/e-mail-session-utils.c:751
+#: ../libemail-engine/mail-ops.c:832
+#, c-format
+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
+msgid "Sending message"
+msgstr "Sending message"
+
+#: ../libemail-engine/e-mail-store-utils.c:190
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Disconnecting from '%s'"
 
-#: ../libemail-engine/e-mail-store-utils.c:263
+#: ../libemail-engine/e-mail-store-utils.c:266
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Reconnecting to '%s'"
 
-#: ../libemail-engine/e-mail-store-utils.c:340
+#: ../libemail-engine/e-mail-store-utils.c:351
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparing account '%s' for offline"
 
-#: ../libemail-engine/mail-folder-cache.c:884
-#, c-format
-msgid "Pinging %s"
-msgstr "Pinging %s"
-
-#: ../libemail-engine/mail-ops.c:94
+#: ../libemail-engine/mail-ops.c:90
 msgid "Filtering Selected Messages"
 msgstr "Filtering Selected Messages"
 
-#: ../libemail-engine/mail-ops.c:152
+#: ../libemail-engine/mail-ops.c:148
 #, c-format
 msgid ""
 "Failed to filter selected messages. One reason can be that folder location "
@@ -11808,16 +15384,16 @@ msgid ""
 "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:233
+#: ../libemail-engine/mail-ops.c:229
 #, c-format
 msgid "Fetching mail from '%s'"
 msgstr "Fetching mail from '%s'"
 
-#: ../libemail-engine/mail-ops.c:759
+#: ../libemail-engine/mail-ops.c:750
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -11826,85 +15402,92 @@ msgid ""
 "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:982
+#: ../libemail-engine/mail-ops.c:1006
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
 
-#: ../libemail-engine/mail-ops.c:1034
+#: ../libemail-engine/mail-ops.c:1058
 #, 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:1040
-msgid "Canceled."
+#: ../libemail-engine/mail-ops.c:1064
+#| msgid "Cancelled"
+msgid "Cancelled."
 msgstr "Cancelled."
 
-#: ../libemail-engine/mail-ops.c:1042
+#: ../libemail-engine/mail-ops.c:1066
 msgid "Complete."
 msgstr "Complete."
 
-#: ../libemail-engine/mail-ops.c:1154
+#: ../libemail-engine/mail-ops.c:1182
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Moving messages to '%s'"
 
-#: ../libemail-engine/mail-ops.c:1155
+#: ../libemail-engine/mail-ops.c:1183
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copying messages to '%s'"
 
-#: ../libemail-engine/mail-ops.c:1274
+#: ../libemail-engine/mail-ops.c:1302
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Storing folder '%s'"
 
-#: ../libemail-engine/mail-ops.c:1402
+#: ../libemail-engine/mail-ops.c:1430
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: ../libemail-engine/mail-ops.c:1403
+#: ../libemail-engine/mail-ops.c:1431
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Storing account '%s'"
 
-#: ../libemail-engine/mail-ops.c:1477
+#: ../libemail-engine/mail-ops.c:1506
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Emptying wastebasket in '%s'"
 
-#: ../libemail-engine/mail-tools.c:71
+#: ../libemail-engine/mail-ops.c:1598
+#, c-format
+#| msgid "Scanning folders in '%s'"
+msgid "Processing folder changes in '%s'"
+msgstr "Processing folder changes in '%s'"
+
+#: ../libemail-engine/mail-tools.c:70
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "Could not create spool directory '%s': %s"
 
-#: ../libemail-engine/mail-tools.c:111
+#: ../libemail-engine/mail-tools.c:110
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Trying to movemail a non-mbox source '%s'"
 
-#: ../libemail-engine/mail-tools.c:229
+#: ../libemail-engine/mail-tools.c:236
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Forwarded message — %s"
 
-#: ../libemail-engine/mail-tools.c:231
+#: ../libemail-engine/mail-tools.c:238
 msgid "Forwarded message"
 msgstr "Forwarded message"
 
-#: ../libemail-engine/mail-vfolder.c:127
+#: ../libemail-engine/mail-vfolder.c:151
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Setting up Search Folder: %s"
 
-#: ../libemail-engine/mail-vfolder.c:280
+#: ../libemail-engine/mail-vfolder.c:304
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "Updating Search Folders for '%s' - %s"
@@ -11914,7 +15497,7 @@ msgstr "Updating Search Folders for '%s' - %s"
 #. * 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:646
+#: ../libemail-engine/mail-vfolder.c:668
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -11933,71 +15516,88 @@ msgstr[1] ""
 "%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 
-#: ../mail/e-mail-account-manager.c:460
-msgid "_Restore Default"
-msgstr "_Restore Default"
+#: ../mail/e-mail-account-manager.c:117 ../mail/e-mail-account-manager.c:204
+#| msgid "All Accounts"
+msgid "Open _Online Accounts"
+msgstr "Open _Online Accounts"
 
-#: ../mail/e-mail-account-manager.c:473
+#: ../mail/e-mail-account-manager.c:143 ../mail/e-mail-account-manager.c:230
+#| msgid ""
+#| "This option will connect to the server by way of the GNOME Online "
+#| "Accounts service"
+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
+msgid "_Reset Order"
+msgstr "_Reset Order"
+
+#: ../mail/e-mail-account-manager.c:702
 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:518
+#: ../mail/e-mail-account-manager.c:745
 msgid "De_fault"
 msgstr "De_fault"
 
-#: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:488
-#: ../modules/plugin-manager/evolution-plugin-manager.c:359
-#: ../plugins/publish-calendar/publish-calendar.c:876
+#: ../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"
 
-#: ../mail/e-mail-account-tree-view.c:109
+#: ../mail/e-mail-account-tree-view.c:107
 msgid "Account Name"
 msgstr "Account Name"
 
-#: ../mail/e-mail-account-tree-view.c:136
-#: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3707
-#: ../mail/mail-config.ui.h:44
-msgid "Default"
-msgstr "Default"
-
-#: ../mail/e-mail-autoconfig.c:563
+#: ../mail/e-mail-autoconfig.c:619
 msgid "No email address provided"
 msgstr "No e-mail address provided"
 
-#: ../mail/e-mail-autoconfig.c:572
+#: ../mail/e-mail-autoconfig.c:628
 msgid "Missing domain in email address"
 msgstr "Missing domain in e-mail address"
 
-#: ../mail/e-mail-backend.c:754
-msgid "Unknown background operation"
-msgstr "Unknown background operation"
-
-#: ../mail/e-mail-browser.c:123 ../shell/e-shell-window-actions.c:848
-#: ../shell/e-shell-window-actions.c:855 ../shell/e-shell-window-actions.c:862
+#: ../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
 msgid "Close this window"
 msgstr "Close this window"
 
-#: ../mail/e-mail-browser.c:280
+#: ../mail/e-mail-browser.c:289
 msgid "(No Subject)"
 msgstr "(No Subject)"
 
+#. GtkAssistant's back button label.
+#: ../mail/e-mail-config-assistant.c:46
+#| msgid "Go Back"
+msgid "Go _Back"
+msgstr "Go _Back"
+
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:102
+#: ../mail/e-mail-config-assistant.c:115
 msgid "_Skip Lookup"
 msgstr "_Skip Lookup"
 
-#: ../mail/e-mail-config-assistant.c:562
+#: ../mail/e-mail-config-assistant.c:660
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistant"
 
-#: ../mail/e-mail-config-auth-check.c:352
+#: ../mail/e-mail-config-assistant.c:954
+#| msgid "_Restore Defaults"
+msgid "_Revise Details"
+msgstr "_Revise Details"
+
+#: ../mail/e-mail-config-auth-check.c:177
+#| msgid "_Authentication Type"
+msgid "Querying authentication types..."
+msgstr "Querying authentication types..."
+
+#: ../mail/e-mail-config-auth-check.c:340
 msgid "Check for Supported Types"
 msgstr "Check for Supported Types"
 
-#: ../mail/e-mail-config-confirm-page.c:157
+#: ../mail/e-mail-config-confirm-page.c:155
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12011,91 +15611,155 @@ msgstr ""
 "\n"
 "Click \"Apply\" to save your settings."
 
-#: ../mail/e-mail-config-confirm-page.c:169
+#: ../mail/e-mail-config-confirm-page.c:167
 msgid "Done"
 msgstr "Done"
 
-#: ../mail/e-mail-config-defaults-page.c:552
+#: ../mail/e-mail-config-defaults-page.c:377
+#| msgid "Printer settings"
+msgid "Checking server settings..."
+msgstr "Checking server settings..."
+
+#: ../mail/e-mail-config-defaults-page.c:495
+#| msgid "Shell Settings"
+msgctxt "ReplyForward"
+msgid "Use global setting"
+msgstr "Use global setting"
+
+#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:26
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "Attachment"
+
+#: ../mail/e-mail-config-defaults-page.c:499 ../mail/mail-config.ui.h:27
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "Inline (Outlook style)"
+
+#: ../mail/e-mail-config-defaults-page.c:501 ../mail/mail-config.ui.h:28
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "Quoted"
+
+#: ../mail/e-mail-config-defaults-page.c:503 ../mail/mail-config.ui.h:29
+#| msgctxt "ReplyForward"
+#| msgid "Do not quote"
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "Do Not Quote"
+
+#: ../mail/e-mail-config-defaults-page.c:829
 msgid "Special Folders"
 msgstr "Special Folders"
 
-#: ../mail/e-mail-config-defaults-page.c:561
+#: ../mail/e-mail-config-defaults-page.c:838
 msgid "Draft Messages _Folder:"
 msgstr "Draft Messages _Folder:"
 
-#: ../mail/e-mail-config-defaults-page.c:571
+#: ../mail/e-mail-config-defaults-page.c:848
 msgid "Choose a folder for saving draft messages."
 msgstr "Choose a folder for saving draft messages."
 
-#: ../mail/e-mail-config-defaults-page.c:585
+#: ../mail/e-mail-config-defaults-page.c:862
 msgid "Sent _Messages Folder:"
 msgstr "Sent _Messages Folder:"
 
-#: ../mail/e-mail-config-defaults-page.c:595
+#: ../mail/e-mail-config-defaults-page.c:872
 msgid "Choose a folder for saving sent messages."
 msgstr "Choose a folder for saving sent messages."
 
-#: ../mail/e-mail-config-defaults-page.c:614
+#: ../mail/e-mail-config-defaults-page.c:891
 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:631
+#: ../mail/e-mail-config-defaults-page.c:908
+#| msgid "_Trash Folder:"
+msgid "Archi_ve Folder:"
+msgstr "Archi_ve Folder:"
+
+#: ../mail/e-mail-config-defaults-page.c:918
+#: ../modules/mail/em-mailer-prefs.c:1403
+#| msgid "Choose folders to post the message to."
+msgid "Choose a folder to archive messages to."
+msgstr "Choose a folder to archive messages to."
+
+#: ../mail/e-mail-config-defaults-page.c:932
+#| msgid "_Trash Folder:"
+msgid "_Templates Folder:"
+msgstr "_Templates Folder:"
+
+#: ../mail/e-mail-config-defaults-page.c:942
+#| msgid "Choose a folder for deleted messages."
+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
 msgid "_Restore Defaults"
 msgstr "_Restore Defaults"
 
-#: ../mail/e-mail-config-defaults-page.c:645
+#: ../mail/e-mail-config-defaults-page.c:981
+#| msgid "Local Folders"
+msgid "_Lookup Folders"
+msgstr "_Lookup Folders"
+
+#: ../mail/e-mail-config-defaults-page.c:999
 msgid "Use a Real Folder for _Trash:"
 msgstr "Use a Real Folder for _Wastebasket:"
 
-#: ../mail/e-mail-config-defaults-page.c:646
+#: ../mail/e-mail-config-defaults-page.c:1000
 msgid "Choose a folder for deleted messages."
 msgstr "Choose a folder for deleted messages."
 
-#: ../mail/e-mail-config-defaults-page.c:655
+#: ../mail/e-mail-config-defaults-page.c:1009
 msgid "Use a Real Folder for _Junk:"
 msgstr "Use a Real Folder for _Junk:"
 
-#: ../mail/e-mail-config-defaults-page.c:656
+#: ../mail/e-mail-config-defaults-page.c:1010
 msgid "Choose a folder for junk messages."
 msgstr "Choose a folder for junk messages."
 
-#: ../mail/e-mail-config-defaults-page.c:673
+#: ../mail/e-mail-config-defaults-page.c:1027
 msgid "Composing Messages"
 msgstr "Composing Messages"
 
-#: ../mail/e-mail-config-defaults-page.c:682
+#: ../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:707
+#: ../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:742
+#: ../mail/e-mail-config-defaults-page.c:1092
+#| msgid "_Reply style:"
+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:751
+#: ../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:776
+#: ../mail/e-mail-config-defaults-page.c:1162
 msgid "Never"
 msgstr "Never"
 
-#: ../mail/e-mail-config-defaults-page.c:782
+#: ../mail/e-mail-config-defaults-page.c:1168
 msgid "Always"
 msgstr "Always"
 
-#: ../mail/e-mail-config-defaults-page.c:788
+#: ../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:859
+#: ../mail/e-mail-config-defaults-page.c:1281
 msgid "Defaults"
 msgstr "Defaults"
 
-#: ../mail/e-mail-config-identity-page.c:266
+#: ../mail/e-mail-config-identity-page.c:304
 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 "
@@ -12105,216 +15769,276 @@ msgstr ""
 "below do not need to be filled in, unless you wish to include this "
 "information in e-mails you send."
 
-#: ../mail/e-mail-config-identity-page.c:294
-#: ../mail/e-mail-config-summary-page.c:324
+#: ../mail/e-mail-config-identity-page.c:332
+#: ../mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Account Information"
 
-#: ../mail/e-mail-config-identity-page.c:303
-#: ../mail/e-mail-config-summary-page.c:333
+#: ../mail/e-mail-config-identity-page.c:370
+#: ../mail/e-mail-config-summary-page.c:353
+#| msgid ""
+#| "Type the name by which you would like to refer to this account.\n"
+#| "For example, \"Work\" or \"Personal\"."
 msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example, \"Work\" or \"Personal\"."
+"The above name will be used to identify this account.\n"
+"Use for example, \"Work\" or \"Personal\"."
 msgstr ""
-"Type the name by which you would like to refer to this account.\n"
-"For example, \"Work\" or \"Personal\"."
+"The above name will be used to identify this account.\n"
+"Use for example, \"Work\" or \"Personal\"."
 
-#: ../mail/e-mail-config-identity-page.c:348
+#: ../mail/e-mail-config-identity-page.c:387
 msgid "Required Information"
 msgstr "Required Information"
 
-#: ../mail/e-mail-config-identity-page.c:357
+#: ../mail/e-mail-config-identity-page.c:396
 msgid "Full Nam_e:"
 msgstr "Full Nam_e:"
 
-#: ../mail/e-mail-config-identity-page.c:384
+#: ../mail/e-mail-config-identity-page.c:425
 msgid "Email _Address:"
 msgstr "E-mail _Address:"
 
-#: ../mail/e-mail-config-identity-page.c:431
+#: ../mail/e-mail-config-identity-page.c:474
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Optional Information"
 
-#: ../mail/e-mail-config-identity-page.c:439
+#: ../mail/e-mail-config-identity-page.c:483
 msgid "Re_ply-To:"
 msgstr "Re_ply-To:"
 
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../mail/e-mail-config-identity-page.c:512
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: ../mail/e-mail-config-identity-page.c:521
+#: ../mail/e-mail-config-identity-page.c:567
 msgid "Add Ne_w Signature..."
 msgstr "Add Ne_w Signature…"
 
-#: ../mail/e-mail-config-lookup-page.c:68
+#: ../mail/e-mail-config-identity-page.c:585
+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
+#| msgid "Label name cannot be empty."
+msgid "Full Name should not be empty"
+msgstr "Full Name should not be empty"
+
+#: ../mail/e-mail-config-identity-page.c:637
+#| msgid "Label name cannot be empty."
+msgid "Email Address cannot be empty"
+msgstr "E-mail Address cannot be empty"
+
+#: ../mail/e-mail-config-identity-page.c:642
+#| msgid "File is not a valid .desktop file"
+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
+#| msgid "File is not a valid .desktop file"
+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
+#| msgid "Label name cannot be empty."
+msgid "Account Name cannot be empty"
+msgstr "Account Name cannot be empty"
+
+#: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
 msgstr "Looking up account details…"
 
-#: ../mail/e-mail-config-provider-page.c:485
+#: ../mail/e-mail-config-provider-page.c:484
 msgid "Checking for New Mail"
 msgstr "Checking for New Mail"
 
-#: ../mail/e-mail-config-provider-page.c:501
+#: ../mail/e-mail-config-provider-page.c:500
 msgid "Check for _new messages every"
 msgstr "Check for _new messages every"
 
-#: ../mail/e-mail-config-provider-page.c:700
+#: ../mail/e-mail-config-provider-page.c:698
 msgid "Receiving Options"
 msgstr "Receiving Options"
 
-#: ../mail/e-mail-config-receiving-page.c:50
+#: ../mail/e-mail-config-receiving-page.c:49
 msgid "Receiving Email"
 msgstr "Receiving E-mail"
 
-#: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:260 ../mail/mail-config.ui.h:19
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
-#: ../modules/itip-formatter/plugin/config-ui.c:91
+#. 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
+#, c-format
+#| msgid "Task - %s"
+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
-#: ../smime/gui/certificate-viewer.c:653
 msgid "General"
 msgstr "General"
 
-#: ../mail/e-mail-config-security-page.c:268
+#: ../mail/e-mail-config-security-page.c:349
 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:290
+#: ../mail/e-mail-config-security-page.c:371
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP)"
 
-#: ../mail/e-mail-config-security-page.c:298
+#: ../mail/e-mail-config-security-page.c:380
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP _Key ID:"
 
-#: ../mail/e-mail-config-security-page.c:320
+#: ../mail/e-mail-config-security-page.c:413
 msgid "Si_gning algorithm:"
 msgstr "Si_gning algorithm:"
 
-#: ../mail/e-mail-config-security-page.c:336
-#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:45
+#: ../mail/e-mail-config-security-page.c:429
+#: ../mail/e-mail-config-security-page.c:593 ../mail/mail-config.ui.h:74
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:339
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:46
+#: ../mail/e-mail-config-security-page.c:432
+#: ../mail/e-mail-config-security-page.c:596 ../mail/mail-config.ui.h:75
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:342
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:47
+#: ../mail/e-mail-config-security-page.c:435
+#: ../mail/e-mail-config-security-page.c:599 ../mail/mail-config.ui.h:76
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:345
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:48
+#: ../mail/e-mail-config-security-page.c:438
+#: ../mail/e-mail-config-security-page.c:602 ../mail/mail-config.ui.h:77
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:361
+#: ../mail/e-mail-config-security-page.c:454
 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:373
+#: ../mail/e-mail-config-security-page.c:466
+#| msgid "Always encrypt outgoing messages when using this account"
+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
 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:385
+#: ../mail/e-mail-config-security-page.c:490
 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:409
+#: ../mail/e-mail-config-security-page.c:502
+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
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:417
+#: ../mail/e-mail-config-security-page.c:535
 msgid "Sig_ning certificate:"
 msgstr "Sig_ning certificate:"
 
-#: ../mail/e-mail-config-security-page.c:441
-#: ../mail/e-mail-config-security-page.c:547
+#: ../mail/e-mail-config-security-page.c:559
+#: ../mail/e-mail-config-security-page.c:665
 msgid "Select"
 msgstr "Select"
 
-#: ../mail/e-mail-config-security-page.c:459
+#: ../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
+msgid "_Clear"
+msgstr "_Clear"
+
+#: ../mail/e-mail-config-security-page.c:577
 msgid "Signing _algorithm:"
 msgstr "Signing _algorithm:"
 
-#: ../mail/e-mail-config-security-page.c:500
+#: ../mail/e-mail-config-security-page.c:618
 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:523
+#: ../mail/e-mail-config-security-page.c:641
 msgid "Encryption certificate:"
 msgstr "Encryption certificate:"
 
-#: ../mail/e-mail-config-security-page.c:565
+#: ../mail/e-mail-config-security-page.c:683
 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:585
+#: ../mail/e-mail-config-security-page.c:703
 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:50
+#: ../mail/e-mail-config-sending-page.c:49
 msgid "Sending Email"
 msgstr "Sending E-mail"
 
-#: ../mail/e-mail-config-service-page.c:640
+#: ../mail/e-mail-config-service-page.c:638
 msgid "Server _Type:"
 msgstr "Server _Type:"
 
 #: ../mail/e-mail-config-summary-page.c:142
-msgid "SSL"
-msgstr "SSL"
-
-#: ../mail/e-mail-config-summary-page.c:145
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:307
+#: ../mail/e-mail-config-summary-page.c:145
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: ../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:372
+#: ../mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "Personal Details"
 
-#: ../mail/e-mail-config-summary-page.c:381
+#: ../mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "Full Name:"
 
-#: ../mail/e-mail-config-summary-page.c:395
+#: ../mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "E-mail Address:"
 
-#: ../mail/e-mail-config-summary-page.c:409
+#: ../mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "Receiving"
 
-#: ../mail/e-mail-config-summary-page.c:421
+#: ../mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "Sending"
 
-#: ../mail/e-mail-config-summary-page.c:433
+#: ../mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "Server Type:"
 
-#: ../mail/e-mail-config-summary-page.c:454
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#: ../mail/e-mail-config-summary-page.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:605
 msgid "Server:"
 msgstr "Server:"
 
-#: ../mail/e-mail-config-summary-page.c:475
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:697
+#: ../mail/e-mail-config-summary-page.c:473
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:703
 msgid "Username:"
 msgstr "Username:"
 
-#: ../mail/e-mail-config-summary-page.c:496
+#: ../mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "Security:"
 
@@ -12322,101 +16046,191 @@ msgstr "Security:"
 msgid "Account Summary"
 msgstr "Account Summary"
 
-#: ../mail/e-mail-config-welcome-page.c:157
+#: ../mail/e-mail-config-welcome-page.c:156
+#| msgid ""
+#| "Welcome to the Evolution Mail Configuration Assistant.\n"
+#| "\n"
+#| "Click \"Continue\" to begin."
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Continue\" to begin."
+"Click \"Next\" to begin."
 msgstr ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Continue\" to begin."
+"Click \"Next\" to begin."
 
-#: ../mail/e-mail-config-welcome-page.c:167
-#: ../modules/startup-wizard/e-startup-assistant.c:152
+#: ../mail/e-mail-config-welcome-page.c:166
+#: ../modules/startup-wizard/e-startup-assistant.c:151
 msgid "Welcome"
 msgstr "Welcome"
 
-#: ../mail/e-mail-config-window.c:327
+#: ../mail/e-mail-config-window.c:325
 msgid "Account Editor"
 msgstr "Account Editor"
 
-#: ../mail/e-mail-display.c:113
+#: ../mail/e-mail-display.c:124
 msgid "_Add to Address Book..."
 msgstr "_Add to Address Book…"
 
-#: ../mail/e-mail-display.c:120
+#: ../mail/e-mail-display.c:131
 msgid "_To This Address"
 msgstr "_To this Address"
 
-#: ../mail/e-mail-display.c:127
+#: ../mail/e-mail-display.c:138
 msgid "_From This Address"
 msgstr "_From This Address"
 
-#: ../mail/e-mail-display.c:134
+#: ../mail/e-mail-display.c:145
 msgid "Send _Reply To..."
 msgstr "Send _Reply To…"
 
-#: ../mail/e-mail-display.c:136
+#: ../mail/e-mail-display.c:147
 msgid "Send a reply message to this address"
 msgstr "Send a reply message to this address"
 
-#: ../mail/e-mail-display.c:143
+#: ../mail/e-mail-display.c:154
 msgid "Create Search _Folder"
 msgstr "Create Search _Folder"
 
-#: ../mail/e-mail-display.c:153
-msgid "Save _Image..."
-msgstr "Save _Image…"
+#: ../mail/e-mail-display.c:753
+msgid "Hid_e All"
+msgstr "Hid_e All"
 
-#: ../mail/e-mail-display.c:155
-msgid "Save the image to a file"
-msgstr "Save the image to a file"
+#: ../mail/e-mail-display.c:760
+msgid "_View Inline"
+msgstr "_View Inline"
+
+#: ../mail/e-mail-display.c:767
+msgid "Vie_w All Inline"
+msgstr "Vie_w All Inline"
+
+#: ../mail/e-mail-display.c:774
+msgid "_Zoom to 100%"
+msgstr "_Zoom to 100%"
+
+#: ../mail/e-mail-display.c:776
+#| msgid "Reset the text to its original size"
+msgid "Zoom the image to its natural size"
+msgstr "Zoom the image to its natural size"
+
+#: ../mail/e-mail-display.c:781
+#| msgid "Close this window"
+msgid "_Zoom to window"
+msgstr "_Zoom to window"
+
+#: ../mail/e-mail-display.c:783
+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
+msgid "Create Folder"
+msgstr "Create Folder"
+
+#: ../mail/e-mail-folder-create-dialog.c:331
+msgid "Specify where to create the folder:"
+msgstr "Specify where to create the folder:"
+
+#: ../mail/e-mail-folder-create-dialog.c:334
+msgid "C_reate"
+msgstr "C_reate"
+
+#: ../mail/e-mail-folder-create-dialog.c:351
+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
+#| msgid "Answered"
+msgctxt "ffe"
+msgid "Answered"
+msgstr "Answered"
+
+#: ../mail/e-mail-free-form-exp.c:237
+#| msgid "Deleted"
+msgctxt "ffe"
+msgid "Deleted"
+msgstr "Deleted"
+
+#: ../mail/e-mail-free-form-exp.c:238
+#| msgid "Draft"
+msgctxt "ffe"
+msgid "Draft"
+msgstr "Draft"
+
+#: ../mail/e-mail-free-form-exp.c:239
+#| msgid "Flagged"
+msgctxt "ffe"
+msgid "Flagged"
+msgstr "Flagged"
+
+#: ../mail/e-mail-free-form-exp.c:240
+#| msgid "Seen"
+msgctxt "ffe"
+msgid "Seen"
+msgstr "Seen"
+
+#: ../mail/e-mail-free-form-exp.c:241
+#| msgid "Attachment"
+#| msgid_plural "Attachments"
+msgctxt "ffe"
+msgid "Attachment"
+msgstr "Attachment"
+
+#: ../mail/e-mail-free-form-exp.c:489
+#| msgid "now"
+msgctxt "ffe"
+msgid "no"
+msgstr "no"
 
-#. Label + combo box has a 12px left margin so it's
-#. * aligned with the junk mail options above it.
-#: ../mail/e-mail-junk-options.c:252
+#: ../mail/e-mail-free-form-exp.c:490
+msgctxt "ffe"
+msgid "false"
+msgstr "false"
+
+#: ../mail/e-mail-junk-options.c:295
 msgid "Junk filtering software:"
 msgstr "Junk filtering software:"
 
-#: ../mail/e-mail-label-dialog.c:225
+#: ../mail/e-mail-label-dialog.c:224
 msgid "_Label name:"
 msgstr "_Label name:"
 
-#: ../mail/e-mail-label-list-store.c:49
+#: ../mail/e-mail-label-list-store.c:57
 msgid "I_mportant"
 msgstr "I_mportant"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:50
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Work"
 msgstr "_Work"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:51
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_Personal"
 msgstr "_Personal"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:52
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_To Do"
 msgstr "_To Do"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:53
+#: ../mail/e-mail-label-list-store.c:61
 msgid "_Later"
 msgstr "_Later"
 
-#: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:771
+#: ../mail/e-mail-label-manager.c:171
+#: ../modules/mail/e-mail-shell-view-actions.c:1200
 msgid "Add Label"
 msgstr "Add Label"
 
-#: ../mail/e-mail-label-manager.c:221
+#: ../mail/e-mail-label-manager.c:222
 msgid "Edit Label"
 msgstr "Edit Label"
 
-#: ../mail/e-mail-label-manager.c:353
+#: ../mail/e-mail-label-manager.c:354
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -12424,669 +16238,792 @@ msgstr ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
 
-#: ../mail/e-mail-label-tree-view.c:89
+#: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
 msgstr "Colour"
 
-#: ../mail/e-mail-notebook-view.c:269
-msgid "Please select a folder"
-msgstr "Please select a folder"
-
-#: ../mail/e-mail-printer.c:123
-#, c-format
-msgid "Page %d of %d"
-msgstr "Page %d of %d"
-
-#: ../mail/e-mail-printer.c:573
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
-msgid "Print"
-msgstr "Print"
-
-#: ../mail/e-mail-printer.c:579
+#: ../mail/e-mail-notes.c:321 ../mail/e-mail-notes.c:719
+#| msgid "Message Fonts"
+msgid "Message Note"
+msgstr "Message Note"
+
+#: ../mail/e-mail-notes.c:639
+#| msgid "Copying messages into folder %s"
+msgid "Cannot find message in its folder summary"
+msgstr "Cannot find message in its folder summary"
+
+#: ../mail/e-mail-notes.c:842
+#| msgid "Formatting Message..."
+msgid "Storing changes..."
+msgstr "Storing changes..."
+
+#: ../mail/e-mail-notes.c:968
+#| msgid "_Edit Message"
+msgid "Edit Message Note"
+msgstr "Edit Message Note"
+
+#: ../mail/e-mail-notes.c:1122
+#| msgid "Retrieving Message..."
+msgid "Retrieving message..."
+msgstr "Retrieving message..."
+
+#: ../mail/e-mail-print-config-headers.c:165
+#| msgid "Move selected messages to another folder"
+msgid "Move selected headers to top"
+msgstr "Move selected headers to top"
+
+#: ../mail/e-mail-print-config-headers.c:170
+#| msgid "Move selected messages to another folder"
+msgid "Move selected headers up one row"
+msgstr "Move selected headers up one row"
+
+#: ../mail/e-mail-print-config-headers.c:175
+#| msgid "Move selected messages to another folder"
+msgid "Move selected headers down one row"
+msgstr "Move selected headers down one row"
+
+#: ../mail/e-mail-print-config-headers.c:180
+#| msgid "Move selected messages to another folder"
+msgid "Move selected headers to bottom"
+msgstr "Move selected headers to bottom"
+
+#: ../mail/e-mail-print-config-headers.c:185
+#| msgid "Select _All Messages"
+msgid "Select all headers"
+msgstr "Select all headers"
+
+#: ../mail/e-mail-print-config-headers.c:204
 msgid "Header Name"
 msgstr "Header Name"
 
-#: ../mail/e-mail-printer.c:585
+#: ../mail/e-mail-print-config-headers.c:213
 msgid "Header Value"
 msgstr "Header Value"
 
-#: ../mail/e-mail-printer.c:639 ../mail/mail-config.ui.h:102
+#: ../mail/e-mail-printer.c:111 ../mail/mail-config.ui.h:123
 msgid "Headers"
 msgstr "Headers"
 
-#: ../mail/e-mail-reader.c:370
-msgid "Save Image"
-msgstr "Save Image"
+#: ../mail/e-mail-printer.c:153
+#, c-format
+msgid "Page %d of %d"
+msgstr "Page %d of %d"
 
-#: ../mail/e-mail-reader.c:452 ../mail/em-filter-i18n.h:12
+#: ../mail/e-mail-reader.c:352 ../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
 msgid "Copy to Folder"
 msgstr "Copy to Folder"
 
-#: ../mail/e-mail-reader.c:452 ../mail/em-folder-utils.c:489
+#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
+#: ../mail/mail.error.xml.h:152
+msgid "_Move"
+msgstr "_Move"
+
+#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "C_opy"
 
-#: ../mail/e-mail-reader.c:986 ../mail/em-filter-i18n.h:54
-msgid "Move to Folder"
-msgstr "Move to Folder"
-
-#: ../mail/e-mail-reader.c:986 ../mail/em-folder-utils.c:489
-msgid "_Move"
-msgstr "_Move"
+#: ../mail/e-mail-reader.c:488
+#| msgid "Generating message list"
+msgid "Deleting message note..."
+msgstr "Deleting message note..."
 
-#: ../mail/e-mail-reader.c:1334 ../mail/e-mail-reader.c:1534
-#: ../mail/e-mail-reader.c:1574
+#: ../mail/e-mail-reader.c:1310 ../mail/e-mail-reader.c:1522
+#: ../mail/e-mail-reader.c:1562
 msgid "_Do not ask me again."
 msgstr "_Do not ask me again."
 
-#: ../mail/e-mail-reader.c:1580
+#: ../mail/e-mail-reader.c:1568
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Always ignore Reply-To: for mailing lists."
 
-#: ../mail/e-mail-reader.c:1775
+#: ../mail/e-mail-reader.c:1771
 msgid "Failed to retrieve message:"
 msgstr "Failed to retrieve message:"
 
-#: ../mail/e-mail-reader.c:1821 ../mail/e-mail-reader.c:2914
+#: ../mail/e-mail-reader.c:1816 ../mail/e-mail-reader.c:3186
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Retrieving message '%s'"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2004
 msgid "A_dd Sender to Address Book"
 msgstr "A_dd Sender to Address Book"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2006
 msgid "Add sender to address book"
 msgstr "Add sender to address book"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2011
+msgid "_Archive..."
+msgstr "_Archive..."
+
+#: ../mail/e-mail-reader.c:2013
+#| msgid "Move selected messages to another folder"
+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
 msgid "Check for _Junk"
 msgstr "Check for _Junk"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2020
 msgid "Filter the selected messages for junk status"
 msgstr "Filter the selected messages for junk status"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2025
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder…"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2027
 msgid "Copy selected messages to another folder"
 msgstr "Copy selected messages to another folder"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2032
 msgid "_Delete Message"
 msgstr "_Delete Message"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2034
 msgid "Mark the selected messages for deletion"
 msgstr "Mark the selected messages for deletion"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2039
+#| msgid "_Add Attachment..."
+msgid "_Add note..."
+msgstr "_Add note..."
+
+#: ../mail/e-mail-reader.c:2041
+#| msgid "Create a new memo from the selected message"
+msgid "Add a note for the selected message"
+msgstr "Add a note for the selected message"
+
+#: ../mail/e-mail-reader.c:2046
+#| msgid "Delete Any Items"
+msgid "Delete no_te"
+msgstr "Delete no_te"
+
+#: ../mail/e-mail-reader.c:2048
+#| msgid "Create a new event from the selected message"
+msgid "Delete the note for the selected message"
+msgstr "Delete the note for the selected message"
+
+#: ../mail/e-mail-reader.c:2053
+#| msgid "_Edit..."
+msgid "_Edit note..."
+msgstr "_Edit note..."
+
+#: ../mail/e-mail-reader.c:2055
+#| msgid "Create a new memo from the selected message"
+msgid "Edit a note for the selected message"
+msgstr "Edit a note for the selected message"
+
+#: ../mail/e-mail-reader.c:2060
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Create a Filter Rule for Mailing _List…"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2062
 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:2033
+#: ../mail/e-mail-reader.c:2067
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Create a Filter Rule for _Recipients…"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2069
 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:2040
+#: ../mail/e-mail-reader.c:2074
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Create a Filter Rule for Se_nder…"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2076
 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:2047
+#: ../mail/e-mail-reader.c:2081
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Create a Filter Rule for _Subject…"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2083
 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:2054
+#: ../mail/e-mail-reader.c:2088
 msgid "A_pply Filters"
 msgstr "A_pply Filters"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2090
 msgid "Apply filter rules to the selected messages"
 msgstr "Apply filter rules to the selected messages"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2095
 msgid "_Find in Message..."
 msgstr "_Find in Message…"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2097
 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:2068
+#: ../mail/e-mail-reader.c:2102
 msgid "_Clear Flag"
 msgstr "_Clear Flag"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2104
 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:2075
+#: ../mail/e-mail-reader.c:2109
 msgid "_Flag Completed"
 msgstr "_Flag Completed"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2111
 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:2082
+#: ../mail/e-mail-reader.c:2116
 msgid "Follow _Up..."
 msgstr "Follow _Up…"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2118
 msgid "Flag the selected messages for follow-up"
 msgstr "Flag the selected messages for follow-up"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2123 ../modules/mail/e-mail-attachment-handler.c:432
 msgid "_Attached"
 msgstr "_Attached"
 
-#: ../mail/e-mail-reader.c:2091 ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2125 ../mail/e-mail-reader.c:2132
+#: ../modules/mail/e-mail-attachment-handler.c:434
 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:2096
+#: ../mail/e-mail-reader.c:2130
 msgid "Forward As _Attached"
 msgstr "Forward As _Attached"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2137 ../modules/mail/e-mail-attachment-handler.c:439
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ../mail/e-mail-reader.c:2105 ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2139 ../mail/e-mail-reader.c:2146
+#: ../modules/mail/e-mail-attachment-handler.c:441
 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:2110
+#: ../mail/e-mail-reader.c:2144
 msgid "Forward As _Inline"
 msgstr "Forward As _Inline"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2151 ../modules/mail/e-mail-attachment-handler.c:446
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ../mail/e-mail-reader.c:2119 ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2153 ../mail/e-mail-reader.c:2160
+#: ../modules/mail/e-mail-attachment-handler.c:448
 msgid "Forward the selected message quoted like a reply"
 msgstr "Forward the selected message quoted like a reply"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2158
 msgid "Forward As _Quoted"
 msgstr "Forward As _Quoted"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2165
 msgid "_Load Images"
 msgstr "_Load Images"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2167
 msgid "Force images in HTML mail to be loaded"
 msgstr "Force images in HTML mail to be loaded"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2172 ../mail/e-mail-reader.c:2562
+msgid "_Ignore Subthread"
+msgstr "_Ignore Subthread"
+
+#: ../mail/e-mail-reader.c:2174
+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
+#| msgid "Next _Thread"
+msgid "_Ignore Thread"
+msgstr "_Ignore Thread"
+
+#: ../mail/e-mail-reader.c:2181
+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
 msgid "_Important"
 msgstr "_Important"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2188
 msgid "Mark the selected messages as important"
 msgstr "Mark the selected messages as important"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2193
 msgid "_Junk"
 msgstr "_Junk"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2195
 msgid "Mark the selected messages as junk"
 msgstr "Mark the selected messages as junk"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2200
 msgid "_Not Junk"
 msgstr "_Not Junk"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2202
 msgid "Mark the selected messages as not being junk"
 msgstr "Mark the selected messages as not being junk"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2207
 msgid "_Read"
 msgstr "_Read"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2209
 msgid "Mark the selected messages as having been read"
 msgstr "Mark the selected messages as having been read"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2214 ../mail/e-mail-reader.c:2586
+#| msgid "Could not create publish thread."
+msgid "Do not _Ignore Subthread"
+msgstr "Do not _Ignore Subthread"
+
+#: ../mail/e-mail-reader.c:2216
+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
+msgid "Do not _Ignore Thread"
+msgstr "Do not _Ignore Thread"
+
+#: ../mail/e-mail-reader.c:2223
+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
 msgid "Uni_mportant"
 msgstr "Uni_mportant"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2230
 msgid "Mark the selected messages as unimportant"
 msgstr "Mark the selected messages as unimportant"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2235
 msgid "_Unread"
 msgstr "_Unread"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2237
 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:2180
+#: ../mail/e-mail-reader.c:2242 ../modules/mail/e-mail-attachment-handler.c:418
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Message…"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2244 ../modules/mail/e-mail-attachment-handler.c:420
 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:2187
+#: ../mail/e-mail-reader.c:2249
 msgid "Compose _New Message"
 msgstr "Compose _New Message"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2251
 msgid "Open a window for composing a mail message"
 msgstr "Open a window for composing a mail message"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2256
 msgid "_Open in New Window"
 msgstr "_Open in New Window"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2258
 msgid "Open the selected messages in a new window"
 msgstr "Open the selected messages in a new window"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2263
 msgid "_Move to Folder..."
 msgstr "_Move to Folder…"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2265
 msgid "Move selected messages to another folder"
 msgstr "Move selected messages to another folder"
 
-#: ../mail/e-mail-reader.c:2208
-msgid "_Switch to Folder"
-msgstr "_Switch to Folder"
-
-#: ../mail/e-mail-reader.c:2210
-msgid "Display the parent folder"
-msgstr "Display the parent folder"
-
-#: ../mail/e-mail-reader.c:2215
-msgid "Switch to _next tab"
-msgstr "Switch to _next tab"
-
-#: ../mail/e-mail-reader.c:2217
-msgid "Switch to the next tab"
-msgstr "Switch to the next tab"
-
-#: ../mail/e-mail-reader.c:2222
-msgid "Switch to _previous tab"
-msgstr "Switch to _previous tab"
-
-#: ../mail/e-mail-reader.c:2224
-msgid "Switch to the previous tab"
-msgstr "Switch to the previous tab"
-
-#: ../mail/e-mail-reader.c:2229
-msgid "Cl_ose current tab"
-msgstr "Cl_ose current tab"
-
-#: ../mail/e-mail-reader.c:2231
-msgid "Close current tab"
-msgstr "Close current tab"
-
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2270
 msgid "_Next Message"
 msgstr "_Next Message"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2272
 msgid "Display the next message"
 msgstr "Display the next message"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2277
 msgid "Next _Important Message"
 msgstr "Next _Important Message"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2279
 msgid "Display the next important message"
 msgstr "Display the next important message"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2284
 msgid "Next _Thread"
 msgstr "Next _Thread"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2286
 msgid "Display the next thread"
 msgstr "Display the next thread"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2291
 msgid "Next _Unread Message"
 msgstr "Next _Unread Message"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2293
 msgid "Display the next unread message"
 msgstr "Display the next unread message"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2298
 msgid "_Previous Message"
 msgstr "_Previous Message"
 
-#: ../mail/e-mail-reader.c:2266
+#: ../mail/e-mail-reader.c:2300
 msgid "Display the previous message"
 msgstr "Display the previous message"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2305
 msgid "Pr_evious Important Message"
 msgstr "Pr_evious Important Message"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2307
 msgid "Display the previous important message"
 msgstr "Display the previous important message"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2312
 msgid "Previous T_hread"
 msgstr "Previous T_hread"
 
-#: ../mail/e-mail-reader.c:2280
+#: ../mail/e-mail-reader.c:2314
 msgid "Display the previous thread"
 msgstr "Display the previous thread"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2319
 msgid "P_revious Unread Message"
 msgstr "P_revious Unread Message"
 
-#: ../mail/e-mail-reader.c:2287
+#: ../mail/e-mail-reader.c:2321
 msgid "Display the previous unread message"
 msgstr "Display the previous unread message"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2328
 msgid "Print this message"
 msgstr "Print this message"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2335
 msgid "Preview the message to be printed"
 msgstr "Preview the message to be printed"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2340 ../modules/mail/e-mail-attachment-handler.c:453
 msgid "Re_direct"
 msgstr "Re_direct"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2342 ../modules/mail/e-mail-attachment-handler.c:455
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirect (bounce) the selected message to someone"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2347
 msgid "Remo_ve Attachments"
 msgstr "Remo_ve Attachments"
 
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2349
 msgid "Remove attachments"
 msgstr "Remove attachments"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2354
 msgid "Remove Du_plicate Messages"
 msgstr "Remove Du_plicate Messages"
 
-#: ../mail/e-mail-reader.c:2322
+#: ../mail/e-mail-reader.c:2356
 msgid "Checks selected messages for duplicates"
 msgstr "Checks selected messages for duplicates"
 
-#: ../mail/e-mail-reader.c:2327 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
-#: ../modules/mail/e-mail-attachment-handler.c:196
+#: ../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
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: ../mail/e-mail-reader.c:2329
+#: ../mail/e-mail-reader.c:2363 ../modules/mail/e-mail-attachment-handler.c:399
 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:2334 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2368 ../mail/mail.error.xml.h:26
+#: ../modules/mail/e-mail-attachment-handler.c:404
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: ../mail/e-mail-reader.c:2336
+#: ../mail/e-mail-reader.c:2370 ../modules/mail/e-mail-attachment-handler.c:406
 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:2341
-#: ../modules/mail/e-mail-attachment-handler.c:203
+#: ../mail/e-mail-reader.c:2375 ../modules/mail/e-mail-attachment-handler.c:411
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: ../mail/e-mail-reader.c:2343
+#: ../mail/e-mail-reader.c:2377 ../modules/mail/e-mail-attachment-handler.c:413
 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:2348
+#: ../mail/e-mail-reader.c:2382
 msgid "_Save as mbox..."
 msgstr "_Save as mbox…"
 
-#: ../mail/e-mail-reader.c:2350
+#: ../mail/e-mail-reader.c:2384
 msgid "Save selected messages as an mbox file"
 msgstr "Save selected messages as an mbox file"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2389
 msgid "_Message Source"
 msgstr "_Message Source"
 
-#: ../mail/e-mail-reader.c:2357
+#: ../mail/e-mail-reader.c:2391
 msgid "Show the raw email source of the message"
 msgstr "Show the raw e-mail source of the message"
 
-#: ../mail/e-mail-reader.c:2369
+#: ../mail/e-mail-reader.c:2403
 msgid "_Undelete Message"
 msgstr "_Undelete Message"
 
-#: ../mail/e-mail-reader.c:2371
+#: ../mail/e-mail-reader.c:2405
 msgid "Undelete the selected messages"
 msgstr "Undelete the selected messages"
 
-#: ../mail/e-mail-reader.c:2376
+#: ../mail/e-mail-reader.c:2410
 msgid "_Normal Size"
 msgstr "_Normal Size"
 
-#: ../mail/e-mail-reader.c:2378
+#: ../mail/e-mail-reader.c:2412
 msgid "Reset the text to its original size"
 msgstr "Reset the text to its original size"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2417
 msgid "_Zoom In"
 msgstr "_Zoom In"
 
-#: ../mail/e-mail-reader.c:2385
+#: ../mail/e-mail-reader.c:2419
 msgid "Increase the text size"
 msgstr "Increase the text size"
 
-#: ../mail/e-mail-reader.c:2390
-msgid "Zoom _Out"
-msgstr "Zoom _Out"
-
-#: ../mail/e-mail-reader.c:2392
+#: ../mail/e-mail-reader.c:2426
 msgid "Decrease the text size"
 msgstr "Decrease the text size"
 
-#: ../mail/e-mail-reader.c:2399
+#: ../mail/e-mail-reader.c:2433
 msgid "Cre_ate"
 msgstr "Cre_ate"
 
-#: ../mail/e-mail-reader.c:2406
+#: ../mail/e-mail-reader.c:2440
 msgid "Ch_aracter Encoding"
 msgstr "Ch_aracter Encoding"
 
-#: ../mail/e-mail-reader.c:2413
+#: ../mail/e-mail-reader.c:2447 ../modules/mail/e-mail-attachment-handler.c:425
 msgid "F_orward As"
 msgstr "F_orward As"
 
-#: ../mail/e-mail-reader.c:2420
+#: ../mail/e-mail-reader.c:2454
 msgid "_Group Reply"
 msgstr "_Group Reply"
 
-#: ../mail/e-mail-reader.c:2427
+#: ../mail/e-mail-reader.c:2461
 msgid "_Go To"
 msgstr "_Go To"
 
-#: ../mail/e-mail-reader.c:2434
+#: ../mail/e-mail-reader.c:2468
 msgid "Mar_k As"
 msgstr "Mar_k As"
 
-#: ../mail/e-mail-reader.c:2441
+#: ../mail/e-mail-reader.c:2475
 msgid "_Message"
 msgstr "_Message"
 
-#: ../mail/e-mail-reader.c:2448
+#: ../mail/e-mail-reader.c:2482
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:2458
+#: ../mail/e-mail-reader.c:2492
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Create a Search Folder from Mailing _List…"
 
-#: ../mail/e-mail-reader.c:2460
+#: ../mail/e-mail-reader.c:2494
 msgid "Create a search folder for this mailing list"
 msgstr "Create a search folder for this mailing list"
 
-#: ../mail/e-mail-reader.c:2465
+#: ../mail/e-mail-reader.c:2499
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Create a Search Folder from Recipien_ts…"
 
-#: ../mail/e-mail-reader.c:2467
+#: ../mail/e-mail-reader.c:2501
 msgid "Create a search folder for these recipients"
 msgstr "Create a search folder for these recipients"
 
-#: ../mail/e-mail-reader.c:2472
+#: ../mail/e-mail-reader.c:2506
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Create a Search Folder from Sen_der…"
 
-#: ../mail/e-mail-reader.c:2474
+#: ../mail/e-mail-reader.c:2508
 msgid "Create a search folder for this sender"
 msgstr "Create a search folder for this sender"
 
-#: ../mail/e-mail-reader.c:2479
+#: ../mail/e-mail-reader.c:2513
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Create a Search Folder from S_ubject…"
 
-#: ../mail/e-mail-reader.c:2481
+#: ../mail/e-mail-reader.c:2515
 msgid "Create a search folder for this subject"
 msgstr "Create a search folder for this subject"
 
-#: ../mail/e-mail-reader.c:2504
+#: ../mail/e-mail-reader.c:2554
 msgid "Mark for Follo_w Up..."
 msgstr "Mark for Follo_w Up…"
 
-#: ../mail/e-mail-reader.c:2512
+#: ../mail/e-mail-reader.c:2570
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: ../mail/e-mail-reader.c:2516
+#: ../mail/e-mail-reader.c:2574
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: ../mail/e-mail-reader.c:2520
+#: ../mail/e-mail-reader.c:2578
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: ../mail/e-mail-reader.c:2524
+#: ../mail/e-mail-reader.c:2582
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: ../mail/e-mail-reader.c:2528
+#: ../mail/e-mail-reader.c:2594
 msgid "Mark as Uni_mportant"
 msgstr "Mark as Uni_mportant"
 
-#: ../mail/e-mail-reader.c:2532
+#: ../mail/e-mail-reader.c:2598
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: ../mail/e-mail-reader.c:2576
+#: ../mail/e-mail-reader.c:2642
 msgid "_Caret Mode"
 msgstr "_Caret Mode"
 
-#: ../mail/e-mail-reader.c:2578
+#: ../mail/e-mail-reader.c:2644
 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:2584
+#: ../mail/e-mail-reader.c:2650
 msgid "All Message _Headers"
 msgstr "All Message _Headers"
 
-#: ../mail/e-mail-reader.c:2586
+#: ../mail/e-mail-reader.c:2652
 msgid "Show messages with all email headers"
 msgstr "Show messages with all e-mail headers"
 
-#: ../mail/e-mail-reader.c:2920
+#: ../mail/e-mail-reader.c:3192
 msgid "Retrieving message"
 msgstr "Retrieving message"
 
-#: ../mail/e-mail-reader.c:3900
-#: ../modules/mail/e-mail-attachment-handler.c:189
+#: ../mail/e-mail-reader.c:4242 ../modules/mail/e-mail-attachment-handler.c:390
 msgid "_Forward"
 msgstr "_Forward"
 
-#: ../mail/e-mail-reader.c:3901
+#: ../mail/e-mail-reader.c:4243 ../modules/mail/e-mail-attachment-handler.c:392
 msgid "Forward the selected message to someone"
 msgstr "Forward the selected message to someone"
 
-#: ../mail/e-mail-reader.c:3920
+#: ../mail/e-mail-reader.c:4262
 msgid "Group Reply"
 msgstr "Group Reply"
 
-#: ../mail/e-mail-reader.c:3921
+#: ../mail/e-mail-reader.c:4263
 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:3987 ../mail/em-filter-i18n.h:15
+#: ../mail/e-mail-reader.c:4329 ../mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Delete"
 
-#: ../mail/e-mail-reader.c:4020
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../mail/e-mail-reader.c:4341
+#: ../modules/calendar/e-cal-shell-view-actions.c:1243
 msgid "Next"
 msgstr "Next"
 
-#: ../mail/e-mail-reader.c:4024
-#: ../modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../mail/e-mail-reader.c:4345
+#: ../modules/calendar/e-cal-shell-view-actions.c:1236
 msgid "Previous"
 msgstr "Previous"
 
-#: ../mail/e-mail-reader.c:4033 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:4354 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Reply"
 
-#: ../mail/e-mail-reader.c:4751
+#: ../mail/e-mail-reader.c:5426
+#, c-format
+msgid "Allow remote content for anyone from %s"
+msgstr "Allow remote content for anyone from %s"
+
+#: ../mail/e-mail-reader.c:5428
+#, c-format
+msgid "Allow remote content for %s"
+msgstr "Allow remote content for %s"
+
+#: ../mail/e-mail-reader.c:5445
 #, c-format
-msgid "Folder '%s'"
-msgstr "Folder '%s'"
+msgid "Allow remote content from %s"
+msgstr "Allow remote content from %s"
+
+#: ../mail/e-mail-reader.c:5462
+#| msgid "_Do not show this message again"
+msgid "Do not show this message again"
+msgstr "Do not show this message again"
 
-#: ../mail/e-mail-reader-utils.c:161
+#: ../mail/e-mail-reader.c:5510
+#| msgid "Header content"
+msgid "Load remote content"
+msgstr "Load remote content"
+
+#: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "Do not warn me again"
 
-#: ../mail/e-mail-reader-utils.c:962
+#: ../mail/e-mail-reader-utils.c:570
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "Refreshing folder '%s'"
+
+#: ../mail/e-mail-reader-utils.c:1163
+#| msgid "Preview data to be imported"
+msgid "Marking thread to be ignored"
+msgstr "Marking thread to be ignored"
+
+#: ../mail/e-mail-reader-utils.c:1167
+msgid "Unmarking thread from being ignored"
+msgstr "Unmarking thread from being ignored"
+
+#: ../mail/e-mail-reader-utils.c:1171
+msgid "Marking subthread to be ignored"
+msgstr "Marking subthread to be ignored"
+
+#: ../mail/e-mail-reader-utils.c:1175
+msgid "Unmarking subthread from being ignored"
+msgstr "Unmarking subthread from being ignored"
+
+#: ../mail/e-mail-reader-utils.c:1419
 msgid "Printing"
 msgstr "Printing"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1149
+#: ../mail/e-mail-reader-utils.c:1656
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -13101,7 +17038,7 @@ msgstr[1] ""
 "Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
 "them?"
 
-#: ../mail/e-mail-reader-utils.c:1614
+#: ../mail/e-mail-reader-utils.c:2656
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Save Message"
@@ -13112,30 +17049,87 @@ 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:1635
+#: ../mail/e-mail-reader-utils.c:2677
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Message"
 msgstr[1] "Messages"
 
-#: ../mail/e-mail-reader-utils.c:2089
+#: ../mail/e-mail-reader-utils.c:3050
 msgid "Parsing message"
 msgstr "Parsing message"
 
-#: ../mail/e-mail-request.c:181
-#, c-format
-msgid "Failed to load part '%s'"
-msgstr "Failed to load part '%s'"
+#: ../mail/e-mail-request.c:272
+#| msgid "These messages are not copies."
+msgid "The message has no text content."
+msgstr "The message has no text content."
 
-#: ../mail/e-mail-tag-editor.c:238
+#: ../mail/e-mail-tag-editor.c:237
 msgid "Flag to Follow Up"
 msgstr "Flag to Follow Up"
 
+#: ../mail/e-mail-ui-session.c:801
+#, c-format
+msgid "%s authentication failed"
+msgstr "%s authentication failed"
+
+#: ../mail/e-mail-ui-session.c:851
+#, c-format
+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
+#, c-format
+#| msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message with %d To and CC recipients?"
+msgid_plural ""
+"Are you sure you want to send a message with %d To and CC recipients?"
+msgstr[0] ""
+"Are you sure you want to send a message with %d To and CC recipients?"
+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
+#, c-format
+msgid ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgid_plural ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgstr[0] ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the e-mail addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgstr[1] ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the e-mail addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+
+#. 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
+#| msgid "Imports ICS attachments to calendar."
+msgid "Waiting for attachments to load..."
+msgstr "Waiting for attachments to load..."
+
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1279
+#: ../mail/em-composer-utils.c:1742
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -13143,599 +17137,759 @@ msgstr ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
-#: ../mail/em-composer-utils.c:1285
+#: ../mail/em-composer-utils.c:1748
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: ../mail/em-composer-utils.c:1290
+#: ../mail/em-composer-utils.c:1753
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
-#: ../mail/em-composer-utils.c:2685
+#: ../mail/em-composer-utils.c:3020
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
-#: ../mail/em-composer-utils.c:3104
+#. FIXME GTK_WINDOW (composer)
+#: ../mail/em-composer-utils.c:3492
 msgid "Posting destination"
 msgstr "Posting destination"
 
-#: ../mail/em-composer-utils.c:3105
+#: ../mail/em-composer-utils.c:3497
 msgid "Choose folders to post the message to."
 msgstr "Choose folders to post the message to."
 
-#: ../mail/em-filter-editor-folder-element.c:157
+#: ../mail/em-filter-editor-folder-element.c:153
 msgid "Select Folder"
 msgstr "Select Folder"
 
-#. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Adjust Score"
-
-#: ../mail/em-filter-i18n.h:3
-msgid "Any header"
-msgstr "Any header"
-
-#: ../mail/em-filter-i18n.h:4
-msgid "Assign Color"
-msgstr "Assign Colour"
-
-#: ../mail/em-filter-i18n.h:5
-msgid "Assign Score"
-msgstr "Assign Score"
-
-#: ../mail/em-filter-i18n.h:7
-msgid "BCC"
-msgstr "BCC"
-
-#: ../mail/em-filter-i18n.h:8
-msgid "Beep"
-msgstr "Beep"
-
-#: ../mail/em-filter-i18n.h:9
-msgid "CC"
-msgstr "CC"
-
-#: ../mail/em-filter-i18n.h:10
-msgid "Completed On"
-msgstr "Completed On"
-
-#: ../mail/em-filter-i18n.h:13
-msgid "Date received"
-msgstr "Date received"
-
-#: ../mail/em-filter-i18n.h:14
-msgid "Date sent"
-msgstr "Date sent"
-
-#: ../mail/em-filter-i18n.h:16
-msgid "Deleted"
-msgstr "Deleted"
-
-#: ../mail/em-filter-i18n.h:18
-msgid "does not end with"
-msgstr "does not end with"
-
-#: ../mail/em-filter-i18n.h:19
-msgid "does not exist"
-msgstr "does not exist"
-
-#: ../mail/em-filter-i18n.h:20
-msgid "does not have words"
-msgstr "does not have words"
-
-#: ../mail/em-filter-i18n.h:21
-msgid "does not return"
-msgstr "does not return"
-
-#: ../mail/em-filter-i18n.h:22
-msgid "does not sound like"
-msgstr "does not sound like"
-
-#: ../mail/em-filter-i18n.h:23
-msgid "does not start with"
-msgstr "does not start with"
-
-#: ../mail/em-filter-i18n.h:25
-msgid "Draft"
-msgstr "Draft"
-
-#: ../mail/em-filter-i18n.h:26
-msgid "ends with"
-msgstr "ends with"
-
-#: ../mail/em-filter-i18n.h:28
-msgid "exists"
-msgstr "exists"
-
-#: ../mail/em-filter-i18n.h:29
-msgid "Expression"
-msgstr "Expression"
-
-#: ../mail/em-filter-i18n.h:30
-msgid "Follow Up"
-msgstr "Follow Up"
-
-#: ../mail/em-filter-i18n.h:31
-msgid "Forward to"
-msgstr "Forward to"
-
-#: ../mail/em-filter-i18n.h:32
-msgid "has words"
-msgstr "has words"
-
-#: ../mail/em-filter-i18n.h:33
-msgid "Important"
-msgstr "Important"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is after"
-msgstr "is after"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is before"
-msgstr "is before"
-
-#: ../mail/em-filter-i18n.h:37
-msgid "is Flagged"
-msgstr "is Flagged"
-
-#: ../mail/em-filter-i18n.h:41
-msgid "is not Flagged"
-msgstr "is not Flagged"
-
-#: ../mail/em-filter-i18n.h:42
-msgid "is not set"
-msgstr "is not set"
-
-#: ../mail/em-filter-i18n.h:43
-msgid "is set"
-msgstr "is set"
-
-#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:109
-msgid "Junk"
-msgstr "Junk"
-
-#: ../mail/em-filter-i18n.h:45
-msgid "Junk Test"
-msgstr "Junk Test"
-
-#: ../mail/em-filter-i18n.h:46
-msgid "Label"
-msgstr "Label"
-
-#: ../mail/em-filter-i18n.h:47
-msgid "Mailing list"
-msgstr "Mailing list"
-
-#: ../mail/em-filter-i18n.h:48
-msgid "Match All"
-msgstr "Match All"
-
-#: ../mail/em-filter-i18n.h:49
-msgid "Message Body"
-msgstr "Message Body"
-
-#: ../mail/em-filter-i18n.h:50
-msgid "Message Header"
-msgstr "Message Header"
-
-#: ../mail/em-filter-i18n.h:51
-msgid "Message is Junk"
-msgstr "Message is Junk"
-
-#: ../mail/em-filter-i18n.h:52
-msgid "Message is not Junk"
-msgstr "Message is not Junk"
-
-#: ../mail/em-filter-i18n.h:53
-msgid "Message Location"
-msgstr "Message Location"
-
-#: ../mail/em-filter-i18n.h:55
-msgid "Pipe to Program"
-msgstr "Pipe to Program"
-
-#: ../mail/em-filter-i18n.h:56
-msgid "Play Sound"
-msgstr "Play Sound"
-
-#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:57 ../mail/mail-dialogs.ui.h:14
-msgid "Read"
-msgstr "Read"
-
-#: ../mail/em-filter-i18n.h:58 ../mail/message-list.etspec.h:16
-msgid "Recipients"
-msgstr "Recipients"
-
-#: ../mail/em-filter-i18n.h:59
-msgid "Regex Match"
-msgstr "Regex Match"
-
-#: ../mail/em-filter-i18n.h:60
-msgid "Replied to"
-msgstr "Replied to"
-
-#: ../mail/em-filter-i18n.h:61
-msgid "returns"
-msgstr "returns"
-
-#: ../mail/em-filter-i18n.h:62
-msgid "returns greater than"
-msgstr "returns greater than"
-
-#: ../mail/em-filter-i18n.h:63
-msgid "returns less than"
-msgstr "returns less than"
-
-#: ../mail/em-filter-i18n.h:64
-msgid "Run Program"
-msgstr "Run Program"
-
-#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:3
-msgid "Score"
-msgstr "Score"
-
-#: ../mail/em-filter-i18n.h:66 ../mail/message-list.etspec.h:15
-msgid "Sender"
-msgstr "Sender"
-
-#: ../mail/em-filter-i18n.h:67
-msgid "Sender or Recipients"
-msgstr "Sender or Recipients"
-
-#: ../mail/em-filter-i18n.h:68
-msgid "Set Label"
-msgstr "Set Label"
-
-#: ../mail/em-filter-i18n.h:69
-msgid "Set Status"
-msgstr "Set Status"
-
-#: ../mail/em-filter-i18n.h:70
-msgid "Size (kB)"
-msgstr "Size (kB)"
-
-#: ../mail/em-filter-i18n.h:71
-msgid "sounds like"
-msgstr "sounds like"
-
-#: ../mail/em-filter-i18n.h:72
-msgid "Source Account"
-msgstr "Source Account"
-
-#: ../mail/em-filter-i18n.h:73
-msgid "Specific header"
-msgstr "Specific header"
-
-#: ../mail/em-filter-i18n.h:74
-msgid "starts with"
-msgstr "starts with"
-
-#: ../mail/em-filter-i18n.h:76
-msgid "Stop Processing"
-msgstr "Stop Processing"
-
-#: ../mail/em-filter-i18n.h:79
-msgid "Unset Color"
-msgstr "Unset Colour"
-
-#: ../mail/em-filter-i18n.h:80
-msgid "Unset Status"
-msgstr "Unset Status"
-
 #. and now for the action area
-#: ../mail/em-filter-rule.c:583
+#: ../mail/em-filter-rule.c:587
 msgid "Then"
 msgstr "Then"
 
-#: ../mail/em-filter-rule.c:648
+#: ../mail/em-filter-rule.c:652
 msgid "Add Ac_tion"
 msgstr "Add Ac_tion"
 
-#: ../mail/em-folder-properties.c:145
+#: ../mail/em-folder-properties.c:227
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Unread messages:"
 msgstr[1] "Unread messages:"
 
-#: ../mail/em-folder-properties.c:156
+#: ../mail/em-folder-properties.c:238
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total messages:"
 msgstr[1] "Total messages:"
 
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:259
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Quota usage (%s):"
 
-#: ../mail/em-folder-properties.c:179
+#: ../mail/em-folder-properties.c:261
 #, c-format
 msgid "Quota usage"
 msgstr "Quota usage"
 
-#: ../mail/em-folder-properties.c:341
+#. 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
+msgid "_Send Account Override:"
+msgstr "_Send Account Override:"
+
+#: ../mail/em-folder-properties.c:589
+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
+#| msgid "Sent _Messages Folder:"
+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
+#| msgid "days"
+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
+#| msgid "weeks"
+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
+#| msgid "months"
+msgctxt "autoarchive"
+msgid "months"
+msgstr "months"
+
+#: ../mail/em-folder-properties.c:624
+#| msgid "Move selected messages to another folder"
+msgid "Move old messages to the default archive _folder"
+msgstr "Move old messages to the default archive _folder"
+
+#: ../mail/em-folder-properties.c:635
+#| msgid "Moving messages to '%s'"
+msgid "_Move old messages to:"
+msgstr "_Move old messages to:"
+
+#: ../mail/em-folder-properties.c:639
+msgid "AutoArchive folder"
+msgstr "AutoArchive folder"
+
+#: ../mail/em-folder-properties.c:639
+#| msgid "Select folder to import into"
+msgid "Select folder to use for AutoArchive"
+msgstr "Select folder to use for AutoArchive"
+
+#: ../mail/em-folder-properties.c:645
+#| msgid "_Delete junk messages"
+msgid "_Delete old messages"
+msgstr "_Delete old messages"
+
+#: ../mail/em-folder-properties.c:704
+msgid "AutoArchive"
+msgstr "AutoArchive"
+
+#: ../mail/em-folder-properties.c:783
 msgid "Folder Properties"
 msgstr "Folder Properties"
 
-#: ../mail/em-folder-selection-button.c:80
+#: ../mail/em-folder-selection-button.c:76
 msgid "<click here to select a folder>"
 msgstr "<click here to select a folder>"
 
-#: ../mail/em-folder-selector.c:390
-msgid "C_reate"
-msgstr "C_reate"
-
-#: ../mail/em-folder-selector.c:396
-msgid "Folder _name:"
-msgstr "Folder _name:"
+#: ../mail/em-folder-selector.c:398
+#| msgid "Create a new mail folder"
+msgid "Create a new folder"
+msgstr "Create a new folder"
 
-#: ../mail/em-folder-tree.c:637
+#: ../mail/em-folder-tree.c:682
 msgid "Folder names cannot contain '/'"
 msgstr "Folder names cannot contain '/'"
 
-#: ../mail/em-folder-tree.c:774
+#: ../mail/em-folder-tree.c:845
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1599
+#: ../mail/em-folder-tree.c:1703
 msgid "Mail Folder Tree"
 msgstr "Mail Folder Tree"
 
-#: ../mail/em-folder-tree.c:2130 ../mail/em-folder-utils.c:112
+#: ../mail/em-folder-tree.c:2251 ../mail/em-folder-utils.c:82
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: ../mail/em-folder-tree.c:2133 ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2254 ../mail/em-folder-utils.c:84
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/message-list.c:2283
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2496
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: ../mail/em-folder-tree.c:2144 ../mail/message-list.c:2285
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2498
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: ../mail/em-folder-tree.c:2163
+#: ../mail/em-folder-tree.c:2284
 #, 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:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:444 ../mail/em-folder-tree-model.c:446
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:848 ../mail/em-folder-tree-model.c:1133
+#: ../mail/em-folder-tree-model.c:1301 ../mail/em-folder-tree-model.c:1677
 msgid "Loading..."
 msgstr "Loading…"
 
-#: ../mail/em-folder-utils.c:490
+#: ../mail/em-folder-utils.c:488
 msgid "Move Folder To"
 msgstr "Move Folder To"
 
-#: ../mail/em-folder-utils.c:490
+#: ../mail/em-folder-utils.c:488
 msgid "Copy Folder To"
 msgstr "Copy Folder To"
 
-#: ../mail/em-folder-utils.c:587
-msgid "Create Folder"
-msgstr "Create Folder"
-
-#: ../mail/em-folder-utils.c:588
-msgid "Specify where to create the folder:"
-msgstr "Specify where to create the folder:"
-
-#: ../mail/em-subscription-editor.c:867
+#: ../mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
-#: ../mail/em-subscription-editor.c:876
+#: ../mail/em-subscription-editor.c:864
 msgid "Su_bscribe To Shown"
 msgstr "Su_bscribe To Shown"
 
-#: ../mail/em-subscription-editor.c:884
+#: ../mail/em-subscription-editor.c:872
 msgid "Subscribe To _All"
 msgstr "Subscribe To _All"
 
-#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1836
-#: ../modules/mail/e-mail-shell-view-actions.c:1398
+#: ../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:1808
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
-#: ../mail/em-subscription-editor.c:990
+#: ../mail/em-subscription-editor.c:979
 msgid "Unsu_bscribe From Hidden"
 msgstr "Unsu_bscribe From Hidden"
 
-#: ../mail/em-subscription-editor.c:998
+#: ../mail/em-subscription-editor.c:987
 msgid "Unsubscribe From _All"
 msgstr "Unsubscribe From _All"
 
-#: ../mail/em-subscription-editor.c:1677
+#: ../mail/em-subscription-editor.c:1339
+#: ../modules/mail/e-mail-shell-view-private.c:1025
+#, 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:1035
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d total"
+msgstr[1] "%d total"
+
+#: ../mail/em-subscription-editor.c:1755
 msgid "Folder Subscriptions"
 msgstr "Folder Subscriptions"
 
-#: ../mail/em-subscription-editor.c:1716
+#: ../mail/em-subscription-editor.c:1790
 msgid "_Account:"
 msgstr "_Account:"
 
-#: ../mail/em-subscription-editor.c:1729
+#: ../mail/em-subscription-editor.c:1803
 msgid "Clear Search"
 msgstr "Clear Search"
 
-#: ../mail/em-subscription-editor.c:1746
+#: ../mail/em-subscription-editor.c:1820
 msgid "Sho_w items that contain:"
 msgstr "Sho_w items that contain:"
 
-#: ../mail/em-subscription-editor.c:1789
+#: ../mail/em-subscription-editor.c:1867
 msgid "Subscribe to the selected folder"
 msgstr "Subscribe to the selected folder"
 
-#: ../mail/em-subscription-editor.c:1790
+#: ../mail/em-subscription-editor.c:1868
 msgid "Su_bscribe"
 msgstr "Su_bscribe"
 
-#: ../mail/em-subscription-editor.c:1835
-#: ../modules/mail/e-mail-shell-view-actions.c:1400
+#: ../mail/em-subscription-editor.c:1913
+#: ../modules/mail/e-mail-shell-view-actions.c:1810
 msgid "Unsubscribe from the selected folder"
 msgstr "Unsubscribe from the selected folder"
 
-#: ../mail/em-subscription-editor.c:1875
+#: ../mail/em-subscription-editor.c:1953
 msgid "Collapse all folders"
 msgstr "Collapse all folders"
 
-#: ../mail/em-subscription-editor.c:1876
+#: ../mail/em-subscription-editor.c:1954
 msgid "C_ollapse All"
 msgstr "C_ollapse All"
 
-#: ../mail/em-subscription-editor.c:1886
+#: ../mail/em-subscription-editor.c:1964
 msgid "Expand all folders"
 msgstr "Expand all folders"
 
-#: ../mail/em-subscription-editor.c:1887
+#: ../mail/em-subscription-editor.c:1965
 msgid "E_xpand All"
 msgstr "E_xpand All"
 
-#: ../mail/em-subscription-editor.c:1897
+#: ../mail/em-subscription-editor.c:1975
 msgid "Refresh the folder list"
 msgstr "Refresh the folder list"
 
-#: ../mail/em-subscription-editor.c:1909
+#: ../mail/em-subscription-editor.c:1976
+#: ../modules/mail/e-mail-shell-view-actions.c:1709
+#: ../modules/mail/e-mail-shell-view-actions.c:1780
+msgid "_Refresh"
+msgstr "_Refresh"
+
+#: ../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
+#| msgid "Stop"
+msgid "_Stop"
+msgstr "_Stop"
+
 #. Translators: This message is shown only for ten or more
 #. * 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:97
+#: ../mail/em-utils.c:76
 #, 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:153
-#: ../modules/mailto-handler/evolution-mailto-handler.c:154
-msgid "_Do not show this message again"
-msgstr "_Do not show this message again"
-
-#: ../mail/em-utils.c:305
+#: ../mail/em-utils.c:177
 msgid "Message Filters"
 msgstr "Message Filters"
 
-#: ../mail/em-utils.c:1041
+#: ../mail/em-utils.c:923
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
 
-#: ../mail/em-vfolder-editor.c:105
+#: ../mail/em-utils.c:1680
+#| msgid "_Delete junk messages"
+msgid "Deleting old messages"
+msgstr "Deleting old messages"
+
+#: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
 msgstr "Search _Folders"
 
-#: ../mail/em-vfolder-editor-rule.c:397
+#: ../mail/em-vfolder-editor-rule.c:392
 msgid "Add Folder"
 msgstr "Add Folder"
 
-#: ../mail/em-vfolder-editor-rule.c:523
+#: ../mail/em-vfolder-editor-rule.c:521
 msgid "Search Folder Sources"
 msgstr "Search Folder Sources"
 
-#: ../mail/em-vfolder-editor-rule.c:555
+#: ../mail/em-vfolder-editor-rule.c:553
 msgid "Automatically update on any _source folder change"
 msgstr "Automatically update on any _source folder change"
 
-#: ../mail/em-vfolder-editor-rule.c:567
+#: ../mail/em-vfolder-editor-rule.c:565
 msgid "All local folders"
 msgstr "All local folders"
 
-#: ../mail/em-vfolder-editor-rule.c:568
+#: ../mail/em-vfolder-editor-rule.c:566
 msgid "All active remote folders"
 msgstr "All active remote folders"
 
-#: ../mail/em-vfolder-editor-rule.c:569
+#: ../mail/em-vfolder-editor-rule.c:567
 msgid "All local and active remote folders"
 msgstr "All local and active remote folders"
 
-#: ../mail/em-vfolder-editor-rule.c:570
+#: ../mail/em-vfolder-editor-rule.c:568
 msgid "Specific folders"
 msgstr "Specific folders"
 
-#: ../mail/em-vfolder-editor-rule.c:608
+#: ../mail/em-vfolder-editor-rule.c:606
 msgid "include subfolders"
 msgstr "include subfolders"
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/filtertypes.xml.in.h:1 ../mail/message-list.etspec.h:15
+#: ../mail/searchtypes.xml.in.h:1 ../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
+msgid "starts with"
+msgstr "starts with"
+
+#: ../mail/filtertypes.xml.in.h:7 ../mail/searchtypes.xml.in.h:7
+#: ../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
+msgid "ends with"
+msgstr "ends with"
+
+#: ../mail/filtertypes.xml.in.h:9 ../mail/searchtypes.xml.in.h:9
+#: ../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
+msgid "sounds like"
+msgstr "sounds like"
+
+#: ../mail/filtertypes.xml.in.h:11 ../mail/searchtypes.xml.in.h:13
+#: ../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
+msgid "Recipients"
+msgstr "Recipients"
+
+#: ../mail/filtertypes.xml.in.h:13 ../mail/searchtypes.xml.in.h:14
+#: ../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
+msgid "BCC"
+msgstr "BCC"
+
+#: ../mail/filtertypes.xml.in.h:15 ../mail/searchtypes.xml.in.h:16
+#: ../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
+msgid "has words"
+msgstr "has words"
+
+#: ../mail/filtertypes.xml.in.h:18 ../mail/searchtypes.xml.in.h:19
+#: ../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
+msgid "Specific header"
+msgstr "Specific header"
+
+#: ../mail/filtertypes.xml.in.h:20 ../mail/searchtypes.xml.in.h:21
+#: ../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
+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
+msgid "Message Body"
+msgstr "Message Body"
+
+#: ../mail/filtertypes.xml.in.h:23 ../mail/searchtypes.xml.in.h:25
+#: ../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
+#| msgid "Expression"
+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
+msgid "Date sent"
+msgstr "Date sent"
+
+#: ../mail/filtertypes.xml.in.h:26 ../mail/searchtypes.xml.in.h:28
+#: ../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
+msgid "is after"
+msgstr "is after"
+
+#: ../mail/filtertypes.xml.in.h:28 ../mail/searchtypes.xml.in.h:30
+#: ../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
+msgid "Score"
+msgstr "Score"
+
+#: ../mail/filtertypes.xml.in.h:33 ../mail/searchtypes.xml.in.h:35
+#: ../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
+#| msgid "is greater than"
+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
+#| msgid "is less than"
+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
+msgid "Replied to"
+msgstr "Replied to"
+
+#: ../mail/filtertypes.xml.in.h:39 ../mail/searchtypes.xml.in.h:42
+#: ../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
+msgid "Read"
+msgstr "Read"
+
+#: ../mail/filtertypes.xml.in.h:41 ../mail/mail-config.ui.h:130
+#: ../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
+msgid "Follow Up"
+msgstr "Follow Up"
+
+#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
+#: ../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
+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
+#| msgid "% Completed"
+msgid "is Completed"
+msgstr "is Completed"
+
+#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
+#: ../mail/vfoldertypes.xml.in.h:49
+#| msgid "% Completed"
+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
+msgid "Mailing list"
+msgstr "Mailing list"
+
+#: ../mail/filtertypes.xml.in.h:52 ../mail/searchtypes.xml.in.h:54
+#: ../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
+msgid "Message Header"
+msgstr "Message Header"
+
+#: ../mail/filtertypes.xml.in.h:54
+msgid "Source Account"
+msgstr "Source Account"
+
+#: ../mail/filtertypes.xml.in.h:55
+msgid "Pipe to Program"
+msgstr "Pipe to Program"
+
+#: ../mail/filtertypes.xml.in.h:56
+msgid "returns"
+msgstr "returns"
+
+#: ../mail/filtertypes.xml.in.h:57
+msgid "does not return"
+msgstr "does not return"
+
+#: ../mail/filtertypes.xml.in.h:58
+msgid "returns greater than"
+msgstr "returns greater than"
+
+#: ../mail/filtertypes.xml.in.h:59
+msgid "returns less than"
+msgstr "returns less than"
+
+#: ../mail/filtertypes.xml.in.h:60
+msgid "Junk Test"
+msgstr "Junk Test"
+
+#: ../mail/filtertypes.xml.in.h:61
+msgid "Message is Junk"
+msgstr "Message is Junk"
+
+#: ../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
+msgid "Message Location"
+msgstr "Message Location"
+
+#: ../mail/filtertypes.xml.in.h:64 ../mail/searchtypes.xml.in.h:56
+#: ../mail/vfoldertypes.xml.in.h:58
+msgid "Match All"
+msgstr "Match All"
+
+#: ../mail/filtertypes.xml.in.h:68
+msgid "Stop Processing"
+msgstr "Stop Processing"
+
+#: ../mail/filtertypes.xml.in.h:69
+msgid "Set Label"
+msgstr "Set Label"
+
+#: ../mail/filtertypes.xml.in.h:70
+msgid "Assign Color"
+msgstr "Assign Colour"
+
+#: ../mail/filtertypes.xml.in.h:71
+msgid "Unset Color"
+msgstr "Unset Colour"
+
+#: ../mail/filtertypes.xml.in.h:72
+msgid "Assign Score"
+msgstr "Assign Score"
+
+#: ../mail/filtertypes.xml.in.h:73
+msgid "Adjust Score"
+msgstr "Adjust Score"
+
+#: ../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
+msgid "Deleted"
+msgstr "Deleted"
+
+#: ../mail/filtertypes.xml.in.h:76
+msgid "Unset Status"
+msgstr "Unset Status"
+
+#: ../mail/filtertypes.xml.in.h:77
+msgid "Beep"
+msgstr "Beep"
+
+#: ../mail/filtertypes.xml.in.h:78
+msgid "Play Sound"
+msgstr "Play Sound"
+
+#: ../mail/filtertypes.xml.in.h:79
+msgid "Run Program"
+msgstr "Run Program"
+
+#: ../mail/filtertypes.xml.in.h:80
+msgid "Forward to"
+msgstr "Forward to"
+
+#: ../mail/importers/elm-importer.c:173
 msgid "Importing Elm data"
 msgstr "Importing Elm data"
 
-#: ../mail/importers/elm-importer.c:378
+#: ../mail/importers/elm-importer.c:376
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm importer"
 
-#: ../mail/importers/elm-importer.c:379
+#: ../mail/importers/elm-importer.c:377
 msgid "Import mail from Elm."
 msgstr "Import mail from Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:140
-#: ../plugins/dbx-import/dbx-importer.c:250
+#: ../mail/importers/evolution-mbox-importer.c:134
+#: ../mail/importers/kmail-importer.c:210
+#: ../plugins/dbx-import/dbx-importer.c:246
 msgid "_Destination folder:"
 msgstr "_Destination folder:"
 
-#: ../mail/importers/evolution-mbox-importer.c:146
-#: ../plugins/dbx-import/dbx-importer.c:256
-#: ../plugins/pst-import/pst-importer.c:545
+#: ../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
 msgid "Select folder"
 msgstr "Select folder"
 
-#: ../mail/importers/evolution-mbox-importer.c:147
-#: ../plugins/dbx-import/dbx-importer.c:257
-#: ../plugins/pst-import/pst-importer.c:546
+#: ../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
 msgid "Select folder to import into"
 msgstr "Select folder to import into"
 
-#: ../mail/importers/evolution-mbox-importer.c:437
+#: ../mail/importers/evolution-mbox-importer.c:509
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Subject"
 
-#: ../mail/importers/evolution-mbox-importer.c:442
+#: ../mail/importers/evolution-mbox-importer.c:514
 msgctxt "mboxImp"
 msgid "From"
 msgstr "From"
 
-#: ../mail/importers/evolution-mbox-importer.c:486
-#: ../shell/e-shell-utils.c:193
+#: ../mail/importers/evolution-mbox-importer.c:568 ../shell/e-shell-utils.c:173
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:487
+#: ../mail/importers/evolution-mbox-importer.c:569
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer Berkeley Mailbox format folders"
 
-#: ../mail/importers/mail-importer.c:63
+#: ../mail/importers/kmail-importer.c:263
+#, c-format
+#| msgid "Address"
+msgid "%d Address"
+msgid_plural "%d Addresses"
+msgstr[0] "%d Address"
+msgstr[1] "%d Addresses"
+
+#: ../mail/importers/kmail-importer.c:354
+#| msgid "Evolution Elm importer"
+msgid "Evolution KMail importer"
+msgstr "Evolution KMail importer"
+
+#: ../mail/importers/kmail-importer.c:355
+#| msgid "Import mail from Elm."
+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:1056
+msgid "Trash"
+msgstr "Wastebasket"
+
+#: ../mail/importers/mail-importer.c:54
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
 
+#: ../mail/importers/mail-importer.c:60
+#| msgid "Import mail from Elm."
+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:153
-#: ../plugins/dbx-import/dbx-importer.c:612
-#: ../plugins/pst-import/pst-importer.c:767
+#: ../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
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importing '%s'"
 
-#: ../mail/importers/mail-importer.c:316
+#: ../mail/importers/mail-importer.c:555
 #, c-format
 msgid "Scanning %s"
 msgstr "Scanning %s"
@@ -13744,35 +17898,35 @@ msgstr "Scanning %s"
 msgid "Importing Pine data"
 msgstr "Importing Pine data"
 
-#: ../mail/importers/pine-importer.c:474
+#: ../mail/importers/pine-importer.c:477
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine importer"
 
-#: ../mail/importers/pine-importer.c:475
+#: ../mail/importers/pine-importer.c:478
 msgid "Import mail from Pine."
 msgstr "Import mail from Pine."
 
-#: ../mail/mail-autofilter.c:70
+#: ../mail/mail-autofilter.c:63
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail to %s"
 
-#: ../mail/mail-autofilter.c:226 ../mail/mail-autofilter.c:269
+#: ../mail/mail-autofilter.c:219 ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail from %s"
 
-#: ../mail/mail-autofilter.c:252
+#: ../mail/mail-autofilter.c:245
 #, c-format
 msgid "Subject is %s"
 msgstr "Subject is %s"
 
-#: ../mail/mail-autofilter.c:293
+#: ../mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: ../mail/mail-autofilter.c:403
+#: ../mail/mail-autofilter.c:396
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
@@ -13781,7 +17935,7 @@ 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:512
+#: ../mail/mail-autofilter.c:505
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -13802,7 +17956,7 @@ msgstr[1] ""
 msgid "Set custom junk header"
 msgstr "Set custom junk header"
 
-#: ../mail/mail-config.ui.h:2
+#: ../mail/mail-config.ui.h:4
 msgid ""
 "All new emails with header that matches given content will be automatically "
 "filtered as junk"
@@ -13810,87 +17964,110 @@ msgstr ""
 "All new e-mails with header that matches given content will be automatically "
 "filtered as junk"
 
-#: ../mail/mail-config.ui.h:3
+#: ../mail/mail-config.ui.h:5
 msgid "Header name"
 msgstr "Header name"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:6
 msgid "Header content"
 msgstr "Header content"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:7
 msgid "Default Behavior"
 msgstr "Default Behaviour"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:8
 msgid "For_mat messages in HTML"
 msgstr "For_mat messages in HTML"
 
-#: ../mail/mail-config.ui.h:7
-msgid "Automatically insert _emoticon images"
-msgstr "Automatically insert _emoticon images"
+#: ../mail/mail-config.ui.h:10
+#| msgid "Automatically insert _emoticon images"
+msgid "Automatically insert _emoticons"
+msgstr "Automatically insert _emoticons"
 
-#: ../mail/mail-config.ui.h:8
+#: ../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
 msgid "Always request rea_d receipt"
 msgstr "Always request rea_d receipt"
 
-#: ../mail/mail-config.ui.h:9
+#: ../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:10
+#: ../mail/mail-config.ui.h:14
+#| msgid "Saving message to Outbox."
+msgid "Send messages through Outbo_x folder"
+msgstr "Send messages through Outbo_x folder"
+
+#: ../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
 msgid "Ch_aracter encoding:"
 msgstr "Ch_aracter encoding:"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:17
 msgid "Replies and Forwards"
 msgstr "Replies and Forwards"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:18
 msgid "_Reply style:"
 msgstr "_Reply style:"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:19
 msgid "_Forward style:"
 msgstr "_Forward style:"
 
-#: ../mail/mail-config.ui.h:14
+#: ../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:15
+#: ../mail/mail-config.ui.h:21
 msgid "_Keep signature above the original message on replying"
 msgstr "_Keep signature above the original message on replying"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:22
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "Ig_nore Reply-To: for mailing lists"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:23
 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:18
+#: ../mail/mail-config.ui.h:24
 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:20
+#: ../mail/mail-config.ui.h:25
+msgid "_Wrap quoted text in replies"
+msgstr "_Wrap quoted text in replies"
+
+#: ../mail/mail-config.ui.h:30
+msgctxt "ReplyForward"
+msgid "Inline"
+msgstr "Inline"
+
+#: ../mail/mail-config.ui.h:32
 msgid "Sig_natures"
 msgstr "Sig_natures"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:33
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:34
 msgid "_Languages"
 msgstr "_Languages"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:35
 msgid "Languages Table"
 msgstr "Languages Table"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:36
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -13898,24 +18075,11 @@ msgstr ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:38
 msgid "Check spelling while I _type"
 msgstr "Check spelling while I _type"
 
-#: ../mail/mail-config.ui.h:27
-msgid "Color for _misspelled words:"
-msgstr "Colour for _misspelt words:"
-
-#: ../mail/mail-config.ui.h:28
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "Pick a color"
-msgstr "Pick a colour"
-
-#: ../mail/mail-config.ui.h:29
-msgid "Spell Checking"
-msgstr "Spell Checking"
-
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:40
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -13924,287 +18088,315 @@ msgstr ""
 "before taking the following checkmarked actions:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:42
 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:34
+#: ../mail/mail-config.ui.h:44
 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:36
+#: ../mail/mail-config.ui.h:46
+#| msgid "Sending a message with only _Bcc recipients defined"
+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
 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:38
+#: ../mail/mail-config.ui.h:50
 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:40
+#: ../mail/mail-config.ui.h:52
 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:42
+#: ../mail/mail-config.ui.h:54
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Sending a message with _recipients not entered as mail addresses"
 
-#: ../mail/mail-config.ui.h:43
-msgid "Confirmations"
-msgstr "Confirmations"
-
-#: ../mail/mail-config.ui.h:49 ../smime/gui/smime-ui.ui.h:1
-msgid "a"
-msgstr "a"
-
-#: ../mail/mail-config.ui.h:50 ../smime/gui/smime-ui.ui.h:2
-msgid "b"
-msgstr "b"
-
-#: ../mail/mail-config.ui.h:51
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "Attachment"
-
-#: ../mail/mail-config.ui.h:52
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
-msgstr "Inline (Outlook style)"
-
-#: ../mail/mail-config.ui.h:53
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "Quoted"
-
-#: ../mail/mail-config.ui.h:54
-msgctxt "ReplyForward"
-msgid "Do not quote"
-msgstr "Do not quote"
-
-#: ../mail/mail-config.ui.h:55
-msgctxt "ReplyForward"
-msgid "Inline"
-msgstr "Inline"
-
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:56
-msgid "Proxy Settings"
-msgstr "Proxy Settings"
+#| msgid "Sending a message with an _empty subject line"
+msgid "Sending a message using _key accelerator (Ctrl+Enter)"
+msgstr "Sending a message using _key accelerator (Ctrl+Enter)"
 
 #: ../mail/mail-config.ui.h:57
-msgid "_Use system defaults"
-msgstr "_Use system defaults"
-
-#: ../mail/mail-config.ui.h:58
-msgid "_Direct connection to the Internet"
-msgstr "_Direct connection to the Internet"
+msgid "Confirmations"
+msgstr "Confirmations"
 
-#: ../mail/mail-config.ui.h:59
-msgid "_Manual proxy configuration:"
-msgstr "_Manual proxy configuration:"
+#. 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
+#| msgid "Search Folders"
+msgid "Use for Folders"
+msgstr "Use for Folders"
 
-#: ../mail/mail-config.ui.h:60
-msgid "H_TTP Proxy:"
-msgstr "H_TTP Proxy:"
+#. 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
+#| msgid "Sender or Recipients"
+msgid "Use for Recipients"
+msgstr "Use for Recipients"
 
-#: ../mail/mail-config.ui.h:61
-msgid "_Secure HTTP Proxy:"
-msgstr "_Secure HTTP Proxy:"
+#. 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
+#| msgid "_Account:"
+msgid "Account"
+msgstr "Account"
 
-#: ../mail/mail-config.ui.h:62
-msgid "SOC_KS Proxy:"
-msgstr "SOC_KS Proxy:"
+#: ../mail/mail-config.ui.h:69
+msgid "Send account overrides"
+msgstr "Send account overrides"
 
-#: ../mail/mail-config.ui.h:63
-msgid "No _Proxy for:"
-msgstr "No _Proxy for:"
+#: ../mail/mail-config.ui.h:70
+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 "
+"recipients can contain partial addresses or names. The name and the address "
+"parts are compared separately."
+msgstr ""
+"Assign which account should be used as a send account for respective folders "
+"or recipients, an override for usual send account detection. List of "
+"recipients can contain partial addresses or names. The name and the address "
+"parts are compared separately."
 
-#: ../mail/mail-config.ui.h:64
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:614
-msgid "Port:"
-msgstr "Port:"
+#: ../mail/mail-config.ui.h:71
+msgid "_Folder override has precedence over Recipient override"
+msgstr "_Folder override has precedence over Recipient override"
 
-#: ../mail/mail-config.ui.h:65
-msgid "Use Authe_ntication"
-msgstr "Use Authe_ntication"
+#: ../mail/mail-config.ui.h:72
+#| msgid "Source Account"
+msgid "Send Account"
+msgstr "Send Account"
 
-#: ../mail/mail-config.ui.h:66
-msgid "Us_ername:"
-msgstr "Us_ername:"
+#: ../mail/mail-config.ui.h:78 ../smime/gui/smime-ui.ui.h:1
+msgid "a"
+msgstr "a"
 
-#: ../mail/mail-config.ui.h:67
-msgid "Pass_word:"
-msgstr "Pass_word:"
+#: ../mail/mail-config.ui.h:79 ../smime/gui/smime-ui.ui.h:2
+msgid "b"
+msgstr "b"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:80
 msgid "Start up"
 msgstr "Start up"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:81
 msgid "Check for new _messages on start"
 msgstr "Check for new _messages on start"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:82
 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:71
+#: ../mail/mail-config.ui.h:83
 msgid "Message Display"
 msgstr "Message Display"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:84
 msgid "_Use the same fonts as other applications"
 msgstr "_Use the same fonts as other applications"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:85
 msgid "S_tandard Font:"
 msgstr "S_tandard Font:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:86
 msgid "Select HTML fixed width font"
 msgstr "Select HTML fixed width font"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:87
 msgid "Select HTML variable width font"
 msgstr "Select HTML variable width font"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:88
 msgid "Fix_ed Width Font:"
 msgstr "Fix_ed Width Font:"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:89
 msgid "_Mark messages as read after"
 msgstr "_Mark messages as read after"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:91
 msgid "Highlight _quotations with"
 msgstr "Highlight _quotations with"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:92
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
+msgid "Pick a color"
+msgstr "Pick a colour"
+
+#: ../mail/mail-config.ui.h:93
 msgid "color"
 msgstr "colour"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:94
 msgid "Default character e_ncoding:"
 msgstr "Default character e_ncoding:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:95
 msgid "Apply the same _view settings to all folders"
 msgstr "Apply the same _view settings to all folders"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:96
 msgid "F_all back to threading messages by subject"
 msgstr "F_all back to threading messages by subject"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:97
 msgid "Delete Mail"
 msgstr "Delete Mail"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:98
 msgid "Empty _trash folders"
 msgstr "Empty wastebaske_t folders"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:99
 msgid "Confirm _when expunging a folder"
 msgstr "Confirm _when expunging a folder"
 
+#: ../mail/mail-config.ui.h:100
+msgid "Archive Mail"
+msgstr "Archive Mail"
+
+#: ../mail/mail-config.ui.h:101
+#| msgid "On This Computer"
+msgid "On This Computer A_rchive folder:"
+msgstr "On This Computer A_rchive folder:"
+
+#: ../mail/mail-config.ui.h:102
+msgid "Archive folder to use for On This Computer messages"
+msgstr "Archive folder to use for On This Computer messages"
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:104
 msgid "_Show animated images"
 msgstr "_Show animated images"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:105
 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:90
-msgid "Loading Images"
-msgstr "Loading Images"
+#: ../mail/mail-config.ui.h:106
+#| msgid "Loading memos at %s"
+msgid "Loading Remote Content"
+msgstr "Loading Remote Content"
 
-#: ../mail/mail-config.ui.h:91
-msgid "_Never load images from the Internet"
-msgstr "_Never load images from the Internet"
+#: ../mail/mail-config.ui.h:107
+#| msgid "_Never load images from the Internet"
+msgid "_Never load remote content from the Internet"
+msgstr "_Never load remote content from the Internet"
 
-#: ../mail/mail-config.ui.h:92
-msgid "_Load images only in messages from contacts"
-msgstr "_Load images only in messages from contacts"
+#: ../mail/mail-config.ui.h:108
+#| msgid "_Load images only in messages from contacts"
+msgid "_Load remote content only in messages from contacts"
+msgstr "_Load remote content only in messages from contacts"
 
-#: ../mail/mail-config.ui.h:93
-msgid "_Always load images from the Internet"
-msgstr "_Always load images from the Internet"
+#: ../mail/mail-config.ui.h:109
+#| msgid "_Always load images from the Internet"
+msgid "_Always load remote content from the Internet"
+msgstr "_Always load remote content from the Internet"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:110
+#| msgid "_Show the photograph of sender in the message preview"
+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
+#| msgid "_Add"
+msgid "Add"
+msgstr "Add"
+
+#: ../mail/mail-config.ui.h:112
+msgid "Remove"
+msgstr "Remove"
+
+#: ../mail/mail-config.ui.h:113
+#| msgid "Allow newlines"
+msgid "Allow for sites:"
+msgstr "Allow for sites:"
+
+#: ../mail/mail-config.ui.h:114
+#| msgid "All local folders"
+msgid "Allow for senders:"
+msgstr "Allow for senders:"
+
+#: ../mail/mail-config.ui.h:115
 msgid "HTML Messages"
 msgstr "HTML Messages"
 
-#: ../mail/mail-config.ui.h:95 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:116 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Labels"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:117
 msgid "Sender Photograph"
 msgstr "Sender Photograph"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:118
 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:98
-msgid "S_earch for sender photograph only in local address books"
-msgstr "S_earch for sender photograph only in local address books"
+#: ../mail/mail-config.ui.h:119
+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:99
+#: ../mail/mail-config.ui.h:120
 msgid "Displayed Message Headers"
 msgstr "Displayed Message Headers"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:121
 msgid "Mail Headers Table"
 msgstr "Mail Headers Table"
 
-#: ../mail/mail-config.ui.h:101
-#: ../modules/addressbook/autocompletion-config.c:86
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../mail/mail-config.ui.h:122
+#: ../modules/addressbook/autocompletion-config.c:116
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Date/Time Format"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:124
 msgid "Check incoming _messages for junk"
 msgstr "Check incoming _messages for junk"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:125
 msgid "_Delete junk messages"
 msgstr "_Delete junk messages"
 
-#: ../mail/mail-config.ui.h:105
-msgid "Check cu_stom headers for junk"
-msgstr "Check cu_stom headers for junk"
+#: ../mail/mail-config.ui.h:126
+#| msgid "Junk Settings"
+msgid "Junk Test Options"
+msgstr "Junk Test Options"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:127
 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:107
+#: ../mail/mail-config.ui.h:128
 msgid "_Lookup in local address book only"
 msgstr "_Look up in local address book only"
 
-#: ../mail/mail-config.ui.h:108
-msgid "Option is ignored if a match for custom junk headers is found."
-msgstr "Option is ignored if a match for custom junk headers is found."
+#: ../mail/mail-config.ui.h:129
+msgid "Check cu_stom headers for junk"
+msgstr "Check cu_stom headers for junk"
 
-#: ../mail/mail-config.ui.h:110
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:225
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:159
+#: ../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
 msgid "No encryption"
 msgstr "No encryption"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:132
 msgid "TLS encryption"
 msgstr "TLS encryption"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:133
 msgid "SSL encryption"
 msgstr "SSL encryption"
 
@@ -14225,63 +18417,63 @@ msgid "_Due By:"
 msgstr "_Due By:"
 
 #. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Co_mpleted"
 msgstr "Co_mpleted"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Call"
 msgstr "Call"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Do Not Forward"
 msgstr "Do Not Forward"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "Follow-Up"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "For Your Information"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Forward"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "No Response Necessary"
 msgstr "No Response Necessary"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Reply to All"
 msgstr "Reply to All"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Review"
 msgstr "Review"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "License Agreement"
 msgstr "Licence Agreement"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../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:20
+#: ../mail/mail-dialogs.ui.h:22
 msgid "_Accept License"
 msgstr "_Accept Licence"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "Security Information"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Digital Signature"
 msgstr "Digital Signature"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Encryption"
 msgstr "Encryption"
 
@@ -14367,11 +18559,11 @@ msgstr ""
 "your message anyway. To avoid this, you should add at least one To: or Cc: "
 "recipient."
 
-#: ../mail/mail.error.xml.h:16
+#: ../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:17
+#: ../mail/mail.error.xml.h:18
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -14379,11 +18571,11 @@ msgstr ""
 "The following recipient was not recognised as a valid mail address:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:19
+#: ../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:20
+#: ../mail/mail.error.xml.h:21
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -14391,11 +18583,11 @@ msgstr ""
 "The following recipients were not recognised as valid mail addresses:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
 msgid "Send private reply?"
 msgstr "Send private reply?"
 
-#: ../mail/mail.error.xml.h:23
+#: ../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 "
@@ -14405,11 +18597,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:24
+#: ../mail/mail.error.xml.h:25
 msgid "Reply _Privately"
 msgstr "Reply _Privately"
 
-#: ../mail/mail.error.xml.h:26
+#: ../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 "
@@ -14419,11 +18611,11 @@ msgstr ""
 "replying privately to the sender; not to the list. Are you sure you want to "
 "proceed?"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
 msgid "Send reply to all recipients?"
 msgstr "Send reply to all recipients?"
 
-#: ../mail/mail.error.xml.h:29
+#: ../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?"
@@ -14431,13 +18623,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:30
+#: ../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:31
+#: ../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."
@@ -14445,23 +18637,30 @@ 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:32
+#: ../mail/mail.error.xml.h:33
 msgid "Use default drafts folder?"
 msgstr "Use default drafts folder?"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
+#| msgid ""
+#| "Unable to open the drafts folder for this account. Use the system drafts "
+#| "folder instead?"
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+"folder instead?\n"
+"\n"
+"The reported error was &quot;{0}&quot;."
 msgstr ""
 "Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+"folder instead?\n"
+"\n"
+"The reported error was &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:37
 msgid "Use _Default"
 msgstr "Use _Default"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:38
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -14469,15 +18668,15 @@ msgstr ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:36
+#: ../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:37
+#: ../mail/mail.error.xml.h:40
 msgid "_Expunge"
 msgstr "_Expunge"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:41
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -14485,24 +18684,23 @@ msgstr ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 
-#: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../mail/mail.error.xml.h:42 ../modules/mail/e-mail-shell-view-actions.c:1695
 msgid "_Empty Trash"
 msgstr "_Empty Wastebasket"
 
-#: ../mail/mail.error.xml.h:40
+#: ../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:41
+#: ../mail/mail.error.xml.h:44
 msgid "_Open Messages"
 msgstr "_Open Messages"
 
-#: ../mail/mail.error.xml.h:42
+#: ../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:43
+#: ../mail/mail.error.xml.h:46
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14513,55 +18711,55 @@ 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:47
+#: ../mail/mail.error.xml.h:50
 msgid "Error while {0}."
 msgstr "Error while {0}."
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:51
 msgid "Error while performing operation."
 msgstr "Error while performing operation."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Enter password."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Error loading filter definitions."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:54
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Cannot save to directory \"{0}\"."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:55
 msgid "Cannot save to file \"{0}\"."
 msgstr "Cannot save to file \"{0}\"."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:56
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Cannot create the save directory, because \"{1}\""
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:57
 msgid "Cannot create temporary save directory."
 msgstr "Cannot create temporary save directory."
 
-#: ../mail/mail.error.xml.h:55
+#: ../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:56
+#: ../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:57
+#: ../mail/mail.error.xml.h:60
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Cannot delete folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:61
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Cannot delete system folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14569,23 +18767,23 @@ msgstr ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:63
 msgid "Failed to expunge folder &quot;{0}&quot;."
 msgstr "Failed to expunge folder &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
 msgid "Failed to refresh folder &quot;{0}&quot;."
 msgstr "Failed to refresh folder &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:66
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Cannot rename or move system folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:64
+#: ../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?"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -14593,21 +18791,41 @@ msgstr ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:70
+#| msgid "Really delete folder \"{0}\"?"
+msgid "Really unsubscribe folder \"{0}\"?"
+msgstr "Really unsubscribe folder \"{0}\"?"
+
+#: ../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."
+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."
+
+#: ../mail/mail.error.xml.h:72
+#| msgid "_Unsubscribe"
+msgid "Do _Not Unsubscribe"
+msgstr "Do _Not Unsubscribe"
+
+#: ../mail/mail.error.xml.h:74
 msgid "Really delete folder \"{0}\"?"
 msgstr "Really delete folder \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:68
+#: ../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:69
+#: ../mail/mail.error.xml.h:76
 msgid "These messages are not copies."
 msgstr "These messages are not copies."
 
-#: ../mail/mail.error.xml.h:70
+#: ../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 "
@@ -14617,63 +18835,63 @@ 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:71
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Cannot rename \"{0}\" to \"{1}\"."
 
-#: ../mail/mail.error.xml.h:72
+#: ../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."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:80
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Cannot move folder \"{0}\" to \"{1}\"."
 
-#: ../mail/mail.error.xml.h:74
+#: ../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:75
+#: ../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:76
+#: ../mail/mail.error.xml.h:83
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:84
 msgid "Cannot create folder \"{0}\"."
 msgstr "Cannot create folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:85
 msgid "Cannot open folder. Error: {1}"
 msgstr "Cannot open folder. Error: {1}"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:86
 msgid "Cannot save changes to account."
 msgstr "Cannot save changes to account."
 
-#: ../mail/mail.error.xml.h:80
+#: ../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:81
+#: ../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:82
+#: ../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?"
 
-#: ../mail/mail.error.xml.h:83
+#: ../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:84
+#: ../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:85
+#: ../mail/mail.error.xml.h:92
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14681,30 +18899,29 @@ msgstr ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:87
+#: ../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:88
+#: ../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:89
+#: ../mail/mail.error.xml.h:96
 msgid "Do _Not Disable"
 msgstr "Do _Not Disable"
 
-#: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:635
+#: ../mail/mail.error.xml.h:97
 msgid "_Disable"
 msgstr "_Disable"
 
-#: ../mail/mail.error.xml.h:91
+#: ../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."
 
-#: ../mail/mail.error.xml.h:92
+#: ../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."
@@ -14712,39 +18929,39 @@ 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:94
+#: ../mail/mail.error.xml.h:101
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Cannot add Search Folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:95
+#: ../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."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:103
 msgid "Search Folders automatically updated."
 msgstr "Search Folders automatically updated."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:104
 msgid "Mail filters automatically updated."
 msgstr "Mail filters automatically updated."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:105
 msgid "Missing folder."
 msgstr "Missing folder."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:106
 msgid "You must specify a folder."
 msgstr "You must specify a folder."
 
-#: ../mail/mail.error.xml.h:101
+#: ../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:102
+#: ../mail/mail.error.xml.h:109
 msgid "No folder selected."
 msgstr "No folder selected."
 
-#: ../mail/mail.error.xml.h:103
+#: ../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 "
@@ -14754,11 +18971,11 @@ msgstr ""
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:112
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem migrating old mail folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -14770,23 +18987,19 @@ msgstr ""
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 
-#: ../mail/mail.error.xml.h:109
-msgid "Ignore"
-msgstr "Ignore"
-
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:117
 msgid "_Overwrite"
 msgstr "_Overwrite"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:118
 msgid "_Append"
 msgstr "_Append"
 
-#: ../mail/mail.error.xml.h:112
+#: ../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:113
+#: ../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 "
@@ -14804,19 +19017,19 @@ 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:116
+#: ../mail/mail.error.xml.h:123
 msgid "_Exit Evolution"
 msgstr "_Exit Evolution"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:124
 msgid "_Migrate Now"
 msgstr "_Migrate Now"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:125
 msgid "Unable to read license file."
 msgstr "Unable to read licence file."
 
-#: ../mail/mail.error.xml.h:119
+#: ../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."
@@ -14824,25 +19037,30 @@ 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."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:127
 msgid "Please wait."
 msgstr "Please wait."
 
-#: ../mail/mail.error.xml.h:121
+#: ../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:122
+#: ../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:123
+#: ../mail/mail.error.xml.h:130
+#| msgid "Failed to get server URL."
+msgid "Failed to get server setup."
+msgstr "Failed to get server setup."
+
+#: ../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:124
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -14850,71 +19068,103 @@ msgstr ""
 "Do you want to locally synchronise the folders that are marked for offline "
 "usage?"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:133
 msgid "Do _Not Synchronize"
 msgstr "Do _Not Synchronise"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:134
 msgid "_Synchronize"
 msgstr "_Synchronise"
 
-#: ../mail/mail.error.xml.h:127
+#: ../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:128
+#: ../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:129
+#: ../mail/mail.error.xml.h:137
+msgid "Also mark messages in subfolders?"
+msgstr "Also mark messages in subfolders?"
+
+#: ../mail/mail.error.xml.h:138
 msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
 msgstr ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
-
-#: ../mail/mail.error.xml.h:130
-msgid "Close message window."
-msgstr "Close message window."
+"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:131
-msgid "Would you like to close the message window?"
-msgstr "Would you like to close the message window?"
+#: ../mail/mail.error.xml.h:139
+msgid "In Current Folder and _Subfolders"
+msgstr "In Current Folder and _Subfolders"
 
-#: ../mail/mail.error.xml.h:132
-msgid "_Yes"
-msgstr "_Yes"
+#: ../mail/mail.error.xml.h:140
+msgid "In Current _Folder Only"
+msgstr "In Current _Folder Only"
 
-#: ../mail/mail.error.xml.h:133
-msgid "_No"
-msgstr "_No"
+#: ../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:134
-msgid "_Always"
-msgstr "_Always"
+#: ../mail/mail.error.xml.h:142
+#| msgid "_Always"
+msgid "_Yes, Always"
+msgstr "_Yes, Always"
 
-#: ../mail/mail.error.xml.h:135
-msgid "N_ever"
-msgstr "N_ever"
+#: ../mail/mail.error.xml.h:143
+#| msgid "Never"
+msgid "_No, Never"
+msgstr "_No, Never"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:144
 msgid "Copy folder in folder tree."
 msgstr "Copy folder in folder tree."
 
-#: ../mail/mail.error.xml.h:137
+#: ../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}'?"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:147
+#| msgid "Do _not Send"
+msgid "Do _not copy"
+msgstr "Do _not copy"
+
+#: ../mail/mail.error.xml.h:148
+#| msgid "_Always"
+msgid "_Always copy"
+msgstr "_Always copy"
+
+#: ../mail/mail.error.xml.h:149
+#| msgid "N_ever"
+msgid "N_ever copy"
+msgstr "N_ever copy"
+
+#: ../mail/mail.error.xml.h:150
 msgid "Move folder in folder tree."
 msgstr "Move folder in folder tree."
 
-#: ../mail/mail.error.xml.h:139
+#: ../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}'?"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:153
+#| msgid "Do _not Send"
+msgid "Do _not move"
+msgstr "Do _not move"
+
+#: ../mail/mail.error.xml.h:154
+#| msgid "_Always"
+msgid "_Always move"
+msgstr "_Always move"
+
+#: ../mail/mail.error.xml.h:155
+#| msgid "N_ever"
+msgid "N_ever move"
+msgstr "N_ever move"
+
+#: ../mail/mail.error.xml.h:156
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14923,88 +19173,117 @@ msgstr ""
 "not enabled"
 
 #  mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:141
+#: ../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:142
+#: ../mail/mail.error.xml.h:158
 msgid "Mail Deletion Failed"
 msgstr "Mail Deletion Failed"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:159
 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:144
+#: ../mail/mail.error.xml.h:160
 msgid "\"Check Junk\" Failed"
 msgstr "\"Check Junk\" Failed"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:161
 msgid "\"Report Junk\" Failed"
 msgstr "\"Report Junk\" Failed"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:162
 msgid "\"Report Not Junk\" Failed"
 msgstr "\"Report Not Junk\" Failed"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:163
 msgid "Remove duplicate messages?"
 msgstr "Remove duplicate messages?"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:164
 msgid "No duplicate messages found."
 msgstr "No duplicate messages found."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:150
+#: ../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:151
+#: ../mail/mail.error.xml.h:167
+#| msgid "Failed to disconnect account &quot;{0}&quot;."
+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:153
+#: ../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:154
+#: ../mail/mail.error.xml.h:170
 msgid "Unable to retrieve message."
 msgstr "Unable to retrieve message."
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:171
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:172
+#| msgid "Not available in offline mode"
+msgid "Message is not available in offline mode."
+msgstr "Message is not available in offline mode."
+
+#: ../mail/mail.error.xml.h:173
+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."
+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 "
+"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
 msgid "Failed to open folder."
 msgstr "Failed to open folder."
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:176
 msgid "Failed to find duplicate messages."
 msgstr "Failed to find duplicate messages."
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:177
 msgid "Failed to retrieve messages."
 msgstr "Failed to retrieve messages."
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:178
+#| msgid "Failed to save messages to disk."
+msgid "Failed to mark messages as read."
+msgstr "Failed to mark messages as read."
+
+#: ../mail/mail.error.xml.h:179
 msgid "Failed to remove attachments from messages."
 msgstr "Failed to remove attachments from messages."
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:180
 msgid "Failed to download messages for offline viewing."
 msgstr "Failed to download messages for offline viewing."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:181
 msgid "Failed to save messages to disk."
 msgstr "Failed to save messages to disk."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:182
 msgid "Hidden file is attached."
 msgstr "Hidden file is attached."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:183
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -15012,140 +19291,222 @@ msgstr ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:184
 msgid "Printing failed."
 msgstr "Printing failed."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:185
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "The printer replied &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:186
 msgid "Could not perform this operation on {0}."
 msgstr "Could not perform this operation on {0}."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:187
 msgid "You must be working online to complete this operation."
 msgstr "You must be working online to complete this operation."
 
-#: ../mail/mail-send-recv.c:202
+#: ../mail/mail.error.xml.h:188
+msgid "Message from &quot;{0}&quot; account:"
+msgstr "Message from &quot;{0}&quot; 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}'"
+
+#: ../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}'"
+
+#: ../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}'"
+
+#: ../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}'"
+
+#: ../mail/mail.error.xml.h:193
+#| msgid "Request a _read receipt for this message"
+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
+msgid ""
+"You can download remote content manually, or set to remember to download "
+"remote content for this sender or used sites."
+msgstr ""
+"You can download remote content manually, or set to remember to download "
+"remote content for this sender or used sites."
+
+#. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
+#: ../mail/mail.error.xml.h:196
+#| msgid "Completed on"
+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
+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
+msgid "Overdue: {0} by {1}"
+msgstr "Overdue: {0} by {1}"
+
+#: ../mail/mail.error.xml.h:202
+#| msgid "This signature has been changed, but has not been saved."
+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 "Copy selected messages to another folder"
+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 stream mail message content to Bogofilter: "
+msgid "Failed to store message note in folder '{0}'"
+msgstr "Failed to store message note in folder '{0}'"
+
+#: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "Cancelling…"
 
-#: ../mail/mail-send-recv.c:546
+#: ../mail/mail-send-recv.c:639
 msgid "Send & Receive Mail"
 msgstr "Send & Receive Mail"
 
-#: ../mail/mail-send-recv.c:562
+#: ../mail/mail-send-recv.c:653
 msgid "Cancel _All"
 msgstr "Cancel _All"
 
-#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:1041
+#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:1263
 msgid "Updating..."
 msgstr "Updating…"
 
-#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:736
+#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
 msgid "Waiting..."
 msgstr "Waiting…"
 
-#: ../mail/mail-send-recv.c:1020
+#: ../mail/mail-send-recv.c:1229
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "Checking for new mail at '%s'"
 
-#: ../mail/mail-vfolder-ui.c:78
+#: ../mail/mail-send-recv.c:1456
+#, c-format
+msgid "Deleting junk and expunging trash at '%s'"
+msgstr "Deleting junk and expunging wastebasket at '%s'"
+
+#: ../mail/mail-send-recv.c:1458
+#, c-format
+#| msgid "Reconnecting to '%s'"
+msgid "Deleting junk at '%s'"
+msgstr "Deleting junk at '%s'"
+
+#: ../mail/mail-send-recv.c:1460
+#, c-format
+#| msgid "Emptying trash in '%s'"
+msgid "Expunging trash at '%s'"
+msgstr "Expunging wastebasket at '%s'"
+
+#: ../mail/mail-vfolder-ui.c:66
 msgid "Search Folders"
 msgstr "Search Folders"
 
-#: ../mail/mail-vfolder-ui.c:158
+#: ../mail/mail-vfolder-ui.c:146
 msgid "Edit Search Folder"
 msgstr "Edit Search Folder"
 
-#: ../mail/mail-vfolder-ui.c:279
+#: ../mail/mail-vfolder-ui.c:267
 msgid "New Search Folder"
 msgstr "New Search Folder"
 
-#: ../mail/message-list.c:1244
+#: ../mail/message-list.c:296
 msgid "Unseen"
 msgstr "Unseen"
 
-#: ../mail/message-list.c:1245
+#: ../mail/message-list.c:297
 msgid "Seen"
 msgstr "Seen"
 
-#: ../mail/message-list.c:1246
+#: ../mail/message-list.c:298
 msgid "Answered"
 msgstr "Answered"
 
-#: ../mail/message-list.c:1247
+#: ../mail/message-list.c:299
 msgid "Forwarded"
 msgstr "Forwarded"
 
-#: ../mail/message-list.c:1248
+#: ../mail/message-list.c:300
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: ../mail/message-list.c:1249
+#: ../mail/message-list.c:301
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: ../mail/message-list.c:1253
+#: ../mail/message-list.c:314
 msgid "Lowest"
 msgstr "Lowest"
 
-#: ../mail/message-list.c:1254
+#: ../mail/message-list.c:315
 msgid "Lower"
 msgstr "Lower"
 
-#: ../mail/message-list.c:1258
+#: ../mail/message-list.c:319
 msgid "Higher"
 msgstr "Higher"
 
-#: ../mail/message-list.c:1259
+#: ../mail/message-list.c:320
 msgid "Highest"
 msgstr "Highest"
 
+#: ../mail/message-list.c:466 ../mail/message-list.c:6186
+msgid "Generating message list"
+msgstr "Generating message list"
+
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1889 ../modules/itip-formatter/itip-view.c:244
+#: ../mail/message-list.c:2062 ../modules/itip-formatter/itip-view.c:269
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: ../mail/message-list.c:1898
+#: ../mail/message-list.c:2071
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: ../mail/message-list.c:1910
+#: ../mail/message-list.c:2083
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1918
+#: ../mail/message-list.c:2091
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1920
+#: ../mail/message-list.c:2093
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2751
+#: ../mail/message-list.c:3001
 msgid "Select all visible messages"
 msgstr "Select all visible messages"
 
-#: ../mail/message-list.c:2889 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3703 ../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:4136
+#: ../mail/message-list.c:5117
 msgid "Follow-up"
 msgstr "Follow-up"
 
-#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4638 ../mail/message-list.c:5042
-msgid "Generating message list"
-msgstr "Generating message list"
-
-#: ../mail/message-list.c:4872
+#: ../mail/message-list.c:6125
 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 "
@@ -15157,7 +19518,7 @@ msgstr ""
 "running a new search either by clearing it with Search->Clear menu item or "
 "by changing the query above."
 
-#: ../mail/message-list.c:4877
+#: ../mail/message-list.c:6133
 msgid "There are no messages in this folder."
 msgstr "There are no messages in this folder."
 
@@ -15189,388 +19550,408 @@ msgstr "Messages To"
 msgid "Subject - Trimmed"
 msgstr "Subject — Trimmed"
 
-#: ../mail/searchtypes.xml.h:1
+#: ../mail/message-list.etspec.h:21 ../plugins/save-calendar/csv-format.c:374
+msgid "UID"
+msgstr "UID"
+
+#: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
+msgid "Any header"
+msgstr "Any header"
+
+#: ../mail/searchtypes.xml.in.h:57
 msgid "Subject or Addresses contains"
 msgstr "Subject or Addresses contains"
 
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1762
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2224
 msgid "Recipients contain"
 msgstr "Recipients contain"
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1755
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2217
 msgid "Message contains"
 msgstr "Message contains"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1776
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2238
 msgid "Subject contains"
 msgstr "Subject contains"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1769
+#: ../mail/searchtypes.xml.in.h:61
+#: ../modules/mail/e-mail-shell-view-actions.c:2231
 msgid "Sender contains"
 msgstr "Sender contains"
 
-#: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1748
+#: ../mail/searchtypes.xml.in.h:62
+#: ../modules/mail/e-mail-shell-view-actions.c:2203
 msgid "Body contains"
 msgstr "Body contains"
 
+#: ../mail/searchtypes.xml.in.h:63
+#: ../modules/mail/e-mail-shell-view-actions.c:2210
+#| msgid "Expression"
+msgid "Free form expression"
+msgstr "Free form expression"
+
 #. 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:92
-#: ../modules/mail/em-mailer-prefs.c:1139
+#: ../modules/addressbook/autocompletion-config.c:122
+#: ../modules/mail/em-mailer-prefs.c:1558
 msgid "_Table column:"
 msgstr "_Table column:"
 
-#: ../modules/addressbook/autocompletion-config.c:95
+#: ../modules/addressbook/autocompletion-config.c:125
 msgid "Address formatting"
 msgstr "Address formatting"
 
-#: ../modules/addressbook/autocompletion-config.c:98
+#: ../modules/addressbook/autocompletion-config.c:128
 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:107
+#: ../modules/addressbook/autocompletion-config.c:136
 msgid "Autocompletion"
 msgstr "Autocompletion"
 
-#: ../modules/addressbook/autocompletion-config.c:110
+#: ../modules/addressbook/autocompletion-config.c:139
 msgid "Always _show address of the autocompleted contact"
 msgstr "Always _show address of the autocompleted contact"
 
-#: ../modules/addressbook/eab-composer-util.c:148
+#: ../modules/addressbook/eab-composer-util.c:100
 msgid "Multiple vCards"
 msgstr "Multiple vCards"
 
-#: ../modules/addressbook/eab-composer-util.c:156
+#: ../modules/addressbook/eab-composer-util.c:108
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard for %s"
 
-#: ../modules/addressbook/eab-composer-util.c:168
-#: ../modules/addressbook/eab-composer-util.c:195
+#: ../modules/addressbook/eab-composer-util.c:119
+#: ../modules/addressbook/eab-composer-util.c:146
 #, c-format
 msgid "Contact information"
 msgstr "Contact information"
 
-#: ../modules/addressbook/eab-composer-util.c:197
+#: ../modules/addressbook/eab-composer-util.c:148
 #, c-format
 msgid "Contact information for %s"
 msgstr "Contact information for %s"
 
-#: ../modules/addressbook/e-book-shell-backend.c:260
-#: ../modules/addressbook/e-book-shell-view-actions.c:125
+#: ../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:269
+#: ../modules/addressbook/e-book-shell-backend.c:267
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contact"
 
-#: ../modules/addressbook/e-book-shell-backend.c:271
-#: ../modules/addressbook/e-book-shell-view-actions.c:936
+#: ../modules/addressbook/e-book-shell-backend.c:269
+#: ../modules/addressbook/e-book-shell-view-actions.c:1045
 msgid "Create a new contact"
 msgstr "Create a new contact"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-backend.c:274
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Contact _List"
 
-#: ../modules/addressbook/e-book-shell-backend.c:278
-#: ../modules/addressbook/e-book-shell-view-actions.c:943
+#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
 msgid "Create a new contact list"
 msgstr "Create a new contact list"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Address _Book"
 
-#: ../modules/addressbook/e-book-shell-backend.c:288
-#: ../modules/addressbook/e-book-shell-view-actions.c:866
+#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-view-actions.c:968
 msgid "Create a new address book"
 msgstr "Create a new address book"
 
-#: ../modules/addressbook/e-book-shell-backend.c:316
-msgid "Certificates"
-msgstr "Certificates"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:198
+#: ../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:418
-#: ../modules/addressbook/e-book-shell-view-actions.c:714
+#: ../modules/addressbook/e-book-shell-view-actions.c:535
+#: ../modules/addressbook/e-book-shell-view-actions.c:831
 msgid "Save as vCard"
 msgstr "Save as vCard…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:843
+#: ../modules/addressbook/e-book-shell-view-actions.c:938
 msgid "Co_py All Contacts To..."
 msgstr "Co_py All Contacts To…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:845
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
 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:850
+#: ../modules/addressbook/e-book-shell-view-actions.c:945
 msgid "D_elete Address Book"
 msgstr "D_elete Address Book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:852
+#: ../modules/addressbook/e-book-shell-view-actions.c:947
 msgid "Delete the selected address book"
 msgstr "Delete the selected address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:857
+#: ../modules/addressbook/e-book-shell-view-actions.c:952
+#| msgid "Mo_ve to Address Book..."
+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
+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
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_ve All Contacts To…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:859
+#: ../modules/addressbook/e-book-shell-view-actions.c:961
 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:864
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
 msgid "_New Address Book"
 msgstr "_New Address Book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:871
+#: ../modules/addressbook/e-book-shell-view-actions.c:973
 msgid "Address _Book Properties"
 msgstr "Address _Book Properties"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:873
+#: ../modules/addressbook/e-book-shell-view-actions.c:975
 msgid "Show properties of the selected address book"
 msgstr "Show properties of the selected address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:878
+#: ../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
+msgid "Re_fresh"
+msgstr "Re_fresh"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:982
+#| msgid "Rename the selected address book"
+msgid "Refresh the selected address book"
+msgstr "Refresh the selected address book"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:987
 msgid "Address Book _Map"
 msgstr "Address Book _Map"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 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:885
-#: ../modules/calendar/e-cal-shell-view-actions.c:1445
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
-#: ../modules/calendar/e-task-shell-view-actions.c:788
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../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:1787
 msgid "_Rename..."
 msgstr "_Rename…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/addressbook/e-book-shell-view-actions.c:996
 msgid "Rename the selected address book"
 msgstr "Rename the selected address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/addressbook/e-book-shell-view-actions.c:1003
 msgid "Stop loading"
 msgstr "Stop loading"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:899
+#: ../modules/addressbook/e-book-shell-view-actions.c:1008
 msgid "_Copy Contact To..."
 msgstr "_Copy Contact To…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/addressbook/e-book-shell-view-actions.c:1010
 msgid "Copy selected contacts to another address book"
 msgstr "Copy selected contacts to another address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:906
+#: ../modules/addressbook/e-book-shell-view-actions.c:1015
 msgid "_Delete Contact"
 msgstr "_Delete Contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
+#: ../modules/addressbook/e-book-shell-view-actions.c:1022
 msgid "_Find in Contact..."
 msgstr "_Find in Contact…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:1024
 msgid "Search for text in the displayed contact"
 msgstr "Search for text in the displayed contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/addressbook/e-book-shell-view-actions.c:1029
 msgid "_Forward Contact..."
 msgstr "_Forward Contact…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:922
+#: ../modules/addressbook/e-book-shell-view-actions.c:1031
 msgid "Send selected contacts to another person"
 msgstr "Send selected contacts to another person"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:1036
 msgid "_Move Contact To..."
 msgstr "_Move Contact To…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:929
+#: ../modules/addressbook/e-book-shell-view-actions.c:1038
 msgid "Move selected contacts to another address book"
 msgstr "Move selected contacts to another address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:1043
 msgid "_New Contact..."
 msgstr "_New Contact…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:1050
 msgid "New Contact _List..."
 msgstr "New Contact _List…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
+#: ../modules/addressbook/e-book-shell-view-actions.c:1057
 msgid "_Open Contact"
 msgstr "_Open Contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
 msgid "View the current contact"
 msgstr "View the current contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:955
+#: ../modules/addressbook/e-book-shell-view-actions.c:1064
 msgid "_Send Message to Contact..."
 msgstr "_Send Message to Contact…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Send a message to the selected contacts"
 msgstr "Send a message to the selected contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:964
-#: ../modules/calendar/e-cal-shell-view-actions.c:1601
-#: ../modules/calendar/e-task-shell-view-actions.c:846
+#: ../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
 msgid "_Actions"
 msgstr "_Actions"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:971
-#: ../modules/calendar/e-memo-shell-view-actions.c:701
-#: ../modules/calendar/e-task-shell-view-actions.c:853
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../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:1959
 msgid "_Preview"
 msgstr "_Preview"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:980
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
-#: ../modules/calendar/e-memo-shell-view-actions.c:714
-#: ../modules/calendar/e-task-shell-view-actions.c:866
-msgid "_Delete"
-msgstr "_Delete"
+#: ../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
+#| msgid "_Manager:"
+msgid "_Manage groups..."
+msgstr "_Manage groups..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:984
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
-msgid "_Properties"
-msgstr "_Properties"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:1105
 msgid "Address Book Map"
 msgstr "Address Book Map"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1020
+#: ../modules/addressbook/e-book-shell-view-actions.c:1137
 msgid "Contact _Preview"
 msgstr "Contact _Preview"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1022
+#: ../modules/addressbook/e-book-shell-view-actions.c:1139
 msgid "Show contact preview window"
 msgstr "Show contact preview window"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1028
+#: ../modules/addressbook/e-book-shell-view-actions.c:1145
 msgid "Show _Maps"
 msgstr "Show _Maps"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
 msgid "Show maps in contact preview window"
 msgstr "Show maps in contact preview window"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1049
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:935
-#: ../modules/mail/e-mail-shell-view-actions.c:1665
+#: ../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:2105
 msgid "_Classic View"
 msgstr "_Classic View"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
+#: ../modules/addressbook/e-book-shell-view-actions.c:1168
 msgid "Show contact preview below the contact list"
 msgstr "Show contact preview below the contact list"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1056
-#: ../modules/calendar/e-memo-shell-view-actions.c:778
-#: ../modules/calendar/e-task-shell-view-actions.c:942
-#: ../modules/mail/e-mail-shell-view-actions.c:1672
+#: ../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:2112
 msgid "_Vertical View"
 msgstr "_Vertical View"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
+#: ../modules/addressbook/e-book-shell-view-actions.c:1175
 msgid "Show contact preview alongside the contact list"
 msgstr "Show contact preview alongside the contact list"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1073
-#: ../modules/calendar/e-cal-shell-view-actions.c:1778
-#: ../modules/calendar/e-memo-shell-view-actions.c:795
-#: ../modules/calendar/e-task-shell-view-actions.c:994
+#: ../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
 msgid "Unmatched"
 msgstr "Unmatched"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1083
-#: ../modules/calendar/e-cal-shell-view-actions.c:1788
-#: ../modules/calendar/e-memo-shell-view-actions.c:805
-#: ../modules/calendar/e-task-shell-view-actions.c:1004
-#: ../modules/mail/e-mail-shell-view-actions.c:1741
+#: ../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:2196
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Advanced Search"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+#: ../modules/addressbook/e-book-shell-view-actions.c:1233
 msgid "Print all shown contacts"
 msgstr "Print all shown contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1123
+#: ../modules/addressbook/e-book-shell-view-actions.c:1240
 msgid "Preview the contacts to be printed"
 msgstr "Preview the contacts to be printed"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1130
+#: ../modules/addressbook/e-book-shell-view-actions.c:1247
 msgid "Print selected contacts"
 msgstr "Print selected contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1145
+#: ../modules/addressbook/e-book-shell-view-actions.c:1262
 msgid "S_ave Address Book as vCard"
 msgstr "S_ave Address Book as vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1147
+#: ../modules/addressbook/e-book-shell-view-actions.c:1264
 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:1153
-#: ../modules/addressbook/e-book-shell-view-actions.c:1163
+#: ../modules/addressbook/e-book-shell-view-actions.c:1270
+#: ../modules/addressbook/e-book-shell-view-actions.c:1280
 msgid "_Save as vCard..."
 msgstr "_Save as vCard…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1155
+#: ../modules/addressbook/e-book-shell-view-actions.c:1272
 msgid "Save selected contacts as a vCard"
 msgstr "Save selected contacts as a vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:300
+#: ../modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contacts"
 msgstr "_Forward Contacts"
 
-#: ../modules/addressbook/e-book-shell-view.c:302
+#: ../modules/addressbook/e-book-shell-view.c:315
 msgid "_Forward Contact"
 msgstr "_Forward Contact"
 
-#: ../modules/addressbook/e-book-shell-view.c:333
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to Contacts"
 msgstr "_Send Message to Contacts"
 
-#: ../modules/addressbook/e-book-shell-view.c:335
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to List"
 msgstr "_Send Message to List"
 
-#: ../modules/addressbook/e-book-shell-view.c:337
+#: ../modules/addressbook/e-book-shell-view.c:350
 msgid "_Send Message to Contact"
 msgstr "_Send Message to Contact"
 
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:309
-msgid "Audio Player"
-msgstr "Audio Player"
-
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
-msgid "Play the attachment in embedded audio player"
-msgstr "Play the attachment in embedded audio player"
-
-#: ../modules/backup-restore/e-mail-config-restore-page.c:165
+#: ../modules/backup-restore/e-mail-config-restore-page.c:163
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -15580,18 +19961,18 @@ msgstr ""
 "\n"
 "This will restore all your personal data, settings mail filters, etc."
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:180
+#: ../modules/backup-restore/e-mail-config-restore-page.c:178
 msgid "_Restore from a backup file:"
 msgstr "_Restore from a backup file:"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:191
+#: ../modules/backup-restore/e-mail-config-restore-page.c:189
 msgid "Choose a backup file to restore"
 msgstr "Choose a backup file to restore"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:311
-#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
+#: ../modules/backup-restore/e-mail-config-restore-page.c:309
+#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
 msgid "Restore from Backup"
 msgstr "Restore from Backup"
 
@@ -15603,128 +19984,134 @@ msgstr "Select name of the Evolution backup file"
 msgid "_Restart Evolution after backup"
 msgstr "_Restart Evolution after backup"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:277
+#: ../modules/backup-restore/evolution-backup-restore.c:285
+#| msgid "_Restart Evolution after restore"
+msgid "Re_start Evolution after restore"
+msgstr "Re_start Evolution after restore"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:327
 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:290
-msgid "_Restart Evolution after restore"
-msgstr "_Restart Evolution after restore"
+#: ../modules/backup-restore/evolution-backup-restore.c:336
+#, c-format
+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:308
+#: ../modules/backup-restore/evolution-backup-restore.c:357
 msgid "_Back up Evolution Data..."
 msgstr "_Back up Evolution Data…"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:310
+#: ../modules/backup-restore/evolution-backup-restore.c:359
 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:315
+#: ../modules/backup-restore/evolution-backup-restore.c:364
 msgid "R_estore Evolution Data..."
 msgstr "R_estore Evolution Data…"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:317
+#: ../modules/backup-restore/evolution-backup-restore.c:366
 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:84
+#: ../modules/backup-restore/evolution-backup-tool.c:75
 msgid "Back up Evolution directory"
 msgstr "Back up Evolution directory"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:86
+#: ../modules/backup-restore/evolution-backup-tool.c:77
 msgid "Restore Evolution directory"
 msgstr "Restore Evolution directory"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:88
+#: ../modules/backup-restore/evolution-backup-tool.c:79
 msgid "Check Evolution Back up"
 msgstr "Check Evolution Backup"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:90
+#: ../modules/backup-restore/evolution-backup-tool.c:81
 msgid "Restart Evolution"
 msgstr "Restart Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:92
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "With Graphical User Interface"
 msgstr "With Graphical User Interface"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:321
-#: ../modules/backup-restore/evolution-backup-tool.c:515
+#: ../modules/backup-restore/evolution-backup-tool.c:281
+#: ../modules/backup-restore/evolution-backup-tool.c:485
 msgid "Shutting down Evolution"
 msgstr "Shutting down Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:290
 msgid "Backing Evolution accounts and settings"
 msgstr "Backing up Evolution accounts and settings"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:347
+#: ../modules/backup-restore/evolution-backup-tool.c:307
 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:363
+#: ../modules/backup-restore/evolution-backup-tool.c:323
 msgid "Back up complete"
 msgstr "Backup complete"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:370
-#: ../modules/backup-restore/evolution-backup-tool.c:702
+#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:679
 msgid "Restarting Evolution"
 msgstr "Restarting Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:521
+#: ../modules/backup-restore/evolution-backup-tool.c:491
 msgid "Back up current Evolution data"
 msgstr "Back up current Evolution data"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:528
+#: ../modules/backup-restore/evolution-backup-tool.c:498
 msgid "Extracting files from back up"
 msgstr "Extracting files from backup"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:610
+#: ../modules/backup-restore/evolution-backup-tool.c:580
 msgid "Loading Evolution settings"
 msgstr "Loading Evolution settings"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:676
+#: ../modules/backup-restore/evolution-backup-tool.c:650
 msgid "Removing temporary back up files"
 msgstr "Removing temporary backup files"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:687
+#: ../modules/backup-restore/evolution-backup-tool.c:664
 msgid "Reloading registry service"
 msgstr "Reloading registry service"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:914
+#: ../modules/backup-restore/evolution-backup-tool.c:866
 msgid "Evolution Back Up"
 msgstr "Evolution Back Up"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:915
+#: ../modules/backup-restore/evolution-backup-tool.c:867
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Backing up to the folder %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:919
+#: ../modules/backup-restore/evolution-backup-tool.c:871
 msgid "Evolution Restore"
 msgstr "Evolution Restore"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:920
+#: ../modules/backup-restore/evolution-backup-tool.c:872
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restoring from the folder %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:990
+#: ../modules/backup-restore/evolution-backup-tool.c:941
 msgid "Backing up Evolution Data"
 msgstr "Backing up Evolution Data"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:991
+#: ../modules/backup-restore/evolution-backup-tool.c:942
 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:993
+#: ../modules/backup-restore/evolution-backup-tool.c:944
 msgid "Restoring Evolution Data"
 msgstr "Restoring Evolution Data"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:994
+#: ../modules/backup-restore/evolution-backup-tool.c:945
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Please wait while Evolution restores your data."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:1016
+#: ../modules/backup-restore/evolution-backup-tool.c:967
 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."
 
@@ -15733,8 +20120,9 @@ msgid "Invalid Evolution backup file"
 msgstr "Invalid Evolution backup file"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Please select a valid backup file to restore."
-msgstr "Please select a valid backup file to restore."
+#| msgid "Invalid 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
 msgid "Are you sure you want to close Evolution?"
@@ -15749,8 +20137,9 @@ msgstr ""
 "make sure that you save any unsaved data before proceeding."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Close and Back up Evolution"
-msgstr "Close and Back Up Evolution"
+#| msgid "Close and Back up Evolution"
+msgid "Close and _Back up Evolution"
+msgstr "Close and _Back up Evolution"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid ""
@@ -15771,8 +20160,9 @@ msgstr ""
 "backup."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "Close and Restore Evolution"
-msgstr "Close and Restore Evolution"
+#| msgid "Close and Restore Evolution"
+msgid "Close and _Restore Evolution"
+msgstr "Close and _Restore Evolution"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid "Insufficient Permissions"
@@ -15782,88 +20172,116 @@ msgstr "Insufficient Permissions"
 msgid "The selected folder is not writable."
 msgstr "The selected folder is not writable."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:145
+#: ../modules/bogofilter/evolution-bogofilter.c:160
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Failed to spawn Bogofilter (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:163
+#: ../modules/bogofilter/evolution-bogofilter.c:178
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "Failed to stream mail message content to Bogofilter: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:212
+#: ../modules/bogofilter/evolution-bogofilter.c:227
 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:308
+#: ../modules/bogofilter/evolution-bogofilter.c:372
 msgid "Bogofilter Options"
 msgstr "Bogofilter Options"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:317
+#: ../modules/bogofilter/evolution-bogofilter.c:381
 msgid "Convert message text to _Unicode"
 msgstr "Convert message text to _Unicode"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:474
+#: ../modules/bogofilter/evolution-bogofilter.c:539
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+#| msgid "Junk filtering software:"
+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
+#| msgid "Label name cannot be empty."
+msgid "User name cannot be empty"
+msgstr "User name cannot be empty"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
 msgid "Standard LDAP Port"
 msgstr "Standard LDAP Port"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:625
-msgid "LDAP over SSL (deprecated)"
-msgstr "LDAP over SSL (deprecated)"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:631
+#| msgid "LDAP over SSL (deprecated)"
+msgid "LDAP over SSL/TLS (deprecated)"
+msgstr "LDAP over SSL/TLS (deprecated)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft Global Catalogue"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:465
-msgid "Microsoft Global Catalog over SSL"
-msgstr "Microsoft Global Catalogue over SSL"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+#| msgid "Microsoft Global Catalog over SSL"
+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:570
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:567
 msgid "Connecting to LDAP"
 msgstr "Connecting to LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:587
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:584
 msgid "Server Information"
 msgstr "Server Information"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:611
+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
+msgid "Port number is not valid"
+msgstr "Port number is not valid"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:634
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (recommended)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:630
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:636
 msgid "Encryption:"
 msgstr "Encryption:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:654
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:246
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:180
+#: ../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
 msgid "Authentication"
 msgstr "Authentication"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:680
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:686
 msgid "Using email address"
 msgstr "Using e-mail address"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
 msgid "Using distinguished name (DN)"
 msgstr "Using distinguished name (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:685
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Method:"
 msgstr "Method:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -15874,36 +20292,36 @@ msgstr ""
 "LDAP server."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:705
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:711
 msgid "Using LDAP"
 msgstr "Using LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
-#: ../modules/mail/e-mail-shell-view.c:115
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:728
+#: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "Searching"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:744
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:750
 msgid "Search Base:"
 msgstr "Search Base:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:749
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:754
 msgid "Find Possible Search Bases"
 msgstr "Find Possible Search Bases"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:774
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "One Level"
 msgstr "One Level"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 msgid "Subtree"
 msgstr "Subtree"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:780
 msgid "Search Scope:"
 msgstr "Search Scope:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:783
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:785
 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 "
@@ -15915,439 +20333,607 @@ msgstr ""
 "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:792
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
 msgid "Search Filter:"
 msgstr "Search Filter:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:804
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:806
 msgid "Downloading"
 msgstr "Downloading"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:827
 msgid "Limit:"
 msgstr "Limit:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:838
 msgid "contacts"
 msgstr "contacts"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:841
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:843
 msgid "Browse until limit is reached"
 msgstr "Browse until limit is reached"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:136
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:205
-#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:128
+#: ../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
+#| msgid "Label name cannot be empty."
+msgid "Server address cannot be empty"
+msgstr "Server address cannot be empty"
+
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:92
+#| msgid "New Address Book"
+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
 msgid "URL:"
 msgstr "URL:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:146
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:249
+#| msgid "Add Address Book"
+msgid "Find Address Books"
+msgstr "Find Address Books"
+
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:259
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Avoid IfMatch (needed on Apache < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
-#, c-format
-msgid "HTTP Error: %s"
-msgstr "HTTP Error: %s"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:475
-msgid "Could not parse response"
-msgstr "Could not parse response"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:484
-msgid "Empty response"
-msgstr "Empty response"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:492
-msgid "Unexpected reply from server"
-msgstr "Unexpected reply from server"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1124
-msgid "Could not locate user's calendars"
-msgstr "Could not locate user's calendars"
+#: ../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
+msgid "URL is not a valid http:// nor https:// URL"
+msgstr "URL is not a valid http:// nor https:// URL"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1348
-msgid "Path"
-msgstr "Path"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:200
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:109
+#: ../modules/cal-config-google/e-google-chooser-button.c:224
 msgid "Choose a Calendar"
 msgstr "Choose a Calendar"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:113
+#: ../modules/cal-config-google/e-google-chooser-button.c:228
 msgid "Choose a Memo List"
 msgstr "Choose a Memo List"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:117
+#: ../modules/cal-config-google/e-google-chooser-button.c:232
 msgid "Choose a Task List"
 msgstr "Choose a Task List"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:219
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:310
 msgid "Find Calendars"
 msgstr "Find Calendars"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:222
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
 msgid "Find Memo Lists"
 msgstr "Find Memo Lists"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:225
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
 msgid "Find Task Lists"
 msgstr "Find Task Lists"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:243
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:334
 msgid "Email:"
 msgstr "E-mail:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:248
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:339
 msgid "Server handles meeting invitations"
 msgstr "Server handles meeting invitations"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:71
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:70
 msgid "Choose which address books to use."
 msgstr "Choose which address books to use."
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:201
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Use in Birthdays & Anniversaries calendar"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:127
+#: ../modules/cal-config-google/e-google-chooser-button.c:143
 msgid "Default User Calendar"
 msgstr "Default User Calendar"
 
-#: ../modules/cal-config-google/e-google-chooser.c:508
-#, c-format
-msgid "Enter Google password for user '%s'."
-msgstr "Enter Google password for user '%s'."
-
-#: ../modules/cal-config-google/e-google-chooser.c:525
-msgid "User declined to provide a password"
-msgstr "User declined to provide a password"
-
-#: ../modules/cal-config-local/evolution-cal-config-local.c:160
+#: ../modules/cal-config-local/evolution-cal-config-local.c:158
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Use an existing iCalendar (ics) file"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:185
+#: ../modules/cal-config-local/evolution-cal-config-local.c:183
 msgid "iCalendar File"
 msgstr "iCalendar File"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:197
+#: ../modules/cal-config-local/evolution-cal-config-local.c:195
 msgid "Choose an iCalendar file"
 msgstr "Choose an iCalendar file"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:200
+#: ../modules/cal-config-local/evolution-cal-config-local.c:198
 msgid "File:"
 msgstr "File:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:215
+#: ../modules/cal-config-local/evolution-cal-config-local.c:213
 msgid "Allow Evolution to update the file"
 msgstr "Allow Evolution to update the file"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:318
+#. Translators: Please indicate whether your locale uses the
+#. * metric or imperial measurement system by changing this to
+#. * either "default:mm" or "default:inch", respectively.
+#. *
+#. * 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
+#| msgid "Default"
+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
+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
+msgid "Centigrade (°C)"
+msgstr "Centigrade (°C)"
+
+#. Translators: This is the temperature in kelvin.
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:267
+msgid "Kelvin (K)"
+msgstr "Kelvin (K)"
+
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
+#| msgid "_Units:"
+msgid "Units:"
+msgstr "Units:"
+
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:321
+#| msgid "Label name cannot be empty."
+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
 msgid "I_mport"
 msgstr "I_mport"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:404
+#: ../modules/calendar/e-cal-attachment-handler.c:337
+#| msgid "Importing data."
+msgid "Importing an event"
+msgstr "Importing an event"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+#| msgid "Importing mailbox"
+msgid "Importing a memo"
+msgstr "Importing a memo"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:345
+#| msgid "Importing data."
+msgid "Importing a task"
+msgstr "Importing a task"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:403
 msgid "Select a Calendar"
 msgstr "Select a Calendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:431
+#: ../modules/calendar/e-cal-attachment-handler.c:410
+#| msgid "D_elete Memo List"
+msgid "Select a Memo List"
+msgstr "Select a Memo List"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:417
 msgid "Select a Task List"
 msgstr "Select a Task List"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:441
+#: ../modules/calendar/e-cal-attachment-handler.c:424
 msgid "I_mport to Calendar"
 msgstr "I_mport to Calendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:448
-msgid "I_mport to Tasks"
-msgstr "I_mport to Tasks"
+#: ../modules/calendar/e-cal-attachment-handler.c:431
+#| msgid "I_mport to Tasks"
+msgid "I_mport to Memo List"
+msgstr "I_mport to Memo List"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:438
+#| msgid "I_mport to Tasks"
+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
+#, c-format
+#| msgid "Found the appointment in 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
+#, c-format
+#| msgid "Found the appointment in 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
+#, c-format
+#| msgid "Opening 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
+#, c-format
+#| msgid "Show memo preview below the memo list"
+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
+#, c-format
+#| msgid "Opening 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
+#, c-format
+#| msgid "Show task preview below the task list"
+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
+msgid "Calendar Selector"
+msgstr "Calendar Selector"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:692
+msgid "Memo List Selector"
+msgstr "Memo List Selector"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:697
+msgid "Task List Selector"
+msgstr "Task List Selector"
 
-#: ../modules/calendar/e-calendar-preferences.c:401
+#: ../modules/calendar/e-calendar-preferences.c:515
 msgid "Selected Calendars for Alarms"
 msgstr "Selected Calendars for Alarms"
 
-#: ../modules/calendar/e-calendar-preferences.c:822
+#: ../modules/calendar/e-calendar-preferences.c:611
+msgid "Meeting Invitations"
+msgstr "Meeting Invitations"
+
+#: ../modules/calendar/e-calendar-preferences.c:637
+msgid "_Delete message after acting"
+msgstr "_Delete message after acting"
+
+#: ../modules/calendar/e-calendar-preferences.c:651
+#: ../modules/calendar/e-calendar-preferences.c:682
+msgid "Conflict Search"
+msgstr "Conflict Search"
+
+#. Source selector
+#: ../modules/calendar/e-calendar-preferences.c:666
+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
 msgid "Ti_me and date:"
 msgstr "Ti_me and date:"
 
-#: ../modules/calendar/e-calendar-preferences.c:823
+#: ../modules/calendar/e-calendar-preferences.c:1065
 msgid "_Date only:"
 msgstr "_Date only:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Minutes"
 msgstr "Minutes"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Hours"
 msgstr "Hours"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Days"
 msgstr "Days"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "60 minutes"
 msgstr "60 minutes"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "30 minutes"
 msgstr "30 minutes"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "15 minutes"
 msgstr "15 minutes"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "10 minutes"
 msgstr "10 minutes"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
 msgid "05 minutes"
 msgstr "05 minutes"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Se_cond zone:"
 msgstr "Se_cond zone:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
+#: ../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:21
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Time _zone:"
+msgstr "Time _zone:"
+
+#: ../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:22
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
 msgid "Time format:"
 msgstr "Time format:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#: ../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:24
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
 msgid "_24 hour"
 msgstr "_24 hour"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Work Week"
 msgstr "Work Week"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../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:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Work days:"
 msgstr "Work days:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "_Day begins:"
 msgstr "_Day begins:"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
 msgid "_Mon"
 msgstr "_Mon"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "Monday"
+msgstr "Monday"
+
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "_Tue"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Tuesday"
+msgstr "Tuesday"
+
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "_Wed"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Wednesday"
+msgstr "Wednesday"
+
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "T_hu"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Thursday"
+msgstr "Thursday"
+
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "_Fri"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "Friday"
+msgstr "Friday"
+
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "_Sat"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Saturday"
+msgstr "Saturday"
+
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "S_un"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+msgid "Sunday"
+msgstr "Sunday"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:44
 msgid "Day _ends:"
 msgstr "Day _ends:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Alerts"
-msgstr "Alerts"
+#: ../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:46
-msgid "_Ask for confirmation when deleting items"
-msgstr "_Ask for confirmation when deleting items"
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
+#| msgid "Send Options"
+msgid "View Options"
+msgstr "View Options"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
 msgid "_Time divisions:"
 msgstr "_Time divisions:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:49
+#: ../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:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#| msgid "Show appointment end times in week and month views"
+msgid "Show appointment _icons in the month view"
+msgstr "Show appointment _icons in the month view"
+
+#: ../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:51
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Show week _numbers"
 msgstr "Show week _numbers"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../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:53
+#: ../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:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
+msgid "Alerts"
+msgstr "Alerts"
+
+#: ../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
 msgid "Display"
 msgstr "Display"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Task List"
 msgstr "Task List"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../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:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Highlight _overdue tasks"
 msgstr "Highlight _overdue tasks"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../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:63
+#: ../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
+#| msgid "Delete completed tasks"
+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:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Sh_ow a reminder"
 msgstr "Sh_ow a 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:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "before every appointment"
 msgstr "before every 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:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 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:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every anniversary/birthday"
 msgstr "before every anniversary/birthday"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+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"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:79
 msgid "Default Free/Busy Server"
 msgstr "Default Free/Busy Server"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
-msgid "Template:"
-msgstr "Template:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:82
 #, 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:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:83
 msgid "Publishing Information"
 msgstr "Publishing Information"
 
-#: ../modules/calendar/e-cal-shell-backend.c:308
-#: ../modules/calendar/e-cal-shell-view-actions.c:191
-msgid "New Calendar"
-msgstr "New Calendar"
-
-#: ../modules/calendar/e-cal-shell-backend.c:317
+#: ../modules/calendar/e-cal-shell-backend.c:114
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:319
-#: ../modules/calendar/e-cal-shell-view-actions.c:1545
+#: ../modules/calendar/e-cal-shell-backend.c:116
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:324
+#: ../modules/calendar/e-cal-shell-backend.c:121
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "All Day A_ppointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:326
+#: ../modules/calendar/e-cal-shell-backend.c:123
 msgid "Create a new all-day appointment"
 msgstr "Create a new all-day appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:331
+#: ../modules/calendar/e-cal-shell-backend.c:128
 msgctxt "New"
 msgid "M_eeting"
 msgstr "M_eeting"
 
-#: ../modules/calendar/e-cal-shell-backend.c:333
+#: ../modules/calendar/e-cal-shell-backend.c:130
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: ../modules/calendar/e-cal-shell-backend.c:341
+#: ../modules/calendar/e-cal-shell-backend.c:138
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:343
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-backend.c:140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:675
+#: ../modules/calendar/e-cal-shell-backend.c:257
 msgid "Calendar and Tasks"
 msgstr "Calendar and Tasks"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:565
-msgid "Calendar Selector"
-msgstr "Calendar Selector"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:868
-#, c-format
-msgid "Opening calendar '%s'"
-msgstr "Opening calendar '%s'"
+#: ../modules/calendar/e-cal-shell-view-actions.c:199
+msgid "Print"
+msgstr "Print"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:291
+#: ../modules/calendar/e-cal-shell-view-actions.c:285
 msgid "Calendar Properties"
 msgstr "Calendar Properties"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:322
+#: ../modules/calendar/e-cal-shell-view-actions.c:314
 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 "
@@ -16359,363 +20945,384 @@ 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:339
+#: ../modules/calendar/e-cal-shell-view-actions.c:331
 msgid "Purge events older than"
 msgstr "Purge events older than"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:588
-msgid "Copying Items"
-msgstr "Copying Items"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:881
-msgid "Moving Items"
-msgstr "Moving Items"
+#: ../modules/calendar/e-cal-shell-view-actions.c:926
+#| msgid "Make this Occurrence _Movable"
+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:1215
+#: ../modules/calendar/e-cal-shell-view-actions.c:1086
 msgid "event"
 msgstr "event"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1217
-#: ../modules/calendar/e-cal-shell-view-memopad.c:231
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:548
-#: ../modules/calendar/e-task-shell-view-actions.c:665
+#: ../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
 msgid "Save as iCalendar"
 msgstr "Save as iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
-#: ../modules/calendar/e-memo-shell-view-actions.c:629
+#: ../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
 msgid "_Copy..."
 msgstr "_Copy…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../modules/calendar/e-cal-shell-view-actions.c:1229
 msgid "D_elete Calendar"
 msgstr "D_elete Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1231
 msgid "Delete the selected calendar"
 msgstr "Delete the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1238
 msgid "Go Back"
 msgstr "Go Back"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1245
 msgid "Go Forward"
 msgstr "Go Forward"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
 msgid "Select today"
 msgstr "Select today"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "Select _Date"
 msgstr "Select _Date"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Select a specific date"
 msgstr "Select a specific date"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+#| msgid "_New Calendar..."
+msgid "_Manage Calendar groups..."
+msgstr "_Manage Calendar groups..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+msgid "Manage Calendar groups order and visibility"
+msgstr "Manage Calendar groups order and visibility"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 msgid "_New Calendar"
 msgstr "_New Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1431
-#: ../modules/calendar/e-task-shell-view-actions.c:837
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../modules/calendar/e-task-shell-view-actions.c:803
 msgid "Purg_e"
 msgstr "Purg_e"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Purge old appointments and meetings"
 msgstr "Purge old appointments and meetings"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1438
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
-#: ../modules/calendar/e-task-shell-view-actions.c:781
-msgid "Re_fresh"
-msgstr "Re_fresh"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Refresh the selected calendar"
 msgstr "Refresh the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
 msgid "Rename the selected calendar"
 msgstr "Rename the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
-msgid "Find _next"
-msgstr "Find _next"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#| msgid "Find _next"
+msgid "Find _Next"
+msgstr "Find _Next"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 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:1459
-msgid "Find _previous"
-msgstr "Find _previous"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#| msgid "Find _previous"
+msgid "Find _Previous"
+msgstr "Find _Previous"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 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:1466
-msgid "Stop _running search"
-msgstr "Stop _running search"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#| msgid "Stop _running search"
+msgid "Stop _Running Search"
+msgstr "Stop _Running Search"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Stop currently running search"
 msgstr "Stop currently running search"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1473
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#| msgid "Local Calendars"
+msgid "Sho_w All Calendars"
+msgstr "Sho_w All Calendars"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Show _Only This Calendar"
 msgstr "Show _Only This Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1480
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "Cop_y to Calendar..."
 msgstr "Cop_y to Calendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delegate Meeting..."
 msgstr "_Delegate Meeting…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1494
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "_Delete Appointment"
 msgstr "_Delete Appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete selected appointments"
 msgstr "Delete selected appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1501
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete This _Occurrence"
 msgstr "Delete This _Occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete this occurrence"
 msgstr "Delete this occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1508
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Delete All Occ_urrences"
 msgstr "Delete All Occ_urrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Delete all occurrences"
 msgstr "Delete all occurrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1515
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "New All Day _Event..."
 msgstr "New All Day _Event…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Create a new all day event"
 msgstr "Create a new all-day event"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1522
-#: ../modules/calendar/e-cal-shell-view-memopad.c:265
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../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
 msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1529
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "New _Meeting..."
 msgstr "New _Meeting…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Create a new meeting"
 msgstr "Create a new meeting"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1536
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1543
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "New _Appointment..."
 msgstr "New _Appointment…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "Make this Occurrence _Movable"
 msgstr "Make this Occurrence _Movable"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Open Appointment"
 msgstr "_Open Appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
 msgid "View the current appointment"
 msgstr "View the current appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "_Reply"
 msgstr "_Reply"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "_Schedule Meeting…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
 msgstr "Converts an appointment to a meeting"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1585
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_ert to Appointment…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
 msgstr "Converts a meeting to an appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1592
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "Quit"
 msgstr "Quit"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1712
+#: ../modules/calendar/e-cal-shell-view-actions.c:1581
 msgid "Day"
 msgstr "Day"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1714
+#: ../modules/calendar/e-cal-shell-view-actions.c:1583
 msgid "Show one day"
 msgstr "Show one day"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "List"
 msgstr "List"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1721
+#: ../modules/calendar/e-cal-shell-view-actions.c:1590
 msgid "Show as list"
 msgstr "Show as list"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
 msgid "Month"
 msgstr "Month"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
+#: ../modules/calendar/e-cal-shell-view-actions.c:1597
 msgid "Show one month"
 msgstr "Show one month"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1733
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
 msgid "Week"
 msgstr "Week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1735
+#: ../modules/calendar/e-cal-shell-view-actions.c:1604
 msgid "Show one week"
 msgstr "Show one week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1742
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Show one work week"
 msgstr "Show one work week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1750
+#: ../modules/calendar/e-cal-shell-view-actions.c:1619
 msgid "Active Appointments"
 msgstr "Active Appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1764
+#: ../modules/calendar/e-cal-shell-view-actions.c:1633
 msgid "Next 7 Days' Appointments"
 msgstr "Next 7 Days' Appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1771
+#: ../modules/calendar/e-cal-shell-view-actions.c:1640
 msgid "Occurs Less Than 5 Times"
 msgstr "Occurs Less Than 5 Times"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1802
-#: ../modules/calendar/e-memo-shell-view-actions.c:819
-#: ../modules/calendar/e-task-shell-view-actions.c:1018
+#: ../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
 msgid "Description contains"
 msgstr "Description contains"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1809
-#: ../modules/calendar/e-memo-shell-view-actions.c:826
-#: ../modules/calendar/e-task-shell-view-actions.c:1025
+#: ../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
 msgid "Summary contains"
 msgstr "Summary contains"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1821
+#: ../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
+#| msgid "_Print..."
+msgid "Print..."
+msgstr "Print..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1690
 msgid "Print this calendar"
 msgstr "Print this calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1828
+#: ../modules/calendar/e-cal-shell-view-actions.c:1697
 msgid "Preview the calendar to be printed"
 msgstr "Preview the calendar to be printed"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1850
-#: ../modules/calendar/e-cal-shell-view-memopad.c:306
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:393
-#: ../modules/calendar/e-memo-shell-view-actions.c:867
-#: ../modules/calendar/e-task-shell-view-actions.c:1066
+#: ../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
 msgid "_Save as iCalendar..."
 msgstr "_Save as iCalendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1927
+#: ../modules/calendar/e-cal-shell-view-actions.c:1796
 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:229
-#: ../modules/calendar/e-memo-shell-view-actions.c:546
+#: ../modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:496
 msgid "memo"
 msgstr "memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "New _Memo"
 msgstr "New _Memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-memo-shell-backend.c:219
-#: ../modules/calendar/e-memo-shell-view-actions.c:680
+#: ../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
 msgid "Create a new memo"
 msgstr "Create a new memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:279
-#: ../modules/calendar/e-memo-shell-view-actions.c:685
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:649
 msgid "_Open Memo"
 msgstr "_Open Memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:687
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:651
 msgid "View the selected memo"
 msgstr "View the selected memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:286
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-memo-shell-view-actions.c:692
-#: ../modules/calendar/e-task-shell-view-actions.c:830
+#: ../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
 msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:852
+#: ../modules/calendar/e-cal-shell-view-memopad.c:276
+#: ../modules/calendar/e-memo-shell-view-actions.c:824
 msgid "Print the selected memo"
 msgstr "Print the selected memo"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1509
+#: ../modules/calendar/e-cal-shell-view-private.c:816
 msgid "Searching next matching event"
 msgstr "Searching next matching event"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1510
+#: ../modules/calendar/e-cal-shell-view-private.c:817
 msgid "Searching previous matching event"
 msgstr "Searching previous matching event"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1531
+#: ../modules/calendar/e-cal-shell-view-private.c:838
 #, 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:1535
+#: ../modules/calendar/e-cal-shell-view-private.c:842
 #, 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:1560
+#: ../modules/calendar/e-cal-shell-view-private.c:865
 msgid "Cannot search with no active calendar"
 msgstr "Cannot search with no active calendar"
 
@@ -16723,237 +21330,222 @@ 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:296
-#: ../modules/calendar/e-task-shell-view-actions.c:663
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../modules/calendar/e-task-shell-view-actions.c:615
 msgid "task"
 msgstr "task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:677
 msgid "_Assign Task"
 msgstr "_Assign Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Mark as Complete"
 msgstr "_Mark as Complete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "Mark selected tasks as complete"
 msgstr "Mark selected tasks as complete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
 msgid "_Mark as Incomplete"
 msgstr "_Mark as Incomplete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:811
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Mark selected tasks as incomplete"
 msgstr "Mark selected tasks as incomplete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:782
 msgid "New _Task"
 msgstr "New _Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-task-shell-backend.c:216
-#: ../modules/calendar/e-task-shell-view-actions.c:818
+#: ../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
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:366
-#: ../modules/calendar/e-task-shell-view-actions.c:823
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:789
 msgid "_Open Task"
 msgstr "_Open Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:825
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:791
 msgid "View the selected task"
 msgstr "View the selected task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:385
-#: ../modules/calendar/e-task-shell-view-actions.c:1051
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:364
+#: ../modules/calendar/e-task-shell-view-actions.c:1025
 msgid "Print the selected task"
 msgstr "Print the selected task"
 
-#: ../modules/calendar/e-memo-shell-backend.c:208
-#: ../modules/calendar/e-memo-shell-view-actions.c:216
-msgid "New Memo List"
-msgstr "New Memo List"
-
-#: ../modules/calendar/e-memo-shell-backend.c:217
+#: ../modules/calendar/e-memo-shell-backend.c:79
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Mem_o"
 
-#: ../modules/calendar/e-memo-shell-backend.c:224
+#: ../modules/calendar/e-memo-shell-backend.c:86
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Shared Memo"
 
-#: ../modules/calendar/e-memo-shell-backend.c:226
+#: ../modules/calendar/e-memo-shell-backend.c:88
 msgid "Create a new shared memo"
 msgstr "Create a new shared memo"
 
-#: ../modules/calendar/e-memo-shell-backend.c:234
+#: ../modules/calendar/e-memo-shell-backend.c:96
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Memo Li_st"
 
-#: ../modules/calendar/e-memo-shell-backend.c:236
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-view-actions.c:602
 msgid "Create a new memo list"
 msgstr "Create a new memo list"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:499
-msgid "Memo List Selector"
-msgstr "Memo List Selector"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:755
-#, c-format
-msgid "Opening memo list '%s'"
-msgstr "Opening memo list '%s'"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:232
-#: ../modules/calendar/e-memo-shell-view-actions.c:247
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
 msgid "Print Memos"
 msgstr "Print Memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:288
+#: ../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:608
+#: ../modules/calendar/e-memo-shell-view-actions.c:558
 msgid "_Delete Memo"
 msgstr "_Delete Memo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:565
 msgid "_Find in Memo..."
 msgstr "_Find in Memo…"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:567
 msgid "Search for text in the displayed memo"
 msgstr "Search for text in the displayed memo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "D_elete Memo List"
 msgstr "D_elete Memo List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-memo-shell-view-actions.c:588
 msgid "Delete the selected memo list"
 msgstr "Delete the selected memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
+msgid "_Manage Memo List groups..."
+msgstr "_Manage Memo List groups..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:595
+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
 msgid "_New Memo List"
 msgstr "_New Memo List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
 msgid "Refresh the selected memo list"
 msgstr "Refresh the selected memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
 msgid "Rename the selected memo list"
 msgstr "Rename the selected memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Show _Only This Memo List"
 msgstr "Show _Only This Memo List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#| msgid "Show _Only This Memo List"
+msgid "Sho_w All Memo Lists"
+msgstr "Sho_w All Memo Lists"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:722
 msgid "Memo _Preview"
 msgstr "Memo _Preview"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:752
+#: ../modules/calendar/e-memo-shell-view-actions.c:724
 msgid "Show memo preview pane"
 msgstr "Show memo preview pane"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
+#: ../modules/calendar/e-memo-shell-view-actions.c:745
 msgid "Show memo preview below the memo list"
 msgstr "Show memo preview below the memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:780
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 msgid "Show memo preview alongside the memo list"
 msgstr "Show memo preview alongside the memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:838
+#: ../modules/calendar/e-memo-shell-view-actions.c:810
 msgid "Print the list of memos"
 msgstr "Print the list of memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:845
+#: ../modules/calendar/e-memo-shell-view-actions.c:817
 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:236
+#: ../modules/calendar/e-memo-shell-view.c:219
 msgid "Delete Memos"
 msgstr "Delete Memos"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../modules/calendar/e-memo-shell-view.c:221
 msgid "Delete Memo"
 msgstr "Delete Memo"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:465
+#: ../modules/calendar/e-memo-shell-view-private.c:369
 #, 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:469
-#: ../modules/calendar/e-task-shell-view-private.c:639
+#: ../modules/calendar/e-memo-shell-view-private.c:373
+#: ../modules/calendar/e-task-shell-view-private.c:550
 #, c-format
 msgid "%d selected"
 msgstr "%d selected"
 
-#: ../modules/calendar/e-task-shell-backend.c:205
-#: ../modules/calendar/e-task-shell-view-actions.c:239
-msgid "New Task List"
-msgstr "New Task List"
-
-#: ../modules/calendar/e-task-shell-backend.c:214
+#: ../modules/calendar/e-task-shell-backend.c:77
 msgctxt "New"
 msgid "_Task"
 msgstr "_Task"
 
-#: ../modules/calendar/e-task-shell-backend.c:221
+#: ../modules/calendar/e-task-shell-backend.c:84
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Assigne_d Task"
 
-#: ../modules/calendar/e-task-shell-backend.c:223
+#: ../modules/calendar/e-task-shell-backend.c:86
 msgid "Create a new assigned task"
 msgstr "Create a new assigned task"
 
-#: ../modules/calendar/e-task-shell-backend.c:231
+#: ../modules/calendar/e-task-shell-backend.c:94
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Tas_k List"
 
-#: ../modules/calendar/e-task-shell-backend.c:233
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-backend.c:96
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Create a new task list"
 msgstr "Create a new task list"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:499
-msgid "Task List Selector"
-msgstr "Task List Selector"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:755
-#, c-format
-msgid "Opening task list '%s'"
-msgstr "Opening task list '%s'"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:255
-#: ../modules/calendar/e-task-shell-view-actions.c:270
+#: ../modules/calendar/e-task-shell-view-actions.c:220
+#: ../modules/calendar/e-task-shell-view-actions.c:235
 msgid "Print Tasks"
 msgstr "Print Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:311
+#: ../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:607
+#: ../modules/calendar/e-task-shell-view-actions.c:559
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -16965,319 +21557,321 @@ msgstr ""
 "\n"
 "Really erase these tasks?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:614
+#: ../modules/calendar/e-task-shell-view-actions.c:566
 msgid "Do not ask me again"
 msgstr "Do not ask me again"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:732
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "_Delete Task"
 msgstr "_Delete Task"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "_Find in Task..."
 msgstr "_Find in Task…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:693
 msgid "Search for text in the displayed task"
 msgstr "Search for text in the displayed task"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:753
-msgid "Copy..."
-msgstr "Copy…"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "D_elete Task List"
 msgstr "D_elete Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:714
 msgid "Delete the selected task list"
 msgstr "Delete the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:719
+#| msgid "Task List Group"
+msgid "_Manage Task List groups..."
+msgstr "_Manage Task List groups..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "_New Task List"
 msgstr "_New Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Refresh the selected task list"
 msgstr "Refresh the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "Rename the selected task list"
 msgstr "Rename the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:754
+#| msgid "Show _Only This Task List"
+msgid "Sho_w All Task Lists"
+msgstr "Sho_w All Task Lists"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Show _Only This Task List"
 msgstr "Show _Only This Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-task-shell-view-actions.c:775
 msgid "Mar_k as Incomplete"
 msgstr "Mar_k as Incomplete"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:839
+#: ../modules/calendar/e-task-shell-view-actions.c:805
 msgid "Delete completed tasks"
 msgstr "Delete completed tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 msgid "Task _Preview"
 msgstr "Task _Preview"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/calendar/e-task-shell-view-actions.c:890
 msgid "Show task preview pane"
 msgstr "Show task preview pane"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:937
+#: ../modules/calendar/e-task-shell-view-actions.c:911
 msgid "Show task preview below the task list"
 msgstr "Show task preview below the task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:944
+#: ../modules/calendar/e-task-shell-view-actions.c:918
 msgid "Show task preview alongside the task list"
 msgstr "Show task preview alongside the task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:952
+#: ../modules/calendar/e-task-shell-view-actions.c:926
 msgid "Active Tasks"
 msgstr "Active Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Completed Tasks"
 msgstr "Completed Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Next 7 Days' Tasks"
 msgstr "Next 7 Days' Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/calendar/e-task-shell-view-actions.c:954
 msgid "Overdue Tasks"
 msgstr "Overdue Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/calendar/e-task-shell-view-actions.c:961
 msgid "Tasks with Attachments"
 msgstr "Tasks with Attachments"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1037
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
 msgid "Print the list of tasks"
 msgstr "Print the list of tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1044
+#: ../modules/calendar/e-task-shell-view-actions.c:1018
 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:371
+#: ../modules/calendar/e-task-shell-view.c:323
 msgid "Delete Tasks"
 msgstr "Delete Tasks"
 
-#: ../modules/calendar/e-task-shell-view.c:373
+#: ../modules/calendar/e-task-shell-view.c:325
 msgid "Delete Task"
 msgstr "Delete Task"
 
-#: ../modules/calendar/e-task-shell-view-private.c:524
-msgid "Expunging"
-msgstr "Expunging"
-
-#: ../modules/calendar/e-task-shell-view-private.c:635
+#: ../modules/calendar/e-task-shell-view-private.c:546
 #, 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:146
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:156
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:147
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:157
 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:235
+#: ../modules/itip-formatter/itip-view.c:260
 msgid "Today %H:%M"
 msgstr "Today %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:239
+#: ../modules/itip-formatter/itip-view.c:264
 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:248
+#: ../modules/itip-formatter/itip-view.c:273
 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:263
+#: ../modules/itip-formatter/itip-view.c:288
 msgid "Tomorrow %H:%M"
 msgstr "Tomorrow %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:267
+#: ../modules/itip-formatter/itip-view.c:292
 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:272
+#: ../modules/itip-formatter/itip-view.c:297
 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:276
+#: ../modules/itip-formatter/itip-view.c:301
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Tomorrow %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:295
+#: ../modules/itip-formatter/itip-view.c:320
 #, 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:300
+#: ../modules/itip-formatter/itip-view.c:325
 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:304
+#: ../modules/itip-formatter/itip-view.c:329
 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:309
+#: ../modules/itip-formatter/itip-view.c:334
 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:313
+#: ../modules/itip-formatter/itip-view.c:338
 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:322
+#: ../modules/itip-formatter/itip-view.c:347
 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:328
+#: ../modules/itip-formatter/itip-view.c:353
 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:332
+#: ../modules/itip-formatter/itip-view.c:357
 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:337
+#: ../modules/itip-formatter/itip-view.c:362
 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:341
+#: ../modules/itip-formatter/itip-view.c:366
 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:347
+#: ../modules/itip-formatter/itip-view.c:372
 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:352
+#: ../modules/itip-formatter/itip-view.c:377
 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:356
+#: ../modules/itip-formatter/itip-view.c:381
 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:361
+#: ../modules/itip-formatter/itip-view.c:386
 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:365
+#: ../modules/itip-formatter/itip-view.c:390
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l:%M:%S %p"
 
-#: ../modules/itip-formatter/itip-view.c:403
-#: ../modules/itip-formatter/itip-view.c:404
-#: ../modules/itip-formatter/itip-view.c:493
-#: ../modules/itip-formatter/itip-view.c:494
-#: ../modules/itip-formatter/itip-view.c:583
+#: ../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
 msgid "An unknown person"
 msgstr "An unknown person"
 
-#: ../modules/itip-formatter/itip-view.c:408
-#: ../modules/itip-formatter/itip-view.c:498
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../modules/itip-formatter/itip-view.c:433
+#: ../modules/itip-formatter/itip-view.c:523
+#: ../modules/itip-formatter/itip-view.c:612
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Please respond on behalf of %s"
 
-#: ../modules/itip-formatter/itip-view.c:410
-#: ../modules/itip-formatter/itip-view.c:500
-#: ../modules/itip-formatter/itip-view.c:589
+#: ../modules/itip-formatter/itip-view.c:435
+#: ../modules/itip-formatter/itip-view.c:525
+#: ../modules/itip-formatter/itip-view.c:614
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Received on behalf of %s"
 
-#: ../modules/itip-formatter/itip-view.c:415
+#: ../modules/itip-formatter/itip-view.c:440
 #, 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:417
+#: ../modules/itip-formatter/itip-view.c:442
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s has published the following meeting information:"
 
-#: ../modules/itip-formatter/itip-view.c:422
+#: ../modules/itip-formatter/itip-view.c:447
 #, 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:425
+#: ../modules/itip-formatter/itip-view.c:450
 #, 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:427
+#: ../modules/itip-formatter/itip-view.c:452
 #, 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:433
+#: ../modules/itip-formatter/itip-view.c:458
 #, 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:435
+#: ../modules/itip-formatter/itip-view.c:460
 #, 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:439
+#: ../modules/itip-formatter/itip-view.c:464
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -17286,87 +21880,89 @@ msgstr ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 
-#: ../modules/itip-formatter/itip-view.c:441
+#: ../modules/itip-formatter/itip-view.c:466
 #, 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:445
+#: ../modules/itip-formatter/itip-view.c:470
 #, 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:447
+#: ../modules/itip-formatter/itip-view.c:472
 #, 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:451
+#: ../modules/itip-formatter/itip-view.c:476
 #, c-format
-msgid "%s through %s has canceled the following meeting:"
+#| msgid "%s through %s has canceled the following meeting:"
+msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s through %s has cancelled the following meeting:"
 
-#: ../modules/itip-formatter/itip-view.c:453
+#: ../modules/itip-formatter/itip-view.c:478
 #, c-format
-msgid "%s has canceled the following meeting:"
+#| msgid "%s has canceled the following meeting:"
+msgid "%s has cancelled the following meeting:"
 msgstr "%s has cancelled the following meeting:"
 
-#: ../modules/itip-formatter/itip-view.c:457
+#: ../modules/itip-formatter/itip-view.c:482
 #, 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:459
+#: ../modules/itip-formatter/itip-view.c:484
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s has proposed the following meeting changes:"
 
-#: ../modules/itip-formatter/itip-view.c:463
+#: ../modules/itip-formatter/itip-view.c:488
 #, 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:465
+#: ../modules/itip-formatter/itip-view.c:490
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s has declined the following meeting changes:"
 
-#: ../modules/itip-formatter/itip-view.c:505
+#: ../modules/itip-formatter/itip-view.c:530
 #, 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:507
+#: ../modules/itip-formatter/itip-view.c:532
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s has published the following task:"
 
-#: ../modules/itip-formatter/itip-view.c:512
+#: ../modules/itip-formatter/itip-view.c:537
 #, 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:515
+#: ../modules/itip-formatter/itip-view.c:540
 #, 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:517
+#: ../modules/itip-formatter/itip-view.c:542
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s has assigned you a task:"
 
-#: ../modules/itip-formatter/itip-view.c:523
+#: ../modules/itip-formatter/itip-view.c:548
 #, 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:525
+#: ../modules/itip-formatter/itip-view.c:550
 #, 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:529
+#: ../modules/itip-formatter/itip-view.c:554
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -17375,334 +21971,341 @@ msgstr ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 
-#: ../modules/itip-formatter/itip-view.c:531
+#: ../modules/itip-formatter/itip-view.c:556
 #, 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:535
+#: ../modules/itip-formatter/itip-view.c:560
 #, 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:537
+#: ../modules/itip-formatter/itip-view.c:562
 #, 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:541
+#: ../modules/itip-formatter/itip-view.c:566
 #, c-format
-msgid "%s through %s has canceled the following assigned task:"
+#| msgid "%s through %s has canceled the following assigned task:"
+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:543
+#: ../modules/itip-formatter/itip-view.c:568
 #, c-format
-msgid "%s has canceled the following assigned task:"
+#| msgid "%s has canceled the following assigned task:"
+msgid "%s has cancelled the following assigned task:"
 msgstr "%s has cancelled the following assigned task:"
 
-#: ../modules/itip-formatter/itip-view.c:547
+#: ../modules/itip-formatter/itip-view.c:572
 #, 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:549
+#: ../modules/itip-formatter/itip-view.c:574
 #, 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:553
+#: ../modules/itip-formatter/itip-view.c:578
 #, 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:555
+#: ../modules/itip-formatter/itip-view.c:580
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s has declined the following assigned task:"
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:619
 #, 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:596
+#: ../modules/itip-formatter/itip-view.c:621
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s has published the following memo:"
 
-#: ../modules/itip-formatter/itip-view.c:601
+#: ../modules/itip-formatter/itip-view.c:626
 #, 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:603
+#: ../modules/itip-formatter/itip-view.c:628
 #, 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:607
+#: ../modules/itip-formatter/itip-view.c:632
 #, c-format
-msgid "%s through %s has canceled the following shared memo:"
+#| msgid "%s through %s has canceled the following shared memo:"
+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:609
+#: ../modules/itip-formatter/itip-view.c:634
 #, c-format
-msgid "%s has canceled the following shared memo:"
+#| msgid "%s has canceled the following shared memo:"
+msgid "%s has cancelled the following shared memo:"
 msgstr "%s has cancelled the following shared memo:"
 
-#: ../modules/itip-formatter/itip-view.c:682
+#: ../modules/itip-formatter/itip-view.c:893
 msgid "All day:"
 msgstr "All day:"
 
-#: ../modules/itip-formatter/itip-view.c:688
+#: ../modules/itip-formatter/itip-view.c:899
 msgid "Start day:"
 msgstr "Start day:"
 
-#: ../modules/itip-formatter/itip-view.c:688
-#: ../modules/itip-formatter/itip-view.c:1490
+#: ../modules/itip-formatter/itip-view.c:899
+#: ../modules/itip-formatter/itip-view.c:1725
 msgid "Start time:"
 msgstr "Start time:"
 
-#: ../modules/itip-formatter/itip-view.c:697
+#: ../modules/itip-formatter/itip-view.c:908
 msgid "End day:"
 msgstr "End day:"
 
-#: ../modules/itip-formatter/itip-view.c:697
-#: ../modules/itip-formatter/itip-view.c:1491
+#: ../modules/itip-formatter/itip-view.c:908
+#: ../modules/itip-formatter/itip-view.c:1726
 msgid "End time:"
 msgstr "End time:"
 
-#: ../modules/itip-formatter/itip-view.c:1016
+#: ../modules/itip-formatter/itip-view.c:1255
 msgid "Ope_n Calendar"
 msgstr "Ope_n Calendar"
 
-#: ../modules/itip-formatter/itip-view.c:1019
+#: ../modules/itip-formatter/itip-view.c:1258
 msgid "_Decline all"
 msgstr "_Decline all"
 
-#: ../modules/itip-formatter/itip-view.c:1022
+#: ../modules/itip-formatter/itip-view.c:1261
 msgid "_Decline"
 msgstr "_Decline"
 
-#: ../modules/itip-formatter/itip-view.c:1025
+#: ../modules/itip-formatter/itip-view.c:1264
 msgid "_Tentative all"
 msgstr "_Tentative all"
 
-#: ../modules/itip-formatter/itip-view.c:1028
+#: ../modules/itip-formatter/itip-view.c:1267
 msgid "_Tentative"
 msgstr "_Tentative"
 
-#: ../modules/itip-formatter/itip-view.c:1031
+#: ../modules/itip-formatter/itip-view.c:1270
 msgid "Acce_pt all"
 msgstr "Acce_pt all"
 
-#: ../modules/itip-formatter/itip-view.c:1034
+#: ../modules/itip-formatter/itip-view.c:1273
 msgid "Acce_pt"
 msgstr "Acce_pt"
 
-#: ../modules/itip-formatter/itip-view.c:1037
+#: ../modules/itip-formatter/itip-view.c:1276
 msgid "Send _Information"
 msgstr "Send _Information"
 
-#: ../modules/itip-formatter/itip-view.c:1040
+#: ../modules/itip-formatter/itip-view.c:1279
 msgid "_Update Attendee Status"
 msgstr "_Update Attendee Status"
 
-#: ../modules/itip-formatter/itip-view.c:1043
+#: ../modules/itip-formatter/itip-view.c:1282
+#: ../smime/gui/certificate-manager.c:1679
 msgid "_Update"
 msgstr "_Update"
 
-#: ../modules/itip-formatter/itip-view.c:1493
-#: ../modules/itip-formatter/itip-view.c:1541
-#: ../modules/itip-formatter/itip-view.c:1612
+#: ../modules/itip-formatter/itip-view.c:1728
+#: ../modules/itip-formatter/itip-view.c:1776
+#: ../modules/itip-formatter/itip-view.c:1847
 msgid "Comment:"
 msgstr "Comment:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1529
+#: ../modules/itip-formatter/itip-view.c:1764
 msgid "Send reply to sender"
 msgstr "Send reply to sender"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1544
+#: ../modules/itip-formatter/itip-view.c:1779
 msgid "Send _updates to attendees"
 msgstr "Send _updates to attendees"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1547
+#: ../modules/itip-formatter/itip-view.c:1782
 msgid "_Apply to all instances"
 msgstr "_Apply to all instances"
 
-#: ../modules/itip-formatter/itip-view.c:1548
+#: ../modules/itip-formatter/itip-view.c:1783
 msgid "Show time as _free"
 msgstr "Show time as _free"
 
-#: ../modules/itip-formatter/itip-view.c:1549
+#: ../modules/itip-formatter/itip-view.c:1784
 msgid "_Preserve my reminder"
 msgstr "_Preserve my reminder"
 
-#: ../modules/itip-formatter/itip-view.c:1550
+#: ../modules/itip-formatter/itip-view.c:1785
 msgid "_Inherit reminder"
 msgstr "_Inherit reminder"
 
-#: ../modules/itip-formatter/itip-view.c:1880
+#: ../modules/itip-formatter/itip-view.c:2102
 msgid "_Tasks:"
 msgstr "_Tasks:"
 
-#: ../modules/itip-formatter/itip-view.c:1883
+#: ../modules/itip-formatter/itip-view.c:2105
 msgid "_Memos:"
 msgstr "_Memos:"
 
-#: ../modules/itip-formatter/itip-view.c:3111
+#: ../modules/itip-formatter/itip-view.c:3059
 msgid "Sa_ve"
 msgstr "Sa_ve"
 
-#: ../modules/itip-formatter/itip-view.c:3682
+#: ../modules/itip-formatter/itip-view.c:3499
+#: ../modules/itip-formatter/itip-view.c:4955
+msgid "Attendee status updated"
+msgstr "Attendee status updated"
+
+#: ../modules/itip-formatter/itip-view.c:3664
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "An appointment in the calendar '%s' conflicts with this meeting"
 
-#: ../modules/itip-formatter/itip-view.c:3711
+#: ../modules/itip-formatter/itip-view.c:3694
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Found the appointment in the calendar '%s'"
 
-#: ../modules/itip-formatter/itip-view.c:3824
+#: ../modules/itip-formatter/itip-view.c:3828
 msgid "Unable to find any calendars"
 msgstr "Unable to find any calendars"
 
-#: ../modules/itip-formatter/itip-view.c:3832
+#: ../modules/itip-formatter/itip-view.c:3836
 msgid "Unable to find this meeting in any calendar"
 msgstr "Unable to find this meeting in any calendar"
 
-#: ../modules/itip-formatter/itip-view.c:3837
+#: ../modules/itip-formatter/itip-view.c:3841
 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:3842
+#: ../modules/itip-formatter/itip-view.c:3846
 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:4188
+#: ../modules/itip-formatter/itip-view.c:4190
 msgid "Opening the calendar. Please wait..."
 msgstr "Opening the calendar. Please wait…"
 
-#: ../modules/itip-formatter/itip-view.c:4193
+#: ../modules/itip-formatter/itip-view.c:4195
 msgid "Searching for an existing version of this appointment"
 msgstr "Searching for an existing version of this appointment"
 
-#: ../modules/itip-formatter/itip-view.c:4584
+#: ../modules/itip-formatter/itip-view.c:4594
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Unable to send item to calendar '%s'.  %s"
 
-#: ../modules/itip-formatter/itip-view.c:4600
+#: ../modules/itip-formatter/itip-view.c:4609
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sent to calendar '%s' as accepted"
 
-#: ../modules/itip-formatter/itip-view.c:4605
+#: ../modules/itip-formatter/itip-view.c:4614
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sent to calendar '%s' as tentative"
 
-#: ../modules/itip-formatter/itip-view.c:4611
+#: ../modules/itip-formatter/itip-view.c:4620
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sent to calendar '%s' as declined"
 
-#: ../modules/itip-formatter/itip-view.c:4617
+#: ../modules/itip-formatter/itip-view.c:4626
 #, c-format
-msgid "Sent to calendar '%s' as canceled"
+#| msgid "Sent to calendar '%s' as canceled"
+msgid "Sent to calendar '%s' as cancelled"
 msgstr "Sent to calendar '%s' as cancelled"
 
-#: ../modules/itip-formatter/itip-view.c:4638
-#: ../modules/itip-formatter/itip-view.c:5085
-#: ../modules/itip-formatter/itip-view.c:5192
+#: ../modules/itip-formatter/itip-view.c:4646
+#: ../modules/itip-formatter/itip-view.c:5092
+#: ../modules/itip-formatter/itip-view.c:5195
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Saving changes to the calendar. Please wait…"
 
-#: ../modules/itip-formatter/itip-view.c:4679
+#: ../modules/itip-formatter/itip-view.c:4687
 msgid "Unable to parse item"
 msgstr "Unable to parse item"
 
-#: ../modules/itip-formatter/itip-view.c:4872
+#: ../modules/itip-formatter/itip-view.c:4879
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organiser has removed the delegate %s "
 
-#: ../modules/itip-formatter/itip-view.c:4889
+#: ../modules/itip-formatter/itip-view.c:4896
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Sent a cancellation notice to the delegate"
 
-#: ../modules/itip-formatter/itip-view.c:4893
+#: ../modules/itip-formatter/itip-view.c:4900
 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:4944
+#: ../modules/itip-formatter/itip-view.c:4947
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Unable to update attendee. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4951
-msgid "Attendee status updated"
-msgstr "Attendee status updated"
-
-#: ../modules/itip-formatter/itip-view.c:4974
+#: ../modules/itip-formatter/itip-view.c:4982
 msgid "The meeting is invalid and cannot be updated"
 msgstr "The meeting is invalid and cannot be updated"
 
-#: ../modules/itip-formatter/itip-view.c:5050
+#: ../modules/itip-formatter/itip-view.c:5057
 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:5122
-#: ../modules/itip-formatter/itip-view.c:5162
+#: ../modules/itip-formatter/itip-view.c:5128
+#: ../modules/itip-formatter/itip-view.c:5166
 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:5225
+#: ../modules/itip-formatter/itip-view.c:5227
 msgid "Meeting information sent"
 msgstr "Meeting information sent"
 
-#: ../modules/itip-formatter/itip-view.c:5230
+#: ../modules/itip-formatter/itip-view.c:5232
 msgid "Task information sent"
 msgstr "Task information sent"
 
-#: ../modules/itip-formatter/itip-view.c:5235
+#: ../modules/itip-formatter/itip-view.c:5237
 msgid "Memo information sent"
 msgstr "Memo information sent"
 
-#: ../modules/itip-formatter/itip-view.c:5246
+#: ../modules/itip-formatter/itip-view.c:5248
 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:5251
+#: ../modules/itip-formatter/itip-view.c:5253
 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:5256
+#: ../modules/itip-formatter/itip-view.c:5258
 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:5321
+#: ../modules/itip-formatter/itip-view.c:5323
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5326
+#: ../modules/itip-formatter/itip-view.c:5328
 msgid "Save Calendar"
 msgstr "Save Calendar"
 
-#: ../modules/itip-formatter/itip-view.c:5379
-#: ../modules/itip-formatter/itip-view.c:5392
+#: ../modules/itip-formatter/itip-view.c:5376
+#: ../modules/itip-formatter/itip-view.c:5389
 msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
-#: ../modules/itip-formatter/itip-view.c:5380
-#: ../modules/itip-formatter/itip-view.c:5393
+#: ../modules/itip-formatter/itip-view.c:5377
+#: ../modules/itip-formatter/itip-view.c:5390
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17710,15 +22313,15 @@ msgstr ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5435
-#: ../modules/itip-formatter/itip-view.c:5465
-#: ../modules/itip-formatter/itip-view.c:5566
+#: ../modules/itip-formatter/itip-view.c:5432
+#: ../modules/itip-formatter/itip-view.c:5462
+#: ../modules/itip-formatter/itip-view.c:5565
 msgid "The item in the calendar is not valid"
 msgstr "The item in the calendar is not valid"
 
-#: ../modules/itip-formatter/itip-view.c:5436
-#: ../modules/itip-formatter/itip-view.c:5466
-#: ../modules/itip-formatter/itip-view.c:5567
+#: ../modules/itip-formatter/itip-view.c:5433
+#: ../modules/itip-formatter/itip-view.c:5463
+#: ../modules/itip-formatter/itip-view.c:5566
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17726,11 +22329,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:5481
+#: ../modules/itip-formatter/itip-view.c:5478
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
-#: ../modules/itip-formatter/itip-view.c:5482
+#: ../modules/itip-formatter/itip-view.c:5479
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17738,24 +22341,24 @@ msgstr ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 
-#: ../modules/itip-formatter/itip-view.c:5970
+#: ../modules/itip-formatter/itip-view.c:5974
 msgctxt "cal-itip"
 msgid "None"
 msgstr "None"
 
-#: ../modules/itip-formatter/itip-view.c:5986
+#: ../modules/itip-formatter/itip-view.c:5990
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
-#: ../modules/itip-formatter/itip-view.c:6129
+#: ../modules/itip-formatter/itip-view.c:6150
 msgid "This meeting recurs"
 msgstr "This meeting recurs"
 
-#: ../modules/itip-formatter/itip-view.c:6132
+#: ../modules/itip-formatter/itip-view.c:6153
 msgid "This task recurs"
 msgstr "This task recurs"
 
-#: ../modules/itip-formatter/itip-view.c:6135
+#: ../modules/itip-formatter/itip-view.c:6156
 msgid "This memo recurs"
 msgstr "This memo recurs"
 
@@ -17774,140 +22377,147 @@ 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}'?"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:82
-msgid "Meeting Invitations"
-msgstr "Meeting Invitations"
-
-#: ../modules/itip-formatter/plugin/config-ui.c:108
-msgid "_Delete message after acting"
-msgstr "_Delete message after acting"
-
-#: ../modules/itip-formatter/plugin/config-ui.c:122
-#: ../modules/itip-formatter/plugin/config-ui.c:153
-msgid "Conflict Search"
-msgstr "Conflict Search"
-
-#. Source selector
-#: ../modules/itip-formatter/plugin/config-ui.c:137
-msgid "Select the calendars to search for meeting conflicts"
-msgstr "Select the calendars to search for meeting conflicts"
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Itip Formatter"
-msgstr "Itip Formatter"
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "Display \"text/calendar\" MIME parts in mail messages."
-
-#: ../modules/mail-config/e-mail-config-google-summary.c:252
+#: ../modules/mail-config/e-mail-config-google-summary.c:265
 msgid "Google Features"
 msgstr "Google Features"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:261
+#: ../modules/mail-config/e-mail-config-google-summary.c:274
 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:269
+#: ../modules/mail-config/e-mail-config-google-summary.c:283
 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:277
+#: ../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:246
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#: ../modules/mail-config/e-mail-config-local-accounts.c:267
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
 msgid "Mail _Directory:"
 msgstr "Mail _Directory:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:247
+#: ../modules/mail-config/e-mail-config-local-accounts.c:268
 msgid "Choose a MH mail directory"
 msgstr "Choose a MH mail directory"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+#| msgid "Label name cannot be empty."
+msgid "MH mail directory cannot be empty"
+msgstr "MH mail directory cannot be empty"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:291
 msgid "Local Delivery _File:"
 msgstr "Local Delivery _File:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
 msgid "Choose a local delivery file"
 msgstr "Choose a local delivery file"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:293
+#: ../modules/mail-config/e-mail-config-local-accounts.c:294
+#| msgid "Label name cannot be empty."
+msgid "Local delivery file cannot be empty"
+msgstr "Local delivery file cannot be empty"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:316
 msgid "Choose a Maildir mail directory"
 msgstr "Choose a Maildir mail directory"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#: ../modules/mail-config/e-mail-config-local-accounts.c:318
+#| msgid "Label name cannot be empty."
+msgid "Maildir mail directory cannot be empty"
+msgstr "Maildir mail directory cannot be empty"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:339
 msgid "Spool _File:"
 msgstr "Spool _File:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:316
+#: ../modules/mail-config/e-mail-config-local-accounts.c:340
 msgid "Choose a mbox spool file"
 msgstr "Choose a mbox spool file"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+#: ../modules/mail-config/e-mail-config-local-accounts.c:342
+#| msgid "Label name cannot be empty."
+msgid "Mbox spool file cannot be empty"
+msgstr "Mbox spool file cannot be empty"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:363
 msgid "Spool _Directory:"
 msgstr "Spool _Directory:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:339
+#: ../modules/mail-config/e-mail-config-local-accounts.c:364
 msgid "Choose a mbox spool directory"
 msgstr "Choose a mbox spool directory"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:80
-#: ../modules/plugin-manager/evolution-plugin-manager.c:159
+#: ../modules/mail-config/e-mail-config-local-accounts.c:366
+#| msgid "Label name cannot be empty."
+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
 msgid "Configuration"
 msgstr "Configuration"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:98
+#: ../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
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:184
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:227
+#. do not reference
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:250
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:312
 msgid "User_name:"
 msgstr "User_name:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:214
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:148
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:264
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:326
+#| msgid "_Forget Passwords"
+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
 msgid "Encryption _method:"
 msgstr "Encryption _method:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:305
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:248
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS after connecting"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:233
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:167
-msgid "SSL on a dedicated port"
-msgstr "SSL on a dedicated port"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:309
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
+#| msgid "SSL on a dedicated port"
+msgid "TLS on a dedicated port"
+msgstr "TLS on a dedicated port"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:77
 msgid "_Use custom binary, instead of 'sendmail'"
 msgstr "_Use custom binary, instead of 'sendmail'"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:81
 msgid "_Custom binary:"
 msgstr "_Custom binary:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:100
 msgid "U_se custom arguments"
 msgstr "U_se custom arguments"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:104
 msgid "Cus_tom arguments:"
 msgstr "Cus_tom arguments:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:122
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
@@ -17917,518 +22527,651 @@ msgstr ""
 "   %F - stands for the From address\n"
 "   %R - stands for the recipient addresses"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:137
+#| msgid "Not available in offline mode"
+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
+#| msgid "Label name cannot be empty."
+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
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver requires authentication"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:209
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:294
 msgid "T_ype:"
 msgstr "T_ype:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:247
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:251
 msgid "Yahoo! Features"
 msgstr "Yahoo! Features"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:256
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:260
 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:404
+#: ../modules/mail/e-mail-attachment-handler.c:673
 #, 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:238
+#: ../modules/mail/e-mail-shell-backend.c:377
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: ../modules/mail/e-mail-shell-backend.c:240
+#: ../modules/mail/e-mail-shell-backend.c:379
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: ../modules/mail/e-mail-shell-backend.c:248
+#: ../modules/mail/e-mail-shell-backend.c:387
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Mail Acco_unt"
 
-#: ../modules/mail/e-mail-shell-backend.c:250
+#: ../modules/mail/e-mail-shell-backend.c:389
 msgid "Create a new mail account"
 msgstr "Create a new mail account"
 
-#: ../modules/mail/e-mail-shell-backend.c:255
+#: ../modules/mail/e-mail-shell-backend.c:394
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: ../modules/mail/e-mail-shell-backend.c:257
+#: ../modules/mail/e-mail-shell-backend.c:396
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: ../modules/mail/e-mail-shell-backend.c:555
+#. 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
+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
+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
+msgctxt "NetworkMonitor"
+msgid "networkmanager"
+msgstr "networkmanager"
+
+#: ../modules/mail/e-mail-shell-backend.c:749
+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
+#| msgid "Default"
+msgctxt "NetworkMonitor"
+msgid "Default"
+msgstr "Default"
+
+#. Always as the last
+#: ../modules/mail/e-mail-shell-backend.c:772
+#| msgid "Allow newlines"
+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:564
+#: ../modules/mail/e-mail-shell-backend.c:841
 msgid "Mail Preferences"
 msgstr "Mail Preferences"
 
-#: ../modules/mail/e-mail-shell-backend.c:573
+#: ../modules/mail/e-mail-shell-backend.c:850
 msgid "Composer Preferences"
 msgstr "Composer Preferences"
 
-#: ../modules/mail/e-mail-shell-backend.c:582
+#: ../modules/mail/e-mail-shell-backend.c:859
 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:883
+#. 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
 msgctxt "label"
 msgid "None"
 msgstr "None"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:736
+#| msgid "Mark all messages as read"
+msgid "Marking messages as read..."
+msgstr "Marking messages as read..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+#| msgid "Copy to Folder"
+msgid "Go to Folder"
+msgstr "Go to Folder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#| msgid "Select"
+msgid "_Select"
+msgstr "_Select"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1688
 msgid "_Disable Account"
 msgstr "_Disable Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1281
+#: ../modules/mail/e-mail-shell-view-actions.c:1690
 msgid "Disable this account"
 msgstr "Disable this account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1288
+#: ../modules/mail/e-mail-shell-view-actions.c:1697
 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:1295
+#: ../modules/mail/e-mail-shell-view-actions.c:1704
 msgid "Edit properties of this account"
 msgstr "Edit properties of this account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
-msgid "_Refresh"
-msgstr "_Refresh"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1302
+#: ../modules/mail/e-mail-shell-view-actions.c:1711
 msgid "Refresh list of folders of this account"
 msgstr "Refresh list of folders of this account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1716
 msgid "_Download Messages for Offline Usage"
 msgstr "_Download Messages for Offline Usage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1309
+#: ../modules/mail/e-mail-shell-view-actions.c:1718
 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:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1723
 msgid "Fl_ush Outbox"
 msgstr "Fl_ush Outbox"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1321
+#: ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "_Copy Folder To..."
 msgstr "_Copy Folder To…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1732
 msgid "Copy the selected folder into another folder"
 msgstr "Copy the selected folder into another folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Permanently remove this folder"
 msgstr "Permanently remove this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1335
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
 msgid "E_xpunge"
 msgstr "E_xpunge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1746
 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:1342
+#: ../modules/mail/e-mail-shell-view-actions.c:1751
+#: ../modules/mail/e-mail-shell-view-actions.c:1859
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_k All Messages as Read"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1344
+#: ../modules/mail/e-mail-shell-view-actions.c:1753
+#: ../modules/mail/e-mail-shell-view-actions.c:1861
 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:1349
+#: ../modules/mail/e-mail-shell-view-actions.c:1758
 msgid "_Move Folder To..."
 msgstr "_Move Folder To…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1351
+#: ../modules/mail/e-mail-shell-view-actions.c:1760
 msgid "Move the selected folder into another folder"
 msgstr "Move the selected folder into another folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1356
+#. Translators: An action caption to create a new mail folder
+#: ../modules/mail/e-mail-shell-view-actions.c:1766
 msgid "_New..."
 msgstr "_New…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1358
+#: ../modules/mail/e-mail-shell-view-actions.c:1768
 msgid "Create a new folder for storing mail"
 msgstr "Create a new folder for storing mail"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1365
+#: ../modules/mail/e-mail-shell-view-actions.c:1775
 msgid "Change the properties of this folder"
 msgstr "Change the properties of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1372
+#: ../modules/mail/e-mail-shell-view-actions.c:1782
 msgid "Refresh the folder"
 msgstr "Refresh the folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1379
+#: ../modules/mail/e-mail-shell-view-actions.c:1789
 msgid "Change the name of this folder"
 msgstr "Change the name of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1384
+#: ../modules/mail/e-mail-shell-view-actions.c:1794
 msgid "Select Message _Thread"
 msgstr "Select Message _Thread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1386
+#: ../modules/mail/e-mail-shell-view-actions.c:1796
 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:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1801
 msgid "Select Message S_ubthread"
 msgstr "Select Message S_ubthread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1393
+#: ../modules/mail/e-mail-shell-view-actions.c:1803
 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:1405
+#: ../modules/mail/e-mail-shell-view-actions.c:1815
 msgid "Empty _Trash"
 msgstr "Empty Was_tebasket"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1407
+#: ../modules/mail/e-mail-shell-view-actions.c:1817
 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:1412
+#: ../modules/mail/e-mail-shell-view-actions.c:1822
+#| msgid "Copy to Folder"
+msgid "Go to _Folder"
+msgstr "Go to _Folder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1824
+#| msgid "Click here to select folders to post to"
+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:1829
 msgid "_New Label"
 msgstr "_New Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1421
+#: ../modules/mail/e-mail-shell-view-actions.c:1838
 msgid "N_one"
 msgstr "N_one"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1852
 msgid "_Manage Subscriptions"
 msgstr "_Manage Subscriptions"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1854
+#: ../modules/mail/e-mail-shell-view-actions.c:1938
 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:1442
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1866
+#: ../modules/mail/e-mail-shell-view-actions.c:1887
 msgid "Send / _Receive"
 msgstr "Send / _Receive"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1444
+#: ../modules/mail/e-mail-shell-view-actions.c:1868
 msgid "Send queued items and retrieve new items"
 msgstr "Send queued items and retrieve new items"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1449
+#: ../modules/mail/e-mail-shell-view-actions.c:1873
 msgid "R_eceive All"
 msgstr "R_eceive All"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1451
+#: ../modules/mail/e-mail-shell-view-actions.c:1875
 msgid "Receive new items from all accounts"
 msgstr "Receive new items from all accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1456
+#: ../modules/mail/e-mail-shell-view-actions.c:1880
 msgid "_Send All"
 msgstr "_Send All"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1458
+#: ../modules/mail/e-mail-shell-view-actions.c:1882
 msgid "Send queued items in all accounts"
 msgstr "Send queued items in all accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1486
+#: ../modules/mail/e-mail-shell-view-actions.c:1910
 msgid "Cancel the current mail operation"
 msgstr "Cancel the current mail operation"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1915
 msgid "Collapse All _Threads"
 msgstr "Collapse All _Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1493
+#: ../modules/mail/e-mail-shell-view-actions.c:1917
 msgid "Collapse all message threads"
 msgstr "Collapse all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1498
+#: ../modules/mail/e-mail-shell-view-actions.c:1922
 msgid "E_xpand All Threads"
 msgstr "E_xpand All Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1500
+#: ../modules/mail/e-mail-shell-view-actions.c:1924
 msgid "Expand all message threads"
 msgstr "Expand all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1505
+#: ../modules/mail/e-mail-shell-view-actions.c:1929
 msgid "_Message Filters"
 msgstr "_Message Filters"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1507
+#: ../modules/mail/e-mail-shell-view-actions.c:1931
 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:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1936
 msgid "_Subscriptions..."
 msgstr "_Subscriptions…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1945
 msgid "F_older"
 msgstr "F_older"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1952
 msgid "_Label"
 msgstr "_Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1969
 msgid "C_reate Search Folder From Search..."
 msgstr "C_reate Search Folder From Search…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1552
+#: ../modules/mail/e-mail-shell-view-actions.c:1976
 msgid "Search F_olders"
 msgstr "Search F_olders"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1978
 msgid "Create or edit search folder definitions"
 msgstr "Create or edit search folder definitions"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1593
+#: ../modules/mail/e-mail-shell-view-actions.c:2017
 msgid "_New Folder..."
 msgstr "_New Folder…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:2045
 msgid "Show Message _Preview"
 msgstr "Show Message _Preview"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:2047
 msgid "Show message preview pane"
 msgstr "Show message preview pane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1629
+#: ../modules/mail/e-mail-shell-view-actions.c:2053
+msgid "Show _Attachment Bar"
+msgstr "Show _Attachment Bar"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2055
+#| msgid "Show message preview below the message list"
+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"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2061
 msgid "Show _Deleted Messages"
 msgstr "Show _Deleted Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:2063
 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:1637
+#: ../modules/mail/e-mail-shell-view-actions.c:2069
+#| msgid "Show Hidde_n Messages"
+msgid "Show _Junk Messages"
+msgstr "Show _Junk Messages"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2071
+#| msgid "Show deleted messages with a line through them"
+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:2077
 msgid "_Group By Threads"
 msgstr "_Group By Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1639
+#: ../modules/mail/e-mail-shell-view-actions.c:2079
 msgid "Threaded message list"
 msgstr "Threaded message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:2085
 msgid "_Unmatched Folder Enabled"
 msgstr "_Unmatched Folder Enabled"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1647
+#: ../modules/mail/e-mail-shell-view-actions.c:2087
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Toggles whether Unmatched search folder is enabled"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1667
+#: ../modules/mail/e-mail-shell-view-actions.c:2107
 msgid "Show message preview below the message list"
 msgstr "Show message preview below the message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1674
+#: ../modules/mail/e-mail-shell-view-actions.c:2114
 msgid "Show message preview alongside the message list"
 msgstr "Show message preview alongside the message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:2122
 msgid "All Messages"
 msgstr "All Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:2129
 msgid "Important Messages"
 msgstr "Important Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:2136
 msgid "Last 5 Days' Messages"
 msgstr "Last 5 Days' Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:2143
 msgid "Messages Not Junk"
 msgstr "Messages Not Junk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1710
+#: ../modules/mail/e-mail-shell-view-actions.c:2150
 msgid "Messages with Attachments"
 msgstr "Messages with Attachments"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:2157
+#| msgid "Messages with Attachments"
+msgid "Messages with Notes"
+msgstr "Messages with Notes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2164
 msgid "No Label"
 msgstr "No Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
+#: ../modules/mail/e-mail-shell-view-actions.c:2171
 msgid "Read Messages"
 msgstr "Read Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:2178
 msgid "Unread Messages"
 msgstr "Unread Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1783
+#: ../modules/mail/e-mail-shell-view-actions.c:2185
+#| msgid "Message Header"
+msgid "Message Thread"
+msgstr "Message Thread"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2245
 msgid "Subject or Addresses contain"
 msgstr "Subject or Addresses contain"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1793
+#: ../modules/mail/e-mail-shell-view-actions.c:2255
 msgid "All Accounts"
 msgstr "All Accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1800
+#: ../modules/mail/e-mail-shell-view-actions.c:2262
 msgid "Current Account"
 msgstr "Current Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1807
+#: ../modules/mail/e-mail-shell-view-actions.c:2269
 msgid "Current Folder"
 msgstr "Current Folder"
 
-#: ../modules/mail/e-mail-shell-view.c:616
+#: ../modules/mail/e-mail-shell-view.c:779
 msgid "All Account Search"
 msgstr "All Account Search"
 
-#: ../modules/mail/e-mail-shell-view.c:717
+#: ../modules/mail/e-mail-shell-view.c:887
 msgid "Account Search"
 msgstr "Account Search"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1022
+#: ../modules/mail/e-mail-shell-view-private.c:953
 #, 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:1033
+#: ../modules/mail/e-mail-shell-view-private.c:962
+#: ../modules/mail/e-mail-shell-view-private.c:979
 #, 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:1039
-#: ../modules/mail/e-mail-shell-view-private.c:1046
+#: ../modules/mail/e-mail-shell-view-private.c:988
+#: ../modules/mail/e-mail-shell-view-private.c:994
 #, 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:1052
+#: ../modules/mail/e-mail-shell-view-private.c:1001
 #, 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:1058
+#: ../modules/mail/e-mail-shell-view-private.c:1007
 #, 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:1064
+#: ../modules/mail/e-mail-shell-view-private.c:1013
 #, 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:1076
-#, 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:1079
+#: ../modules/mail/e-mail-shell-view-private.c:1030
 #, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d total"
-msgstr[1] "%d total"
+#| msgid "%d unread, "
+#| msgid_plural "%d unread, "
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d unread"
+msgstr[1] "%d unread"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1102
-msgid "Trash"
-msgstr "Wastebasket"
-
-#: ../modules/mail/e-mail-shell-view-private.c:1518
+#: ../modules/mail/e-mail-shell-view-private.c:1548
 msgid "Send / Receive"
 msgstr "Send / Receive"
 
-#: ../modules/mail/em-composer-prefs.c:492
+#: ../modules/mail/em-composer-prefs.c:413
+#| msgid "Select Folder"
+msgid "Select Folder to Add"
+msgstr "Select Folder to Add"
+
+#: ../modules/mail/em-composer-prefs.c:883
+msgid "Folder"
+msgstr "Folder"
+
+#: ../modules/mail/em-composer-prefs.c:919
+#| msgid "Recipients"
+msgid "Recipient"
+msgstr "Recipient"
+
+#: ../modules/mail/em-composer-prefs.c:1204
+#| msgid "_Save to Outbox"
+msgid "Keep in Outbox"
+msgstr "Keep in Outbox"
+
+#: ../modules/mail/em-composer-prefs.c:1205
+#| msgid "Send private reply?"
+msgid "Send immediately"
+msgstr "Send immediately"
+
+#: ../modules/mail/em-composer-prefs.c:1206
+#| msgid "15 minutes"
+msgid "Send after 5 minutes"
+msgstr "Send after 5 minutes"
+
+#: ../modules/mail/em-composer-prefs.c:1285
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "On exit, every time"
 msgstr "On exit, every time"
 
+#: ../modules/mail/em-mailer-prefs.c:80
+#| msgid "On exit, once per day"
+msgid "Once per day"
+msgstr "Once per day"
+
 #: ../modules/mail/em-mailer-prefs.c:81
-msgid "On exit, once per day"
-msgstr "On exit, once per day"
+#| msgid "On exit, once per week"
+msgid "Once per week"
+msgstr "Once per week"
 
 #: ../modules/mail/em-mailer-prefs.c:82
-msgid "On exit, once per week"
-msgstr "On exit, once per week"
+#| msgid "On exit, once per month"
+msgid "Once per month"
+msgstr "Once per month"
 
 #: ../modules/mail/em-mailer-prefs.c:83
-msgid "On exit, once per month"
-msgstr "On exit, once per month"
-
-#: ../modules/mail/em-mailer-prefs.c:84
 msgid "Immediately, on folder leave"
 msgstr "Immediately, on folder leave"
 
-#: ../modules/mail/em-mailer-prefs.c:313
+#: ../modules/mail/em-mailer-prefs.c:420
 msgid "Header"
 msgstr "Header"
 
-#: ../modules/mail/em-mailer-prefs.c:317
+#: ../modules/mail/em-mailer-prefs.c:424
 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:1141
+#: ../modules/mail/em-mailer-prefs.c:1560
 msgid "_Date header:"
 msgstr "_Date header:"
 
-#: ../modules/mail/em-mailer-prefs.c:1142
+#: ../modules/mail/em-mailer-prefs.c:1561
 msgid "Show _original header value"
 msgstr "Show _original header value"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#: ../modules/mailto-handler/evolution-mailto-handler.c:140
 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:311
+#: ../modules/mdn/evolution-mdn.c:304
 #, 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."
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:378
+#: ../modules/mdn/evolution-mdn.c:370
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "Delivery Notification for \"%s\""
 
-#: ../modules/mdn/evolution-mdn.c:536
+#: ../modules/mdn/evolution-mdn.c:534
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Send a read receipt to '%s'"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:541
+#: ../modules/mdn/evolution-mdn.c:539
 msgid "_Notify Sender"
 msgstr "_Notify Sender"
 
@@ -18460,88 +23203,68 @@ msgstr ""
 "Evolution will return to online mode once a network connection is "
 "established."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:298
-msgid ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain an authentication token."
-msgstr ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain an authentication token."
-
-#: ../modules/online-accounts/camel-sasl-xoauth.c:380
-msgid "OAuth"
-msgstr "OAuth"
-
-#: ../modules/online-accounts/camel-sasl-xoauth.c:382
-msgid ""
-"This option will connect to the server by way of the GNOME Online Accounts "
-"service"
-msgstr ""
-"This option will connect to the server by way of the GNOME Online Accounts "
-"service"
-
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Author(s)"
 msgstr "Author(s)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:254
+#: ../modules/plugin-manager/evolution-plugin-manager.c:253
 msgid "Plugin Manager"
 msgstr "Plugin Manager"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:269
+#: ../modules/plugin-manager/evolution-plugin-manager.c:268
 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:298
+#: ../modules/plugin-manager/evolution-plugin-manager.c:296
 msgid "Overview"
 msgstr "Overview"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:367
-#: ../modules/plugin-manager/evolution-plugin-manager.c:450
+#: ../modules/plugin-manager/evolution-plugin-manager.c:365
+#: ../modules/plugin-manager/evolution-plugin-manager.c:448
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
 msgid "_Plugins"
 msgstr "_Plugins"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
 msgid "Enable and disable plugins"
 msgstr "Enable and disable plugins"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
 msgid "Display plain text version"
 msgstr "Display plain text version"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:141
 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:148
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
 msgid "Display HTML version"
 msgstr "Display HTML version"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:150
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:149
 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:78
-#: ../modules/prefer-plain/plugin/config-ui.c:44
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/plugin/config-ui.c:37
 msgid "Show HTML if present"
 msgstr "Show HTML if present"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
-#: ../modules/prefer-plain/plugin/config-ui.c:45
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:80
+#: ../modules/prefer-plain/plugin/config-ui.c:38
 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:82
-#: ../modules/prefer-plain/plugin/config-ui.c:48
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:41
 msgid "Show plain text if present"
 msgstr "Show plain text if present"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:49
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:84
+#: ../modules/prefer-plain/plugin/config-ui.c:42
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -18549,13 +23272,27 @@ 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:87
-#: ../modules/prefer-plain/plugin/config-ui.c:53
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/plugin/config-ui.c:46
+#| msgid "Show plain text if present"
+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
+#| msgid ""
+#| "Show plain text part, if present, otherwise let Evolution choose the best "
+#| "part to show."
+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
 msgid "Only ever show plain text"
 msgstr "Only ever show plain text"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
-#: ../modules/prefer-plain/plugin/config-ui.c:54
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:94
+#: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -18563,11 +23300,11 @@ msgstr ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 
-#: ../modules/prefer-plain/plugin/config-ui.c:105
+#: ../modules/prefer-plain/plugin/config-ui.c:103
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Show s_uppressed HTML parts as attachments"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:127
+#: ../modules/prefer-plain/plugin/config-ui.c:125
 msgid "HTML _Mode"
 msgstr "HTML _Mode"
 
@@ -18584,60 +23321,66 @@ msgstr "Plain Text Mode"
 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:184
+#: ../modules/spamassassin/evolution-spamassassin.c:187
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "Failed to spawn SpamAssassin (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:207
+#: ../modules/spamassassin/evolution-spamassassin.c:210
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "Failed to stream mail message content to SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:226
+#: ../modules/spamassassin/evolution-spamassassin.c:229
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "Failed to write '%s' to SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:254
+#: ../modules/spamassassin/evolution-spamassassin.c:257
 msgid "Failed to read output from SpamAssassin: "
 msgstr "Failed to read output from SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:309
+#: ../modules/spamassassin/evolution-spamassassin.c:312
 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:747
+#: ../modules/spamassassin/evolution-spamassassin.c:535
 msgid "SpamAssassin Options"
 msgstr "SpamAssassin Options"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:762
+#: ../modules/spamassassin/evolution-spamassassin.c:550
 msgid "I_nclude remote tests"
 msgstr "I_nclude remote tests"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:776
+#: ../modules/spamassassin/evolution-spamassassin.c:564
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "This will make SpamAssassin more reliable, but slower."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1033
+#: ../modules/spamassassin/evolution-spamassassin.c:739
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+#| msgid "Junk filtering software:"
+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:262
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
+#: ../modules/startup-wizard/e-mail-config-import-page.c:270
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
 msgid "Importing Files"
 msgstr "Importing Files"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:261
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:258
 msgid "Import cancelled."
 msgstr "Import cancelled."
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:278
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:275
 msgid "Import complete."
 msgstr "Import complete."
 
-#: ../modules/startup-wizard/e-startup-assistant.c:156
+#: ../modules/startup-wizard/e-startup-assistant.c:155
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -18649,7 +23392,7 @@ 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:239
+#: ../modules/startup-wizard/evolution-startup-wizard.c:228
 msgid "Loading accounts..."
 msgstr "Loading accounts…"
 
@@ -18661,273 +23404,261 @@ msgstr "_Format as…"
 msgid "_Other languages"
 msgstr "_Other languages"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:371
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
 msgid "Text Highlight"
 msgstr "Text Highlight"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:372
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:439
 msgid "Syntax highlighting of mail parts"
 msgstr "Syntax highlighting of mail parts"
 
-#: ../modules/text-highlight/languages.c:32
+#: ../modules/text-highlight/languages.c:31
 msgid "_Plain text"
 msgstr "_Plain text"
 
-#: ../modules/text-highlight/languages.c:38
+#: ../modules/text-highlight/languages.c:37
 msgid "_Assembler"
 msgstr "_Assembler"
 
-#: ../modules/text-highlight/languages.c:43
+#: ../modules/text-highlight/languages.c:42
 msgid "_Bash"
 msgstr "_Bash"
 
-#: ../modules/text-highlight/languages.c:54
+#: ../modules/text-highlight/languages.c:53
 msgid "_C/C++"
 msgstr "_C/C++"
 
-#: ../modules/text-highlight/languages.c:63
+#: ../modules/text-highlight/languages.c:62
 msgid "_C#"
 msgstr "_C#"
 
-#: ../modules/text-highlight/languages.c:68
+#: ../modules/text-highlight/languages.c:67
 msgid "_Cascade Style Sheet"
 msgstr "_Cascade Style Sheet"
 
-#: ../modules/text-highlight/languages.c:73
-msgid "_HTML"
-msgstr "_HTML"
-
-#: ../modules/text-highlight/languages.c:81
+#: ../modules/text-highlight/languages.c:80
 msgid "_Java"
 msgstr "_Java"
 
-#: ../modules/text-highlight/languages.c:87
+#: ../modules/text-highlight/languages.c:86
 msgid "_JavaScript"
 msgstr "_JavaScript"
 
-#: ../modules/text-highlight/languages.c:93
+#: ../modules/text-highlight/languages.c:92
 msgid "_Patch/diff"
 msgstr "_Patch/diff"
 
-#: ../modules/text-highlight/languages.c:99
+#: ../modules/text-highlight/languages.c:98
 msgid "_Perl"
 msgstr "_Perl"
 
-#: ../modules/text-highlight/languages.c:110
+#: ../modules/text-highlight/languages.c:109
 msgid "_PHP"
 msgstr "_PHP"
 
-#: ../modules/text-highlight/languages.c:123
+#: ../modules/text-highlight/languages.c:122
 msgid "_Python"
 msgstr "_Python"
 
-#: ../modules/text-highlight/languages.c:128
+#: ../modules/text-highlight/languages.c:127
 msgid "_Ruby"
 msgstr "_Ruby"
 
-#: ../modules/text-highlight/languages.c:135
+#: ../modules/text-highlight/languages.c:134
 msgid "_Tcl/Tk"
 msgstr "_Tcl/Tk"
 
-#: ../modules/text-highlight/languages.c:141
+#: ../modules/text-highlight/languages.c:140
 msgid "_TeX/LaTeX"
 msgstr "_TeX/LaTeX"
 
-#: ../modules/text-highlight/languages.c:147
+#: ../modules/text-highlight/languages.c:146
 msgid "_Vala"
 msgstr "_Vala"
 
-#: ../modules/text-highlight/languages.c:152
+#: ../modules/text-highlight/languages.c:151
 msgid "_Visual Basic"
 msgstr "_Visual Basic"
 
-#: ../modules/text-highlight/languages.c:159
+#: ../modules/text-highlight/languages.c:158
 msgid "_XML"
 msgstr "_XML"
 
-#: ../modules/text-highlight/languages.c:177
+#: ../modules/text-highlight/languages.c:176
 msgid "_ActionScript"
 msgstr "_ActionScript"
 
-#: ../modules/text-highlight/languages.c:182
+#: ../modules/text-highlight/languages.c:181
 msgid "_ADA95"
 msgstr "_ADA95"
 
-#: ../modules/text-highlight/languages.c:189
+#: ../modules/text-highlight/languages.c:188
 msgid "_ALGOL 68"
 msgstr "_ALGOL 68"
 
-#: ../modules/text-highlight/languages.c:194
+#: ../modules/text-highlight/languages.c:193
 msgid "(_G)AWK"
 msgstr "(_G)AWK"
 
-#: ../modules/text-highlight/languages.c:199
+#: ../modules/text-highlight/languages.c:198
 msgid "_COBOL"
 msgstr "_COBOL"
 
-#: ../modules/text-highlight/languages.c:204
+#: ../modules/text-highlight/languages.c:203
 msgid "_DOS Batch"
 msgstr "_DOS Batch"
 
-#: ../modules/text-highlight/languages.c:209
+#: ../modules/text-highlight/languages.c:208
 msgid "_D"
 msgstr "_D"
 
-#: ../modules/text-highlight/languages.c:214
+#: ../modules/text-highlight/languages.c:213
 msgid "_Erlang"
 msgstr "_Erlang"
 
-#: ../modules/text-highlight/languages.c:219
+#: ../modules/text-highlight/languages.c:218
 msgid "_FORTRAN 77"
 msgstr "_FORTRAN 77"
 
-#: ../modules/text-highlight/languages.c:225
+#: ../modules/text-highlight/languages.c:224
 msgid "_FORTRAN 90"
 msgstr "_FORTRAN 90"
 
-#: ../modules/text-highlight/languages.c:230
+#: ../modules/text-highlight/languages.c:229
 msgid "_F#"
 msgstr "_F#"
 
-#: ../modules/text-highlight/languages.c:235
+#: ../modules/text-highlight/languages.c:234
 msgid "_Go"
 msgstr "_Go"
 
-#: ../modules/text-highlight/languages.c:240
+#: ../modules/text-highlight/languages.c:239
 msgid "_Haskell"
 msgstr "_Haskell"
 
-#: ../modules/text-highlight/languages.c:245
+#: ../modules/text-highlight/languages.c:244
 msgid "_JSP"
 msgstr "_JSP"
 
-#: ../modules/text-highlight/languages.c:250
+#: ../modules/text-highlight/languages.c:249
 msgid "_Lisp"
 msgstr "_Lisp"
 
-#: ../modules/text-highlight/languages.c:258
+#: ../modules/text-highlight/languages.c:257
 msgid "_Lotus"
 msgstr "_Lotus"
 
-#: ../modules/text-highlight/languages.c:263
+#: ../modules/text-highlight/languages.c:262
 msgid "_Lua"
 msgstr "_Lua"
 
-#: ../modules/text-highlight/languages.c:268
+#: ../modules/text-highlight/languages.c:267
 msgid "_Maple"
 msgstr "_Maple"
 
-#: ../modules/text-highlight/languages.c:273
+#: ../modules/text-highlight/languages.c:272
 msgid "_Matlab"
 msgstr "_Matlab"
 
-#: ../modules/text-highlight/languages.c:278
+#: ../modules/text-highlight/languages.c:277
 msgid "_Maya"
 msgstr "_Maya"
 
-#: ../modules/text-highlight/languages.c:283
+#: ../modules/text-highlight/languages.c:282
 msgid "_Oberon"
 msgstr "_Oberon"
 
-#: ../modules/text-highlight/languages.c:288
+#: ../modules/text-highlight/languages.c:287
 msgid "_Objective C"
 msgstr "_Objective C"
 
-#: ../modules/text-highlight/languages.c:294
+#: ../modules/text-highlight/languages.c:293
 msgid "_OCaml"
 msgstr "_OCaml"
 
-#: ../modules/text-highlight/languages.c:299
+#: ../modules/text-highlight/languages.c:298
 msgid "_Octave"
 msgstr "_Octave"
 
-#: ../modules/text-highlight/languages.c:304
+#: ../modules/text-highlight/languages.c:303
 msgid "_Object Script"
 msgstr "_Object Script"
 
-#: ../modules/text-highlight/languages.c:309
+#: ../modules/text-highlight/languages.c:308
 msgid "_Pascal"
 msgstr "_Pascal"
 
-#: ../modules/text-highlight/languages.c:314
+#: ../modules/text-highlight/languages.c:313
 msgid "_POV-Ray"
 msgstr "_POV-Ray"
 
-#: ../modules/text-highlight/languages.c:319
+#: ../modules/text-highlight/languages.c:318
 msgid "_Prolog"
 msgstr "_Prolog"
 
-#: ../modules/text-highlight/languages.c:324
-msgid "_PostScript"
-msgstr "_PostScript"
-
-#: ../modules/text-highlight/languages.c:329
+#: ../modules/text-highlight/languages.c:323
 msgid "_R"
 msgstr "_R"
 
-#: ../modules/text-highlight/languages.c:334
+#: ../modules/text-highlight/languages.c:328
 msgid "_RPM Spec"
 msgstr "_RPM Spec"
 
-#: ../modules/text-highlight/languages.c:339
+#: ../modules/text-highlight/languages.c:333
 msgid "_Scala"
 msgstr "_Scala"
 
-#: ../modules/text-highlight/languages.c:344
+#: ../modules/text-highlight/languages.c:338
 msgid "_Smalltalk"
 msgstr "_Smalltalk"
 
-#: ../modules/text-highlight/languages.c:350
+#: ../modules/text-highlight/languages.c:344
 msgid "_TCSH"
 msgstr "_TCSH"
 
-#: ../modules/text-highlight/languages.c:355
+#: ../modules/text-highlight/languages.c:349
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:126
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:194
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
+#: ../modules/vcard-inline/e-mail-part-vcard.c:187
 msgid "Show F_ull vCard"
 msgstr "Show F_ull vCard"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:129
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:212
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:134
+#: ../modules/vcard-inline/e-mail-part-vcard.c:192
 msgid "Show Com_pact vCard"
 msgstr "Show Com_pact vCard"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:153
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:165
 msgid "Save _To Addressbook"
 msgstr "Save _To Addressbook"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:173
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
 msgid "There is one other contact."
 msgstr "There is one other contact."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:179
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:194
 #, 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-inline.c:204
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:220
 msgid "Addressbook Contact"
 msgstr "Addressbook Contact"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:205
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:221
 msgid "Display the part as an addressbook contact"
 msgstr "Display the part as an addressbook contact"
 
-#: ../modules/web-inspector/evolution-web-inspector.c:96
-msgid "Evolution Web Inspector"
-msgstr "Evolution Web Inspector"
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:126
 msgid "_Do not show this message again."
 msgstr "_Do not show this message again."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:583
-#: ../plugins/templates/templates.c:473
+#: ../plugins/attachment-reminder/attachment-reminder.c:484
+#: ../plugins/templates/templates.c:490
 msgid "Keywords"
 msgstr "Keywords"
 
@@ -18959,35 +23690,35 @@ msgstr "Attachment Reminder"
 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:638 ../plugins/bbdb/bbdb.c:647
+#: ../plugins/bbdb/bbdb.c:724 ../plugins/bbdb/bbdb.c:835
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatic Contacts"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:662
+#: ../plugins/bbdb/bbdb.c:739
 msgid "Create _address book entries when sending mails"
 msgstr "Create _address book entries when sending mails"
 
-#: ../plugins/bbdb/bbdb.c:670
+#: ../plugins/bbdb/bbdb.c:749
 msgid "Select Address book for Automatic Contacts"
 msgstr "Select Address book for Automatic Contacts"
 
-#: ../plugins/bbdb/bbdb.c:687
+#: ../plugins/bbdb/bbdb.c:769
 msgid "Instant Messaging Contacts"
 msgstr "Instant Messaging Contacts"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:702
+#: ../plugins/bbdb/bbdb.c:784
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Synchronise contact info and images from Pidgin buddy list"
 
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:794
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Select Address book for Pidgin buddy list"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:723
+#: ../plugins/bbdb/bbdb.c:810
 msgid "Synchronize with _buddy list now"
 msgstr "Synchronise with _buddy list now"
 
@@ -19009,7 +23740,7 @@ msgstr ""
 "reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 
-#: ../plugins/dbx-import/dbx-importer.c:282
+#: ../plugins/dbx-import/dbx-importer.c:278
 msgid "Importing Outlook Express data"
 msgstr "Importing Outlook Express data"
 
@@ -19025,52 +23756,52 @@ msgstr "Outlook Express 5/6 personal folders (.dbx)"
 msgid "Import Outlook Express messages from DBX file"
 msgstr "Import Outlook Express messages from DBX file"
 
-#: ../plugins/email-custom-header/email-custom-header.c:291
+#: ../plugins/email-custom-header/email-custom-header.c:293
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Security:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:295
+#: ../plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Personal"
 
-#: ../plugins/email-custom-header/email-custom-header.c:296
+#: ../plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Unclassified"
 
-#: ../plugins/email-custom-header/email-custom-header.c:297
+#: ../plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Protected"
 
-#: ../plugins/email-custom-header/email-custom-header.c:298
+#: ../plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Confidential"
 
-#: ../plugins/email-custom-header/email-custom-header.c:299
+#: ../plugins/email-custom-header/email-custom-header.c:301
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Secret"
 
-#: ../plugins/email-custom-header/email-custom-header.c:300
+#: ../plugins/email-custom-header/email-custom-header.c:302
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Top secret"
 
-#: ../plugins/email-custom-header/email-custom-header.c:360
+#: ../plugins/email-custom-header/email-custom-header.c:362
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "None"
 
-#: ../plugins/email-custom-header/email-custom-header.c:536
+#: ../plugins/email-custom-header/email-custom-header.c:539
 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:806
+#: ../plugins/email-custom-header/email-custom-header.c:809
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -19078,12 +23809,12 @@ msgstr ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
 
-#: ../plugins/email-custom-header/email-custom-header.c:859
+#: ../plugins/email-custom-header/email-custom-header.c:862
 msgid "Key"
 msgstr "Key"
 
-#: ../plugins/email-custom-header/email-custom-header.c:876
-#: ../plugins/templates/templates.c:482
+#: ../plugins/email-custom-header/email-custom-header.c:879
+#: ../plugins/templates/templates.c:499
 msgid "Values"
 msgstr "Values"
 
@@ -19100,11 +23831,11 @@ msgstr "Add custom headers to outgoing mail messages."
 msgid "Email Custom Header"
 msgstr "E-mail Custom Header"
 
-#: ../plugins/external-editor/external-editor.c:112
+#: ../plugins/external-editor/external-editor.c:113
 msgid "Command to be executed to launch the editor: "
 msgstr "Command to be executed to launch the editor: "
 
-#: ../plugins/external-editor/external-editor.c:113
+#: ../plugins/external-editor/external-editor.c:114
 msgid ""
 "For XEmacs use \"xemacs\"\n"
 "For Vim use \"gvim -f\""
@@ -19112,8 +23843,13 @@ msgstr ""
 "For XEmacs use \"xemacs\"\n"
 "For Vim use \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:413
-#: ../plugins/external-editor/external-editor.c:415
+#: ../plugins/external-editor/external-editor.c:124
+#| msgid "Automatically launch when a new mail is edited"
+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
 msgid "Compose in External Editor"
 msgstr "Compose in External Editor"
 
@@ -19161,27 +23897,28 @@ 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:171 ../smime/gui/certificate-manager.c:322
-msgid "Unknown error"
-msgstr "Unknown error"
-
-#: ../plugins/face/face.c:289
+#: ../plugins/face/face.c:294
 msgid "Select a Face Picture"
 msgstr "Select a Face Picture"
 
-#: ../plugins/face/face.c:299
+#: ../plugins/face/face.c:304
 msgid "Image files"
 msgstr "Image files"
 
-#: ../plugins/face/face.c:358
+#: ../plugins/face/face.c:392
 msgid "_Insert Face picture by default"
 msgstr "_Insert Face picture by default"
 
-#: ../plugins/face/face.c:371
+#: ../plugins/face/face.c:405
 msgid "Load new _Face picture"
 msgstr "Load new _Face picture"
 
-#: ../plugins/face/face.c:432
+#: ../plugins/face/face.c:449
+#| msgid "Choose Image"
+msgid "Change Face Image"
+msgstr "Change Face Image"
+
+#: ../plugins/face/face.c:537
 msgid "Include _Face"
 msgstr "Include _Face"
 
@@ -19202,74 +23939,96 @@ msgid "Invalid Image Size"
 msgstr "Invalid Image Size"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
-msgid "Please select an image of size 48 * 48"
-msgstr "Please select an image of size 48 * 48"
+msgid ""
+"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 "
+"exceed 723 bytes."
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
-msgid "Not an image"
-msgstr "Not an image"
+msgid "Incorrect Face Image Byte Size"
+msgstr "Incorrect Face Image Byte Size"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:6
-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}"
+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."
+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."
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-msgid "Inline Image"
-msgstr "Inline Image"
+#: ../plugins/face/org-gnome-face.error.xml.h:7
+msgid "Not an image"
+msgstr "Not an image"
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-msgid "View image attachments directly in mail messages."
-msgstr "View image attachments directly in mail messages."
+#: ../plugins/face/org-gnome-face.error.xml.h:8
+#| msgid ""
+#| "The file you selected does not look like a valid .png image. Error: {0}"
+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:367
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:415
 msgid "Get List _Archive"
 msgstr "Get List _Archive"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:417
 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:374
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:422
+#| msgid "_Message Source"
+msgid "Copy _Message Archive URL"
+msgstr "Copy _Message Archive URL"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:424
+#| msgid "Redirect (bounce) the selected message to someone"
+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
 msgid "Get List _Usage Information"
 msgstr "Get List _Usage Information"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:431
 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:381
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:436
 msgid "Contact List _Owner"
 msgstr "Contact List _Owner"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:438
 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:388
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:443
 msgid "_Post Message to List"
 msgstr "_Post Message to List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:445
 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:395
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:450
 msgid "_Subscribe to List"
 msgstr "_Subscribe to List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:397
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:452
 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:402
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:457
 msgid "_Unsubscribe from List"
 msgstr "_Unsubscribe from List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:404
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:459
 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:411
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:466
 msgid "Mailing _List"
 msgstr "Mailing _List"
 
@@ -19361,57 +24120,64 @@ msgstr ""
 "\n"
 "Header: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:384
-#: ../plugins/mail-notification/mail-notification.c:420
+#: ../plugins/mail-notification/mail-notification.c:400
+#: ../plugins/mail-notification/mail-notification.c:436
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "You have received %d new message."
 msgstr[1] "You have received %d new messages."
 
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:411
+#, 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:409
+#: ../plugins/mail-notification/mail-notification.c:425
 #, c-format
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:426
+#: ../plugins/mail-notification/mail-notification.c:442
 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:461
+#: ../plugins/mail-notification/mail-notification.c:483
 #, c-format
 msgid "Show %s"
 msgstr "Show %s"
 
-#: ../plugins/mail-notification/mail-notification.c:663
+#: ../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:695
+#: ../plugins/mail-notification/mail-notification.c:719
 msgid "_Beep"
 msgstr "_Beep"
 
-#: ../plugins/mail-notification/mail-notification.c:708
+#: ../plugins/mail-notification/mail-notification.c:732
 msgid "Use sound _theme"
 msgstr "Use sound _theme"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:751
 msgid "Play _file:"
 msgstr "Play _file:"
 
-#: ../plugins/mail-notification/mail-notification.c:736
+#: ../plugins/mail-notification/mail-notification.c:760
 msgid "Select sound file"
 msgstr "Select sound file"
 
-#: ../plugins/mail-notification/mail-notification.c:792
+#: ../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:802
+#: ../plugins/mail-notification/mail-notification.c:853
 msgid "Show _notification when a new message arrives"
 msgstr "Show _notification when a new message arrives"
 
@@ -19424,12 +24190,33 @@ 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:233
+#: ../plugins/mail-to-task/mail-to-task.c:196
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Created from a mail by %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:617
+#. Translators: Dialog button to Cancel edit of an existing event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:561
+#| msgid "Cancel"
+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
+#| msgid "_Edit"
+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
+#| msgid "_New"
+msgctxt "mail-to-task"
+msgid "_New"
+msgstr "_New"
+
+#: ../plugins/mail-to-task/mail-to-task.c:583
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -19438,7 +24225,7 @@ msgstr ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:620
+#: ../plugins/mail-to-task/mail-to-task.c:586
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -19447,7 +24234,7 @@ msgstr ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:623
+#: ../plugins/mail-to-task/mail-to-task.c:589
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -19456,7 +24243,7 @@ msgstr ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:643
+#: ../plugins/mail-to-task/mail-to-task.c:609
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -19471,7 +24258,7 @@ 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:650
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -19486,7 +24273,7 @@ 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:657
+#: ../plugins/mail-to-task/mail-to-task.c:623
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -19501,29 +24288,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:678
+#: ../plugins/mail-to-task/mail-to-task.c:644
 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:754
+#: ../plugins/mail-to-task/mail-to-task.c:720
 msgid "[No Summary]"
 msgstr "[No Summary]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:767
+#: ../plugins/mail-to-task/mail-to-task.c:733
 msgid "Invalid object returned from a server"
 msgstr "Invalid object returned from a server"
 
-#: ../plugins/mail-to-task/mail-to-task.c:819
+#: ../plugins/mail-to-task/mail-to-task.c:787
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "An error occurred during processing: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:852
+#: ../plugins/mail-to-task/mail-to-task.c:823
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Cannot open calendar. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:859
+#: ../plugins/mail-to-task/mail-to-task.c:827
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -19531,7 +24318,7 @@ msgstr ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:862
+#: ../plugins/mail-to-task/mail-to-task.c:830
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -19539,7 +24326,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:865
+#: ../plugins/mail-to-task/mail-to-task.c:833
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -19547,39 +24334,35 @@ 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:1199
-msgid "No writable calendar is available."
-msgstr "No writeable calendar is available."
-
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1231
 msgid "Create an _Appointment"
 msgstr "Create an _Appointment"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1279
+#: ../plugins/mail-to-task/mail-to-task.c:1233
 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:1284
+#: ../plugins/mail-to-task/mail-to-task.c:1238
 msgid "Create a Mem_o"
 msgstr "Create a Mem_o"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1286
+#: ../plugins/mail-to-task/mail-to-task.c:1240
 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:1291
+#: ../plugins/mail-to-task/mail-to-task.c:1245
 msgid "Create a _Task"
 msgstr "Create a _Task"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1293
+#: ../plugins/mail-to-task/mail-to-task.c:1247
 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:1301
+#: ../plugins/mail-to-task/mail-to-task.c:1255
 msgid "Create a _Meeting"
 msgstr "Create a _Meeting"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1303
+#: ../plugins/mail-to-task/mail-to-task.c:1257
 msgid "Create a new meeting from the selected message"
 msgstr "Create a new meeting from the selected message"
 
@@ -19587,81 +24370,51 @@ msgstr "Create a new meeting from the selected message"
 msgid "Convert a mail message to a task."
 msgstr "Convert a mail message to a task."
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
-msgid "Also mark messages in subfolders?"
-msgstr "Also mark messages in subfolders?"
-
-#: ../plugins/mark-all-read/mark-all-read.c:44
-msgid ""
-"Do you want to mark messages as read in the current folder only, or in the "
-"current folder as well as all subfolders?"
-msgstr ""
-"Do you want to mark messages as read in the current folder only, or in the "
-"current folder as well as all subfolders?"
-
-#: ../plugins/mark-all-read/mark-all-read.c:184
-msgid "In Current Folder and _Subfolders"
-msgstr "In Current Folder and _Subfolders"
-
-#: ../plugins/mark-all-read/mark-all-read.c:198
-msgid "In Current _Folder Only"
-msgstr "In Current _Folder Only"
-
-#: ../plugins/mark-all-read/mark-all-read.c:544
-msgid "Mark Me_ssages as Read"
-msgstr "Mark Me_ssages as Read"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
-msgid "Mark All Read"
-msgstr "Mark All Read"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark all messages in a folder as read."
-msgstr "Mark all messages in a folder as read."
-
+#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:1
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Outlook PST import"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
-msgid "Outlook personal folders (.pst)"
-msgstr "Outlook personal folders (.pst)"
-
+#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:2
 #: ../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/pst-importer.c:530
+#: ../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:559
+#: ../plugins/pst-import/pst-importer.c:555
 msgid "Destination folder:"
 msgstr "Destination folder:"
 
-#: ../plugins/pst-import/pst-importer.c:569
+#: ../plugins/pst-import/pst-importer.c:565
 msgid "_Address Book"
 msgstr "_Address Book"
 
-#: ../plugins/pst-import/pst-importer.c:574
+#: ../plugins/pst-import/pst-importer.c:570
 msgid "A_ppointments"
 msgstr "A_ppointments"
 
-#: ../plugins/pst-import/pst-importer.c:579 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:575 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "_Tasks"
 
-#: ../plugins/pst-import/pst-importer.c:584
+#: ../plugins/pst-import/pst-importer.c:580
 msgid "_Journal entries"
 msgstr "_Journal entries"
 
-#: ../plugins/pst-import/pst-importer.c:704
+#: ../plugins/pst-import/pst-importer.c:697
 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:142
-#: ../plugins/publish-calendar/publish-calendar.c:149
+#: ../plugins/publish-calendar/publish-calendar.c:140
+#: ../plugins/publish-calendar/publish-calendar.c:147
 msgid "Calendar Publishing"
 msgstr "Calendar Publishing"
 
@@ -19673,49 +24426,39 @@ msgstr "Locations"
 msgid "Publish calendars to the web."
 msgstr "Publish calendars to the web."
 
-#: ../plugins/publish-calendar/publish-calendar.c:214
-#: ../plugins/publish-calendar/publish-calendar.c:472
+#: ../plugins/publish-calendar/publish-calendar.c:217
+#: ../plugins/publish-calendar/publish-calendar.c:484
 #, c-format
 msgid "Could not open %s:"
 msgstr "Could not open %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:216
-#, c-format
-msgid "Could not open %s: Unknown error"
-msgstr "Could not open %s: Unknown error"
-
 #: ../plugins/publish-calendar/publish-calendar.c:236
 #, 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:238
+#: ../plugins/publish-calendar/publish-calendar.c:242
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Publishing to %s finished successfully"
 
-#: ../plugins/publish-calendar/publish-calendar.c:282
+#: ../plugins/publish-calendar/publish-calendar.c:290
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Mount of %s failed:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:635
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
-msgid "E_nable"
-msgstr "E_nable"
-
-#: ../plugins/publish-calendar/publish-calendar.c:785
+#: ../plugins/publish-calendar/publish-calendar.c:789
 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:1124
+#: ../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:1134
+#: ../plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "_Publish Calendar Information"
 
@@ -19796,6 +24539,7 @@ msgid "_Username:"
 msgstr "_Username:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../smime/gui/certificate-manager.c:787
 msgid "_Password:"
 msgstr "_Password:"
 
@@ -19807,100 +24551,96 @@ msgstr "_Remember password"
 msgid "Publishing Location"
 msgstr "Publishing Location"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:100
-#: ../plugins/publish-calendar/publish-format-ical.c:98
+#: ../plugins/publish-calendar/publish-format-fb.c:84
+#: ../plugins/publish-calendar/publish-format-ical.c:104
 #, c-format
 msgid "Invalid source UID '%s'"
 msgstr "Invalid source UID '%s'"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:540
+#: ../plugins/publish-calendar/url-editor-dialog.c:544
 msgid "New Location"
 msgstr "New Location"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:542
+#: ../plugins/publish-calendar/url-editor-dialog.c:546
 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:161
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:375
-msgid "UID"
-msgstr "UID"
-
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Description List"
 msgstr "Description List"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Categories List"
 msgstr "Categories List"
 
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Comment List"
 msgstr "Comment List"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Contact List"
 msgstr "Contact List"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "Start"
 msgstr "Start"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "End"
 msgstr "End"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Due"
 msgstr "Due"
 
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "percent Done"
 msgstr "percent Done"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Attendees List"
 msgstr "Attendees List"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Modified"
 msgstr "Modified"
 
-#: ../plugins/save-calendar/csv-format.c:566
+#: ../plugins/save-calendar/csv-format.c:563
 msgid "A_dvanced options for the CSV format"
 msgstr "A_dvanced options for the CSV format"
 
-#: ../plugins/save-calendar/csv-format.c:574
+#: ../plugins/save-calendar/csv-format.c:571
 msgid "Prepend a _header"
 msgstr "Prepend a _header"
 
-#: ../plugins/save-calendar/csv-format.c:583
+#: ../plugins/save-calendar/csv-format.c:580
 msgid "_Value delimiter:"
 msgstr "_Value delimiter:"
 
-#: ../plugins/save-calendar/csv-format.c:594
+#: ../plugins/save-calendar/csv-format.c:591
 msgid "_Record delimiter:"
 msgstr "_Record delimiter:"
 
-#: ../plugins/save-calendar/csv-format.c:605
+#: ../plugins/save-calendar/csv-format.c:602
 msgid "_Encapsulate values with:"
 msgstr "_Encapsulate values with:"
 
-#: ../plugins/save-calendar/csv-format.c:631
+#: ../plugins/save-calendar/csv-format.c:628
 msgid "Comma separated values (.csv)"
 msgstr "Comma separated values (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:171 ../shell/e-shell-utils.c:197
+#: ../plugins/save-calendar/ical-format.c:183 ../shell/e-shell-utils.c:179
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -19921,30 +24661,39 @@ msgstr "Save a calendar or task list to disk."
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:386
+#: ../plugins/save-calendar/rdf-format.c:385
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:121
+#: ../plugins/save-calendar/save-calendar.c:119
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../plugins/save-calendar/save-calendar.c:187
+#: ../plugins/save-calendar/save-calendar.c:184
 msgid "Select destination file"
 msgstr "Select destination file"
 
-#: ../plugins/save-calendar/save-calendar.c:343
+#: ../plugins/save-calendar/save-calendar.c:188
+#| msgid "_Save As..."
+msgid "_Save As"
+msgstr "_Save As"
+
+#: ../plugins/save-calendar/save-calendar.c:347
 msgid "Save the selected calendar to disk"
 msgstr "Save the selected calendar to disk"
 
-#: ../plugins/save-calendar/save-calendar.c:374
+#: ../plugins/save-calendar/save-calendar.c:378
 msgid "Save the selected memo list to disk"
 msgstr "Save the selected memo list to disk"
 
-#: ../plugins/save-calendar/save-calendar.c:405
+#: ../plugins/save-calendar/save-calendar.c:409
 msgid "Save the selected task list to disk"
 msgstr "Save the selected task list to disk"
 
+#: ../plugins/templates/e-templates-store.c:117
+msgid "No Title"
+msgstr "No Title"
+
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
@@ -19955,34 +24704,57 @@ 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:1135
-msgid "No Title"
-msgstr "No Title"
+#: ../plugins/templates/templates.c:1286
+#| msgid "Saving message to Outbox."
+msgid "Saving message template"
+msgstr "Saving message template"
 
-#: ../plugins/templates/templates.c:1244
+#: ../plugins/templates/templates.c:1307
 msgid "Save as _Template"
 msgstr "Save as _Template"
 
-#: ../plugins/templates/templates.c:1246
+#: ../plugins/templates/templates.c:1309
 msgid "Save as Template"
 msgstr "Save as Template"
 
-#: ../shell/e-shell.c:307
+#: ../shell/e-shell.c:381
 msgid "Preparing to go offline..."
 msgstr "Preparing to go offline…"
 
-#: ../shell/e-shell.c:360
+#: ../shell/e-shell.c:410
 msgid "Preparing to go online..."
 msgstr "Preparing to go online…"
 
-#: ../shell/e-shell.c:434
+#: ../shell/e-shell.c:521
 msgid "Preparing to quit"
 msgstr "Preparing to quit"
 
-#: ../shell/e-shell.c:440
+#: ../shell/e-shell.c:527
 msgid "Preparing to quit..."
 msgstr "Preparing to quit…"
 
+#: ../shell/e-shell.c:1044
+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
+msgid "New _Window"
+msgstr "New _Window"
+
+#: ../shell/e-shell.c:1223
+#| msgid "_Quick Reference"
+msgid "Quick _Reference"
+msgstr "Quick _Reference"
+
+#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:764
+msgid "_About"
+msgstr "_About"
+
+#: ../shell/e-shell.c:1226 ../shell/e-shell-window-actions.c:862
+#| msgid "Quit"
+msgid "_Quit"
+msgstr "_Quit"
+
 #: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr "Searches"
@@ -19995,38 +24767,34 @@ 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:1143
+#: ../shell/e-shell-searchbar.c:926
 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:1186
+#: ../shell/e-shell-searchbar.c:951
 msgid "Sear_ch:"
 msgstr "Sear_ch:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1272
+#: ../shell/e-shell-searchbar.c:1019
 msgid "i_n"
 msgstr "i_n"
 
-#: ../shell/e-shell-utils.c:195
+#: ../shell/e-shell-utils.c:176
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:218
+#: ../shell/e-shell-utils.c:200
 msgid "All Files (*)"
 msgstr "All Files (*)"
 
-#: ../shell/e-shell-view.c:295
-msgid "Saving user interface state"
-msgstr "Saving user interface state"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:74
+#: ../shell/e-shell-utils.c:409
 msgid "translator-credits"
 msgstr ""
 "Gareth Owen <gowen72 yahoo com>\n"
@@ -20035,281 +24803,292 @@ msgstr ""
 "Bruce Cowan <bruce bcowan me uk>\n"
 "Chris Leonard <cjl laptop org>"
 
-#: ../shell/e-shell-window-actions.c:85
+#: ../shell/e-shell-utils.c:420
 msgid "Evolution Website"
 msgstr "Evolution Website"
 
-#: ../shell/e-shell-window-actions.c:323
+#: ../shell/e-shell-view.c:292
+msgid "Saving user interface state"
+msgstr "Saving user interface state"
+
+#: ../shell/e-shell-window-actions.c:277
 msgid "Categories Editor"
 msgstr "Categories Editor"
 
-#: ../shell/e-shell-window-actions.c:660
+#: ../shell/e-shell-window-actions.c:585
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy is not installed."
 
-#: ../shell/e-shell-window-actions.c:661
+#: ../shell/e-shell-window-actions.c:586
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy could not be run."
 
-#: ../shell/e-shell-window-actions.c:841
+#: ../shell/e-shell-window-actions.c:766
 msgid "Show information about Evolution"
 msgstr "Show information about Evolution"
 
-#: ../shell/e-shell-window-actions.c:846 ../shell/e-shell-window-actions.c:860
+#: ../shell/e-shell-window-actions.c:771 ../shell/e-shell-window-actions.c:785
 msgid "_Close Window"
 msgstr "_Close Window"
 
-#: ../shell/e-shell-window-actions.c:867
+#: ../shell/e-shell-window-actions.c:792
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../shell/e-shell-window-actions.c:869
+#: ../shell/e-shell-window-actions.c:794
 msgid "Open the Evolution User Guide"
 msgstr "Open the Evolution User Guide"
 
-#: ../shell/e-shell-window-actions.c:895
+#: ../shell/e-shell-window-actions.c:820
 msgid "I_mport..."
 msgstr "I_mport…"
 
-#: ../shell/e-shell-window-actions.c:897
+#: ../shell/e-shell-window-actions.c:822
 msgid "Import data from other programs"
 msgstr "Import data from other programs"
 
-#: ../shell/e-shell-window-actions.c:902
-msgid "New _Window"
-msgstr "New _Window"
-
-#: ../shell/e-shell-window-actions.c:904
+#: ../shell/e-shell-window-actions.c:829
 msgid "Create a new window displaying this view"
 msgstr "Create a new window displaying this view"
 
-#: ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:841
 msgid "Available Cate_gories"
 msgstr "Available Cate_gories"
 
-#: ../shell/e-shell-window-actions.c:918
+#: ../shell/e-shell-window-actions.c:843
 msgid "Manage available categories"
 msgstr "Manage available categories"
 
-#: ../shell/e-shell-window-actions.c:930
+#: ../shell/e-shell-window-actions.c:855
 msgid "_Quick Reference"
 msgstr "_Quick Reference"
 
-#: ../shell/e-shell-window-actions.c:932
+#: ../shell/e-shell-window-actions.c:857
 msgid "Show Evolution's shortcut keys"
 msgstr "Show Evolution's shortcut keys"
 
-#: ../shell/e-shell-window-actions.c:939
+#: ../shell/e-shell-window-actions.c:864
 msgid "Exit the program"
 msgstr "Exit the program"
 
-#: ../shell/e-shell-window-actions.c:944
+#: ../shell/e-shell-window-actions.c:869
 msgid "_Advanced Search..."
 msgstr "_Advanced Search…"
 
-#: ../shell/e-shell-window-actions.c:946
+#: ../shell/e-shell-window-actions.c:871
 msgid "Construct a more advanced search"
 msgstr "Construct a more advanced search"
 
-#: ../shell/e-shell-window-actions.c:953
+#: ../shell/e-shell-window-actions.c:878
 msgid "Clear the current search parameters"
 msgstr "Clear the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:958
+#: ../shell/e-shell-window-actions.c:883
 msgid "_Edit Saved Searches..."
 msgstr "_Edit Saved Searches…"
 
-#: ../shell/e-shell-window-actions.c:960
+#: ../shell/e-shell-window-actions.c:885
 msgid "Manage your saved searches"
 msgstr "Manage your saved searches"
 
-#: ../shell/e-shell-window-actions.c:967
+#: ../shell/e-shell-window-actions.c:892
 msgid "Click here to change the search type"
 msgstr "Click here to change the search type"
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:897
 msgid "_Find Now"
 msgstr "_Find Now"
 
-#. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:974
+#: ../shell/e-shell-window-actions.c:899
 msgid "Execute the current search parameters"
 msgstr "Execute the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:979
+#: ../shell/e-shell-window-actions.c:904
 msgid "_Save Search..."
 msgstr "_Save Search…"
 
-#: ../shell/e-shell-window-actions.c:981
+#: ../shell/e-shell-window-actions.c:906
 msgid "Save the current search parameters"
 msgstr "Save the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:993
+#: ../shell/e-shell-window-actions.c:918
 msgid "Submit _Bug Report..."
 msgstr "Submit _Bug Report…"
 
-#: ../shell/e-shell-window-actions.c:995
+#: ../shell/e-shell-window-actions.c:920
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Submit a bug report using Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1000
+#: ../shell/e-shell-window-actions.c:925
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: ../shell/e-shell-window-actions.c:1002
+#: ../shell/e-shell-window-actions.c:927
 msgid "Put Evolution into offline mode"
 msgstr "Put Evolution into offline mode"
 
-#: ../shell/e-shell-window-actions.c:1007
+#: ../shell/e-shell-window-actions.c:932
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: ../shell/e-shell-window-actions.c:1009
+#: ../shell/e-shell-window-actions.c:934
 msgid "Put Evolution into online mode"
 msgstr "Put Evolution into online mode"
 
-#: ../shell/e-shell-window-actions.c:1037
+#: ../shell/e-shell-window-actions.c:962
 msgid "Lay_out"
 msgstr "Lay_out"
 
-#: ../shell/e-shell-window-actions.c:1044
+#. Translators: This is a New menu item caption, under File->New
+#: ../shell/e-shell-window-actions.c:970
 msgid "_New"
 msgstr "_New"
 
-#: ../shell/e-shell-window-actions.c:1051
+#: ../shell/e-shell-window-actions.c:977
 msgid "_Search"
 msgstr "_Search"
 
-#: ../shell/e-shell-window-actions.c:1058
+#: ../shell/e-shell-window-actions.c:984
 msgid "_Switcher Appearance"
 msgstr "_Switcher Appearance"
 
-#: ../shell/e-shell-window-actions.c:1072
+#: ../shell/e-shell-window-actions.c:998
 msgid "_Window"
 msgstr "_Window"
 
-#: ../shell/e-shell-window-actions.c:1101
+#: ../shell/e-shell-window-actions.c:1027
 msgid "Show Side _Bar"
 msgstr "Show Side _Bar"
 
-#: ../shell/e-shell-window-actions.c:1103
+#: ../shell/e-shell-window-actions.c:1029
 msgid "Show the side bar"
 msgstr "Show the side bar"
 
-#: ../shell/e-shell-window-actions.c:1109
+#: ../shell/e-shell-window-actions.c:1035
 msgid "Show _Buttons"
 msgstr "Show _Buttons"
 
-#: ../shell/e-shell-window-actions.c:1111
+#: ../shell/e-shell-window-actions.c:1037
 msgid "Show the switcher buttons"
 msgstr "Show the switcher buttons"
 
-#: ../shell/e-shell-window-actions.c:1117
+#: ../shell/e-shell-window-actions.c:1043
 msgid "Show _Status Bar"
 msgstr "Show _Status Bar"
 
-#: ../shell/e-shell-window-actions.c:1119
+#: ../shell/e-shell-window-actions.c:1045
 msgid "Show the status bar"
 msgstr "Show the status bar"
 
-#: ../shell/e-shell-window-actions.c:1125
+#: ../shell/e-shell-window-actions.c:1051
 msgid "Show _Tool Bar"
 msgstr "Show _Tool Bar"
 
-#: ../shell/e-shell-window-actions.c:1127
+#: ../shell/e-shell-window-actions.c:1053
 msgid "Show the tool bar"
 msgstr "Show the tool bar"
 
-#: ../shell/e-shell-window-actions.c:1149
+#: ../shell/e-shell-window-actions.c:1075
 msgid "_Icons Only"
 msgstr "_Icons Only"
 
-#: ../shell/e-shell-window-actions.c:1151
+#: ../shell/e-shell-window-actions.c:1077
 msgid "Display window buttons with icons only"
 msgstr "Display window buttons with icons only"
 
-#: ../shell/e-shell-window-actions.c:1156
+#: ../shell/e-shell-window-actions.c:1082
 msgid "_Text Only"
 msgstr "_Text Only"
 
-#: ../shell/e-shell-window-actions.c:1158
+#: ../shell/e-shell-window-actions.c:1084
 msgid "Display window buttons with text only"
 msgstr "Display window buttons with text only"
 
-#: ../shell/e-shell-window-actions.c:1163
+#: ../shell/e-shell-window-actions.c:1089
 msgid "Icons _and Text"
 msgstr "Icons _and Text"
 
-#: ../shell/e-shell-window-actions.c:1165
+#: ../shell/e-shell-window-actions.c:1091
 msgid "Display window buttons with icons and text"
 msgstr "Display window buttons with icons and text"
 
-#: ../shell/e-shell-window-actions.c:1170
+#: ../shell/e-shell-window-actions.c:1096
 msgid "Tool_bar Style"
 msgstr "Tool_bar Style"
 
-#: ../shell/e-shell-window-actions.c:1172
+#: ../shell/e-shell-window-actions.c:1098
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Display window buttons using the desktop toolbar setting"
 
-#: ../shell/e-shell-window-actions.c:1180
-msgid "Define Views..."
-msgstr "Define Views…"
+#: ../shell/e-shell-window-actions.c:1106
+#| msgid "Save Current View"
+msgid "Delete Current View"
+msgstr "Delete Current View"
 
-#: ../shell/e-shell-window-actions.c:1182
-msgid "Create or edit views"
-msgstr "Create or edit views"
-
-#: ../shell/e-shell-window-actions.c:1187
+#: ../shell/e-shell-window-actions.c:1113
 msgid "Save Custom View..."
 msgstr "Save Custom View…"
 
-#: ../shell/e-shell-window-actions.c:1189
+#: ../shell/e-shell-window-actions.c:1115
 msgid "Save current custom view"
 msgstr "Save current custom view"
 
-#: ../shell/e-shell-window-actions.c:1196
+#: ../shell/e-shell-window-actions.c:1122
 msgid "C_urrent View"
 msgstr "C_urrent View"
 
-#: ../shell/e-shell-window-actions.c:1206
+#: ../shell/e-shell-window-actions.c:1132
 msgid "Custom View"
 msgstr "Custom View"
 
-#: ../shell/e-shell-window-actions.c:1208
+#: ../shell/e-shell-window-actions.c:1134
 msgid "Current view is a customized view"
 msgstr "Current view is a customised view"
 
-#: ../shell/e-shell-window-actions.c:1218
+#: ../shell/e-shell-window-actions.c:1142
+msgid "Page Set_up..."
+msgstr "Page Set_up…"
+
+#: ../shell/e-shell-window-actions.c:1144
 msgid "Change the page settings for your current printer"
 msgstr "Change the page settings for your current printer"
 
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1507
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1630
 #, c-format
 msgid "Select view: %s"
 msgstr "Select view: %s"
 
-#: ../shell/e-shell-window-actions.c:1830
+#: ../shell/e-shell-window-actions.c:1647
+#, c-format
+#| msgid "Select view: %s"
+msgid "Delete view: %s"
+msgstr "Delete view: %s"
+
+#: ../shell/e-shell-window-actions.c:1748
 msgid "Execute these search parameters"
 msgstr "Execute these search parameters"
 
-#: ../shell/e-shell-window.c:497
+#. 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
+#| msgid "New"
+msgctxt "toolbar-button"
 msgid "New"
 msgstr "New"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:585
+#: ../shell/e-shell-window-private.c:632
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s — Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:182
+#: ../shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20344,7 +25123,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: ../shell/main.c:206
+#: ../shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20352,13 +25131,13 @@ msgstr ""
 "Thanks\n"
 "The Evolution Team\n"
 
-#: ../shell/main.c:212
+#: ../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:303
+#: ../shell/main.c:314
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20366,43 +25145,39 @@ msgstr ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 
-#: ../shell/main.c:307
+#: ../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:311
+#: ../shell/main.c:322
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: ../shell/main.c:313
+#: ../shell/main.c:324
 msgid "Ignore network availability"
 msgstr "Ignore network availability"
 
-#: ../shell/main.c:315
-msgid "Start in \"express\" mode"
-msgstr "Start in \"express\" mode"
-
-#: ../shell/main.c:318
+#: ../shell/main.c:327
 msgid "Forcibly shut down Evolution"
 msgstr "Forcibly shut down Evolution"
 
-#: ../shell/main.c:321
+#: ../shell/main.c:330
 msgid "Disable loading of any plugins."
 msgstr "Disable loading of any plugins."
 
-#: ../shell/main.c:323
+#: ../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:327
+#: ../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:329
+#: ../shell/main.c:338
 msgid "Request a running Evolution process to quit"
 msgstr "Request a running Evolution process to quit"
 
-#: ../shell/main.c:419
+#: ../shell/main.c:415
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -20411,11 +25186,11 @@ msgstr ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
 "System error: %s"
 
-#: ../shell/main.c:515 ../shell/main.c:520
+#: ../shell/main.c:469 ../shell/main.c:474
 msgid "- The Evolution PIM and Email Client"
 msgstr "- The Evolution PIM and E-mail Client"
 
-#: ../shell/main.c:587
+#: ../shell/main.c:536
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20424,7 +25199,7 @@ msgstr ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 
-#: ../shell/main.c:593
+#: ../shell/main.c:542
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -20473,7 +25248,113 @@ msgstr ""
 "a workaround you might try first upgrading to Evolution 2, and then "
 "upgrading to Evolution 3."
 
-#: ../smime/gui/ca-trust-dialog.c:109
+#: ../shell/shell.error.xml.h:11
+#| msgid "Unknown background operation"
+msgid "Close Evolution with pending background operations?"
+msgstr "Close Evolution with pending background operations?"
+
+#: ../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 "
+"close immediately, or keep waiting?"
+msgstr ""
+"Evolution is taking a long time to shut down, possibly due to network "
+"connectivity issues. Would you like to cancel all pending operations and "
+"close immediately, or keep waiting?"
+
+#: ../shell/shell.error.xml.h:13
+#| msgid "Choose Image"
+msgid "_Close Immediately"
+msgstr "_Close Immediately"
+
+#: ../shell/shell.error.xml.h:14
+#| msgid "Waiting..."
+msgid "Keep _Waiting"
+msgstr "Keep _Waiting"
+
+#: ../shell/shell.error.xml.h:15
+#| msgid "Failed to get server URL."
+msgid "Failed to get values from '{0}'"
+msgstr "Failed to get values from '{0}'"
+
+#: ../shell/shell.error.xml.h:16
+#| msgid "Failed to authenticate.\n"
+msgid "Failed to invoke authenticate for '{0}'"
+msgstr "Failed to invoke authenticate for '{0}'"
+
+#: ../shell/shell.error.xml.h:17
+#| msgid "Failed to open client '%s': %s"
+msgid "Failed to connect '{0}'"
+msgstr "Failed to connect '{0}'"
+
+#: ../shell/shell.error.xml.h:18
+#| msgid "_Recover"
+msgid "_Reconnect"
+msgstr "_Reconnect"
+
+#: ../shell/shell.error.xml.h:19
+#| msgid "Delete address book '{0}'?"
+msgid "Failed to connect address book '{0}'"
+msgstr "Failed to connect address book '{0}'"
+
+#: ../shell/shell.error.xml.h:20
+#| msgid "Delete calendar '{0}'?"
+msgid "Failed to connect calendar '{0}'"
+msgstr "Failed to connect calendar '{0}'"
+
+#: ../shell/shell.error.xml.h:21
+#| msgid "Failed to disconnect account &quot;{0}&quot;."
+msgid "Failed to connect mail account '{0}'"
+msgstr "Failed to connect mail account '{0}'"
+
+#: ../shell/shell.error.xml.h:22
+#| msgid "Delete memo list '{0}'?"
+msgid "Failed to connect memo list '{0}'"
+msgstr "Failed to connect memo list '{0}'"
+
+#: ../shell/shell.error.xml.h:23
+#| msgid "Delete task list '{0}'?"
+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
+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."
+
+#: ../shell/shell.error.xml.h:30
+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."
+
+#: ../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."
+
+#: ../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."
+
+#: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20484,175 +25365,288 @@ msgstr ""
 "\n"
 "Edit trust settings:"
 
-#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
-#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:84 ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "Certificate Name"
 
-#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:85 ../smime/gui/certificate-manager.c:105
 msgid "Issued To Organization"
 msgstr "Issued To Organisation"
 
-#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:86 ../smime/gui/certificate-manager.c:106
 msgid "Issued To Organizational Unit"
 msgstr "Issued To Organisational Unit"
 
-#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
-#: ../smime/gui/certificate-manager.c:114
-#: ../smime/gui/certificate-viewer.c:638 ../smime/lib/e-asn1-object.c:134
+#: ../smime/gui/certificate-manager.c:87 ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "Serial Number"
 
-#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
-#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:88 ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr "Purposes"
 
-#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
-#: ../smime/gui/certificate-manager.c:116
-#: ../smime/gui/certificate-viewer.c:640
+#: ../smime/gui/certificate-manager.c:89 ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:127
 msgid "Issued By"
 msgstr "Issued By"
 
-#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:117
+#: ../smime/gui/certificate-manager.c:90 ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:128
 msgid "Issued By Organization"
 msgstr "Issued By Organisation"
 
-#: ../smime/gui/certificate-manager.c:80
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:118
+#: ../smime/gui/certificate-manager.c:91 ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:129
 msgid "Issued By Organizational Unit"
 msgstr "Issued By Organisational Unit"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:92 ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:130
 msgid "Issued"
 msgstr "Issued"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:93 ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "Expires"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
-#: ../smime/gui/certificate-viewer.c:650
+#: ../smime/gui/certificate-manager.c:94 ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-manager.c:132
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 Fingerprint"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
-#: ../smime/gui/certificate-viewer.c:651
+#: ../smime/gui/certificate-manager.c:95 ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
 msgstr "MD5 Fingerprint"
 
-#: ../smime/gui/certificate-manager.c:93
-#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:124
 msgid "Email Address"
 msgstr "E-mail Address"
 
-#: ../smime/gui/certificate-manager.c:614
+#: ../smime/gui/certificate-manager.c:665
+msgid "Select a file to backup your key and certificate..."
+msgstr "Select a file to backup your key and certificate..."
+
+#. To Translators:
+#. * %s-backup.p12 is the default file name suggested by the file selection dialog,
+#. * when a user wants to backup one of her/his private keys/certificates.
+#. * For example: gnomedev-backup.p12
+#.
+#: ../smime/gui/certificate-manager.c:677
+#, c-format
+msgid "%s-backup.p12"
+msgstr "%s-backup.p12"
+
+#: ../smime/gui/certificate-manager.c:743
+#| msgid "Certificate"
+msgid "Backup Certificate"
+msgstr "Backup Certificate"
+
+#. filename selection
+#: ../smime/gui/certificate-manager.c:757
+#| msgid "_Filename:"
+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
+#| msgid "Please select a folder"
+msgid "Please select a file..."
+msgstr "Please select a file..."
+
+#: ../smime/gui/certificate-manager.c:776
+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
+msgid ""
+"The certificate backup password you set here protects the backup file that "
+"you are about to create.\n"
+"You must set this password to proceed with the backup."
+msgstr ""
+"The certificate backup password you set here protects the backup file that "
+"you are about to create.\n"
+"You must set this password to proceed with the backup."
+
+#: ../smime/gui/certificate-manager.c:801
+#| msgid "_Password:"
+msgid "_Repeat Password:"
+msgstr "_Repeat Password:"
+
+#: ../smime/gui/certificate-manager.c:820
+msgid "Passwords do not match"
+msgstr "Passwords do not match"
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:828
+msgid ""
+"Important:\n"
+"If you forget your certificate backup password, you will not be able to "
+"restore this backup later.\n"
+"Please record it in a safe location."
+msgstr ""
+"Important:\n"
+"If you forget your certificate backup password, you will not be able to "
+"restore this backup later.\n"
+"Please record it in a safe location."
+
+#: ../smime/gui/certificate-manager.c:873
+#| msgid "No email address provided"
+msgid "No file name provided"
+msgstr "No file name provided"
+
+#: ../smime/gui/certificate-manager.c:877
+#| msgid "Failed to import certificate"
+msgid "Failed to backup key and certificate"
+msgstr "Failed to backup key and certificate"
+
+#: ../smime/gui/certificate-manager.c:966
 msgid "Select a certificate to import..."
 msgstr "Select a certificate to import…"
 
-#: ../smime/gui/certificate-manager.c:628
-msgid "All files"
-msgstr "All files"
-
-#: ../smime/gui/certificate-manager.c:664
+#: ../smime/gui/certificate-manager.c:1016
 msgid "Failed to import certificate"
 msgstr "Failed to import certificate"
 
-#: ../smime/gui/certificate-manager.c:1046
-msgid "All PKCS12 files"
-msgstr "All PKCS12 files"
+#: ../smime/gui/certificate-manager.c:1132
+msgctxt "CamelTrust"
+msgid "Ask when used"
+msgstr "Ask when used"
 
-#: ../smime/gui/certificate-manager.c:1063
-msgid "All email certificate files"
-msgstr "All e-mail certificate files"
-
-#: ../smime/gui/certificate-manager.c:1080
-msgid "All CA certificate files"
-msgstr "All CA certificate files"
-
-#: ../smime/gui/certificate-viewer.c:292
-msgid "Not part of certificate"
-msgstr "Not part of certificate"
-
-#: ../smime/gui/certificate-viewer.c:600
-msgid "This certificate has been verified for the following uses:"
-msgstr "This certificate has been verified for the following uses:"
-
-#: ../smime/gui/certificate-viewer.c:604 ../smime/lib/e-asn1-object.c:387
-msgid "SSL Client Certificate"
-msgstr "SSL Client Certificate"
-
-#: ../smime/gui/certificate-viewer.c:609 ../smime/lib/e-asn1-object.c:391
-msgid "SSL Server Certificate"
-msgstr "SSL Server Certificate"
-
-#: ../smime/gui/certificate-viewer.c:614
-msgid "Email Signer Certificate"
-msgstr "E-mail Signer Certificate"
-
-#: ../smime/gui/certificate-viewer.c:619
-msgid "Email Recipient Certificate"
-msgstr "E-mail Recipient Certificate"
-
-#: ../smime/gui/certificate-viewer.c:634
-msgid "Issued To"
-msgstr "Issued To"
-
-#: ../smime/gui/certificate-viewer.c:635 ../smime/gui/certificate-viewer.c:641
-msgid "Common Name (CN)"
-msgstr "Common Name (CN)"
-
-#: ../smime/gui/certificate-viewer.c:636 ../smime/gui/certificate-viewer.c:642
-msgid "Organization (O)"
-msgstr "Organisation (O)"
-
-#: ../smime/gui/certificate-viewer.c:637 ../smime/gui/certificate-viewer.c:643
-msgid "Organizational Unit (OU)"
-msgstr "Organisational Unit (OU)"
-
-#: ../smime/gui/certificate-viewer.c:645
-msgid "Validity"
-msgstr "Validity"
+#: ../smime/gui/certificate-manager.c:1134
+#| msgid "Never"
+msgctxt "CamelTrust"
+msgid "Never"
+msgstr "Never"
 
-#: ../smime/gui/certificate-viewer.c:646
-msgid "Issued On"
-msgstr "Issued On"
+#: ../smime/gui/certificate-manager.c:1136
+#| msgid "Margins"
+msgctxt "CamelTrust"
+msgid "Marginally"
+msgstr "Marginally"
+
+#: ../smime/gui/certificate-manager.c:1138
+msgctxt "CamelTrust"
+msgid "Fully"
+msgstr "Fully"
+
+#: ../smime/gui/certificate-manager.c:1140
+msgctxt "CamelTrust"
+msgid "Ultimately"
+msgstr "Ultimately"
+
+#: ../smime/gui/certificate-manager.c:1142
+msgctxt "CamelTrust"
+msgid "Temporarily"
+msgstr "Temporarily"
+
+#: ../smime/gui/certificate-manager.c:1348
+#| msgid "Certificate Authority Trust"
+msgid "Change certificate trust"
+msgstr "Change certificate trust"
+
+#: ../smime/gui/certificate-manager.c:1360
+#, c-format
+#| msgid "Cannot get transport for account '%s'"
+msgid "Change trust for the host '%s':"
+msgstr "Change trust for the host '%s':"
+
+#: ../smime/gui/certificate-manager.c:1384
+msgctxt "CamelTrust"
+msgid "_Ask when used"
+msgstr "_Ask when used"
+
+#: ../smime/gui/certificate-manager.c:1385
+#| msgid "Unset _trust for SSL certificate"
+msgctxt "CamelTrust"
+msgid "_Never trust this certificate"
+msgstr "_Never trust this certificate"
+
+#: ../smime/gui/certificate-manager.c:1386
+msgctxt "CamelTrust"
+msgid "_Temporarily trusted (this session only)"
+msgstr "_Temporarily trusted (this session only)"
+
+#: ../smime/gui/certificate-manager.c:1387
+msgctxt "CamelTrust"
+msgid "_Marginally trusted"
+msgstr "_Marginally trusted"
+
+#: ../smime/gui/certificate-manager.c:1388
+#| msgid "R_eply requested"
+msgctxt "CamelTrust"
+msgid "_Fully trusted"
+msgstr "_Fully trusted"
+
+#: ../smime/gui/certificate-manager.c:1389
+#| msgid "R_eply requested"
+msgctxt "CamelTrust"
+msgid "_Ultimately trusted"
+msgstr "_Ultimately trusted"
+
+#: ../smime/gui/certificate-manager.c:1393
+#| msgid ""
+#| "Before trusting this CA for any purpose, you should examine its "
+#| "certificate and its policy and procedures (if available)."
+msgid ""
+"Before trusting this site, you should examine its certificate and its policy "
+"and procedures (if available)."
+msgstr ""
+"Before trusting this site, you should examine its certificate and its policy "
+"and procedures (if available)."
+
+#: ../smime/gui/certificate-manager.c:1408
+#| msgid "_View Certificate"
+msgid "_Display certificate"
+msgstr "_Display certificate"
+
+#: ../smime/gui/certificate-manager.c:1613
+#| msgid "You have certificates on file that identify these people:"
+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
+#| msgid "_List name:"
+msgid "Host name"
+msgstr "Host name"
+
+#: ../smime/gui/certificate-manager.c:1646
+msgid "Issuer"
+msgstr "Issuer"
 
-#: ../smime/gui/certificate-viewer.c:647
-msgid "Expires On"
-msgstr "Expires On"
+#: ../smime/gui/certificate-manager.c:1647
+#| msgid "Fingerprints"
+msgid "Fingerprint"
+msgstr "Fingerprint"
 
-#: ../smime/gui/certificate-viewer.c:649
-msgid "Fingerprints"
-msgstr "Fingerprints"
+#: ../smime/gui/certificate-manager.c:1648
+msgid "Trust"
+msgstr "Trust"
 
-#: ../smime/gui/certificate-viewer.c:671
-msgid "Certificate Hierarchy"
-msgstr "Certificate Hierarchy"
+#: ../smime/gui/certificate-manager.c:1669
+#| msgid "_Edit CA Trust"
+msgid "_Edit Trust"
+msgstr "_Edit Trust"
 
-#: ../smime/gui/certificate-viewer.c:674
-msgid "Certificate Fields"
-msgstr "Certificate Fields"
+#: ../smime/gui/certificate-manager.c:2123
+msgid "All PKCS12 files"
+msgstr "All PKCS12 files"
 
-#: ../smime/gui/certificate-viewer.c:677
-msgid "Field Value"
-msgstr "Field Value"
+#: ../smime/gui/certificate-manager.c:2140
+msgid "All email certificate files"
+msgstr "All e-mail certificate files"
 
-#: ../smime/gui/certificate-viewer.c:679
-msgid "Details"
-msgstr "Details"
+#: ../smime/gui/certificate-manager.c:2157
+msgid "All CA certificate files"
+msgstr "All CA certificate files"
 
-#: ../smime/gui/cert-trust-dialog.c:153
+#: ../smime/gui/cert-trust-dialog.c:152
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20662,7 +25656,7 @@ msgstr ""
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../smime/gui/cert-trust-dialog.c:157
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20672,40 +25666,27 @@ msgstr ""
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 
-#: ../smime/gui/component.c:51
+#: ../smime/gui/component.c:55
+#, c-format
+#| msgid "Enter the password for '%s'"
+msgid "Enter the password for '%s', token '%s'"
+msgstr "Enter the password for '%s', token '%s'"
+
+#: ../smime/gui/component.c:57
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "Enter the password for '%s'"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:77
+#: ../smime/gui/component.c:85
 msgid "Enter new password for certificate database"
 msgstr "Enter new password for certificate database"
 
-#: ../smime/gui/component.c:80
+#: ../smime/gui/component.c:88
 msgid "Enter new password"
 msgstr "Enter new password"
 
-#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:122
-#, c-format
-msgid ""
-"Issued to:\n"
-"  Subject: %s\n"
-msgstr ""
-"Issued to:\n"
-"  Subject: %s\n"
-
-#: ../smime/gui/e-cert-selector.c:123
-#, c-format
-msgid ""
-"Issued by:\n"
-"  Subject: %s\n"
-msgstr ""
-"Issued by:\n"
-"  Subject: %s\n"
-
-#: ../smime/gui/e-cert-selector.c:176
+#: ../smime/gui/e-cert-selector.c:180
 msgid "Select certificate"
 msgstr "Select certificate"
 
@@ -20726,45 +25707,45 @@ msgstr "_Backup"
 msgid "Backup _All"
 msgstr "Back Up _All"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Your Certificates"
 msgstr "Your Certificates"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:12
 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:12
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Contact Certificates"
 msgstr "Contact Certificates"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:15
 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:14
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Authorities"
 msgstr "Authorities"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Certificate Authority Trust"
 msgstr "Certificate Authority Trust"
 
-#: ../smime/gui/smime-ui.ui.h:16
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Trust this CA to identify _websites."
 msgstr "Trust this CA to identify _websites."
 
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Trust this CA to identify _email users."
 msgstr "Trust this CA to identify _e-mail users."
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Trust this CA to identify _software developers."
 msgstr "Trust this CA to identify _software developers."
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:21
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -20772,226 +25753,82 @@ 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:21 ../smime/lib/e-asn1-object.c:658
-msgid "Certificate"
-msgstr "Certificate"
-
-#: ../smime/gui/smime-ui.ui.h:22
-msgid "Certificate details"
-msgstr "Certificate details"
+#: ../smime/gui/smime-ui.ui.h:25
+#| msgid "Certificate"
+msgid "C_ertificate:"
+msgstr "C_ertificate:"
 
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "Email Certificate Trust Settings"
 msgstr "E-mail Certificate Trust Settings"
 
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Trust the authenticity of this certificate"
 msgstr "Trust the authenticity of this certificate"
 
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Do not trust the authenticity of this certificate"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "_Edit CA Trust"
 msgstr "_Edit CA Trust"
 
-#: ../smime/lib/e-asn1-object.c:95
-msgid "Version"
-msgstr "Version"
-
-#: ../smime/lib/e-asn1-object.c:110
-msgid "Version 1"
-msgstr "Version 1"
-
-#: ../smime/lib/e-asn1-object.c:113
-msgid "Version 2"
-msgstr "Version 2"
-
-#: ../smime/lib/e-asn1-object.c:116
-msgid "Version 3"
-msgstr "Version 3"
-
-#: ../smime/lib/e-asn1-object.c:192
-msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr "PKCS #1 MD2 With RSA Encryption"
-
-#: ../smime/lib/e-asn1-object.c:195
-msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr "PKCS #1 MD5 With RSA Encryption"
-
-#: ../smime/lib/e-asn1-object.c:198
-msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr "PKCS #1 SHA-1 With RSA Encryption"
-
-#: ../smime/lib/e-asn1-object.c:201
-msgid "PKCS #1 SHA-256 With RSA Encryption"
-msgstr "PKCS #1 SHA-256 With RSA Encryption"
-
-#: ../smime/lib/e-asn1-object.c:204
-msgid "PKCS #1 SHA-384 With RSA Encryption"
-msgstr "PKCS #1 SHA-384 With RSA Encryption"
-
-#: ../smime/lib/e-asn1-object.c:207
-msgid "PKCS #1 SHA-512 With RSA Encryption"
-msgstr "PKCS #1 SHA-512 With RSA Encryption"
-
-#: ../smime/lib/e-asn1-object.c:234
-msgid "PKCS #1 RSA Encryption"
-msgstr "PKCS #1 RSA Encryption"
-
-#: ../smime/lib/e-asn1-object.c:237
-msgid "Certificate Key Usage"
-msgstr "Certificate Key Usage"
-
-#: ../smime/lib/e-asn1-object.c:240
-msgid "Netscape Certificate Type"
-msgstr "Netscape Certificate Type"
-
-#: ../smime/lib/e-asn1-object.c:243
-msgid "Certificate Authority Key Identifier"
-msgstr "Certificate Authority Key Identifier"
-
-#: ../smime/lib/e-asn1-object.c:255
-#, c-format
-msgid "Object Identifier (%s)"
-msgstr "Object Identifier (%s)"
-
-#: ../smime/lib/e-asn1-object.c:306
-msgid "Algorithm Identifier"
-msgstr "Algorithm Identifier"
-
-#: ../smime/lib/e-asn1-object.c:314
-msgid "Algorithm Parameters"
-msgstr "Algorithm Parameters"
-
-#: ../smime/lib/e-asn1-object.c:336
-msgid "Subject Public Key Info"
-msgstr "Subject Public Key Info"
-
-#: ../smime/lib/e-asn1-object.c:341
-msgid "Subject Public Key Algorithm"
-msgstr "Subject Public Key Algorithm"
-
-#: ../smime/lib/e-asn1-object.c:356
-msgid "Subject's Public Key"
-msgstr "Subject's Public Key"
-
-#: ../smime/lib/e-asn1-object.c:378 ../smime/lib/e-asn1-object.c:428
-msgid "Error: Unable to process extension"
-msgstr "Error: Unable to process extension"
-
-#: ../smime/lib/e-asn1-object.c:399 ../smime/lib/e-asn1-object.c:411
-msgid "Object Signer"
-msgstr "Object Signer"
-
-#: ../smime/lib/e-asn1-object.c:403
-msgid "SSL Certificate Authority"
-msgstr "SSL Certificate Authority"
-
-#: ../smime/lib/e-asn1-object.c:407
-msgid "Email Certificate Authority"
-msgstr "E-mail Certificate Authority"
-
-#: ../smime/lib/e-asn1-object.c:436
-msgid "Signing"
-msgstr "Signing"
-
-#: ../smime/lib/e-asn1-object.c:440
-msgid "Non-repudiation"
-msgstr "Non-repudiation"
-
-#: ../smime/lib/e-asn1-object.c:444
-msgid "Key Encipherment"
-msgstr "Key Encipherment"
-
-#: ../smime/lib/e-asn1-object.c:448
-msgid "Data Encipherment"
-msgstr "Data Encipherment"
-
-#: ../smime/lib/e-asn1-object.c:452
-msgid "Key Agreement"
-msgstr "Key Agreement"
-
-#: ../smime/lib/e-asn1-object.c:456
-msgid "Certificate Signer"
-msgstr "Certificate Signer"
-
-#: ../smime/lib/e-asn1-object.c:460
-msgid "CRL Signer"
-msgstr "CRL Signer"
-
-#: ../smime/lib/e-asn1-object.c:509
-msgid "Critical"
-msgstr "Critical"
-
-#: ../smime/lib/e-asn1-object.c:511 ../smime/lib/e-asn1-object.c:514
-msgid "Not Critical"
-msgstr "Not Critical"
-
-#: ../smime/lib/e-asn1-object.c:535
-msgid "Extensions"
-msgstr "Extensions"
-
-#. Translators: This string is used in Certificate
-#. * details for fields like Issuer or Subject, which
-#. * shows the field name on the left and its respective
-#. * value on the right, both as stored in the
-#. * certificate itself.  You probably do not need to
-#. * change this string, unless changing the order of
-#. * name and value.  As a result example:
-#. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-asn1-object.c:615
-#, c-format
-msgid "%s = %s"
-msgstr "%s = %s"
-
-#: ../smime/lib/e-asn1-object.c:672 ../smime/lib/e-asn1-object.c:807
-msgid "Certificate Signature Algorithm"
-msgstr "Certificate Signature Algorithm"
-
-#: ../smime/lib/e-asn1-object.c:681
-msgid "Issuer"
-msgstr "Issuer"
-
-#: ../smime/lib/e-asn1-object.c:735
-msgid "Issuer Unique ID"
-msgstr "Issuer Unique ID"
-
-#: ../smime/lib/e-asn1-object.c:754
-msgid "Subject Unique ID"
-msgstr "Subject Unique ID"
-
-#: ../smime/lib/e-asn1-object.c:813
-msgid "Certificate Signature Value"
-msgstr "Certificate Signature Value"
-
-#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
+#: ../smime/lib/e-cert.c:236 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:392
+#: ../smime/lib/e-cert.c:404
 msgid "Sign"
 msgstr "Sign"
 
-#: ../smime/lib/e-cert.c:393
+#: ../smime/lib/e-cert.c:405
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: ../smime/lib/e-cert-db.c:864
+#: ../smime/lib/e-cert-db.c:787
 msgid "Certificate already exists"
 msgstr "Certificate already exists"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:201
 msgid "PKCS12 File Password"
 msgstr "PKCS12 File Password"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:202
 msgid "Enter password for PKCS12 file:"
 msgstr "Enter password for PKCS12 file:"
 
-#: ../smime/lib/e-pkcs12.c:307
+#: ../smime/lib/e-pkcs12.c:328
+#, c-format
+#| msgid "Unable to create new folder `%s': %s"
+msgid "Unable to create export context, err_code: %i"
+msgstr "Unable to create export context, err_code: %i"
+
+#: ../smime/lib/e-pkcs12.c:335
+#, 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
+#, c-format
+#| msgid "Unable to create new folder `%s': %s"
+msgid "Unable to create safe bag, err_code: %i"
+msgstr "Unable to create safe bag, err_code: %i"
+
+#: ../smime/lib/e-pkcs12.c:363
+#, c-format
+#| msgid "Unable to book a resource, error: %s"
+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
+#, c-format
+#| msgid "Unable to book a resource, error: %s"
+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
 msgid "Imported Certificate"
 msgstr "Imported Certificate"
 
@@ -21067,6 +25904,897 @@ msgstr "With _Due Date"
 msgid "With _Status"
 msgstr "With _Status"
 
+#~ msgid "Web addresses"
+#~ msgstr "Web addresses"
+
+#~ msgid "Original Contact:"
+#~ msgstr "Original Contact:"
+
+#~ msgid "Card View"
+#~ msgstr "Card View"
+
+#~ msgid "Specify the output file instead of standard output"
+#~ msgstr "Specify the output file instead of standard output"
+
+#~ msgid "OUTPUTFILE"
+#~ msgstr "OUTPUTFILE"
+
+#~ msgid "List local address book folders"
+#~ msgstr "List local address book folders"
+
+#~ msgid "Show cards as vcard or csv file"
+#~ msgstr "Show cards as vcard or csv file"
+
+#~ msgid "[vcard|csv]"
+#~ msgstr "[vcard|csv]"
+
+#~ msgid ""
+#~ "Command line arguments error, please use --help option to see the usage."
+#~ msgstr ""
+#~ "Command line arguments error, please use --help option to see the usage."
+
+#~ msgid "Only support csv or vcard format."
+#~ msgstr "Only support csv or vcard format."
+
+#~ msgid "Unhandled error"
+#~ msgstr "Unhandled error"
+
+#~ msgid ""
+#~ "Evolution does not support calendar reminders with\n"
+#~ "email notifications yet, but this reminder was\n"
+#~ "configured to send an email.  Evolution will display\n"
+#~ "a normal reminder dialog box instead."
+#~ msgstr ""
+#~ "Evolution does not support calendar reminders with\n"
+#~ "e-mail notifications yet, but this reminder was\n"
+#~ "configured to send an e-mail.  Evolution will display\n"
+#~ "a normal reminder dialogue box instead."
+
+#~ msgid "Day View"
+#~ msgstr "Day View"
+
+#~ msgid "Work Week View"
+#~ msgstr "Work Week View"
+
+#~ msgid "Week View"
+#~ msgstr "Week View"
+
+#~ msgid "Month View"
+#~ msgstr "Month View"
+
+#~ msgid "start of appointment"
+#~ msgstr "start of appointment"
+
+#~ msgid "end of appointment"
+#~ msgstr "end of appointment"
+
+#~ msgid "Add Reminder"
+#~ msgstr "Add Reminder"
+
+#~ msgid "Reminder"
+#~ msgstr "Reminder"
+
+#~ msgid "Repeat"
+#~ msgstr "Repeat"
+
+#~ msgid "Mes_sage:"
+#~ msgstr "Mes_sage:"
+
+#~ msgid "_Sound:"
+#~ msgstr "_Sound:"
+
+#~ msgid "Select A File"
+#~ msgstr "Select A File"
+
+#~ msgid "Action/Trigger"
+#~ msgstr "Action/Trigger"
+
+#~ msgid "This event has been deleted."
+#~ msgstr "This event has been deleted."
+
+#~ msgid "This task has been deleted."
+#~ msgstr "This task has been deleted."
+
+#~ msgid "This memo has been deleted."
+#~ msgstr "This memo has been deleted."
+
+#~ msgid ""
+#~ "%s  You have made changes. Forget those changes and close the editor?"
+#~ msgstr ""
+#~ "%s  You have made changes. Forget those changes and close the editor?"
+
+#~ msgid "%s  You have made no changes, close the editor?"
+#~ msgstr "%s  You have made no changes, close the editor?"
+
+#~ msgid "This event has been changed."
+#~ msgstr "This event has been changed."
+
+#~ msgid "This task has been changed."
+#~ msgstr "This task has been changed."
+
+#~ msgid "This memo has been changed."
+#~ msgstr "This memo has been changed."
+
+#~ msgid ""
+#~ "%s  You have made changes. Forget those changes and update the editor?"
+#~ msgstr ""
+#~ "%s  You have made changes. Forget those changes and update the editor?"
+
+#~ msgid "%s  You have made no changes, update the editor?"
+#~ msgstr "%s  You have made no changes, update the editor?"
+
+#~ msgid "Could not update object"
+#~ msgstr "Could not update object"
+
+#~ msgid "Edit Appointment"
+#~ msgstr "Edit Appointment"
+
+#~ msgid "Keep original item?"
+#~ msgstr "Keep original item?"
+
+#~ msgid "Changes made to this item may be discarded if an update arrives"
+#~ msgstr "Changes made to this item may be discarded if an update arrives"
+
+#~ msgid "Unable to use current version!"
+#~ msgstr "Unable to use current version!"
+
+#~ msgid "Validation error: %s"
+#~ msgstr "Validation error: %s"
+
+#~ msgid "Could not open destination"
+#~ msgstr "Could not open destination"
+
+#~ msgid "Cannot create object"
+#~ msgstr "Cannot create object"
+
+#~ msgid "Could not open source"
+#~ msgstr "Could not open source"
+
+#~ msgid "The event could not be deleted due to a dbus error: %s"
+#~ msgstr "The event could not be deleted due to a D-Bus error: %s"
+
+#~ msgid "The task could not be deleted due to a dbus error: %s"
+#~ msgstr "The task could not be deleted due to a D-Bus error: %s"
+
+#~ msgid "The memo could not be deleted due to a dbus error: %s"
+#~ msgstr "The memo could not be deleted due to a D-Bus error: %s"
+
+#~ msgid "The item could not be deleted due to a dbus error: %s"
+#~ msgstr "The item could not be deleted due to a D-Bus error: %s"
+
+#~ msgid "The event could not be deleted because permission was denied"
+#~ msgstr "The event could not be deleted because permission was denied"
+
+#~ msgid "The task could not be deleted because permission was denied"
+#~ msgstr "The task could not be deleted because permission was denied"
+
+#~ msgid "The memo could not be deleted because permission was denied"
+#~ msgstr "The memo could not be deleted because permission was denied"
+
+#~ msgid "The item could not be deleted because permission was denied"
+#~ msgstr "The item could not be deleted because permission was denied"
+
+#~ msgid "The event could not be deleted due to an error: %s"
+#~ msgstr "The event could not be deleted due to an error: %s"
+
+#~ msgid "The task could not be deleted due to an error: %s"
+#~ msgstr "The task could not be deleted due to an error: %s"
+
+#~ msgid "The memo could not be deleted due to an error: %s"
+#~ msgstr "The memo could not be deleted due to an error: %s"
+
+#~ msgid "The item could not be deleted due to an error: %s"
+#~ msgstr "The item could not be deleted due to an error: %s"
+
+#~ msgid "Enter Delegate"
+#~ msgstr "Enter Delegate"
+
+#~ msgid "Delegate To:"
+#~ msgstr "Delegate To:"
+
+#~ msgid "Contacts..."
+#~ msgstr "Contacts…"
+
+#~ msgid "_Recurrence"
+#~ msgstr "_Recurrence"
+
+#~ msgid "Make this a recurring event"
+#~ msgstr "Make this a recurring event"
+
+#~ msgid "Insert advanced send options"
+#~ msgstr "Insert advanced send options"
+
+#~ msgid "_Free/Busy"
+#~ msgstr "_Free/Busy"
+
+#~ msgid "This event has reminders"
+#~ msgstr "This event has reminders"
+
+#~ msgid "Event with no start date"
+#~ msgstr "Event with no start date"
+
+#~ msgid "Event with no end date"
+#~ msgstr "Event with no end date"
+
+#~ msgid "Start date is wrong"
+#~ msgstr "Start date is wrong"
+
+#~ msgid "End date is wrong"
+#~ msgstr "End date is wrong"
+
+#~ msgid "Start time is wrong"
+#~ msgstr "Start time is wrong"
+
+#~ msgid "End time is wrong"
+#~ msgstr "End time is wrong"
+
+#~ msgid "_Delegatees"
+#~ msgstr "_Delegatees"
+
+#~ msgid "Atte_ndees"
+#~ msgstr "Atte_ndees"
+
+#~ msgid "%d day before appointment"
+#~ msgid_plural "%d days before appointment"
+#~ msgstr[0] "%d day before appointment"
+#~ msgstr[1] "%d days before appointment"
+
+#~ msgid "Customize"
+#~ msgstr "Customise"
+
+#~ msgctxt "eventpage"
+#~ msgid "15 minutes before appointment"
+#~ msgstr "15 minutes before appointment"
+
+#~ msgctxt "eventpage"
+#~ msgid "1 hour before appointment"
+#~ msgstr "1 hour before appointment"
+
+#~ msgctxt "eventpage"
+#~ msgid "1 day before appointment"
+#~ msgstr "1 day before appointment"
+
+#~ msgid "_Time:"
+#~ msgstr "_Time:"
+
+#~ msgid "Event Description"
+#~ msgstr "Event Description"
+
+#~ msgid "Custom Reminder:"
+#~ msgstr "Custom Reminder:"
+
+#~ msgid "Print this memo"
+#~ msgstr "Print this memo"
+
+#~ msgid "Memo's start date is in the past"
+#~ msgstr "Memo's start date is in the past"
+
+#~ msgid "Organi_zer:"
+#~ msgstr "Organi_ser:"
+
+#~ msgid "T_o:"
+#~ msgstr "T_o:"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "Su_mmary:"
+
+#~ msgid "Could not get a selection to modify."
+#~ msgstr "Could not get a selection to modify."
+
+#~ msgid "Could not get a selection to delete."
+#~ msgstr "Could not get a selection to delete."
+
+#~ msgid "Date/Time"
+#~ msgstr "Date/Time"
+
+#~ msgctxt "recurrpage"
+#~ msgid "day(s)"
+#~ msgstr "day(s)"
+
+#~ msgctxt "recurrpage"
+#~ msgid "for"
+#~ msgstr "for"
+
+#~ msgctxt "recurrpage"
+#~ msgid "until"
+#~ msgstr "until"
+
+#~ msgid "Web Page"
+#~ msgstr "Web Page"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancelled"
+
+#~ msgid "Stat_us:"
+#~ msgstr "Stat_us:"
+
+#~ msgid "_Status Details"
+#~ msgstr "_Status Details"
+
+#~ msgid "Click to change or view the status details of the task"
+#~ msgstr "Click to change or view the status details of the task"
+
+#~ msgid "_Send Options"
+#~ msgstr "_Send Options"
+
+#~ msgid "Task Details"
+#~ msgstr "Task Details"
+
+#~ msgid "Print this task"
+#~ msgstr "Print this task"
+
+#~ msgid ""
+#~ "Task cannot be edited, because the selected task list does not support "
+#~ "assigned tasks"
+#~ msgstr ""
+#~ "Task cannot be edited, because the selected task list does not support "
+#~ "assigned tasks"
+
+#~ msgid "Due date is wrong"
+#~ msgstr "Due date is wrong"
+
+#~ msgid "Time zone:"
+#~ msgstr "Time zone:"
+
+#~ msgid "Gnome Calendar"
+#~ msgstr "Gnome Calendar"
+
+#~ msgid "%s at the start of the appointment"
+#~ msgstr "%s at the start of the appointment"
+
+#~ msgid "%s at the end of the appointment"
+#~ msgstr "%s at the end of the appointment"
+
+#~ msgid "Deleting selected objects"
+#~ msgstr "Deleting selected objects"
+
+#~ msgid "Save draft"
+#~ msgstr "Save draft"
+
+#~ msgid "Untitled Message"
+#~ msgstr "Untitled Message"
+
+#~ msgid "Download in progress. Do you want to send the mail?"
+#~ msgstr "Download in progress. Do you want to send the mail?"
+
+#~ msgid ""
+#~ " There are few attachments getting downloaded. Sending the mail will "
+#~ "cause the mail to be sent without those pending attachments "
+#~ msgstr ""
+#~ " There are a few attachments getting downloaded. Sending the mail will "
+#~ "cause the mail to be sent without those pending attachments "
+
+#~ msgid "Email Settings"
+#~ msgstr "E-mail Settings"
+
+#~ msgid "Configure email accounts"
+#~ msgstr "Configure e-mail accounts"
+
+#~ msgid "Week start"
+#~ msgstr "Week start"
+
+#~ msgid "Work days"
+#~ msgstr "Work days"
+
+#~ msgid "Days on which the start and end of work hours should be indicated"
+#~ msgstr "Days on which the start and end of work hours should be indicated"
+
+#~ msgid "Spell checking color"
+#~ msgstr "Spell checking colour"
+
+#~ msgid "Underline color for misspelled words when using inline spelling."
+#~ msgstr "Underline colour for misspelt words when using inline spelling."
+
+#~ msgid "Save name format for drag-and-drop operation"
+#~ msgstr "Save name format for drag-and-drop operation"
+
+#~ msgid ""
+#~ "Can be either 2 to use current date and time or any other value for sent "
+#~ "date of the message. This has a meaning only when dropping just one "
+#~ "message."
+#~ msgstr ""
+#~ "Can be either 2 to use current date and time or any other value for sent "
+#~ "date of the message. This has a meaning only when dropping just one "
+#~ "message."
+
+#~ msgid "Disable or enable ellipsizing of folder names in side bar"
+#~ msgstr "Disable or enable ellipsizing of folder names in side bar"
+
+#~ msgid "Whether disable ellipsizing feature of folder names in side bar."
+#~ msgstr ""
+#~ "Whether to disable ellipsizing feature of folder names in the side bar."
+
+#~ msgid ""
+#~ "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
+#~ "Never load images off the net. \"1\" - Load images in messages from "
+#~ "contacts. \"2\" - Always load images off the net."
+#~ msgstr ""
+#~ "Load images for HTML messages over HTTP(S). Possible values are: \"0\" — "
+#~ "Never load images off the net. \"1\" — Load images in messages from "
+#~ "contacts. \"2\" — Always load images off the net."
+
+#~ msgid ""
+#~ "This key should contain a list of XML structures specifying custom "
+#~ "headers, and whether they are to be displayed. The format of the XML "
+#~ "structure is &lt;header enabled&gt; - set enabled if the header is to be "
+#~ "displayed in the mail view."
+#~ msgstr ""
+#~ "This key should contain a list of XML structures specifying custom "
+#~ "headers, and whether they are to be displayed. The format of the XML "
+#~ "structure is &lt;header enabled&gt; — set enabled if the header is to be "
+#~ "displayed in the mail view."
+
+#~ msgid "Search for the sender photo in local address books"
+#~ msgstr "Search for the sender photo in local address books"
+
+#~ msgid "This option would help in improving the speed of fetching."
+#~ msgstr "This option would help in improving the speed of fetching."
+
+#~ msgid ""
+#~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
+#~ "\" lines in the \"Messages\" column in vertical view"
+#~ msgstr ""
+#~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
+#~ "\" lines in the \"Messages\" column in vertical view"
+
+#~ msgid ""
+#~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
+#~ "\" lines in the \"Messages\" column in vertical view."
+#~ msgstr ""
+#~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
+#~ "\" lines in the \"Messages\" column in vertical view."
+
+#~ msgid "State of message headers in paned view"
+#~ msgstr "State of message headers in paned view"
+
+#~ msgid ""
+#~ "Describes whether message headers in paned view should be collapsed or "
+#~ "expanded by default. \"0\" = expanded and \"1\" = collapsed"
+#~ msgstr ""
+#~ "Describes whether message headers in paned view should be collapsed or "
+#~ "expanded by default. \"0\" = expanded and \"1\" = collapsed"
+
+#~ msgid ""
+#~ "Possible values are: 'never' - to never close browser window, 'always' - "
+#~ "to always close browser window or 'ask' - (or any other value) will ask "
+#~ "user."
+#~ msgstr ""
+#~ "Possible values are: 'never' - to never close browser window, 'always' - "
+#~ "to always close browser window or 'ask' - (or any other value) will ask "
+#~ "user."
+
+#~ msgid "Socket path for SpamAssassin"
+#~ msgstr "Socket path for SpamAssassin"
+
+#~ msgid "Use SpamAssassin daemon and client"
+#~ msgstr "Use SpamAssassin daemon and client"
+
+#~ msgid "Use spamc and spamd programs, if available."
+#~ msgstr "Use spamc and spamd programs, if available."
+
+#~ msgid "Signature exists, but need public key"
+#~ msgstr "Signature exists, but need public key"
+
+#~ msgid "_Show these fields in order:"
+#~ msgstr "_Show these fields in order:"
+
+#~ msgid "Move _Up"
+#~ msgstr "Move _Up"
+
+#~ msgid "Define Views for \"%s\""
+#~ msgstr "Define Views for \"%s\""
+
+#~ msgid "Define Views for %s"
+#~ msgstr "Define Views for %s"
+
+#~ msgid "Name of new view:"
+#~ msgstr "Name of new view:"
+
+#~ msgid "Type of view:"
+#~ msgstr "Type of view:"
+
+#~ msgid "Type of View"
+#~ msgstr "Type of View"
+
+#~ msgid "Could not send attachment"
+#~ msgid_plural "Could not send attachments"
+#~ msgstr[0] "Could not send attachment"
+#~ msgstr[1] "Could not send attachments"
+
+#~ msgid "_Send To..."
+#~ msgstr "_Send To…"
+
+#~ msgid "Send the selected attachments somewhere"
+#~ msgstr "Send the selected attachments somewhere"
+
+#~ msgid "Available Fields"
+#~ msgstr "Available Fields"
+
+#~ msgid "_Unsort"
+#~ msgstr "_Unsort"
+
+#~ msgid "Define Views"
+#~ msgstr "Define Views"
+
+#~ msgid "Define New View"
+#~ msgstr "Define New View"
+
+#~ msgid "Invalid authentication result code (%d)"
+#~ msgstr "Invalid authentication result code (%d)"
+
+#~ msgid "No mail service found with UID '%s'"
+#~ msgstr "No mail service found with UID '%s'"
+
+#~ msgid "UID '%s' is not a mail transport"
+#~ msgstr "UID '%s' is not a mail transport"
+
+#~ msgid "Pinging %s"
+#~ msgstr "Pinging %s"
+
+#~ msgid "Canceled."
+#~ msgstr "Cancelled."
+
+#~ msgid "_Restore Default"
+#~ msgstr "_Restore Default"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "_Switch to Folder"
+#~ msgstr "_Switch to Folder"
+
+#~ msgid "Display the parent folder"
+#~ msgstr "Display the parent folder"
+
+#~ msgid "Switch to _next tab"
+#~ msgstr "Switch to _next tab"
+
+#~ msgid "Switch to the next tab"
+#~ msgstr "Switch to the next tab"
+
+#~ msgid "Switch to _previous tab"
+#~ msgstr "Switch to _previous tab"
+
+#~ msgid "Switch to the previous tab"
+#~ msgstr "Switch to the previous tab"
+
+#~ msgid "Cl_ose current tab"
+#~ msgstr "Cl_ose current tab"
+
+#~ msgid "Close current tab"
+#~ msgstr "Close current tab"
+
+#~ msgid "Folder '%s'"
+#~ msgstr "Folder '%s'"
+
+#~ msgid "Completed On"
+#~ msgstr "Completed On"
+
+#~ msgid "is not set"
+#~ msgstr "is not set"
+
+#~ msgid "is set"
+#~ msgstr "is set"
+
+#~ msgid "Proxy Settings"
+#~ msgstr "Proxy Settings"
+
+#~ msgid "_Use system defaults"
+#~ msgstr "_Use system defaults"
+
+#~ msgid "_Direct connection to the Internet"
+#~ msgstr "_Direct connection to the Internet"
+
+#~ msgid "_Manual proxy configuration:"
+#~ msgstr "_Manual proxy configuration:"
+
+#~ msgid "_Secure HTTP Proxy:"
+#~ msgstr "_Secure HTTP Proxy:"
+
+#~ msgid "Use Authe_ntication"
+#~ msgstr "Use Authe_ntication"
+
+#~ msgid "Us_ername:"
+#~ msgstr "Us_ername:"
+
+#~ msgid "Pass_word:"
+#~ msgstr "Pass_word:"
+
+#~ msgid "Loading Images"
+#~ msgstr "Loading Images"
+
+#~ msgid "S_earch for sender photograph only in local address books"
+#~ msgstr "S_earch for sender photograph only in local address books"
+
+#~ msgid "Option is ignored if a match for custom junk headers is found."
+#~ msgstr "Option is ignored if a match for custom junk headers is found."
+
+#~ msgid ""
+#~ "This will mark all messages as read in the selected folder and its "
+#~ "subfolders."
+#~ msgstr ""
+#~ "This will mark all messages as read in the selected folder and its "
+#~ "subfolders."
+
+#~ msgid "Close message window."
+#~ msgstr "Close message window."
+
+#~ msgid "Would you like to close the message window?"
+#~ msgstr "Would you like to close the message window?"
+
+#~ msgid "Please select a valid backup file to restore."
+#~ msgstr "Please select a valid backup file to restore."
+
+#~ msgid "HTTP Error: %s"
+#~ msgstr "HTTP Error: %s"
+
+#~ msgid "Could not parse response"
+#~ msgstr "Could not parse response"
+
+#~ msgid "Empty response"
+#~ msgstr "Empty response"
+
+#~ msgid "Unexpected reply from server"
+#~ msgstr "Unexpected reply from server"
+
+#~ msgid "Could not locate user's calendars"
+#~ msgstr "Could not locate user's calendars"
+
+#~ msgid "Path"
+#~ msgstr "Path"
+
+#~ msgid "Enter Google password for user '%s'."
+#~ msgstr "Enter Google password for user '%s'."
+
+#~ msgid "User declined to provide a password"
+#~ msgstr "User declined to provide a password"
+
+#~ msgid "Copy..."
+#~ msgstr "Copy…"
+
+#~ msgid "Expunging"
+#~ msgstr "Expunging"
+
+#~ msgid "Itip Formatter"
+#~ msgstr "Itip Formatter"
+
+#~ msgid "Display \"text/calendar\" MIME parts in mail messages."
+#~ msgstr "Display \"text/calendar\" MIME parts in mail messages."
+
+#~ msgid ""
+#~ "Cannot find a corresponding account in the org.gnome.OnlineAccounts "
+#~ "service from which to obtain an authentication token."
+#~ msgstr ""
+#~ "Cannot find a corresponding account in the org.gnome.OnlineAccounts "
+#~ "service from which to obtain an authentication token."
+
+#~ msgid "OAuth"
+#~ msgstr "OAuth"
+
+#~ msgid "_PostScript"
+#~ msgstr "_PostScript"
+
+#~ msgid "Evolution Web Inspector"
+#~ msgstr "Evolution Web Inspector"
+
+#~ msgid "Please select an image of size 48 * 48"
+#~ msgstr "Please select an image of size 48 * 48"
+
+#~ msgid "View image attachments directly in mail messages."
+#~ msgstr "View image attachments directly in mail messages."
+
+#~ msgid "No writable calendar is available."
+#~ msgstr "No writeable calendar is available."
+
+#~ msgid "Mark Me_ssages as Read"
+#~ msgstr "Mark Me_ssages as Read"
+
+#~ msgid "Mark All Read"
+#~ msgstr "Mark All Read"
+
+#~ msgid "Mark all messages in a folder as read."
+#~ msgstr "Mark all messages in a folder as read."
+
+#~ msgid "Could not open %s: Unknown error"
+#~ msgstr "Could not open %s: Unknown error"
+
+#~ msgid "E_nable"
+#~ msgstr "E_nable"
+
+#~ msgid "Define Views..."
+#~ msgstr "Define Views…"
+
+#~ msgid "Create or edit views"
+#~ msgstr "Create or edit views"
+
+#~ msgid "Start in \"express\" mode"
+#~ msgstr "Start in \"express\" mode"
+
+#~ msgid "Not part of certificate"
+#~ msgstr "Not part of certificate"
+
+#~ msgid "This certificate has been verified for the following uses:"
+#~ msgstr "This certificate has been verified for the following uses:"
+
+#~ msgid "SSL Client Certificate"
+#~ msgstr "SSL Client Certificate"
+
+#~ msgid "SSL Server Certificate"
+#~ msgstr "SSL Server Certificate"
+
+#~ msgid "Email Signer Certificate"
+#~ msgstr "E-mail Signer Certificate"
+
+#~ msgid "Email Recipient Certificate"
+#~ msgstr "E-mail Recipient Certificate"
+
+#~ msgid "Issued To"
+#~ msgstr "Issued To"
+
+#~ msgid "Common Name (CN)"
+#~ msgstr "Common Name (CN)"
+
+#~ msgid "Organization (O)"
+#~ msgstr "Organisation (O)"
+
+#~ msgid "Organizational Unit (OU)"
+#~ msgstr "Organisational Unit (OU)"
+
+#~ msgid "Validity"
+#~ msgstr "Validity"
+
+#~ msgid "Issued On"
+#~ msgstr "Issued On"
+
+#~ msgid "Expires On"
+#~ msgstr "Expires On"
+
+#~ msgid "Certificate Hierarchy"
+#~ msgstr "Certificate Hierarchy"
+
+#~ msgid "Certificate Fields"
+#~ msgstr "Certificate Fields"
+
+#~ msgid "Field Value"
+#~ msgstr "Field Value"
+
+#~ msgid "Details"
+#~ msgstr "Details"
+
+#~ msgid ""
+#~ "Issued to:\n"
+#~ "  Subject: %s\n"
+#~ msgstr ""
+#~ "Issued to:\n"
+#~ "  Subject: %s\n"
+
+#~ msgid ""
+#~ "Issued by:\n"
+#~ "  Subject: %s\n"
+#~ msgstr ""
+#~ "Issued by:\n"
+#~ "  Subject: %s\n"
+
+#~ msgid "Certificate details"
+#~ msgstr "Certificate details"
+
+#~ msgid "Version"
+#~ msgstr "Version"
+
+#~ msgid "Version 1"
+#~ msgstr "Version 1"
+
+#~ msgid "Version 2"
+#~ msgstr "Version 2"
+
+#~ msgid "Version 3"
+#~ msgstr "Version 3"
+
+#~ msgid "PKCS #1 MD2 With RSA Encryption"
+#~ msgstr "PKCS #1 MD2 With RSA Encryption"
+
+#~ msgid "PKCS #1 MD5 With RSA Encryption"
+#~ msgstr "PKCS #1 MD5 With RSA Encryption"
+
+#~ msgid "PKCS #1 SHA-1 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-1 With RSA Encryption"
+
+#~ msgid "PKCS #1 SHA-256 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-256 With RSA Encryption"
+
+#~ msgid "PKCS #1 SHA-384 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-384 With RSA Encryption"
+
+#~ msgid "PKCS #1 SHA-512 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-512 With RSA Encryption"
+
+#~ msgid "PKCS #1 RSA Encryption"
+#~ msgstr "PKCS #1 RSA Encryption"
+
+#~ msgid "Certificate Key Usage"
+#~ msgstr "Certificate Key Usage"
+
+#~ msgid "Netscape Certificate Type"
+#~ msgstr "Netscape Certificate Type"
+
+#~ msgid "Certificate Authority Key Identifier"
+#~ msgstr "Certificate Authority Key Identifier"
+
+#~ msgid "Object Identifier (%s)"
+#~ msgstr "Object Identifier (%s)"
+
+#~ msgid "Algorithm Identifier"
+#~ msgstr "Algorithm Identifier"
+
+#~ msgid "Algorithm Parameters"
+#~ msgstr "Algorithm Parameters"
+
+#~ msgid "Subject Public Key Info"
+#~ msgstr "Subject Public Key Info"
+
+#~ msgid "Subject Public Key Algorithm"
+#~ msgstr "Subject Public Key Algorithm"
+
+#~ msgid "Subject's Public Key"
+#~ msgstr "Subject's Public Key"
+
+#~ msgid "Error: Unable to process extension"
+#~ msgstr "Error: Unable to process extension"
+
+#~ msgid "Object Signer"
+#~ msgstr "Object Signer"
+
+#~ msgid "SSL Certificate Authority"
+#~ msgstr "SSL Certificate Authority"
+
+#~ msgid "Email Certificate Authority"
+#~ msgstr "E-mail Certificate Authority"
+
+#~ msgid "Signing"
+#~ msgstr "Signing"
+
+#~ msgid "Non-repudiation"
+#~ msgstr "Non-repudiation"
+
+#~ msgid "Key Encipherment"
+#~ msgstr "Key Encipherment"
+
+#~ msgid "Data Encipherment"
+#~ msgstr "Data Encipherment"
+
+#~ msgid "Key Agreement"
+#~ msgstr "Key Agreement"
+
+#~ msgid "Certificate Signer"
+#~ msgstr "Certificate Signer"
+
+#~ msgid "CRL Signer"
+#~ msgstr "CRL Signer"
+
+#~ msgid "Critical"
+#~ msgstr "Critical"
+
+#~ msgid "Not Critical"
+#~ msgstr "Not Critical"
+
+#~ msgid "Extensions"
+#~ msgstr "Extensions"
+
+#~ msgid "%s = %s"
+#~ msgstr "%s = %s"
+
+#~ msgid "Certificate Signature Algorithm"
+#~ msgstr "Certificate Signature Algorithm"
+
+#~ msgid "Issuer Unique ID"
+#~ msgstr "Issuer Unique ID"
+
+#~ msgid "Subject Unique ID"
+#~ msgstr "Subject Unique ID"
+
+#~ msgid "Certificate Signature Value"
+#~ msgstr "Certificate Signature Value"
+
 #~ msgid "Export in asynchronous mode"
 #~ msgstr "Export in asynchronous mode"
 
@@ -21123,9 +26851,6 @@ msgstr "With _Status"
 #~ msgid "Could not perform this operation."
 #~ msgstr "Could not perform this operation."
 
-#~ msgid "Unable to open the calendar '%s': %s"
-#~ msgstr "Unable to open the calendar '%s': %s"
-
 #~ msgid "Unable to open memos in '%s': %s"
 #~ msgstr "Unable to open memos in '%s': %s"
 
@@ -21185,12 +26910,6 @@ msgstr "With _Status"
 #~ msgid "Loading calendars"
 #~ msgstr "Loading calendars"
 
-#~ msgid "Loading memos"
-#~ msgstr "Loading memos"
-
-#~ msgid "Loading tasks"
-#~ msgstr "Loading tasks"
-
 #~ msgid "IMAP Headers"
 #~ msgstr "IMAP Headers"
 
@@ -21226,9 +26945,6 @@ msgstr "With _Status"
 #~ msgid "A_ccept"
 #~ msgstr "A_ccept"
 
-#~ msgid "Failed to load the calendar '%s' (%s)"
-#~ msgstr "Failed to load the calendar '%s' (%s)"
-
 #~ msgid "Proxy _Logout"
 #~ msgstr "Proxy _Logout"
 
@@ -21244,9 +26960,6 @@ msgstr "With _Status"
 #~ msgid "Could not publish calendar: Calendar backend no longer exists"
 #~ msgstr "Could not publish calendar: Calendar backend no longer exists"
 
-#~ msgid "File is not a valid .desktop file"
-#~ msgstr "File is not a valid .desktop file"
-
 #~ msgid "Unrecognized desktop file Version '%s'"
 #~ msgstr "Unrecognised desktop file Version '%s'"
 
@@ -21313,9 +27026,6 @@ msgstr "With _Status"
 #~ msgid "Lo_gin:"
 #~ msgstr "Lo_gin:"
 
-#~ msgid "Search _base:"
-#~ msgstr "Search _base:"
-
 #~ msgid "_Search scope:"
 #~ msgstr "_Search scope:"
 
@@ -21335,9 +27045,6 @@ msgstr "With _Status"
 #~ "Search filter is the type of object to be searched for. If this is not "
 #~ "modified, the default search will be performed on the type \"person\"."
 
-#~ msgid "1"
-#~ msgstr "1"
-
 #~ msgid "5"
 #~ msgstr "5"
 
@@ -21419,9 +27126,6 @@ msgstr "With _Status"
 #~ msgid "CalDAV"
 #~ msgstr "CalDAV"
 
-#~ msgid "Google"
-#~ msgstr "Google"
-
 #~ msgid "Always (SSL)"
 #~ msgstr "Always (SSL)"
 
@@ -21507,9 +27211,6 @@ msgstr "With _Status"
 #~ msgid "Back - Receiving mail"
 #~ msgstr "Back — Receiving mail"
 
-#~ msgid "Sending mail"
-#~ msgstr "Sending mail"
-
 #~ msgid "Next - Review account"
 #~ msgstr "Next — Review account"
 
@@ -21570,9 +27271,6 @@ msgstr "With _Status"
 #~ msgid "Evolution account assistant"
 #~ msgstr "Evolution account assistant"
 
-#~ msgid "On This Computer"
-#~ msgstr "On This Computer"
-
 #~ msgid "Modify %s..."
 #~ msgstr "Modify %s…"
 
@@ -21585,18 +27283,6 @@ msgstr "With _Status"
 #~ msgid "Settings"
 #~ msgstr "Settings"
 
-#~ msgid "Undo the last action"
-#~ msgstr "Undo the last action"
-
-#~ msgid "Redo the last undone action"
-#~ msgstr "Redo the last undone action"
-
-#~ msgid "Search for text"
-#~ msgstr "Search for text"
-
-#~ msgid "Search for and replace text"
-#~ msgstr "Search for and replace text"
-
 #~ msgid "List of selected calendars"
 #~ msgstr "List of selected calendars"
 
@@ -21697,24 +27383,15 @@ msgstr "With _Status"
 #~ msgid "Enter Passphrase for %s"
 #~ msgstr "Enter Passphrase for %s"
 
-#~ msgid "Enter Passphrase"
-#~ msgstr "Enter Passphrase"
-
 #~ msgid "Enter Password for %s"
 #~ msgstr "Enter Password for %s"
 
 #~ msgid "Enter Password"
 #~ msgstr "Enter Password"
 
-#~ msgid "Cannot get transport for account '%s'"
-#~ msgstr "Cannot get transport for account '%s'"
-
 #~ msgid "Unsubscribing from folder '%s'"
 #~ msgstr "Unsubscribing from folder '%s'"
 
-#~ msgid "Refreshing folder '%s'"
-#~ msgstr "Refreshing folder '%s'"
-
 #~ msgid "Expunging folder '%s'"
 #~ msgstr "Expunging folder '%s'"
 
@@ -21762,9 +27439,6 @@ msgstr "With _Status"
 #~ msgid "Create R_ule"
 #~ msgstr "Create R_ule"
 
-#~ msgid "Formatting Message..."
-#~ msgstr "Formatting Message…"
-
 #~ msgid "Retrieving '%s'"
 #~ msgstr "Retrieving '%s'"
 
@@ -21778,31 +27452,19 @@ msgstr "With _Status"
 #~ "Evolution cannot render this e-mail as it is too large to process. You "
 #~ "can view it unformatted or with an external text editor."
 
-#~ msgid "Completed on"
-#~ msgstr "Completed on"
-
 #~ msgid "Overdue:"
 #~ msgstr "Overdue:"
 
 #~ msgid "by"
 #~ msgstr "by"
 
-#~ msgid "View _Unformatted"
-#~ msgstr "View _Unformatted"
-
 #~ msgid "Hide _Unformatted"
 #~ msgstr "Hide _Unformatted"
 
-#~ msgid "O_pen With"
-#~ msgstr "O_pen With"
-
 #~ msgctxt "Button"
 #~ msgid "Attachment"
 #~ msgstr "Attachment"
 
-#~ msgid "No HTML stream available"
-#~ msgstr "No HTML stream available"
-
 #~ msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
 #~ msgstr ""
 #~ "Digitally sign messages when original message signed (PGP or S/MIME)"
@@ -21858,9 +27520,6 @@ msgstr "With _Status"
 #~ "Picture folder, usually set to ~/Pictures. This folder will be also used "
 #~ "when the set path is not pointing to the existent folder."
 
-#~ msgid "Whether to show local folders (On This Computer) in a folder tree."
-#~ msgstr "Whether to show local folders (On This Computer) in a folder tree."
-
 #~ msgid ""
 #~ "This setting specifies whether the threads should be in expanded or "
 #~ "collapsed state by default. Requires a restart to apply."
@@ -21940,9 +27599,6 @@ msgstr "With _Status"
 #~ "Initial width of the \"Folder Subscriptions\" window. The value updates "
 #~ "as the user resizes the window horizontally."
 
-#~ msgid "Default reply style"
-#~ msgstr "Default reply style"
-
 #~ msgid ""
 #~ "Possible values are: never - to never close browser window always - to "
 #~ "always close browser window ask - (or any other value) will ask user"
@@ -22127,9 +27783,6 @@ msgstr "With _Status"
 #~ msgid "Drafts _Folder:"
 #~ msgstr "Drafts _Folder:"
 
-#~ msgid "_Trash Folder:"
-#~ msgstr "Wastebaske_t Folder:"
-
 #~ msgid "_Junk Folder:"
 #~ msgstr "_Junk Folder:"
 
@@ -22169,9 +27822,6 @@ msgstr "With _Status"
 #~ msgid "SSL is not supported in this build of Evolution"
 #~ msgstr "SSL is not supported in this build of Evolution"
 
-#~ msgid "_Authentication Type"
-#~ msgstr "_Authentication Type"
-
 #~ msgid "Re_member password"
 #~ msgstr "Re_member password"
 
@@ -22555,9 +28205,6 @@ msgstr "With _Status"
 #~ msgid "Birthdays & Anniversaries"
 #~ msgstr "Birthdays & Anniversaries"
 
-#~ msgid "_New Calendar..."
-#~ msgstr "_New Calendar…"
-
 #~ msgid "Recent Messages"
 #~ msgstr "Recent Messages"
 
@@ -22622,9 +28269,6 @@ msgstr "With _Status"
 #~ msgid "User's calendars"
 #~ msgstr "User's calendars"
 
-#~ msgid "Failed to get server URL."
-#~ msgstr "Failed to get server URL."
-
 #~ msgid "Searching for user's calendars..."
 #~ msgstr "Searching for user's calendars…"
 
@@ -22652,18 +28296,12 @@ msgstr "With _Status"
 #~ msgid "User e_mail:"
 #~ msgstr "User e-_mail:"
 
-#~ msgid "Failed to create thread: %s"
-#~ msgstr "Failed to create thread: %s"
-
 #~ msgid "Server URL '%s' is not a valid URL"
 #~ msgstr "Server URL '%s' is not a valid URL"
 
 #~ msgid "Browse for a CalDAV calendar"
 #~ msgstr "Browse for a CalDAV calendar"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
-
 #~ msgid "Brows_e server for a calendar"
 #~ msgstr "Brows_e server for a calendar"
 
@@ -22691,9 +28329,6 @@ msgstr "With _Status"
 #~ msgid "Force read _only"
 #~ msgstr "Force read _only"
 
-#~ msgid "Local Calendars"
-#~ msgstr "Local Calendars"
-
 #~ msgid "Add local calendars to Evolution."
 #~ msgstr "Add local calendars to Evolution."
 
@@ -22740,9 +28375,6 @@ msgstr "With _Status"
 #~ msgid "None"
 #~ msgstr "None"
 
-#~ msgid "_Units:"
-#~ msgstr "_Units:"
-
 #~ msgid "Metric (Celsius, cm, etc)"
 #~ msgstr "Metric (Celsius, cm, etc)"
 
@@ -22781,9 +28413,6 @@ msgstr "With _Status"
 #~ msgid "Cal_endar:"
 #~ msgstr "Cal_endar:"
 
-#~ msgid "Retrieve _List"
-#~ msgstr "Retrieve _List"
-
 #~ msgid "Google Calendars"
 #~ msgstr "Google Calendars"
 
@@ -22825,9 +28454,6 @@ msgstr "With _Status"
 #~ msgid "Cannot get source list. %s"
 #~ msgstr "Cannot get source list. %s"
 
-#~ msgid "Create an _Event"
-#~ msgstr "Create an _Event"
-
 #~ msgid "TNEF Decoder"
 #~ msgstr "TNEF Decoder"
 
@@ -23004,9 +28630,6 @@ msgstr "With _Status"
 #~ msgid "URL that provides proxy configuration values."
 #~ msgstr "URL that provides proxy configuration values."
 
-#~ msgid "_Forget Passwords"
-#~ msgstr "_Forget Passwords"
-
 #~ msgid "Forget all remembered passwords"
 #~ msgstr "Forget all remembered passwords"
 
@@ -23132,9 +28755,6 @@ msgstr "With _Status"
 #~ msgid "Protocol"
 #~ msgstr "Protocol"
 
-#~ msgid "_Filename:"
-#~ msgstr "_Filename:"
-
 #~ msgid "Invalid object"
 #~ msgstr "Invalid object"
 
@@ -23200,27 +28820,15 @@ msgstr "With _Status"
 #~ msgid "Scanning folders in \"%s\""
 #~ msgstr "Scanning folders in \"%s\""
 
-#~ msgid "Creating folder '%s'"
-#~ msgstr "Creating folder '%s'"
-
 #~ msgid "_Default junk plugin:"
 #~ msgstr "_Default junk plugin:"
 
 #~ msgid "_Use Secure Connection:"
 #~ msgstr "_Use Secure Connection:"
 
-#~ msgid "Scanning folders in '%s'"
-#~ msgstr "Scanning folders in '%s'"
-
 #~ msgid "Retrieving quota information for folder '%s'"
 #~ msgstr "Retrieving quota information for folder '%s'"
 
-#~ msgid "Opening store '%s'"
-#~ msgstr "Opening store '%s'"
-
-#~ msgid "Local Folders"
-#~ msgstr "Local Folders"
-
 #~ msgid "Error saving messages to: %s:\n"
 #~ msgstr "Error saving messages to: %s:\n"
 
@@ -23296,9 +28904,6 @@ msgstr "With _Status"
 #~ msgid "Enter password for %s (user %s)"
 #~ msgstr "Enter password for %s (user %s)"
 
-#~ msgid "Failed to authenticate.\n"
-#~ msgstr "Failed to authenticate.\n"
-
 #~ msgid "New _Shared Folder..."
 #~ msgstr "New _Shared Folder…"
 
@@ -23355,9 +28960,6 @@ msgstr "With _Status"
 #~ msgid "Shared Folder Installation"
 #~ msgstr "Shared Folder Installation"
 
-#~ msgid "Junk Settings"
-#~ msgstr "Junk Settings"
-
 #~ msgid "Junk Mail Settings"
 #~ msgstr "Junk Mail Settings"
 
@@ -23383,9 +28985,6 @@ msgstr "With _Status"
 #~ msgid "Message retracted successfully"
 #~ msgstr "Message retracted successfully"
 
-#~ msgid "Insert Send options"
-#~ msgstr "Insert Send options"
-
 #~ msgid "The participants will receive the following notification.\n"
 #~ msgstr "The participants will receive the following notification.\n"
 
@@ -23767,9 +29366,6 @@ msgstr "With _Status"
 #~ msgid "Event Gradient"
 #~ msgstr "Event Gradient"
 
-#~ msgid "Event Transparency"
-#~ msgstr "Event Transparency"
-
 #~ msgid "Gradient of the events in calendar views."
 #~ msgstr "Gradient of the events in calendar views."
 
@@ -23795,11 +29391,6 @@ msgstr "With _Status"
 #~ msgid "Yes. (Complex Recurrence)"
 #~ msgstr "Yes. (Complex Recurrence)"
 
-#~ msgid "Every day"
-#~ msgid_plural "Every %d days"
-#~ msgstr[0] "Every day"
-#~ msgstr[1] "Every %d days"
-
 #~ msgid "Every week"
 #~ msgid_plural "Every %d weeks"
 #~ msgstr[0] "Every week"
@@ -24027,9 +29618,6 @@ msgstr "With _Status"
 #~ msgid "Date:"
 #~ msgstr "Date:"
 
-#~ msgid "Loading Calendar"
-#~ msgstr "Loading Calendar"
-
 #~ msgid "Loading calendar..."
 #~ msgstr "Loading calendar…"
 
@@ -24073,11 +29661,6 @@ msgstr "With _Status"
 #~ msgstr[0] "%d day from now"
 #~ msgstr[1] "%d days from now"
 
-#~ msgid "%d day ago"
-#~ msgid_plural "%d days ago"
-#~ msgstr[0] "%d day ago"
-#~ msgstr[1] "%d days ago"
-
 #~ msgid "Debug Logs"
 #~ msgstr "Debug Logs"
 
@@ -24125,9 +29708,6 @@ msgstr "With _Status"
 #~ msgid "Subscribed"
 #~ msgstr "Subscribed"
 
-#~ msgid "Folder"
-#~ msgstr "Folder"
-
 #~ msgid "Please select a server."
 #~ msgstr "Please select a server."
 
@@ -24164,15 +29744,9 @@ msgstr "With _Status"
 #~ msgid "Fi_xed-width:"
 #~ msgstr "Fi_xed-width:"
 
-#~ msgid "Font Properties"
-#~ msgstr "Font Properties"
-
 #~ msgid "KB"
 #~ msgstr "KB"
 
-#~ msgid "Message Fonts"
-#~ msgstr "Message Fonts"
-
 #~ msgid ""
 #~ "Note: you will not be prompted for a password until you connect for the "
 #~ "first time"
@@ -24265,9 +29839,6 @@ msgstr "With _Status"
 #~ msgid "Thread messages by subject"
 #~ msgstr "Thread messages by subject"
 
-#~ msgid "begin editing this cell"
-#~ msgstr "begin editing this cell"
-
 #~ msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
 #~ msgstr "<span size=\"large\" weight=\"bold\">Details:</span>"
 
@@ -24345,9 +29916,6 @@ msgstr "With _Status"
 #~ msgid "No such source"
 #~ msgstr "No such source"
 
-#~ msgid "Not available in offline mode"
-#~ msgstr "Not available in offline mode"
-
 #~ msgid "Other error"
 #~ msgstr "Other error"
 
@@ -24414,9 +29982,6 @@ msgstr "With _Status"
 #~ msgid "_Task"
 #~ msgstr "_Task"
 
-#~ msgid "_From Field"
-#~ msgstr "_From Field"
-
 #~ msgid "Hide"
 #~ msgstr "Hide"
 
@@ -24429,16 +29994,6 @@ msgstr "With _Status"
 #~ msgid "Could not parse PGP message: Unknown error"
 #~ msgstr "Could not parse PGP message: Unknown error"
 
-#~ msgid "Show \"From\" field when sending a mail message"
-#~ msgstr "Show \"From\" field when sending a mail message"
-
-#~ msgid ""
-#~ "Show the \"From\" field when sending a mail message. This is controlled "
-#~ "from the View menu when a mail account is chosen."
-#~ msgstr ""
-#~ "Show the \"From\" field when sending a mail message. This is controlled "
-#~ "from the View menu when a mail account is chosen."
-
 #~ msgid "<b>Top Posting Option</b> (Not Recommended)"
 #~ msgstr "<b>Top Posting Option</b> (Not Recommended)"
 
@@ -24481,9 +30036,6 @@ msgstr "With _Status"
 #~ msgid "<b>Users:</b>"
 #~ msgstr "<b>Users:</b>"
 
-#~ msgid "<b>Account Name</b>"
-#~ msgstr "<b>Account Name</b>"
-
 #~ msgid "_Accept"
 #~ msgstr "_Accept"
 
@@ -24493,9 +30045,6 @@ msgstr "With _Status"
 #~ msgid "Setup Assistant"
 #~ msgstr "Setup Assistant"
 
-#~ msgid "Importing data."
-#~ msgstr "Importing data."
-
 #~ msgid "Please wait"
 #~ msgstr "Please wait"
 
@@ -24577,9 +30126,6 @@ msgstr "With _Status"
 #~ msgid "Shell View"
 #~ msgstr "Shell View"
 
-#~ msgid "Width"
-#~ msgstr "Width"
-
 #~ msgid "Height"
 #~ msgstr "Height"
 
@@ -24595,9 +30141,6 @@ msgstr "With _Status"
 #~ msgid "Max field name length"
 #~ msgstr "Max field name length"
 
-#~ msgid "Column Width"
-#~ msgstr "Column Width"
-
 #~ msgid "Adapter"
 #~ msgstr "Adaptor"
 
@@ -24622,9 +30165,6 @@ msgstr "With _Status"
 #~ msgid "Default Client"
 #~ msgstr "Default Client"
 
-#~ msgid "Shell Settings"
-#~ msgstr "Shell Settings"
-
 #~ msgid "Application-wide settings"
 #~ msgstr "Application-wide settings"
 
@@ -24700,9 +30240,6 @@ msgstr "With _Status"
 #~ msgid "Later"
 #~ msgstr "Later"
 
-#~ msgid "Unable to create new folder `%s': %s"
-#~ msgstr "Unable to create new folder `%s': %s"
-
 #~ msgid "Unable to copy folder `%s' to `%s': %s"
 #~ msgstr "Unable to copy folder `%s' to `%s': %s"
 
@@ -24899,9 +30436,6 @@ msgstr "With _Status"
 #~ msgid "This widget displays a miniature calendar"
 #~ msgstr "This widget displays a miniature calendar"
 
-#~ msgid "Default Calendar Client"
-#~ msgstr "Default Calendar Client"
-
 #~ msgid "Default client for calendar operations"
 #~ msgstr "Default client for calendar operations"
 
@@ -24911,9 +30445,6 @@ msgstr "With _Status"
 #~ msgid "The memo table model"
 #~ msgstr "The memo table model"
 
-#~ msgid "Default Memo Client"
-#~ msgstr "Default Memo Client"
-
 #~ msgid "Default client for memo operations"
 #~ msgstr "Default client for memo operations"
 
@@ -24937,9 +30468,6 @@ msgstr "With _Status"
 #~ msgid "Unable to migrate tasks `%s'"
 #~ msgstr "Unable to migrate tasks `%s'"
 
-#~ msgid "Default Task Client"
-#~ msgstr "Default Task Client"
-
 #~ msgid "Default client for task operations"
 #~ msgstr "Default client for task operations"
 
@@ -24961,9 +30489,6 @@ msgstr "With _Status"
 #~ msgid "Temporarily hide the selected messages"
 #~ msgstr "Temporarily hide the selected messages"
 
-#~ msgid "Show Hidde_n Messages"
-#~ msgstr "Show Hidde_n Messages"
-
 #~ msgid "Show messages that have been temporarily hidden"
 #~ msgstr "Show messages that have been temporarily hidden"
 
@@ -25174,9 +30699,6 @@ msgstr "With _Status"
 #~ "You will need to make more space available in your home directory before "
 #~ "you can continue."
 
-#~ msgid "_Keep Data"
-#~ msgstr "_Keep Data"
-
 #~ msgid "_Remind Me Later"
 #~ msgstr "_Remind Me Later"
 
@@ -25195,9 +30717,6 @@ msgstr "With _Status"
 #~ msgid "A GtkRadioAction"
 #~ msgstr "A GtkRadioAction"
 
-#~ msgid "Show _Attachment Bar"
-#~ msgstr "Show _Attachment Bar"
-
 #~ msgid "Fill color"
 #~ msgstr "Fill colour"
 
@@ -25225,15 +30744,9 @@ msgstr "With _Status"
 #~ msgid "Minimum Width"
 #~ msgstr "Minimum Width"
 
-#~ msgid "Spacing"
-#~ msgstr "Spacing"
-
 #~ msgid "The button state is online"
 #~ msgstr "The button state is online"
 
-#~ msgid "Horizontal Position"
-#~ msgstr "Horizontal Position"
-
 #~ msgid "Pane position when oriented horizontally"
 #~ msgstr "Pane position when orientated horizontally"
 
@@ -25279,9 +30792,6 @@ msgstr "With _Status"
 #~ msgid "Underline Column"
 #~ msgstr "Underline Column"
 
-#~ msgid "Bold Column"
-#~ msgstr "Bold Column"
-
 #~ msgid "Color Column"
 #~ msgstr "Colour Column"
 
@@ -25327,9 +30837,6 @@ msgstr "With _Status"
 #~ msgid "Sort Info"
 #~ msgstr "Sort Info"
 
-#~ msgid "Always search"
-#~ msgstr "Always search"
-
 #~ msgid "Use click to add"
 #~ msgstr "Use click to add"
 
@@ -25371,15 +30878,6 @@ msgstr "With _Status"
 #~ msgid "Event Processor"
 #~ msgstr "Event Processor"
 
-#~ msgid "Text"
-#~ msgstr "Text"
-
-#~ msgid "Bold"
-#~ msgstr "Bold"
-
-#~ msgid "Strikeout"
-#~ msgstr "Strikeout"
-
 #~ msgid "Anchor"
 #~ msgstr "Anchor"
 
@@ -25419,15 +30917,9 @@ msgstr "With _Status"
 #~ msgid "Break characters"
 #~ msgstr "Break characters"
 
-#~ msgid "Max lines"
-#~ msgstr "Max lines"
-
 #~ msgid "Draw borders"
 #~ msgstr "Draw borders"
 
-#~ msgid "Allow newlines"
-#~ msgstr "Allow newlines"
-
 #~ msgid "Draw background"
 #~ msgstr "Draw background"
 
@@ -25455,27 +30947,18 @@ msgstr "With _Status"
 #~ msgid "<b>Email</b>"
 #~ msgstr "<b>E-mail</b>"
 
-#~ msgid "<b>Home</b>"
-#~ msgstr "<b>Home</b>"
-
 #~ msgid "<b>Job</b>"
 #~ msgstr "<b>Job</b>"
 
 #~ msgid "<b>Miscellaneous</b>"
 #~ msgstr "<b>Miscellaneous</b>"
 
-#~ msgid "<b>Notes</b>"
-#~ msgstr "<b>Notes</b>"
-
 #~ msgid "<b>Other</b>"
 #~ msgstr "<b>Other</b>"
 
 #~ msgid "<b>Telephone</b>"
 #~ msgstr "<b>Telephone</b>"
 
-#~ msgid "<b>Work</b>"
-#~ msgstr "<b>Work</b>"
-
 #~ msgid ""
 #~ "\n"
 #~ "Mr.\n"
@@ -25533,9 +31016,6 @@ msgstr "With _Status"
 #~ msgid "<b>Alarm</b>"
 #~ msgstr "<b>Alarm</b>"
 
-#~ msgid "<b>Options</b>"
-#~ msgstr "<b>Options</b>"
-
 #~ msgid ""
 #~ "before\n"
 #~ "after"
@@ -25931,18 +31411,12 @@ msgstr "With _Status"
 #~ msgid "Discard changes?"
 #~ msgstr "Discard changes?"
 
-#~ msgid "Mark all messages as read"
-#~ msgstr "Mark all messages as read"
-
 #~ msgid "Querying server"
 #~ msgstr "Querying server"
 
 #~ msgid "Base"
 #~ msgstr "Base"
 
-#~ msgid "_Open"
-#~ msgstr "_Open"
-
 #~ msgid ""
 #~ "389\n"
 #~ "636\n"
@@ -26016,9 +31490,6 @@ msgstr "With _Status"
 #~ "This is the name for this server that will appear in your Evolution "
 #~ "folder list. It is for display purposes only. "
 
-#~ msgid "Save As..."
-#~ msgstr "Save As…"
-
 #, fuzzy
 #~ msgid "Deleting selected memos..."
 #~ msgstr "Deleting selected objects…"
@@ -26039,9 +31510,6 @@ msgstr "With _Status"
 #~ msgid "Cut selected tasks"
 #~ msgstr "Cut selected tasks"
 
-#~ msgid "Select _All Messages"
-#~ msgstr "Select _All Messages"
-
 #~ msgid "Open Other User's Folder"
 #~ msgstr "Open Other User's Folder"
 
@@ -26129,9 +31597,6 @@ msgstr "With _Status"
 #~ msgid "0 KB"
 #~ msgstr "0 KB"
 
-#~ msgid "Size:"
-#~ msgstr "Size:"
-
 #~ msgid ""
 #~ "Evolution is in offline mode. You cannot create or modify folders now.\n"
 #~ "Please switch to online mode for such operations."
@@ -26164,9 +31629,6 @@ msgstr "With _Status"
 #~ msgid "Your password will expire in the next %d days"
 #~ msgstr "Your password will expire in the next %d days"
 
-#~ msgid "Custom"
-#~ msgstr "Custom"
-
 #~ msgid "Editor (read, create, edit)"
 #~ msgstr "Editor (read, create, edit)"
 
@@ -26269,9 +31731,6 @@ msgstr "With _Status"
 #~ msgid "Folder Name"
 #~ msgstr "Folder Name"
 
-#~ msgid "Folder Size"
-#~ msgstr "Folder Size"
-
 #~ msgid "Subscribe to Other User's Folder"
 #~ msgstr "Subscribe to Other User's Folder"
 
@@ -26347,9 +31806,6 @@ msgstr "With _Status"
 #~ msgid "Create items"
 #~ msgstr "Create items"
 
-#~ msgid "Delete Any Items"
-#~ msgstr "Delete Any Items"
-
 #~ msgid "Delete Own Items"
 #~ msgstr "Delete Own Items"
 
@@ -26406,9 +31862,6 @@ msgstr "With _Status"
 #~ msgid "Request a _delivery receipt for this message"
 #~ msgstr "Request a _delivery receipt for this message"
 
-#~ msgid "Request a _read receipt for this message"
-#~ msgstr "Request a _read receipt for this message"
-
 #~ msgid "Send as Delegate"
 #~ msgstr "Send as Delegate"
 
@@ -26943,21 +32396,9 @@ msgstr "With _Status"
 #~ msgid "Name begins with"
 #~ msgstr "Name begins with"
 
-#~ msgid "_Print"
-#~ msgstr "_Print"
-
 #~ msgid "Cop_y to Address Book..."
 #~ msgstr "Cop_y to Address Book…"
 
-#~ msgid "Mo_ve to Address Book..."
-#~ msgstr "Mo_ve to Address Book…"
-
-#~ msgid "Cu_t"
-#~ msgstr "Cu_t"
-
-#~ msgid "_Copy"
-#~ msgstr "_Copy"
-
 #~ msgid "P_aste"
 #~ msgstr "P_aste"
 
@@ -27056,12 +32497,6 @@ msgstr "With _Status"
 #~ msgid "Permission denied to open the calendar"
 #~ msgstr "Permission denied to open the calendar"
 
-#~ msgid "_Add "
-#~ msgstr "_Add "
-
-#~ msgid "_Save As..."
-#~ msgstr "_Save As…"
-
 #~ msgid "P_rint..."
 #~ msgstr "P_rint…"
 
@@ -27104,9 +32539,6 @@ msgstr "With _Status"
 #~ msgid "Loading tasks at %s"
 #~ msgstr "Loading tasks at %s"
 
-#~ msgid "Loading memos at %s"
-#~ msgstr "Loading memos at %s"
-
 #~ msgid "Failed upgrading memos."
 #~ msgstr "Failed upgrading memos."
 
@@ -27151,9 +32583,6 @@ msgstr "With _Status"
 #~ msgid "Component"
 #~ msgstr "Component"
 
-#~ msgid "Label name cannot be empty."
-#~ msgstr "Label name cannot be empty."
-
 #~ msgid ""
 #~ "A label having the same tag already exists on the server. Please rename "
 #~ "your label."
@@ -27468,24 +32897,15 @@ msgstr "With _Status"
 #~ msgid "Move to Folder..."
 #~ msgstr "Move to Folder…"
 
-#~ msgid "Paste"
-#~ msgstr "Paste"
-
 #~ msgid "Save as VCard..."
 #~ msgstr "Save as vCard…"
 
-#~ msgid "Select _All"
-#~ msgstr "Select _All"
-
 #~ msgid "Send message to contact"
 #~ msgstr "Send message to contact"
 
 #~ msgid "St_op"
 #~ msgstr "St_op"
 
-#~ msgid "Stop"
-#~ msgstr "Stop"
-
 #~ msgid "_Copy Folder Contacts To"
 #~ msgstr "_Copy Folder Contacts To"
 
@@ -27558,12 +32978,6 @@ msgstr "With _Status"
 #~ msgid "Hide window buttons"
 #~ msgstr "Hide window buttons"
 
-#~ msgid "Page Set_up..."
-#~ msgstr "Page Set_up…"
-
-#~ msgid "Prefere_nces"
-#~ msgstr "Prefere_nces"
-
 #~ msgid "Submit Bug Report"
 #~ msgstr "Submit Bug Report"
 
@@ -27579,9 +32993,6 @@ msgstr "With _Status"
 #~ msgid "Work _Offline"
 #~ msgstr "Work _Offline"
 
-#~ msgid "_About"
-#~ msgstr "_About"
-
 #~ msgid "_Frequently Asked Questions"
 #~ msgstr "_Frequently Asked Questions"
 
@@ -27597,18 +33008,12 @@ msgstr "With _Status"
 #~ msgid "_Searches"
 #~ msgstr "_Searches"
 
-#~ msgid "Choose Image"
-#~ msgstr "Choose Image"
-
 #~ msgid "Reflow model"
 #~ msgstr "Reflow model"
 
 #~ msgid "Column width"
 #~ msgstr "Column width"
 
-#~ msgid "_Clear"
-#~ msgstr "_Clear"
-
 #~ msgid "Item ID"
 #~ msgstr "Item ID"
 
@@ -27621,9 +33026,6 @@ msgstr "With _Status"
 #~ msgid "<b>Type:</b>"
 #~ msgstr "<b>Type:</b>"
 
-#~ msgid "Add Address Book"
-#~ msgstr "Add Address Book"
-
 #~ msgid "Basic"
 #~ msgstr "Basic"
 
@@ -27957,9 +33359,6 @@ msgstr "With _Status"
 #~ msgid "Israel"
 #~ msgstr "Israel"
 
-#~ msgid "Italy"
-#~ msgstr "Italy"
-
 #~ msgid "Jamaica"
 #~ msgstr "Jamaica"
 
@@ -28146,9 +33545,6 @@ msgstr "With _Status"
 #~ msgid "Papua New Guinea"
 #~ msgstr "Papua New Guinea"
 
-#~ msgid "Paraguay"
-#~ msgstr "Paraguay"
-
 #~ msgid "Peru"
 #~ msgstr "Peru"
 
@@ -28407,9 +33803,6 @@ msgstr "With _Status"
 #~ msgid "Body"
 #~ msgstr "Body"
 
-#~ msgid "Bottom:"
-#~ msgstr "Bottom:"
-
 #~ msgid "Dimensions:"
 #~ msgstr "Dimensions:"
 
@@ -28431,21 +33824,12 @@ msgstr "With _Status"
 #~ msgid "Headings for each letter"
 #~ msgstr "Headings for each letter"
 
-#~ msgid "Height:"
-#~ msgstr "Height:"
-
 #~ msgid "Landscape"
 #~ msgstr "Landscape"
 
-#~ msgid "Left:"
-#~ msgstr "Left:"
-
 #~ msgid "Letter tabs on side"
 #~ msgstr "Letter tabs on side"
 
-#~ msgid "Margins"
-#~ msgstr "Margins"
-
 #~ msgid "Number of columns:"
 #~ msgstr "Number of columns:"
 
@@ -28455,9 +33839,6 @@ msgstr "With _Status"
 #~ msgid "Page Setup:"
 #~ msgstr "Page Setup:"
 
-#~ msgid "Paper"
-#~ msgstr "Paper"
-
 #~ msgid "Paper source:"
 #~ msgstr "Paper source:"
 
@@ -28473,33 +33854,18 @@ msgstr "With _Status"
 #~ msgid "Reverse on even pages"
 #~ msgstr "Reverse on even pages"
 
-#~ msgid "Right:"
-#~ msgstr "Right:"
-
 #~ msgid "Sections:"
 #~ msgstr "Sections:"
 
 #~ msgid "Start on a new page"
 #~ msgstr "Start on a new page"
 
-#~ msgid "Style name:"
-#~ msgstr "Style name:"
-
-#~ msgid "Top:"
-#~ msgstr "Top:"
-
-#~ msgid "Width:"
-#~ msgstr "Width:"
-
 #~ msgid "_Font..."
 #~ msgstr "_Font..."
 
 #~ msgid "Whether to use daylight savings time while displaying events."
 #~ msgstr "Whether to use daylight savings time while displaying events."
 
-#~ msgid "daylight savings time"
-#~ msgstr "daylight savings time"
-
 #~ msgid "Adjust for daylight sa_ving time"
 #~ msgstr "Adjust for daylight sa_ving time"
 
@@ -28511,9 +33877,6 @@ msgstr "With _Status"
 #~ msgstr[0] "<b>%d</b> Attachment"
 #~ msgstr[1] "<b>%d</b> Attachments"
 
-#~ msgid "Show Attachments"
-#~ msgstr "Show Attachments"
-
 #~ msgid "Press space key to toggle attachment bar"
 #~ msgstr "Press space key to toggle attachment bar"
 
@@ -28550,9 +33913,6 @@ msgstr "With _Status"
 #~ msgid "Toggles whether the To field is displayed"
 #~ msgstr "Toggles whether the To field is displayed"
 
-#~ msgid "Retrieving Message..."
-#~ msgstr "Retrieving Message..."
-
 #~ msgid "C_all To..."
 #~ msgstr "C_all To..."
 
@@ -28635,9 +33995,6 @@ msgstr "With _Status"
 #~ msgid "_Automatic proxy configuration URL:"
 #~ msgstr "_Automatic proxy configuration URL:"
 
-#~ msgid "Case _sensitive"
-#~ msgstr "Case _sensitive"
-
 #~ msgid "F_ind:"
 #~ msgstr "F_ind:"
 
@@ -28733,9 +34090,6 @@ msgstr "With _Status"
 #~ msgid "Import ICS"
 #~ msgstr "Import ICS"
 
-#~ msgid "Imports ICS attachments to calendar."
-#~ msgstr "Imports ICS attachments to calendar."
-
 #~ msgid ""
 #~ "Synchronize the selected task/memo/calendar/address book with Apple iPod"
 #~ msgstr ""
@@ -28855,9 +34209,6 @@ msgstr "With _Status"
 #~ msgid "Cannot attach file %s: %s"
 #~ msgstr "Cannot attach file %s: %s"
 
-#~ msgid "Cannot attach file %s: not a regular file"
-#~ msgstr "Cannot attach file %s: not a regular file"
-
 #~ msgid "MIME type:"
 #~ msgstr "MIME type:"
 
@@ -28983,9 +34334,6 @@ msgstr "With _Status"
 #~ msgid "Time &amp; Expenses"
 #~ msgstr "Time &amp; Expenses"
 
-#~ msgid "VIP"
-#~ msgstr "VIP"
-
 #~ msgid "Next 7 Days"
 #~ msgstr "Next 7 Days"
 
@@ -29029,9 +34377,6 @@ msgstr "With _Status"
 #~ msgid "De_scription:"
 #~ msgstr "De_scription:"
 
-#~ msgid "Updating query"
-#~ msgstr "Updating query"
-
 #~ msgid "Upcoming Appointments"
 #~ msgstr "Upcoming Appointments"
 
@@ -29112,9 +34457,6 @@ msgstr "With _Status"
 #~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
 #~ "You can restore the preview panes from the View menu.\n"
 
-#~ msgid "All Day Event"
-#~ msgstr "All Day Event"
-
 #~ msgid "Send _Options"
 #~ msgstr "Send _Options"
 
@@ -29190,9 +34532,6 @@ msgstr "With _Status"
 #~ msgid "Delete all but signature"
 #~ msgstr "Delete all but signature"
 
-#~ msgid "For_mat"
-#~ msgstr "For_mat"
-
 #~ msgid "HT_ML"
 #~ msgstr "HT_ML"
 
@@ -29211,9 +34550,6 @@ msgstr "With _Status"
 #~ msgid "Save the message in a specified folder"
 #~ msgstr "Save the message in a specified folder"
 
-#~ msgid "Send"
-#~ msgstr "Send"
-
 #~ msgid "Send the mail in HTML format"
 #~ msgstr "Send the mail in HTML format"
 
@@ -29250,9 +34586,6 @@ msgstr "With _Status"
 #~ msgid "_Address: "
 #~ msgstr "_Address: "
 
-#~ msgid "_Categories..."
-#~ msgstr "_Categories..."
-
 #~ msgid "\n"
 #~ msgstr "\n"
 
@@ -29262,9 +34595,6 @@ msgstr "With _Status"
 #~ msgid "Error loading default addressbook."
 #~ msgstr "Error loading default addressbook."
 
-#~ msgid "Input File"
-#~ msgstr "Input File"
-
 #~ msgid ""
 #~ "All information in these journal entries will be deleted and can not be "
 #~ "restored."
@@ -29329,9 +34659,6 @@ msgstr "With _Status"
 #~ msgid "Add New Task List"
 #~ msgstr "Add New Task List"
 
-#~ msgid "Task List Group"
-#~ msgstr "Task List Group"
-
 #~ msgid "Task List Name"
 #~ msgstr "Task List Name"
 
@@ -29357,12 +34684,6 @@ msgstr "With _Status"
 #~ msgid "Free/Busy Publishing Settings"
 #~ msgstr "Free/Busy Publishing Settings"
 
-#~ msgid "_Manual"
-#~ msgstr "_Manual"
-
-#~ msgid "Task sort"
-#~ msgstr "Task sort"
-
 #~ msgid "Memo sort"
 #~ msgstr "Memo sort"
 
@@ -29571,9 +34892,6 @@ msgstr "With _Status"
 #~ msgid "Mark attachment to be shown inline by default."
 #~ msgstr "Mark attachment to be shown inline by default."
 
-#~ msgid "_Edit..."
-#~ msgstr "_Edit..."
-
 #~ msgid "MTWTFSS"
 #~ msgstr "MTWTFSS"
 
@@ -29687,9 +35005,6 @@ msgstr "With _Status"
 #~ msgid "<b>Recipients </b>"
 #~ msgstr "<b>Recipients </b>"
 
-#~ msgid "<b>Action</b>"
-#~ msgstr "<b>Action</b>"
-
 #~ msgid "<b>Date and Time</b>"
 #~ msgstr "<b>Date and Time</b>"
 
@@ -29699,12 +35014,6 @@ msgstr "With _Status"
 #~ msgid "%I:%M %p"
 #~ msgstr "%I:%M %p"
 
-#~ msgid "range"
-#~ msgstr "range"
-
-#~ msgid "Printer settings"
-#~ msgstr "Printer settings"
-
 #~ msgid "Fo_rward"
 #~ msgstr "Fo_rward"
 
@@ -29807,24 +35116,15 @@ msgstr "With _Status"
 #~ "Starting at %s\n"
 #~ "Ending at %s"
 
-#~ msgid "Remove"
-#~ msgstr "Remove"
-
 #~ msgid "Don't Remove"
 #~ msgstr "Don't Remove"
 
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>General</b>"
-
 #~ msgid "<b>Publishing</b>"
 #~ msgstr "<b>Publishing</b>"
 
 #~ msgid "<b>Task List</b>"
 #~ msgstr "<b>Task List</b>"
 
-#~ msgid "<b>Time</b>"
-#~ msgstr "<b>Time</b>"
-
 #~ msgid "<b>Work Week</b>"
 #~ msgstr "<b>Work Week</b>"
 
@@ -29840,15 +35140,9 @@ msgstr "With _Status"
 #~ msgid "_Attachment Bar (drop attachments here)"
 #~ msgstr "_Attachment Bar (drop attachments here)"
 
-#~ msgid "Scheduling"
-#~ msgstr "Scheduling"
-
 #~ msgid "Invitations"
 #~ msgstr "Invitations"
 
-#~ msgid "<b>Basics</b>"
-#~ msgstr "<b>Basics</b>"
-
 #~ msgid "Cale_ndar:"
 #~ msgstr "Cale_ndar:"
 
@@ -29867,9 +35161,6 @@ msgstr "With _Status"
 #~ msgid "Assignment"
 #~ msgstr "Assignment"
 
-#~ msgid "Task Table"
-#~ msgstr "Task Table"
-
 #~ msgid "_Publish Free/Busy Information"
 #~ msgstr "_Publish Free/Busy Information"
 
@@ -29989,9 +35280,6 @@ msgstr "With _Status"
 #~ msgid "dialog1"
 #~ msgstr "dialogue1"
 
-#~ msgid "Meetings and Tasks"
-#~ msgstr "Meetings and Tasks"
-
 #~ msgid "<span weight=\"bold\">Conflict Search</span>"
 #~ msgstr "<span weight=\"bold\">Conflict Search</span>"
 


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