[evolution] Updated British English translation

[Bruce Cowan <bcowan src gnome org>]

commit d33f21f77d86f2d7d21887ae6b1d05a3af20ff0c
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Tue Mar 6 15:49:20 2012 +0000

    Updated British English translation

 po/en_GB.po |23384 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 12317 insertions(+), 11067 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index cbf6af9..e75c18e 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,15 +2,15 @@
 # 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.
+# Bruce Cowan <bruce bcowan me uk>, 2009, 2010, 2011, 2012.
 # Philip Withnall <philip tecnocode co uk>, 2010.
 #: ../shell/main.c:570
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-07 16:29+0100\n"
-"PO-Revision-Date: 2011-09-07 16:40+0100\n"
+"POT-Creation-Date: 2012-03-06 15:38+0000\n"
+"PO-Revision-Date: 2012-03-06 15:47+0100\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
@@ -18,197 +18,209 @@ 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-beta1\n"
+"X-Generator: Virtaal 0.7.1\n"
+
+#: ../addressbook/addressbook.error.xml.h:1
+msgid "This address book could not be opened."
+msgstr "This address book could not be opened."
 
-#. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 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."
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
 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."
+"This address book server might be unreachable, the server name may be "
+"misspelt, or your network connection could be down."
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
-msgstr ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
+msgid "Failed to authenticate with LDAP server."
+msgstr "Failed to authenticate with LDAP server."
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid ""
-"A contact list named '{0}' is already in this contact list. Would you like "
-"to add it anyway?"
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
 msgstr ""
-"A contact list named '{0}' is already in this contact list. Would you like "
-"to add it anyway?"
+"Check to make sure your password is spelt correctly and that you are using a "
+"supported login method. Remember that many passwords are case-sensitive; "
+"your caps lock might be on."
 
 #: ../addressbook/addressbook.error.xml.h:5
-msgid "Add with duplicates"
-msgstr "Add with duplicates"
+msgid "This address book server does not have any suggested search bases."
+msgstr "This address book server does not have any suggested search bases."
 
+#  addressbook:ldap-search-base secondary
 #: ../addressbook/addressbook.error.xml.h:6
-msgid "Address '{0}' already exists."
-msgstr "Address '{0}' already exists."
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
 
 #: ../addressbook/addressbook.error.xml.h:7
-msgid "Cannot add new contact"
-msgstr "Cannot add new contact"
+msgid "This server does not support LDAPv3 schema information."
+msgstr "This server does not support LDAPv3 schema information."
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid "Cannot move contact."
-msgstr "Cannot move contact."
+msgid "Could not get schema information for LDAP server."
+msgstr "Could not get schema information for LDAP server."
 
 #: ../addressbook/addressbook.error.xml.h:9
-msgid "Category editor not available."
-msgstr "Category editor not available."
+msgid "LDAP server did not respond with valid schema information."
+msgstr "LDAP server did not respond with valid schema information."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"Check to make sure your password is spelt correctly and that you are using a "
-"supported login method. Remember that many passwords are case-sensitive; "
-"your caps lock might be on."
+msgid "Could not remove address book."
+msgstr "Could not remove address book."
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid "Could not get schema information for LDAP server."
-msgstr "Could not get schema information for LDAP server."
+msgid "Delete address book '{0}'?"
+msgstr "Delete address book '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:12
-msgid "Could not remove address book."
-msgstr "Could not remove address book."
+msgid "This address book will be removed permanently."
+msgstr "This address book will be removed permanently."
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid ""
-"Currently you can only access the GroupWise System Address Book from "
-"Evolution. Please use some other GroupWise mail client once to get your "
-"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr ""
-"Currently you can only access the GroupWise System Address Book from "
-"Evolution. Please use some other GroupWise mail client once to get your "
-"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:63
+msgid "Do _Not Delete"
+msgstr "Do _Not Delete"
 
 #: ../addressbook/addressbook.error.xml.h:14
-msgid "Delete address book '{0}'?"
-msgstr "Delete address book '{0}'?"
+msgid "Category editor not available."
+msgstr "Category editor not available."
 
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
-msgid "Do _Not Delete"
-msgstr "Do _Not Delete"
+msgid "Unable to open address book"
+msgstr "Unable to open address book"
 
 #: ../addressbook/addressbook.error.xml.h:16
-msgid "Error saving {0} to {1}: {2}"
-msgstr "Error saving {0} to {1}: {2}"
+msgid "Unable to perform search."
+msgstr "Unable to perform search."
 
 #: ../addressbook/addressbook.error.xml.h:17
-msgid "Failed to authenticate with LDAP server."
-msgstr "Failed to authenticate with LDAP server."
+msgid "Would you like to save your changes?"
+msgstr "Would you like to save your changes?"
 
 #: ../addressbook/addressbook.error.xml.h:18
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
-msgid "Failed to delete contact"
-msgstr "Failed to delete contact"
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "GroupWise Address book creation:"
-msgstr "GroupWise Address book creation:"
+msgid "_Discard"
+msgstr "_Discard"
 
 #: ../addressbook/addressbook.error.xml.h:20
-msgid "LDAP server did not respond with valid schema information."
-msgstr "LDAP server did not respond with valid schema information."
+msgid "Cannot move contact."
+msgstr "Cannot move contact."
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "List '{0}' is already in this contact list."
-msgstr "List '{0}' is already in this contact list."
+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?"
+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:22
-msgid "Skip duplicates"
-msgstr "Skip duplicates"
+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:23
-msgid "Some addresses already exist in this contact list."
-msgstr "Some addresses already exist in this contact list."
+msgid "_Resize"
+msgstr "_Resize"
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "Some features may not work properly with your current server"
-msgstr "Some features may not work properly with your current server"
+msgid "_Use as it is"
+msgstr "_Use as it is"
 
 #: ../addressbook/addressbook.error.xml.h:25
-msgid "The Evolution address book has quit unexpectedly."
-msgstr "The Evolution address book has quit unexpectedly."
+msgid "_Do not save"
+msgstr "_Do not save"
 
 #: ../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?"
+msgid "Unable to save {0}."
+msgstr "Unable to save {0}."
 
-#  addressbook:ldap-search-base secondary
 #: ../addressbook/addressbook.error.xml.h:27
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
+msgid "Error saving {0} to {1}: {2}"
+msgstr "Error saving {0} to {1}: {2}"
 
 #: ../addressbook/addressbook.error.xml.h:28
-msgid "This address book could not be opened."
-msgstr "This address book could not be opened."
-
-#: ../addressbook/addressbook.error.xml.h:29
-msgid "This address book server does not have any suggested search bases."
-msgstr "This address book server does not have any suggested search bases."
+msgid "The Evolution address book has quit unexpectedly."
+msgstr "The Evolution address book has quit unexpectedly."
 
+#. Translators: {0} is replaced with an address book name which will not be available
 #: ../addressbook/addressbook.error.xml.h:30
 msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
-"This address book server might be unreachable, the server name may be "
-"misspelt, or your network connection could be down."
+"Your contacts for {0} will not be available until Evolution is restarted."
 
 #: ../addressbook/addressbook.error.xml.h:31
-msgid "This address book will be removed permanently."
-msgstr "This address book will be removed permanently."
+msgid "Address '{0}' already exists."
+msgstr "Address '{0}' already exists."
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid "This server does not support LDAPv3 schema information."
-msgstr "This server does not support LDAPv3 schema information."
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+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
-msgid "Unable to open address book"
-msgstr "Unable to open address book"
+#: ../mail/em-vfolder-editor-rule.c:339 ../widgets/table/e-table-config.ui.h:6
+msgid "_Add"
+msgstr "_Add"
 
 #: ../addressbook/addressbook.error.xml.h:34
-msgid "Unable to perform search."
-msgstr "Unable to perform search."
+msgid "Some addresses already exist in this contact list."
+msgstr "Some addresses already exist in this contact list."
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid "Unable to save {0}."
-msgstr "Unable to save {0}."
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+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
-msgid "Would you like to save your changes?"
-msgstr "Would you like to save your changes?"
+msgid "Skip duplicates"
+msgstr "Skip duplicates"
 
 #: ../addressbook/addressbook.error.xml.h:37
+msgid "Add with duplicates"
+msgstr "Add with duplicates"
+
+#: ../addressbook/addressbook.error.xml.h:38
+msgid "List '{0}' is already in this contact list."
+msgstr "List '{0}' is already in this contact list."
+
+#: ../addressbook/addressbook.error.xml.h:39
 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?"
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
 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?"
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:40
+msgid "Some features may not work properly with your current server"
+msgstr "Some features may not work properly with your current server"
+
+#: ../addressbook/addressbook.error.xml.h:41
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -218,338 +230,327 @@ msgstr ""
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:42
+msgid "GroupWise Address book creation:"
+msgstr "GroupWise Address book creation:"
+
+#: ../addressbook/addressbook.error.xml.h:43
 msgid ""
-"You are trying to add addresses that are part of this list already. Would "
-"you like to add them anyway?"
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
-"You are trying to add addresses that are part of this list already. Would "
-"you like to add them anyway?"
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1258
+msgid "Failed to delete contact"
+msgstr "Failed to delete contact"
+
+#: ../addressbook/addressbook.error.xml.h:45
 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:41
+#: ../addressbook/addressbook.error.xml.h:46
+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:48
 msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
-msgstr ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
-
-#. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:43
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr ""
-"Your contacts for {0} will not be available until Evolution is restarted."
-
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:618
-#: ../widgets/table/e-table-config.ui.h:18
-msgid "_Add"
-msgstr "_Add"
-
-#: ../addressbook/addressbook.error.xml.h:45
-msgid "_Discard"
-msgstr "_Discard"
-
-#: ../addressbook/addressbook.error.xml.h:46
-msgid "_Do not save"
-msgstr "_Do not save"
-
-#: ../addressbook/addressbook.error.xml.h:47
-msgid "_Resize"
-msgstr "_Resize"
-
-#: ../addressbook/addressbook.error.xml.h:48
-msgid "_Use as it is"
-msgstr "_Use as it is"
+"'{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/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:715
-#: ../calendar/gui/e-calendar-view.c:2104
-msgid "Anniversary"
-msgstr "Anniversary"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:628
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:650
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2911
+msgid "Contact Editor"
+msgstr "Contact Editor"
 
-#. 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:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:714
-#: ../calendar/gui/e-calendar-view.c:2103 ../capplet/anjal-settings-main.c:79
-#: ../shell/main.c:140
-msgid "Birthday"
-msgstr "Birthday"
+msgid "Image"
+msgstr "Image"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+msgid "Nic_kname:"
+msgstr "Nic_kname:"
 
-#. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
-msgid "Blog:"
-msgstr "Blog:"
+msgid "_File under:"
+msgstr "_File under:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+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â"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-msgid "Calendar:"
-msgstr "Calendar:"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:991
-msgid "Contact"
-msgstr "Contact"
+msgid "Full _Name..."
+msgstr "Full _Nameâ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:654
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:676
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2925
-msgid "Contact Editor"
-msgstr "Contact Editor"
+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:386
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
-#: ../addressbook/gui/widgets/eab-contact-display.c:1019
-#: ../smime/lib/e-cert.c:837
+#: ../addressbook/gui/merging/eab-contact-merging.c:392
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/widgets/eab-contact-display.c:1055
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: ../smime/lib/e-cert.c:811
 msgid "Email"
 msgstr "E-mail"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-msgid "Free/Busy:"
-msgstr "Free/Busy:"
+msgid "Telephone"
+msgstr "Telephone"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
-msgid "Full _Name..."
-msgstr "Full _Nameâ"
+msgid "Instant Messaging"
+msgstr "Instant Messaging"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
-#: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:1323
-#: ../widgets/misc/e-contact-map.c:295
-msgid "Home"
-msgstr "Home"
+#: ../addressbook/importers/evolution-vcard-importer.c:990
+msgid "Contact"
+msgstr "Contact"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-msgid "Home Page:"
-msgstr "Home Page:"
+msgid "_Home Page:"
+msgstr "_Home Page:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-msgid "Image"
-msgstr "Image"
+#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../plugins/itip-formatter/itip-view.c:1980
+msgid "_Calendar:"
+msgstr "_Calendar:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-msgid "Instant Messaging"
-msgstr "Instant Messaging"
+msgid "_Free/Busy:"
+msgstr "_Free/Busy:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
-msgid "Job"
-msgstr "Job"
+msgid "_Video Chat:"
+msgstr "_Video Chat:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
-msgid "Mailing Address"
-msgstr "Mailing Address"
+msgid "Home Page:"
+msgstr "Home Page:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../calendar/gui/dialogs/task-details-page.ui.h:11
-msgid "Miscellaneous"
-msgstr "Miscellaneous"
+msgid "Calendar:"
+msgstr "Calendar:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-msgid "Nic_kname:"
-msgstr "Nic_kname:"
+msgid "Free/Busy:"
+msgstr "Free/Busy:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-msgid "Notes"
-msgstr "Notes"
+msgid "Video Chat:"
+msgstr "Video Chat:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
-#: ../addressbook/gui/widgets/eab-contact-display.c:79
-#: ../addressbook/gui/widgets/eab-contact-display.c:409
-#: ../calendar/gui/e-calendar-view.c:1806
-msgid "Other"
-msgstr "Other"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
-msgid "Personal Information"
-msgstr "Personal Information"
+msgid "_Blog:"
+msgstr "_Blog:"
 
+#. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
-msgid "Telephone"
-msgstr "Telephone"
+msgid "Blog:"
+msgstr "Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Video Chat:"
-msgstr "Video Chat:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "Web Addresses"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../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:"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:77
-#: ../addressbook/gui/widgets/eab-contact-display.c:694
-#: ../addressbook/gui/widgets/eab-contact-display.c:1320
-#: ../widgets/misc/e-contact-map.c:303
-msgid "Work"
-msgstr "Work"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+msgid "_Title:"
+msgstr "_Title:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
-msgid "_Address:"
-msgstr "_Address:"
+msgid "_Company:"
+msgstr "_Company:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
-msgid "_Anniversary:"
-msgstr "_Anniversary:"
+msgid "_Department:"
+msgstr "_Department:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-msgid "_Assistant:"
-msgstr "_Assistant:"
+msgid "_Manager:"
+msgstr "_Manager:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
-msgid "_Birthday:"
-msgstr "_Birthday:"
+msgid "_Assistant:"
+msgstr "_Assistant:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
-msgid "_Blog:"
-msgstr "_Blog:"
+msgid "Job"
+msgstr "Job"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:710
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-#: ../plugins/itip-formatter/itip-view.c:1963
-msgid "_Calendar:"
-msgstr "_Calendar:"
+msgid "_Office:"
+msgstr "_Office:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
-msgid "_City:"
-msgstr "_City:"
+msgid "_Spouse:"
+msgstr "_Spouse:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
-msgid "_Company:"
-msgstr "_Company:"
+msgid "_Birthday:"
+msgstr "_Birthday:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
-msgid "_Country:"
-msgstr "_Country:"
+msgid "_Anniversary:"
+msgstr "_Anniversary:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-msgid "_Department:"
-msgstr "_Department:"
+#: ../addressbook/gui/widgets/eab-contact-display.c:729
+#: ../calendar/gui/e-calendar-view.c:2131
+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
-msgid "_File under:"
-msgstr "_File under:"
+#: ../addressbook/gui/widgets/eab-contact-display.c:728
+#: ../calendar/gui/e-calendar-view.c:2130 ../capplet/anjal-settings-main.c:83
+#: ../shell/main.c:133
+msgid "Birthday"
+msgstr "Birthday"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-msgid "_Free/Busy:"
-msgstr "_Free/Busy:"
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+msgid "Miscellaneous"
+msgstr "Miscellaneous"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
-msgid "_Home Page:"
-msgstr "_Home Page:"
+msgid "Personal Information"
+msgstr "Personal Information"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
-msgid "_Manager:"
-msgstr "_Manager:"
+msgid "_City:"
+msgstr "_City:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
-msgid "_Office:"
-msgstr "_Office:"
+msgid "_Zip/Postal Code:"
+msgstr "_Zip/Postal Code:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
-msgid "_PO Box:"
-msgstr "_PO Box:"
+msgid "_State/Province:"
+msgstr "_State/Province/County:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
-msgid "_Profession:"
-msgstr "_Profession:"
+msgid "_Country:"
+msgstr "_Country:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
-msgid "_Spouse:"
-msgstr "_Spouse:"
+msgid "_PO Box:"
+msgstr "_PO Box:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
-msgid "_State/Province:"
-msgstr "_State/Province/County:"
+msgid "_Address:"
+msgstr "_Address:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
-msgid "_Title:"
-msgstr "_Title:"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/widgets/eab-contact-display.c:82
+#: ../addressbook/gui/widgets/eab-contact-display.c:1360
+#: ../widgets/misc/e-contact-map.c:296
+msgid "Home"
+msgstr "Home"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-msgid "_Video Chat:"
-msgstr "_Video Chat:"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
+#: ../addressbook/gui/widgets/eab-contact-display.c:81
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
+#: ../addressbook/gui/widgets/eab-contact-display.c:1357
+#: ../widgets/misc/e-contact-map.c:304
+msgid "Work"
+msgstr "Work"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-msgid "_Wants to receive HTML mail"
-msgstr "_Wants to receive HTML mail"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/widgets/eab-contact-display.c:83
+#: ../addressbook/gui/widgets/eab-contact-display.c:421
+#: ../calendar/gui/e-cal-model.c:3471
+msgid "Other"
+msgstr "Other"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
-msgid "_Where:"
-msgstr "_Where:"
+msgid "Mailing Address"
+msgstr "Mailing Address"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
-msgid "_Zip/Postal Code:"
-msgstr "_Zip/Postal Code:"
+msgid "Notes"
+msgstr "Notes"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:669
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:672
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:674
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:675
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:673
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:671
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:670
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:676
 msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:220
-#: ../addressbook/gui/widgets/eab-gui-util.c:469
+#: ../addressbook/gui/widgets/eab-gui-util.c:488
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
@@ -561,21 +562,21 @@ msgstr "Error modifying contact"
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:670
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2919
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:644
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2905
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Contact Editor â %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3398
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3386
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3399
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3387
 msgid "_No image"
 msgstr "_No image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3730
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3714
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -583,172 +584,168 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3720
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3743
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3727
+#, c-format
+msgid "'%s' cannot be a future date"
+msgstr "'%s' cannot be a future date"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3756
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3770
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3748
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3762
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' is empty"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3785
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3777
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:437
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
 msgid "Contact Quick-Add"
 msgstr "Contact Quick-Add"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:440
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "_Edit Full"
 msgstr "_Edit Full"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:488
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:492
 msgid "_Full name"
 msgstr "_Full name"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:499
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:503
 msgid "E_mail"
 msgstr "E_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:514
 msgid "_Select Address Book"
 msgstr "_Select Address Book"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
-msgid "Dr."
-msgstr "Dr."
+msgid "Mr."
+msgstr "Mr."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:2
-msgid "Esq."
-msgstr "Esq."
+msgid "Mrs."
+msgstr "Mrs."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Full Name"
-msgstr "Full Name"
+msgid "Ms."
+msgstr "Ms."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:4
-msgid "I"
-msgstr "I"
+msgid "Miss"
+msgstr "Miss"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:5
-msgid "II"
-msgstr "II"
+msgid "Dr."
+msgstr "Dr."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:6
-msgid "III"
-msgstr "III"
+msgid "Sr."
+msgstr "Sr."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:7
 msgid "Jr."
 msgstr "Jr."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:8
-msgid "Miss"
-msgstr "Miss"
+msgid "I"
+msgstr "I"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:9
-msgid "Mr."
-msgstr "Mr."
+msgid "II"
+msgstr "II"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:10
-msgid "Mrs."
-msgstr "Mrs."
+msgid "III"
+msgstr "III"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:11
-msgid "Ms."
-msgstr "Ms."
+msgid "Esq."
+msgstr "Esq."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:12
-msgid "Sr."
-msgstr "Sr."
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Full Name"
+msgstr "Full Name"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "_First:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
-msgid "_Last:"
-msgstr "_Last:"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "_Middle:"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:16
+msgid "_Last:"
+msgstr "_Last:"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 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:742
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:768
 msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+msgid "_List name:"
+msgstr "_List name:"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "Members"
 msgstr "Members"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+msgid "_Type an email address or drag a contact into the list below:"
+msgstr "_Type an e-mail address or drag a contact into the list below:"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Hide addresses when sending mail to this list"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
-msgid "_List name:"
-msgstr "_List name:"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:163
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
+#: ../mail/mail-config.ui.h:156
 msgid "_Select..."
 msgstr "_Selectâ"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
-msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_Type an e-mail address or drag a contact into the list below:"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:865
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:891
 msgid "Contact List Members"
 msgstr "Contact List Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1440
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1409
+msgid "_Members"
+msgstr "_Members"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1523
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1455
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1538
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1470
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1553
 msgid "Error removing list"
 msgstr "Error removing list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1601
-msgid "_Members"
-msgstr "_Members"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
-msgid "Changed Contact:"
-msgstr "Changed Contact:"
-
-#. 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:3
-msgid "Conflicting Contact:"
-msgstr "Conflicting Contact:"
-
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Duplicate Contact Detected"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+#: ../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?"
@@ -756,15 +753,21 @@ msgstr ""
 "The name or e-mail of this contact already exists in this folder. Would you "
 "like to save the changes anyway?"
 
+#. 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/merging/eab-contact-commit-duplicate-detected.ui.h:5
+msgid "Changed Contact:"
+msgstr "Changed Contact:"
+
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-msgid "New Contact:"
-msgstr "New Contact:"
+#: ../addressbook/gui/merging/eab-contact-merging.c:338
+msgid "_Merge"
+msgstr "_Merge"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
-msgid "Original Contact:"
-msgstr "Original Contact:"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -772,307 +775,594 @@ 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:5
+msgid "Original Contact:"
+msgstr "Original Contact:"
+
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:332
-msgid "_Merge"
-msgstr "_Merge"
+msgid "New Contact:"
+msgstr "New Contact:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:315
+#: ../addressbook/gui/merging/eab-contact-merging.c:320
 msgid "Merge Contact"
 msgstr "Merge Contact"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:1059
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:988
-msgid "Any field contains"
-msgstr "Any field contains"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1077
+msgid "Name contains"
+msgstr "Name contains"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+#: ../modules/addressbook/e-book-shell-view-actions.c:1070
 msgid "Email begins with"
 msgstr "E-mail begins with"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:1073
-msgid "Name contains"
-msgstr "Name contains"
+#: ../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:1063
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
+msgid "Any field contains"
+msgstr "Any field contains"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:157
-msgid "No contacts"
-msgstr "No contacts"
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-minicard-view.c:189
+msgid "evolution address book"
+msgstr "evolution address book"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:161
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "%d contact"
-msgstr[1] "%d contacts"
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
+msgid "Copy _Email Address"
+msgstr "Copy _E-mail Address"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:357
-msgid "Error getting book view"
-msgstr "Error getting book view"
+#: ../addressbook/gui/widgets/eab-contact-display.c:193
+#: ../widgets/misc/e-web-view.c:432
+msgid "Copy the email address to the clipboard"
+msgstr "Copy the e-mail address to the clipboard"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:771
-msgid "Search Interrupted"
-msgstr "Search Interrupted"
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
+#: ../widgets/misc/e-web-view.c:437
+msgid "_Send New Message To..."
+msgstr "_Send New Message Toâ"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:158
-msgid "Error modifying card"
-msgstr "Error modifying card"
+#: ../addressbook/gui/widgets/eab-contact-display.c:200
+#: ../widgets/misc/e-web-view.c:439
+msgid "Send a mail message to this address"
+msgstr "Send a mail message to this address"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:624
-msgid "Cut selected contacts to the clipboard"
-msgstr "Cut selected contacts to the clipboard"
+#: ../addressbook/gui/widgets/eab-contact-display.c:227
+msgid "Open map"
+msgstr "Open map"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:630
-msgid "Copy selected contacts to the clipboard"
-msgstr "Copy selected contacts to the clipboard"
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/widgets/eab-contact-display.c:570
+msgid "List Members:"
+msgstr "List Members:"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:636
-msgid "Paste contacts from the clipboard"
-msgstr "Paste contacts from the clipboard"
+#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Nickname"
+msgstr "Nickname"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:642
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-msgid "Delete selected contacts"
-msgstr "Delete selected contacts"
+#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Company"
+msgstr "Company"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:648
-msgid "Select all visible contacts"
-msgstr "Select all visible contacts"
+#: ../addressbook/gui/widgets/eab-contact-display.c:695
+msgid "Department"
+msgstr "Department"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
-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/eab-contact-display.c:696
+msgid "Profession"
+msgstr "Profession"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
-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/eab-contact-display.c:697
+msgid "Position"
+msgstr "Position"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
-#, 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/eab-contact-display.c:698
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Manager"
+msgstr "Manager"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1340
-msgid "Are you sure you want to delete these contacts?"
-msgstr "Are you sure you want to delete these contacts?"
+#: ../addressbook/gui/widgets/eab-contact-display.c:699
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+msgid "Assistant"
+msgstr "Assistant"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1344
-msgid "Are you sure you want to delete this contact?"
-msgstr "Are you sure you want to delete this contact?"
+#: ../addressbook/gui/widgets/eab-contact-display.c:700
+msgid "Video Chat"
+msgstr "Video Chat"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1348
-#, 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/eab-contact-display.c:701
+#: ../calendar/gui/dialogs/calendar-setup.c:469
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
+#: ../modules/calendar/e-cal-shell-view.c:528
+#: ../modules/online-accounts/e-online-accounts-google.c:302
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+#: ../widgets/misc/e-send-options.c:546
+msgid "Calendar"
+msgstr "Calendar"
 
-#. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1504
-#, c-format
-msgid ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgid_plural ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr[0] ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-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/eab-contact-display.c:702
+#: ../calendar/gui/dialogs/event-editor.c:127
+#: ../calendar/gui/dialogs/event-editor.c:354
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "Free/Busy"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1512
-msgid "_Don't Display"
-msgstr "_Don't Display"
+#: ../addressbook/gui/widgets/eab-contact-display.c:703
+#: ../addressbook/gui/widgets/eab-contact-display.c:725
+msgid "Phone"
+msgstr "Phone"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
-msgid "Display _All Contacts"
-msgstr "Display _All Contacts"
+#: ../addressbook/gui/widgets/eab-contact-display.c:704
+msgid "Fax"
+msgstr "Fax"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:685
-msgid "Assistant"
-msgstr "Assistant"
+#: ../addressbook/gui/widgets/eab-contact-display.c:705
+#: ../addressbook/gui/widgets/eab-contact-display.c:727
+msgid "Address"
+msgstr "Address"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Assistant Phone"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Business Fax"
+#: ../addressbook/gui/widgets/eab-contact-display.c:722
+msgid "Home Page"
+msgstr "Home Page"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "Business Phone"
+#: ../addressbook/gui/widgets/eab-contact-display.c:723
+msgid "Web Log"
+msgstr "Web Log"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "Business Phone 2"
+#: ../addressbook/gui/widgets/eab-contact-display.c:726
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "Callback Phone"
+#: ../addressbook/gui/widgets/eab-contact-display.c:730
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Spouse"
+msgstr "Spouse"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "Car Phone"
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person memo list
+#. Create the default Person task list
+#: ../addressbook/gui/widgets/eab-contact-display.c:732
+#: ../capplet/settings/mail-capplet-shell.c:385
+#: ../modules/addressbook/e-book-shell-backend.c:126
+#: ../modules/addressbook/e-book-shell-migrate.c:144
+#: ../modules/calendar/e-cal-shell-backend.c:144
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-memo-shell-backend.c:132
+#: ../modules/calendar/e-memo-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-backend.c:128
+#: ../modules/calendar/e-task-shell-migrate.c:132
+msgid "Personal"
+msgstr "Personal"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.etspec.h:1
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-memo-table.etspec.h:1
-msgid "Categories"
-msgstr "Categories"
+#: ../addressbook/gui/widgets/eab-contact-display.c:753
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Note"
+msgstr "Note"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:680
-msgid "Company"
-msgstr "Company"
+#: ../addressbook/gui/widgets/eab-contact-display.c:1022
+msgid "List Members"
+msgstr "List Members"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-msgid "Company Phone"
-msgstr "Company Phone"
+#: ../addressbook/gui/widgets/eab-contact-display.c:1040
+msgid "Job Title"
+msgstr "Job Title"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 2"
-msgstr "E-mail 2"
+#: ../addressbook/gui/widgets/eab-contact-display.c:1077
+msgid "Home page"
+msgstr "Home page"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Email 3"
-msgstr "E-mail 3"
+#: ../addressbook/gui/widgets/eab-contact-display.c:1086
+msgid "Blog"
+msgstr "Blog"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "Family Name"
-msgstr "Family Name"
+#: ../addressbook/gui/widgets/eab-contact-display.c:1285
+#: ../widgets/misc/e-web-view.c:980
+#, c-format
+msgid "Click to mail %s"
+msgstr "Click to mail %s"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
-msgid "File As"
-msgstr "File As"
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
+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/e-addressbook-view.etspec.h:17
-msgid "Given Name"
-msgstr "Given Name"
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#, 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/e-addressbook-view.etspec.h:18
-msgid "Home Fax"
-msgstr "Home Fax"
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
+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/e-addressbook-view.etspec.h:19
-msgid "Home Phone"
-msgstr "Home Phone"
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
+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/e-addressbook-view.etspec.h:20
-msgid "Home Phone 2"
-msgstr "Home Phone 2"
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "Detailed error message:"
+msgstr "Detailed error message:"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "ISDN Phone"
-msgstr "ISDN Phone"
+#: ../addressbook/gui/widgets/eab-gui-util.c:216
+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/e-addressbook-view.etspec.h:22
-msgid "Journal"
-msgstr "Journal"
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
+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."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:684
-msgid "Manager"
-msgstr "Manager"
+#. 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 was unable to parse this query. %s"
+msgstr "The backend for this address book was unable to parse this query. %s"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:712
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:236
+#, 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"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-msgid "Nickname"
-msgstr "Nickname"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:242
+#: ../addressbook/gui/widgets/eab-gui-util.c:248
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "This query did not complete successfully. %s"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:739
-msgid "Note"
-msgstr "Note"
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:270
+msgid "card.vcf"
+msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Office"
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
+msgid "Select Address Book"
+msgstr "Select Address Book"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "Other Fax"
+#: ../addressbook/gui/widgets/eab-gui-util.c:390
+msgid "list"
+msgstr "list"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Other Phone"
+#: ../addressbook/gui/widgets/eab-gui-util.c:575
+msgid "Move contact to"
+msgstr "Move contact to"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "Pager"
+#: ../addressbook/gui/widgets/eab-gui-util.c:577
+msgid "Copy contact to"
+msgstr "Copy contact to"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "Primary Phone"
+#: ../addressbook/gui/widgets/eab-gui-util.c:580
+msgid "Move contacts to"
+msgstr "Move contacts to"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Radio"
-msgstr "Radio"
+#: ../addressbook/gui/widgets/eab-gui-util.c:582
+msgid "Copy contacts to"
+msgstr "Copy contacts to"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:610
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Role"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+msgid "No contacts"
+msgstr "No contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:716
-msgid "Spouse"
-msgstr "Spouse"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:167
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d contact"
+msgstr[1] "%d contacts"
 
-#. Translators: This is a vcard standard and stands for the type of
-#. phone used by the hearing impaired. TTY stands for "teletype"
-#. (familiar from Unix device names), and TDD is "Telecommunications
-#. Device for Deaf". However, you probably want to leave this
-#. abbreviation unchanged unless you know that there is actually a
-#. different and established translation for this in your language.
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
-msgid "TTYTDD"
-msgstr "TTYTDD"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:363
+msgid "Error getting book view"
+msgstr "Error getting book view"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
-msgid "Telex"
-msgstr "Telex"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:752
+msgid "Search Interrupted"
+msgstr "Search Interrupted"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-msgid "Title"
-msgstr "Title"
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:160
+msgid "Error modifying card"
+msgstr "Error modifying card"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-msgid "Unit"
-msgstr "Unit"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+msgid "Cut selected contacts to the clipboard"
+msgstr "Cut selected contacts to the clipboard"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-msgid "Web Site"
-msgstr "Website"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:646
+msgid "Copy selected contacts to the clipboard"
+msgstr "Copy selected contacts to the clipboard"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:192
-msgid ""
-"\n"
-"\n"
-"Searching for the Contacts..."
-msgstr ""
-"\n"
-"\n"
-"Searching for the Contactsâ"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:652
+msgid "Paste contacts from the clipboard"
+msgstr "Paste contacts from the clipboard"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-addressbook-view.c:658
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
+msgid "Delete selected contacts"
+msgstr "Delete selected contacts"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:664
+msgid "Select all visible contacts"
+msgstr "Select all visible contacts"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+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:1310
+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:1314
+#, 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:1320
+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:1324
+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:1328
+#, c-format
+msgid "Are you sure you want to delete this contact (%s)?"
+msgstr "Are you sure you want to delete this contact (%s)?"
+
+#. Translators: This is shown for > 5 contacts.
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
+#, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgid_plural ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[0] ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+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:1492
+msgid "_Don't Display"
+msgstr "_Don't Display"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1493
+msgid "Display _All Contacts"
+msgstr "Display _All Contacts"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "File As"
+msgstr "File As"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Given Name"
+msgstr "Given Name"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Family Name"
+msgstr "Family Name"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Email 3"
+msgstr "E-mail 3"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Assistant Phone"
+msgstr "Assistant Phone"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Business Phone"
+msgstr "Business Phone"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Business Phone 2"
+msgstr "Business Phone 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Business Fax"
+msgstr "Business Fax"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Callback Phone"
+msgstr "Callback Phone"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "Car Phone"
+msgstr "Car Phone"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+msgid "Company Phone"
+msgstr "Company Phone"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Home Phone"
+msgstr "Home Phone"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Phone 2"
+msgstr "Home Phone 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Fax"
+msgstr "Home Fax"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "ISDN Phone"
+msgstr "ISDN Phone"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Other Phone"
+msgstr "Other Phone"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Other Fax"
+msgstr "Other Fax"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Pager"
+msgstr "Pager"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Primary Phone"
+msgstr "Primary Phone"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Radio"
+msgstr "Radio"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Telex"
+msgstr "Telex"
+
+#. Translators: This is a vcard standard and stands for the type of
+#. phone used by the hearing impaired. TTY stands for "teletype"
+#. (familiar from Unix device names), and TDD is "Telecommunications
+#. Device for Deaf". However, you probably want to leave this
+#. abbreviation unchanged unless you know that there is actually a
+#. different and established translation for this in your language.
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: ../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:653
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Role"
+msgstr "Role"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+msgid "Web Site"
+msgstr "Website"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+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
+msgid "Categories"
+msgstr "Categories"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:34
+msgid "Open"
+msgstr "Open"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:156
+msgid "Contact List: "
+msgstr "Contact List: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:157
+msgid "Contact: "
+msgstr "Contact: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:183
+msgid "evolution minicard"
+msgstr "evolution minicard"
+
+#: ../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:172
+#, 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-minicard.c:98
+msgid "Work Email"
+msgstr "Work E-mail"
+
+#: ../addressbook/gui/widgets/e-minicard.c:99
+msgid "Home Email"
+msgstr "Home E-mail"
+
+#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:795
+msgid "Other Email"
+msgstr "Other E-mail"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Searching for the Contactsâ"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1086,7 +1376,7 @@ msgstr ""
 "\n"
 "or double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:198
+#: ../addressbook/gui/widgets/e-minicard-view.c:199
 msgid ""
 "\n"
 "\n"
@@ -1100,7 +1390,7 @@ msgstr ""
 "\n"
 "Double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:202
+#: ../addressbook/gui/widgets/e-minicard-view.c:203
 msgid ""
 "\n"
 "\n"
@@ -1110,7 +1400,7 @@ msgstr ""
 "\n"
 "Search for the Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:204
+#: ../addressbook/gui/widgets/e-minicard-view.c:205
 msgid ""
 "\n"
 "\n"
@@ -1120,326 +1410,42 @@ msgstr ""
 "\n"
 "There are no items to show in this view."
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
-msgid "Work Email"
-msgstr "Work E-mail"
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
+msgid "Card View"
+msgstr "Card View"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-msgid "Home Email"
-msgstr "Home E-mail"
+#: ../addressbook/importers/evolution-csv-importer.c:748
+#: ../addressbook/importers/evolution-ldif-importer.c:546
+#: ../addressbook/importers/evolution-vcard-importer.c:280
+#: ../calendar/importers/icalendar-importer.c:415
+#: ../calendar/importers/icalendar-importer.c:905
+#: ../calendar/importers/icalendar-importer.c:944 ../shell/shell.error.xml.h:1
+msgid "Importing..."
+msgstr "Importingâ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:819
-msgid "Other Email"
-msgstr "Other E-mail"
+#: ../addressbook/importers/evolution-csv-importer.c:1075
+msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
+msgstr "Outlook Contacts CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
-#: ../addressbook/gui/widgets/ea-minicard-view.c:187
-msgid "evolution address book"
-msgstr "evolution address book"
+#: ../addressbook/importers/evolution-csv-importer.c:1076
+msgid "Outlook Contacts CSV and Tab Importer"
+msgstr "Outlook Contacts CSV and Tab Importer"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact"
-msgstr "New Contact"
+#: ../addressbook/importers/evolution-csv-importer.c:1084
+msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
+msgstr "Mozilla Contacts CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:37
-msgid "New Contact List"
-msgstr "New Contact List"
+#: ../addressbook/importers/evolution-csv-importer.c:1085
+msgid "Mozilla Contacts CSV and Tab Importer"
+msgstr "Mozilla Contacts CSV and Tab Importer"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:170
-#, 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/importers/evolution-csv-importer.c:1093
+msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
+msgstr "Evolution Contacts CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:34
-msgid "Open"
-msgstr "Open"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:156
-msgid "Contact List: "
-msgstr "Contact List: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:157
-msgid "Contact: "
-msgstr "Contact: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:183
-msgid "evolution minicard"
-msgstr "evolution minicard"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:182
-msgid "Copy _Email Address"
-msgstr "Copy _E-mail Address"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:184
-#: ../widgets/misc/e-web-view.c:432
-msgid "Copy the email address to the clipboard"
-msgstr "Copy the e-mail address to the clipboard"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:189
-#: ../widgets/misc/e-web-view.c:437
-msgid "_Send New Message To..."
-msgstr "_Send New Message Toâ"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:191
-#: ../widgets/misc/e-web-view.c:439
-msgid "Send a mail message to this address"
-msgstr "Send a mail message to this address"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:215
-msgid "Open map"
-msgstr "Open map"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
-msgid "List Members:"
-msgstr "List Members:"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:681
-msgid "Department"
-msgstr "Department"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:682
-msgid "Profession"
-msgstr "Profession"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:683
-msgid "Position"
-msgstr "Position"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:686
-msgid "Video Chat"
-msgstr "Video Chat"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:687
-#: ../calendar/gui/dialogs/calendar-setup.c:449
-#: ../modules/calendar/e-cal-shell-view-actions.c:232
-#: ../modules/calendar/e-cal-shell-view-actions.c:261
-#: ../modules/calendar/e-cal-shell-view.c:513
-#: ../modules/online-accounts/e-online-accounts-google.c:294
-#: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:528
-msgid "Calendar"
-msgstr "Calendar"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:688
-#: ../calendar/gui/dialogs/event-editor.c:123
-#: ../calendar/gui/dialogs/event-editor.c:350
-#: ../plugins/publish-calendar/publish-calendar.ui.h:6
-msgid "Free/Busy"
-msgstr "Free/Busy"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:689
-#: ../addressbook/gui/widgets/eab-contact-display.c:711
-msgid "Phone"
-msgstr "Phone"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:690
-msgid "Fax"
-msgstr "Fax"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:691
-#: ../addressbook/gui/widgets/eab-contact-display.c:713
-msgid "Address"
-msgstr "Address"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:708
-msgid "Home Page"
-msgstr "Home Page"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:709
-msgid "Web Log"
-msgstr "Web Log"
-
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person memo list
-#. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
-#: ../capplet/settings/mail-capplet-shell.c:385
-#: ../modules/addressbook/e-book-shell-backend.c:120
-#: ../modules/addressbook/e-book-shell-migrate.c:144
-#: ../modules/calendar/e-cal-shell-backend.c:138
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-memo-shell-backend.c:122
-#: ../modules/calendar/e-memo-shell-migrate.c:120
-#: ../modules/calendar/e-task-shell-backend.c:122
-#: ../modules/calendar/e-task-shell-migrate.c:132
-msgid "Personal"
-msgstr "Personal"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:986
-msgid "List Members"
-msgstr "List Members"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:1004
-msgid "Job Title"
-msgstr "Job Title"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:1041
-msgid "Home page"
-msgstr "Home page"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:1050
-msgid "Blog"
-msgstr "Blog"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:1248
-#: ../widgets/misc/e-web-view.c:980
-#, c-format
-msgid "Click to mail %s"
-msgstr "Click to mail %s"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:120
-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:148
-#, 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:161
-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:170
-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:178
-msgid "Detailed error message:"
-msgstr "Detailed error message:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:209
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"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:216
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"configured for this address book.  Please make your search\n"
-"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:224
-#, c-format
-msgid "The backend for this address book was unable to parse this query. %s"
-msgstr "The backend for this address book was unable to parse this query. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
-#, c-format
-msgid "The backend for this address book refused to perform this query. %s"
-msgstr "The backend for this address book refused to perform this query. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:235
-#: ../addressbook/gui/widgets/eab-gui-util.c:241
-#, c-format
-msgid "This query did not complete successfully. %s"
-msgstr "This query did not complete successfully. %s"
-
-#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:263
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
-msgid "Select Address Book"
-msgstr "Select Address Book"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
-msgid "list"
-msgstr "list"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:552
-msgid "Move contact to"
-msgstr "Move contact to"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:554
-msgid "Copy contact to"
-msgstr "Copy contact to"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:557
-msgid "Move contacts to"
-msgstr "Move contacts to"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:559
-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:748
-#: ../addressbook/importers/evolution-ldif-importer.c:546
-#: ../addressbook/importers/evolution-vcard-importer.c:280
-#: ../calendar/importers/icalendar-importer.c:413
-#: ../calendar/importers/icalendar-importer.c:902
-#: ../calendar/importers/icalendar-importer.c:941 ../shell/shell.error.xml.h:6
-msgid "Importing..."
-msgstr "Importingâ"
-
-#: ../addressbook/importers/evolution-csv-importer.c:1072
-msgid "Outlook CSV or Tab (.csv, .tab)"
-msgstr "Outlook CSV or Tab (.csv, .tab)"
-
-#: ../addressbook/importers/evolution-csv-importer.c:1073
-msgid "Outlook CSV and Tab Importer"
-msgstr "Outlook CSV and Tab Importer"
-
-#: ../addressbook/importers/evolution-csv-importer.c:1081
-msgid "Mozilla CSV or Tab (.csv, .tab)"
-msgstr "Mozilla CSV or Tab (.csv, .tab)"
-
-#: ../addressbook/importers/evolution-csv-importer.c:1082
-msgid "Mozilla CSV and Tab Importer"
-msgstr "Mozilla CSV and Tab Importer"
-
-#: ../addressbook/importers/evolution-csv-importer.c:1090
-msgid "Evolution CSV or Tab (.csv, .tab)"
-msgstr "Evolution CSV or Tab (.csv, .tab)"
-
-#: ../addressbook/importers/evolution-csv-importer.c:1091
-msgid "Evolution CSV and Tab Importer"
-msgstr "Evolution CSV and Tab Importer"
+#: ../addressbook/importers/evolution-csv-importer.c:1094
+msgid "Evolution Contacts CSV and Tab Importer"
+msgstr "Evolution Contacts CSV and Tab Importer"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:796
 msgid "LDAP Data Interchange Format (.ldif)"
@@ -1449,49 +1455,21 @@ msgstr "LDAP Data Interchange Format (.ldif)"
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF importer"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:658
+#: ../addressbook/importers/evolution-vcard-importer.c:657
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:659
+#: ../addressbook/importers/evolution-vcard-importer.c:658
 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:719
+#: ../addressbook/printing/e-contact-print.c:723
 #, c-format
 msgid "Page %d"
 msgstr "Page %d"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
-msgid "Can not open file"
-msgstr "Can not open file"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#, c-format
-msgid "Couldn't get list of address books: %s"
-msgstr "Couldn't get list of address books: %s"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#: ../calendar/gui/dialogs/event-page.c:2923
-#: ../calendar/gui/dialogs/memo-page.c:938
-#: ../calendar/gui/dialogs/task-page.c:1759 ../em-format/em-format.c:2324
-#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:658
-#: ../plugins/caldav/caldav-browse-server.c:220
-#: ../plugins/caldav/caldav-browse-server.c:1469 ../plugins/face/face.c:174
-#: ../smime/gui/certificate-manager.c:314
-msgid "Unknown error"
-msgstr "Unknown error"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#, c-format
-msgid "Failed to open client '%s': %s"
-msgstr "Failed to open client '%s': %s"
-
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Specify the output file instead of standard output"
 msgstr "Specify the output file instead of standard output"
@@ -1550,243 +1528,462 @@ msgstr "In normal mode, there is no need for the size option."
 msgid "Unhandled error"
 msgstr "Unhandled error"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:2
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
-msgstr ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
+msgid "Can not open file"
+msgstr "Can not open file"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:4
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar that can accept appointments."
-msgstr ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar that can accept appointments."
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#, c-format
+msgid "Couldn't get list of address books: %s"
+msgstr "Couldn't get list of address books: %s"
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../calendar/gui/dialogs/memo-page.c:951 ../em-format/em-format.c:2330
+#: ../libemail-engine/mail-ops.c:640 ../mail/em-folder-tree.c:678
+#: ../plugins/caldav/caldav-browse-server.c:221
+#: ../plugins/caldav/caldav-browse-server.c:1478 ../plugins/face/face.c:174
+#: ../plugins/itip-formatter/itip-formatter.c:1485
+#: ../plugins/itip-formatter/itip-formatter.c:1855
+#: ../smime/gui/certificate-manager.c:317
+msgid "Unknown error"
+msgstr "Unknown error"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#, c-format
+msgid "Failed to open client '%s': %s"
+msgstr "Failed to open client '%s': %s"
+
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:109
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minute"
+msgstr[1] "minutes"
+
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:122
+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:135
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
+msgid "day"
+msgid_plural "days"
+msgstr[0] "day"
+msgstr[1] "days"
+
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:331
+msgid "Start time"
+msgstr "Start time"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:1
+msgid "Appointments"
+msgstr "Appointments"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:2
+msgid "_Snooze"
+msgstr "_Snooze"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:3
+#: ../libevolution-utils/e-alert-dialog.c:162
+msgid "_Dismiss"
+msgstr "_Dismiss"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+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:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../e-util/e-plugin-util.c:454
+#: ../filter/filter.ui.h:8 ../modules/calendar/e-cal-shell-view-actions.c:350
+#: ../plugins/google-account-setup/google-contacts-source.c:390
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
+msgid "days"
+msgstr "days"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/e-plugin-util.c:453
+#: ../filter/filter.ui.h:7
+#: ../plugins/google-account-setup/google-contacts-source.c:388
+msgid "hours"
+msgstr "hours"
+
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/e-plugin-util.c:452
+#: ../filter/filter.ui.h:6 ../modules/addressbook/ldap-config.ui.h:29
+#: ../plugins/google-account-setup/google-contacts-source.c:386
+msgid "minutes"
+msgstr "minutes"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+msgid "location of appointment"
+msgstr "location of appointment"
+
+#. Location
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/alarm-notify/alarm-queue.c:1758
+#: ../calendar/alarm-notify/alarm-queue.c:1768
+#: ../plugins/itip-formatter/itip-view.c:1051
+msgid "Location:"
+msgstr "Location:"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10
+msgid "Dismiss _All"
+msgstr "Dismiss _All"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1607
+#: ../calendar/alarm-notify/alarm-queue.c:1739
+msgid "No summary available."
+msgstr "No summary available."
+
+#: ../calendar/alarm-notify/alarm-queue.c:1616
+#: ../calendar/alarm-notify/alarm-queue.c:1618
+msgid "No description available."
+msgstr "No description available."
+
+#: ../calendar/alarm-notify/alarm-queue.c:1626
+msgid "No location information available."
+msgstr "No location information available."
+
+#: ../calendar/alarm-notify/alarm-queue.c:1672
+#, 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:1872
+#: ../calendar/alarm-notify/alarm-queue.c:1907
+msgid "Warning"
+msgstr "Warning"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1876
 msgid ""
-"Adding a meaningful summary to your appointment will give you an idea of "
-"what your appointment is about."
+"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 ""
-"Adding a meaningful summary to your appointment will give you an idea of "
-"what your appointment is about."
+"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/calendar.error.xml.h:6
+#: ../calendar/alarm-notify/alarm-queue.c:1913
+#, c-format
 msgid ""
-"Adding a meaningful summary to your task will give you an idea of what your "
-"task is about."
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
 msgstr ""
-"Adding a meaningful summary to your task will give you an idea of what your "
-"task is about."
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
 
-#: ../calendar/calendar.error.xml.h:7
-msgid "All information in these memos will be deleted and can not be restored."
-msgstr ""
-"All information in these memos will be deleted and can not be restored."
+#: ../calendar/alarm-notify/alarm-queue.c:1928
+msgid "Do not ask me about this program again."
+msgstr "Do not ask me about this program again."
 
-#: ../calendar/calendar.error.xml.h:8
-msgid "All information in this memo will be deleted and can not be restored."
-msgstr "All information in this memo will be deleted and can not be restored."
+#: ../calendar/alarm-notify/util.c:45
+msgid "invalid time"
+msgstr "invalid time"
 
-#: ../calendar/calendar.error.xml.h:9
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:371
+#: ../calendar/gui/misc.c:116
+#, 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:77 ../calendar/gui/e-alarm-list.c:377
+#: ../calendar/gui/misc.c:122
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minute"
+msgstr[1] "%d minutes"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:383
+#: ../calendar/gui/misc.c:126
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d second"
+msgstr[1] "%d seconds"
+
+#: ../calendar/calendar.error.xml.h:1
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr "Would you like to send all the participants a cancellation notice?"
+
+#: ../calendar/calendar.error.xml.h:2
 msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
 msgstr ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+"If you do not send a cancellation notice, the other participants may not "
+"know the meeting is cancelled."
 
-#: ../calendar/calendar.error.xml.h:10
-msgid "All information on these tasks will be deleted and can not be restored."
+#: ../calendar/calendar.error.xml.h:3
+msgid "Do _not Send"
+msgstr "Do _not Send"
+
+#: ../calendar/calendar.error.xml.h:4
+msgid "_Send Notice"
+msgstr "_Send Notice"
+
+#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/gui/dialogs/delete-comp.c:189
+#, c-format
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Are you sure you want to delete this meeting?"
+
+#: ../calendar/calendar.error.xml.h:6
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
-"All information on these tasks will be deleted and can not be restored."
+"All information on this meeting will be deleted and can not be restored."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:8
 msgid ""
-"All information on this appointment will be deleted and can not be restored."
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
 msgstr ""
-"All information on this appointment will be deleted and can not be restored."
+"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:192
+#, c-format
+msgid "Are you sure you want to delete this task?"
+msgstr "Are you sure you want to delete this task?"
+
+#: ../calendar/calendar.error.xml.h:10
+msgid "All information on this task will be deleted and can not be restored."
+msgstr "All information on this task will be deleted and can not be restored."
+
+#: ../calendar/calendar.error.xml.h:11
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr "Would you like to send a cancellation notice for this memo?"
 
 #: ../calendar/calendar.error.xml.h:12
 msgid ""
-"All information on this meeting will be deleted and can not be restored."
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
 msgstr ""
-"All information on this meeting will be deleted and can not be restored."
+"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
-msgid "All information on this memo will be deleted and can not be restored."
-msgstr "All information on this memo will be deleted and can not be restored."
+#: ../calendar/gui/dialogs/delete-comp.c:195
+#, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "Are you sure you want to delete this memo?"
 
 #: ../calendar/calendar.error.xml.h:14
-msgid "All information on this task will be deleted and can not be restored."
-msgstr "All information on this task will be deleted and can not be restored."
+msgid "All information on this memo will be deleted and can not be restored."
+msgstr "All information on this memo will be deleted and can not be restored."
 
 #: ../calendar/calendar.error.xml.h:15
-msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "Are you sure you want to delete the '{0}' task?"
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "Are you sure you want to delete the meeting titled '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Are you sure you want to delete the appointment titled '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:17
-msgid "Are you sure you want to delete the meeting titled '{0}'?"
-msgstr "Are you sure you want to delete the meeting titled '{0}'?"
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+"All information on this appointment will be deleted and can not be restored."
 
 #: ../calendar/calendar.error.xml.h:18
-msgid "Are you sure you want to delete the memo '{0}'?"
-msgstr "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Are you sure you want to delete this appointment?"
 
 #: ../calendar/calendar.error.xml.h:19
-msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "Are you sure you want to delete these {0} appointments?"
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Are you sure you want to delete the '{0}' task?"
 
 #: ../calendar/calendar.error.xml.h:20
-msgid "Are you sure you want to delete these {0} memos?"
-msgstr "Are you sure you want to delete these {0} memos?"
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr "Are you sure you want to delete the memo '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:21
-msgid "Are you sure you want to delete these {0} tasks?"
-msgstr "Are you sure you want to delete these {0} tasks?"
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr "All information in this memo will be deleted and can not be restored."
 
 #: ../calendar/calendar.error.xml.h:22
-msgid "Are you sure you want to delete this appointment?"
-msgstr "Are you sure you want to delete this appointment?"
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Are you sure you want to delete these {0} appointments?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:191
-#, c-format
-msgid "Are you sure you want to delete this meeting?"
-msgstr "Are you sure you want to delete this meeting?"
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+"All information on these appointments will be deleted and can not be "
+"restored."
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:197
-#, c-format
-msgid "Are you sure you want to delete this memo?"
-msgstr "Are you sure you want to delete this memo?"
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Are you sure you want to delete these {0} tasks?"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:194
-#, c-format
-msgid "Are you sure you want to delete this task?"
-msgstr "Are you sure you want to delete this task?"
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+"All information on these tasks will be deleted and can not be restored."
 
 #: ../calendar/calendar.error.xml.h:26
-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?"
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "Are you sure you want to delete these {0} memos?"
 
 #: ../calendar/calendar.error.xml.h:27
-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?"
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr ""
+"All information in these memos will be deleted and can not be restored."
 
+#  calendar:prompt-save-task primary
 #: ../calendar/calendar.error.xml.h:28
-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?"
+msgid "Would you like to save your changes to this meeting?"
+msgstr "Would you like to save your changes to this meeting?"
 
+#  calendar:prompt-save-task secondary
 #: ../calendar/calendar.error.xml.h:29
-msgid "Cannot create a new event"
-msgstr "Cannot create a new event"
+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
-msgid "Cannot save event"
-msgstr "Cannot save event"
+#: ../composer/mail-composer.error.xml.h:16
+msgid "_Discard Changes"
+msgstr "_Discard Changes"
 
 #: ../calendar/calendar.error.xml.h:31
-msgid "Delete calendar '{0}'?"
-msgstr "Delete calendar '{0}'?"
+msgid "_Save Changes"
+msgstr "_Save Changes"
 
 #: ../calendar/calendar.error.xml.h:32
-msgid "Delete memo list '{0}'?"
-msgstr "Delete memo list '{0}'?"
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Would you like to save your changes to this appointment?"
 
 #: ../calendar/calendar.error.xml.h:33
-msgid "Delete task list '{0}'?"
-msgstr "Delete task list '{0}'?"
+msgid "You have changed this appointment, but not yet saved it."
+msgstr "You have changed this appointment, but not yet saved it."
 
+#  calendar:prompt-save-task primary
+#: ../calendar/calendar.error.xml.h:34
+msgid "Would you like to save your changes to this task?"
+msgstr "Would you like to save your changes to this task?"
+
+#  calendar:prompt-save-task secondary
 #: ../calendar/calendar.error.xml.h:35
-msgid "Do _not Send"
-msgstr "Do _not Send"
+msgid "You have changed this task, but not yet saved it."
+msgstr "You have changed this task, but not yet saved it."
 
+#  calendar:prompt-save-task primary
 #: ../calendar/calendar.error.xml.h:36
-msgid "Download in progress. Do you want to save the appointment?"
-msgstr "Download in progress. Do you want to save the appointment?"
+msgid "Would you like to save your changes to this memo?"
+msgstr "Would you like to save your changes to this memo?"
 
+#  calendar:prompt-save-task secondary
 #: ../calendar/calendar.error.xml.h:37
-msgid "Download in progress. Do you want to save the task?"
-msgstr "Download in progress. Do you want to save the task?"
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr "You have made changes to this memo, but not yet saved them."
 
 #: ../calendar/calendar.error.xml.h:38
-msgid "Editor could not be loaded."
-msgstr "Editor could not be loaded."
+msgid "Would you like to send meeting invitations to participants?"
+msgstr "Would you like to send meeting invitations to participants?"
 
 #: ../calendar/calendar.error.xml.h:39
 msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
-msgstr ""
-"E-mail invitations will be sent to all participants and allow them to accept "
-"this task."
-
-#: ../calendar/calendar.error.xml.h:40
-msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "E-mail invitations will be sent to all participants and allow them to reply."
 
+#: ../calendar/calendar.error.xml.h:40
+#: ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Send"
+msgstr "_Send"
+
 #: ../calendar/calendar.error.xml.h:41
-msgid "Error loading calendar"
-msgstr "Error loading calendar"
+msgid "Would you like to send updated meeting information to participants?"
+msgstr "Would you like to send updated meeting information to participants?"
 
 #: ../calendar/calendar.error.xml.h:42
-msgid "Error loading memo list"
-msgstr "Error loading memo list"
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
 
 #: ../calendar/calendar.error.xml.h:43
-msgid "Error loading task list"
-msgstr "Error loading task list"
-
-#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
-#. {1} is replaced with a calendar/task/memo list name, where the error happened
-#: ../calendar/calendar.error.xml.h:46
-msgid "Error on {0}: {1}"
-msgstr "Error on {0}: {1}"
+msgid "Would you like to send this task to participants?"
+msgstr "Would you like to send this task to participants?"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
 msgstr ""
-"If you do not send a cancellation notice, the other participants may not "
-"know the meeting is cancelled."
+"E-mail invitations will be sent to all participants and allow them to accept "
+"this task."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:45
+msgid "Download in progress. Do you want to save the task?"
+msgstr "Download in progress. Do you want to save the task?"
+
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
 msgstr ""
-"If you do not send a cancellation notice, the other participants may not "
-"know the memo has been deleted."
+"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:316
+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?"
 
 #: ../calendar/calendar.error.xml.h:49
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
 msgstr ""
-"If you do not send a cancellation notice, the other participants may not "
-"know the task has been deleted."
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
 
 #: ../calendar/calendar.error.xml.h:50
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
-msgstr ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+msgid "Would you like to send updated task information to participants?"
+msgstr "Would you like to send updated task information to participants?"
 
 #: ../calendar/calendar.error.xml.h:51
 msgid ""
@@ -1797,1210 +1994,1039 @@ msgstr ""
 "lists up to date."
 
 #: ../calendar/calendar.error.xml.h:52
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
-msgstr ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr "The Evolution tasks have quit unexpectedly."
 
 #: ../calendar/calendar.error.xml.h:53
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
-msgstr ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr "Your tasks will not be available until Evolution is restarted."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "Some features may not work properly with your current server."
-msgstr "Some features may not work properly with your current server."
-
-#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "The Evolution calendar has quit unexpectedly."
 
-#: ../calendar/calendar.error.xml.h:56
-msgid "The Evolution calendars have quit unexpectedly."
-msgstr "The Evolution calendars have quit unexpectedly."
+#: ../calendar/calendar.error.xml.h:55
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr "Your calendars will not be available until Evolution is restarted."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "The Evolution memo has quit unexpectedly."
 
+#: ../calendar/calendar.error.xml.h:57
+msgid "Your memos will not be available until Evolution is restarted."
+msgstr "Your memos will not be available until Evolution is restarted."
+
 #: ../calendar/calendar.error.xml.h:58
-msgid "The Evolution tasks have quit unexpectedly."
-msgstr "The Evolution tasks have quit unexpectedly."
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "The Evolution calendars have quit unexpectedly."
 
 #: ../calendar/calendar.error.xml.h:59
-msgid "The calendar is not marked for offline usage."
-msgstr "The calendar is not marked for offline usage."
+msgid "Editor could not be loaded."
+msgstr "Editor could not be loaded."
 
 #: ../calendar/calendar.error.xml.h:60
-msgid "The memo list is not marked for offline usage."
-msgstr "The memo list is not marked for offline usage."
+msgid "Delete calendar '{0}'?"
+msgstr "Delete calendar '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:61
-msgid "The task list is not marked for offline usage."
-msgstr "The task list is not marked for offline usage."
-
-#: ../calendar/calendar.error.xml.h:62
 msgid "This calendar will be removed permanently."
 msgstr "This calendar will be removed permanently."
 
-#: ../calendar/calendar.error.xml.h:63
-msgid "This memo list will be removed permanently."
-msgstr "This memo list will be removed permanently."
+#: ../calendar/calendar.error.xml.h:62
+msgid "Delete task list '{0}'?"
+msgstr "Delete task list '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:63
 msgid "This task list will be removed permanently."
 msgstr "This task list will be removed permanently."
 
+#: ../calendar/calendar.error.xml.h:64
+msgid "Delete memo list '{0}'?"
+msgstr "Delete memo list '{0}'?"
+
 #: ../calendar/calendar.error.xml.h:65
-msgid "Would you like to save your changes to this appointment?"
-msgstr "Would you like to save your changes to this appointment?"
+msgid "This memo list will be removed permanently."
+msgstr "This memo list will be removed permanently."
 
-#  calendar:prompt-save-task primary
 #: ../calendar/calendar.error.xml.h:66
-msgid "Would you like to save your changes to this meeting?"
-msgstr "Would you like to save your changes to this meeting?"
+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:prompt-save-task primary
 #: ../calendar/calendar.error.xml.h:67
-msgid "Would you like to save your changes to this memo?"
-msgstr "Would you like to save your changes to this memo?"
+msgid ""
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
+msgstr ""
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
 
-#  calendar:prompt-save-task primary
 #: ../calendar/calendar.error.xml.h:68
-msgid "Would you like to save your changes to this task?"
-msgstr "Would you like to save your changes to this task?"
+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
-msgid "Would you like to send a cancelation notice for this memo?"
-msgstr "Would you like to send a cancellation notice for this memo?"
+msgid ""
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
+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
-msgid "Would you like to send all the participants a cancelation notice?"
-msgstr "Would you like to send all the participants a cancellation notice?"
+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?"
 
 #: ../calendar/calendar.error.xml.h:71
-msgid "Would you like to send meeting invitations to participants?"
-msgstr "Would you like to send meeting invitations to participants?"
-
+msgid "Error loading calendar"
+msgstr "Error loading calendar"
+
 #: ../calendar/calendar.error.xml.h:72
-msgid "Would you like to send this task to participants?"
-msgstr "Would you like to send this task to participants?"
+msgid "The calendar is not marked for offline usage."
+msgstr "The calendar is not marked for offline usage."
 
 #: ../calendar/calendar.error.xml.h:73
-msgid "Would you like to send updated meeting information to participants?"
-msgstr "Would you like to send updated meeting information to participants?"
-
-#: ../calendar/calendar.error.xml.h:74
-msgid "Would you like to send updated task information to participants?"
-msgstr "Would you like to send updated task information to participants?"
+msgid "Cannot create a new event"
+msgstr "Cannot create a new event"
 
+#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:75
 msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 
 #: ../calendar/calendar.error.xml.h:76
-msgid "You have changed this appointment, but not yet saved it."
-msgstr "You have changed this appointment, but not yet saved it."
-
-#  calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:77
-msgid "You have changed this meeting, but not yet saved it."
-msgstr "You have changed this meeting, but not yet saved it."
+msgid "Cannot save event"
+msgstr "Cannot save event"
 
-#  calendar:prompt-save-task secondary
+#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:78
-msgid "You have changed this task, but not yet saved it."
-msgstr "You have changed this task, but not yet saved it."
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 
-#  calendar:prompt-save-task secondary
 #: ../calendar/calendar.error.xml.h:79
-msgid "You have made changes to this memo, but not yet saved them."
-msgstr "You have made changes to this memo, but not yet saved them."
-
-#: ../calendar/calendar.error.xml.h:80
-msgid "Your calendars will not be available until Evolution is restarted."
-msgstr "Your calendars will not be available until Evolution is restarted."
+msgid "Cannot save task"
+msgstr "Cannot save task"
 
+#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:81
-msgid "Your memos will not be available until Evolution is restarted."
-msgstr "Your memos will not be available until Evolution is restarted."
+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."
 
 #: ../calendar/calendar.error.xml.h:82
-msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "Your tasks will not be available until Evolution is restarted."
+msgid "Error loading task list"
+msgstr "Error loading task list"
 
 #: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "_Discard Changes"
+msgid "The task list is not marked for offline usage."
+msgstr "The task list is not marked for offline usage."
 
-#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
-msgid "_Save"
-msgstr "_Save"
+#: ../calendar/calendar.error.xml.h:84
+msgid "Error loading memo list"
+msgstr "Error loading memo list"
 
 #: ../calendar/calendar.error.xml.h:85
-msgid "_Save Changes"
-msgstr "_Save Changes"
+msgid "The memo list is not marked for offline usage."
+msgstr "The memo list is not marked for offline usage."
 
-#: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
-msgid "_Send"
-msgstr "_Send"
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
+#: ../calendar/calendar.error.xml.h:88
+msgid "Error on {0}: {1}"
+msgstr "Error on {0}: {1}"
 
-#: ../calendar/calendar.error.xml.h:87
-msgid "_Send Notice"
-msgstr "_Send Notice"
+#: ../calendar/calendar.error.xml.h:89
+msgid "Some features may not work properly with your current server."
+msgstr "Some features may not work properly with your current server."
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:107
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minute"
-msgstr[1] "minutes"
+#: ../calendar/calendar.error.xml.h:90
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "hour"
-msgstr[1] "hours"
+#: ../calendar/gui/calendar-view-factory.c:88
+msgid "Day View"
+msgstr "Day View"
 
-#. 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/alarm-notify/alarm-notify-dialog.c:133
-#: ../calendar/gui/dialogs/recurrence-page.c:1190
-msgid "day"
-msgid_plural "days"
-msgstr[0] "day"
-msgstr[1] "days"
+#: ../calendar/gui/calendar-view-factory.c:91
+msgid "Work Week View"
+msgstr "Work Week View"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:313
-msgid "Start time"
-msgstr "Start time"
+#: ../calendar/gui/calendar-view-factory.c:94
+msgid "Week View"
+msgstr "Week View"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
-msgid "Appointments"
-msgstr "Appointments"
+#: ../calendar/gui/calendar-view-factory.c:97
+msgid "Month View"
+msgstr "Month View"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
-msgid "Dismiss _All"
-msgstr "Dismiss _All"
+#: ../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:383
+msgid "Summary"
+msgstr "Summary"
 
-#. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1739
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1749
-#: ../plugins/itip-formatter/itip-view.c:1052
-msgid "Location:"
-msgstr "Location:"
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "contains"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
-msgid "Snooze _time:"
-msgstr "Snooze _time:"
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "does not contain"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:919
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
-msgid "_Dismiss"
-msgstr "_Dismiss"
+#: ../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
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
+#: ../widgets/misc/e-attachment-tree-view.c:528
+#: ../widgets/table/e-table-config.ui.h:24
+msgid "Description"
+msgstr "Description"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-msgid "_Snooze"
-msgstr "_Snooze"
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Any Field"
+msgstr "Any Field"
 
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:454
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
-#: ../plugins/google-account-setup/google-contacts-source.c:387
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "days"
-msgstr "days"
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:7
+msgid "Classification"
+msgstr "Classification"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:453
-#: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:386
-msgid "hours"
-msgstr "hours"
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:33
+msgid "is"
+msgstr "is"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
-msgid "location of appointment"
-msgstr "location of appointment"
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:39
+msgid "is not"
+msgstr "is not"
 
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:452
-#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:385
-msgid "minutes"
-msgstr "minutes"
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:800 ../calendar/gui/e-cal-model.c:807
+#: ../calendar/gui/e-task-table.c:558 ../calendar/gui/memotypes.xml.h:10
+msgid "Public"
+msgstr "Public"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
-msgid "No summary available."
-msgstr "No summary available."
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:809 ../calendar/gui/e-task-table.c:559
+#: ../calendar/gui/memotypes.xml.h:11
+msgid "Private"
+msgstr "Private"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-msgid "No description available."
-msgstr "No description available."
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
+#: ../calendar/gui/e-cal-model.c:811 ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/memotypes.xml.h:12 ../widgets/misc/e-send-options.ui.h:7
+msgid "Confidential"
+msgstr "Confidential"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1607
-msgid "No location information available."
-msgstr "No location information available."
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:5
+msgid "Organizer"
+msgstr "Organiser"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
-#, 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/gui/caltypes.xml.h:13
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/tasktypes.xml.h:6
+msgid "Attendee"
+msgstr "Attendee"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1853
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
-msgid "Warning"
-msgstr "Warning"
+#: ../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:861
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+#: ../plugins/save-calendar/csv-format.c:397
+msgid "Location"
+msgstr "Location"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1857
-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/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Category"
+msgstr "Category"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1894
-#, c-format
-msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
-"\n"
-"        %s\n"
-"\n"
-"Are you sure you want to run this program?"
-msgstr ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
-"\n"
-"        %s\n"
-"\n"
-"Are you sure you want to run this program?"
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:15 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Attachments"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1909
-msgid "Do not ask me about this program again."
-msgstr "Do not ask me about this program again."
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:26
+msgid "Exist"
+msgstr "Exist"
 
-#: ../calendar/gui/alarm-notify/util.c:45
-msgid "invalid time"
-msgstr "invalid time"
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:23
+msgid "Do Not Exist"
+msgstr "Do Not Exist"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
-#: ../calendar/gui/misc.c:118
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hour"
-msgstr[1] "%d hours"
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/dialogs/event-editor.c:321
+#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
+msgid "Recurrence"
+msgstr "Recurrence"
 
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
-#: ../calendar/gui/misc.c:124
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minute"
-msgstr[1] "%d minutes"
+#: ../calendar/gui/caltypes.xml.h:20
+msgid "Occurs"
+msgstr "Occurs"
 
-#. 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"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:417
-#: ../calendar/gui/misc.c:128
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d second"
-msgstr[1] "%d seconds"
+#: ../calendar/gui/caltypes.xml.h:21
+msgid "Less Than"
+msgstr "Less Than"
 
-#: ../calendar/gui/calendar-view-factory.c:116
-msgid "Day View"
-msgstr "Day View"
+#: ../calendar/gui/caltypes.xml.h:22
+msgid "Exactly"
+msgstr "Exactly"
 
-#: ../calendar/gui/calendar-view-factory.c:119
-msgid "Work Week View"
-msgstr "Work Week View"
-
-#: ../calendar/gui/calendar-view-factory.c:122
-msgid "Week View"
-msgstr "Week View"
-
-#: ../calendar/gui/calendar-view-factory.c:125
-msgid "Month View"
-msgstr "Month View"
-
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:3
-msgid "Any Field"
-msgstr "Any Field"
-
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Attachments"
-
-#: ../calendar/gui/caltypes.xml.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:6
-msgid "Attendee"
-msgstr "Attendee"
-
-#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:8
-msgid "Category"
-msgstr "Category"
-
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
-msgid "Classification"
-msgstr "Classification"
-
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:243
-#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:504
-#: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
-msgid "Confidential"
-msgstr "Confidential"
-
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../modules/plugin-manager/evolution-plugin-manager.c:71
-#: ../widgets/misc/e-attachment-tree-view.c:526
-#: ../widgets/table/e-table-config.ui.h:6
-msgid "Description"
-msgstr "Description"
-
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:11
-msgid "Description Contains"
-msgstr "Description Contains"
-
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Do Not Exist"
-
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Exist"
-
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:863
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:397
-msgid "Location"
-msgstr "Location"
-
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Organizer"
-msgstr "Organiser"
-
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:503
-#: ../calendar/gui/memotypes.xml.h:12
-msgid "Private"
-msgstr "Private"
-
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
-#: ../calendar/gui/e-task-table.c:502 ../calendar/gui/memotypes.xml.h:13
-msgid "Public"
-msgstr "Public"
-
-#: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:317
-#: ../calendar/gui/dialogs/event-editor.c:338
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
-msgid "Recurrence"
-msgstr "Recurrence"
-
-#: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:383
-msgid "Summary"
-msgstr "Summary"
+#: ../calendar/gui/caltypes.xml.h:23
+msgid "More Than"
+msgstr "More Than"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:23
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:28
 msgid "Summary Contains"
 msgstr "Summary Contains"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "contains"
-
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "does not contain"
-
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
-msgid "is"
-msgstr "is"
-
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
-msgid "is not"
-msgstr "is not"
+#: ../calendar/gui/caltypes.xml.h:25 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:29
+msgid "Description Contains"
+msgstr "Description Contains"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:636
+#: ../calendar/gui/dialogs/alarm-dialog.c:632
 msgid "Edit Reminder"
 msgstr "Edit Reminder"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:827
-#: ../calendar/gui/e-alarm-list.c:447
+#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/e-alarm-list.c:413
 msgid "Pop up an alert"
 msgstr "Pop up an alert"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:828
-#: ../calendar/gui/e-alarm-list.c:443
+#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/e-alarm-list.c:409
 msgid "Play a sound"
 msgstr "Play a sound"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:829
-#: ../calendar/gui/e-alarm-list.c:455
+#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/e-alarm-list.c:421
 msgid "Run a program"
 msgstr "Run a program"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:830
-#: ../calendar/gui/e-alarm-list.c:451
+#: ../calendar/gui/dialogs/alarm-dialog.c:826
+#: ../calendar/gui/e-alarm-list.c:417
 msgid "Send an email"
 msgstr "Send an e-mail"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Reminder"
-msgstr "Add Reminder"
+msgid "minute(s)"
+msgstr "minute(s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-msgid "Custom _message"
-msgstr "Custom _message"
+msgid "hour(s)"
+msgstr "hour(s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "Custom reminder sound"
-msgstr "Custom reminder sound"
+msgid "day(s)"
+msgstr "day(s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Mes_sage:"
-msgstr "Mes_sage:"
+msgid "before"
+msgstr "before"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
-msgid "Options"
-msgstr "Options"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+msgid "after"
+msgstr "after"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Reminder"
-msgstr "Reminder"
+msgid "start of appointment"
+msgstr "start of appointment"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "Repeat"
-msgstr "Repeat"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-msgid "Select A File"
-msgstr "Select A File"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-msgid "Send To:"
-msgstr "Send To:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
-msgid "_Arguments:"
-msgstr "_Arguments:"
+msgid "end of appointment"
+msgstr "end of appointment"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
-msgid "_Program:"
-msgstr "_Program:"
+msgid "Add Reminder"
+msgstr "Add Reminder"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the reminder"
-msgstr "_Repeat the reminder"
+#: ../calendar/gui/dialogs/event-editor.c:364
+msgid "Reminder"
+msgstr "Reminder"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
-msgid "_Sound:"
-msgstr "_Sound:"
+msgid "Repeat"
+msgstr "Repeat"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-msgid "after"
-msgstr "after"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
-msgid "before"
-msgstr "before"
+msgid "_Repeat the reminder"
+msgstr "_Repeat the reminder"
 
+#. 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 "day(s)"
-msgstr "day(s)"
+msgid "extra times every"
+msgstr "extra times every"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:32
+msgid "Options"
+msgstr "Options"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-msgid "end of appointment"
-msgstr "end of appointment"
+msgid "Custom _message"
+msgstr "Custom _message"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+msgid "Mes_sage:"
+msgstr "Mes_sage:"
 
-#. 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:20
-msgid "extra times every"
-msgstr "extra times every"
+msgid "Custom reminder sound"
+msgstr "Custom reminder sound"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-msgid "hour(s)"
-msgstr "hour(s)"
+msgid "_Sound:"
+msgstr "_Sound:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+msgid "Select A File"
+msgstr "Select A File"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-msgid "minute(s)"
-msgstr "minute(s)"
+msgid "_Program:"
+msgstr "_Program:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+msgid "_Arguments:"
+msgstr "_Arguments:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
-msgid "start of appointment"
-msgstr "start of appointment"
+msgid "Send To:"
+msgstr "Send To:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:245
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "Action/Trigger"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-msgid "A_dd"
-msgstr "A_dd"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:8
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Reminders"
 msgstr "Reminders"
 
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+msgid "A_dd"
+msgstr "A_dd"
+
 #: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "Type:"
 msgstr "Type:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:185
-#: ../modules/addressbook/addressbook-config.c:530
+#: ../modules/addressbook/addressbook-config.c:529
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:155
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../calendar/gui/dialogs/calendar-setup.c:264 ../mail/mail-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:12
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:284
+#: ../widgets/misc/e-signature-script-dialog.c:286
 msgid "_Name:"
 msgstr "_Name:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:300
+#: ../calendar/gui/dialogs/calendar-setup.c:316
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Cop_y calendar contents locally for offline operation"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:302
+#: ../calendar/gui/dialogs/calendar-setup.c:318
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Cop_y task list contents locally for offline operation"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:304
+#: ../calendar/gui/dialogs/calendar-setup.c:320
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Cop_y memo list contents locally for offline operation"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:350
+#: ../calendar/gui/dialogs/calendar-setup.c:368
 msgid "Sh_ow reminder notifications"
 msgstr "Sh_ow reminder notifications"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:425
+#: ../calendar/gui/dialogs/calendar-setup.c:445
 msgid "Colo_r:"
 msgstr "Colou_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:448
-#: ../calendar/gui/dialogs/calendar-setup.c:460
-#: ../calendar/gui/dialogs/calendar-setup.c:471
-#: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:52
-#: ../modules/addressbook/addressbook-config.c:1080
-#: ../modules/addressbook/autocompletion-config.c:228
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
-#: ../plugins/itip-formatter/itip-formatter.c:3045
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../calendar/gui/dialogs/calendar-setup.c:468
+#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:491
+#: ../mail/em-folder-properties.c:257 ../mail/mail-config.ui.h:25
+#: ../modules/addressbook/addressbook-config.c:1114
+#: ../modules/addressbook/autocompletion-config.c:240
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../plugins/itip-formatter/itip-formatter.c:3240
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "General"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:461
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Task List"
 msgstr "Task List"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:472
+#: ../calendar/gui/dialogs/calendar-setup.c:492
 msgid "Memo List"
 msgstr "Memo List"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:564
+#: ../calendar/gui/dialogs/calendar-setup.c:584
 msgid "Calendar Properties"
 msgstr "Calendar Properties"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:564
+#: ../calendar/gui/dialogs/calendar-setup.c:584
 msgid "New Calendar"
 msgstr "New Calendar"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:624
+#: ../calendar/gui/dialogs/calendar-setup.c:644
 msgid "Task List Properties"
 msgstr "Task List Properties"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:624
+#: ../calendar/gui/dialogs/calendar-setup.c:644
 msgid "New Task List"
 msgstr "New Task List"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:684
+#: ../calendar/gui/dialogs/calendar-setup.c:704
 msgid "Memo List Properties"
 msgstr "Memo List Properties"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:684
+#: ../calendar/gui/dialogs/calendar-setup.c:704
 msgid "New Memo List"
 msgstr "New Memo List"
 
-#: ../calendar/gui/dialogs/changed-comp.c:62
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "This event has been deleted."
 
-#: ../calendar/gui/dialogs/changed-comp.c:66
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "This task has been deleted."
 
-#: ../calendar/gui/dialogs/changed-comp.c:70
+#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This memo has been deleted."
 msgstr "This memo has been deleted."
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, 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?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:81
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  You have made no changes, close the editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:86
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "This event has been changed."
 
-#: ../calendar/gui/dialogs/changed-comp.c:90
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "This task has been changed."
 
-#: ../calendar/gui/dialogs/changed-comp.c:94
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This memo has been changed."
 msgstr "This memo has been changed."
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, 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?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:105
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  You have made no changes, update the editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:461
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validation error: %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:273
+#: ../calendar/gui/dialogs/comp-editor.c:279
 msgid "Could not save attachments"
 msgstr "Could not save attachments"
 
-#: ../calendar/gui/dialogs/comp-editor.c:613
+#: ../calendar/gui/dialogs/comp-editor.c:625
 msgid "Could not update object"
 msgstr "Could not update object"
 
-#: ../calendar/gui/dialogs/comp-editor.c:741
+#: ../calendar/gui/dialogs/comp-editor.c:753
 msgid "Edit Appointment"
 msgstr "Edit Appointment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:748
+#: ../calendar/gui/dialogs/comp-editor.c:760
 #, c-format
 msgid "Meeting - %s"
 msgstr "Meeting â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:750
+#: ../calendar/gui/dialogs/comp-editor.c:762
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appointment â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:756
+#: ../calendar/gui/dialogs/comp-editor.c:768
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Assigned Task â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:758
+#: ../calendar/gui/dialogs/comp-editor.c:770
 #, c-format
 msgid "Task - %s"
 msgstr "Task â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:763
+#: ../calendar/gui/dialogs/comp-editor.c:775
 #, c-format
 msgid "Memo - %s"
 msgstr "Memo â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:779
+#: ../calendar/gui/dialogs/comp-editor.c:791
 msgid "No Summary"
 msgstr "No Summary"
 
-#: ../calendar/gui/dialogs/comp-editor.c:900
+#: ../calendar/gui/dialogs/comp-editor.c:912
 msgid "Keep original item?"
 msgstr "Keep original item?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "Close the current window"
 msgstr "Close the current window"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1108 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1455
-#: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
+#: ../calendar/gui/dialogs/comp-editor.c:1132 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1467
+#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
 #: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1462
-#: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
+#: ../calendar/gui/dialogs/comp-editor.c:1139 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1474
+#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
 #: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
-#: ../shell/e-shell-window-actions.c:1469
-#: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:1146
+#: ../shell/e-shell-window-actions.c:1481
+#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:568
 msgid "Delete the selection"
 msgstr "Delete the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "View help"
 msgstr "View help"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1497
-#: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
+#: ../calendar/gui/dialogs/comp-editor.c:1160 ../mail/e-mail-browser.c:151
+#: ../shell/e-shell-window-actions.c:1509
+#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
 #: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1157
+#: ../calendar/gui/dialogs/comp-editor.c:1181
 msgid "Save current changes"
 msgstr "Save current changes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1574
-#: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
+#: ../calendar/gui/dialogs/comp-editor.c:1188 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1586
+#: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
 msgid "Select all text"
 msgstr "Select all text"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1171
+#: ../calendar/gui/dialogs/comp-editor.c:1195
 msgid "_Classification"
 msgstr "_Classification"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:176
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1602
+#: ../calendar/gui/dialogs/comp-editor.c:1202
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
+#: ../mail/e-mail-browser.c:172
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+#: ../shell/e-shell-window-actions.c:1614
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1185 ../mail/e-mail-browser.c:169
-#: ../shell/e-shell-window-actions.c:1609
-#: ../widgets/misc/e-signature-editor.c:221
+#: ../calendar/gui/dialogs/comp-editor.c:1209 ../mail/e-mail-browser.c:165
+#: ../shell/e-shell-window-actions.c:1621
+#: ../widgets/misc/e-signature-editor.c:225
 msgid "_File"
 msgstr "_File"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1192
-#: ../shell/e-shell-window-actions.c:1616
+#: ../calendar/gui/dialogs/comp-editor.c:1216
+#: ../shell/e-shell-window-actions.c:1628
 msgid "_Help"
 msgstr "_Help"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1199
+#: ../calendar/gui/dialogs/comp-editor.c:1223
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206
-#: ../composer/e-composer-actions.c:340
+#: ../calendar/gui/dialogs/comp-editor.c:1230
+#: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "_Options"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213 ../mail/e-mail-browser.c:183
-#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1237 ../mail/e-mail-browser.c:179
+#: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:28
 msgid "_View"
 msgstr "_View"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223
-#: ../composer/e-composer-actions.c:289
+#: ../calendar/gui/dialogs/comp-editor.c:1247
+#: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "_Attachmentâ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1225
-#: ../composer/e-composer-actions.c:291
-#: ../widgets/misc/e-attachment-view.c:439
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+#: ../composer/e-composer-actions.c:290
+#: ../widgets/misc/e-attachment-view.c:414
 msgid "Attach a file"
 msgstr "Attach a file"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1233
+#: ../calendar/gui/dialogs/comp-editor.c:1257
 msgid "_Categories"
 msgstr "_Categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1235
+#: ../calendar/gui/dialogs/comp-editor.c:1259
 msgid "Toggles whether to display categories"
 msgstr "Toggles whether to display categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1241
+#: ../calendar/gui/dialogs/comp-editor.c:1265
 msgid "Time _Zone"
 msgstr "Time _Zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1243
+#: ../calendar/gui/dialogs/comp-editor.c:1267
 msgid "Toggles whether the time zone is displayed"
 msgstr "Toggles whether the time zone is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1252
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1254
+#: ../calendar/gui/dialogs/comp-editor.c:1278
 msgid "Classify as public"
 msgstr "Classify as public"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259
+#: ../calendar/gui/dialogs/comp-editor.c:1283
 msgid "_Private"
 msgstr "_Private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1261
+#: ../calendar/gui/dialogs/comp-editor.c:1285
 msgid "Classify as private"
 msgstr "Classify as private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1266
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "_Confidential"
 msgstr "_Confidential"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1268
+#: ../calendar/gui/dialogs/comp-editor.c:1292
 msgid "Classify as confidential"
 msgstr "Classify as confidential"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1300
 msgid "R_ole Field"
 msgstr "R_ole Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1278
+#: ../calendar/gui/dialogs/comp-editor.c:1302
 msgid "Toggles whether the Role field is displayed"
 msgstr "Toggles whether the Role field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../calendar/gui/dialogs/comp-editor.c:1308
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1286
+#: ../calendar/gui/dialogs/comp-editor.c:1310
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Toggles whether the RSVP field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1316
 msgid "_Status Field"
 msgstr "_Status Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294
+#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "Toggles whether the Status field is displayed"
 msgstr "Toggles whether the Status field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1324
 msgid "_Type Field"
 msgstr "_Type Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1302
+#: ../calendar/gui/dialogs/comp-editor.c:1326
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Toggles whether the Attendee Type is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
-#: ../composer/e-composer-private.c:77
-msgid "Recent _Documents"
-msgstr "Recent _Documents"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2057
-#: ../composer/e-composer-actions.c:508
+#: ../calendar/gui/dialogs/comp-editor.c:2047
+#: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "Attach"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2395
-#: ../calendar/gui/dialogs/comp-editor.c:2558
-#: ../calendar/gui/dialogs/comp-editor.c:3547
+#: ../calendar/gui/dialogs/comp-editor.c:2393
+#: ../calendar/gui/dialogs/comp-editor.c:2556
+#: ../calendar/gui/dialogs/comp-editor.c:3548
 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/dialogs/comp-editor.c:3511
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:3512
+#: ../plugins/prefer-plain/prefer-plain.c:66
 msgid "attachment"
 msgstr "attachment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3579
+#: ../calendar/gui/dialogs/comp-editor.c:3580
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
+#: ../calendar/gui/dialogs/comp-editor-page.c:438
+#, c-format
+msgid "Validation error: %s"
+msgstr "Validation error: %s"
+
 #: ../calendar/gui/dialogs/copy-source-dialog.c:114
 msgid "Could not open destination"
 msgstr "Could not open destination"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+#: ../calendar/gui/dialogs/copy-source-dialog.c:126
 msgid "Destination is read only"
 msgstr "Destination is read only"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:164
+#: ../calendar/gui/dialogs/copy-source-dialog.c:160
 msgid "Cannot create object"
 msgstr "Cannot create object"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:193
+#: ../calendar/gui/dialogs/copy-source-dialog.c:189
 msgid "Could not open source"
 msgstr "Could not open source"
 
-#: ../calendar/gui/dialogs/delete-comp.c:214
+#: ../calendar/gui/dialogs/delete-comp.c:212
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Delete this item from all other recipient's mailboxes?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:217
+#: ../calendar/gui/dialogs/delete-comp.c:215
 msgid "_Retract comment"
 msgstr "_Retract comment"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 #, 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"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:59
 #, 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"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:65
+#: ../calendar/gui/dialogs/delete-error.c:63
 #, 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"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:69
+#: ../calendar/gui/dialogs/delete-error.c:67
 #, 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"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../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/dialogs/delete-error.c:79
+#: ../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/dialogs/delete-error.c:82
+#: ../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/dialogs/delete-error.c:85
+#: ../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"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../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"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:97
+#: ../calendar/gui/dialogs/delete-error.c:95
 #, 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"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:101
+#: ../calendar/gui/dialogs/delete-error.c:99
 #, 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"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:105
+#: ../calendar/gui/dialogs/delete-error.c:103
 #, 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"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
-msgid "Contacts..."
-msgstr "Contactsâ"
+msgid "Enter Delegate"
+msgstr "Enter Delegate"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "Delegate To:"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
-msgid "Enter Delegate"
-msgstr "Enter Delegate"
+msgid "Contacts..."
+msgstr "Contactsâ"
 
-#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/event-editor.c:216
 msgid "_Reminders"
 msgstr "_Reminders"
 
-#: ../calendar/gui/dialogs/event-editor.c:214
+#: ../calendar/gui/dialogs/event-editor.c:218
 msgid "Set or unset reminders for this event"
 msgstr "Set or unset reminders for this event"
 
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "Show Time as _Busy"
 msgstr "Show Time as _Busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:224
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to show time as busy"
 msgstr "Toggles whether to show time as busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "_Recurrence"
 msgstr "_Recurrence"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Make this a recurring event"
 msgstr "Make this a recurring event"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../widgets/misc/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "Send Options"
 
-#: ../calendar/gui/dialogs/event-editor.c:242
+#: ../calendar/gui/dialogs/event-editor.c:246
 #: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "Insert advanced send options"
 
-#: ../calendar/gui/dialogs/event-editor.c:250
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "All _Day Event"
 msgstr "All _Day Event"
 
-#: ../calendar/gui/dialogs/event-editor.c:252
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Toggles whether to have All Day Event"
 msgstr "Toggles whether to have All Day Event"
 
-#: ../calendar/gui/dialogs/event-editor.c:261
+#: ../calendar/gui/dialogs/event-editor.c:265
 msgid "_Free/Busy"
 msgstr "_Free/Busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:263
+#: ../calendar/gui/dialogs/event-editor.c:267
 msgid "Query free / busy information for the attendees"
 msgstr "Query free / busy information for the attendees"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3310
+#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3327
 msgid "Appointment"
 msgstr "Appointment"
 
-#: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:2
-#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/dialogs/event-editor.c:388
+#: ../calendar/gui/dialogs/event-page.ui.h:24
+#: ../calendar/gui/e-meeting-list-view.c:162
 msgid "Attendees"
 msgstr "Attendees"
 
-#: ../calendar/gui/dialogs/event-editor.c:582
+#: ../calendar/gui/dialogs/event-editor.c:585
 msgid "Print this event"
 msgstr "Print this event"
 
-#: ../calendar/gui/dialogs/event-page.c:558
+#: ../calendar/gui/dialogs/event-page.c:566
 msgid "Event's start time is in the past"
 msgstr "Event's start time is in the past"
 
-#: ../calendar/gui/dialogs/event-page.c:635
+#: ../calendar/gui/dialogs/event-page.c:643
 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:639
+#: ../calendar/gui/dialogs/event-page.c:647
 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:651
-#: ../calendar/gui/dialogs/event-page.c:3080
+#: ../calendar/gui/dialogs/event-page.c:659
+#: ../calendar/gui/dialogs/event-page.c:3101
 msgid "This event has reminders"
 msgstr "This event has reminders"
 
-#: ../calendar/gui/dialogs/event-page.c:718
-#: ../calendar/gui/dialogs/event-page.ui.h:7
-#: ../calendar/gui/dialogs/memo-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.c:726
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Or_ganizer:"
 msgstr "Or_ganiser:"
 
-#: ../calendar/gui/dialogs/event-page.c:1263
+#: ../calendar/gui/dialogs/event-page.c:1285
 msgid "Event with no start date"
 msgstr "Event with no start date"
 
-#: ../calendar/gui/dialogs/event-page.c:1266
+#: ../calendar/gui/dialogs/event-page.c:1288
 msgid "Event with no end date"
 msgstr "Event with no end date"
 
-#: ../calendar/gui/dialogs/event-page.c:1439
-#: ../calendar/gui/dialogs/memo-page.c:708
-#: ../calendar/gui/dialogs/task-page.c:819
+#: ../calendar/gui/dialogs/event-page.c:1461
+#: ../calendar/gui/dialogs/memo-page.c:723
+#: ../calendar/gui/dialogs/task-page.c:840
 msgid "Start date is wrong"
 msgstr "Start date is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1449
+#: ../calendar/gui/dialogs/event-page.c:1471
 msgid "End date is wrong"
 msgstr "End date is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1472
+#: ../calendar/gui/dialogs/event-page.c:1494
 msgid "Start time is wrong"
 msgstr "Start time is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1479
+#: ../calendar/gui/dialogs/event-page.c:1501
 msgid "End time is wrong"
 msgstr "End time is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1644
-#: ../calendar/gui/dialogs/memo-page.c:749
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1664
+#: ../calendar/gui/dialogs/memo-page.c:762
+#: ../calendar/gui/dialogs/task-page.c:893
 msgid "An organizer is required."
 msgstr "An organiser is required."
 
-#: ../calendar/gui/dialogs/event-page.c:1678
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/event-page.c:1698
+#: ../calendar/gui/dialogs/task-page.c:927
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: ../calendar/gui/dialogs/event-page.c:1885
+#: ../calendar/gui/dialogs/event-page.c:1905
 msgid "_Delegatees"
 msgstr "_Delegatees"
 
-#: ../calendar/gui/dialogs/event-page.c:1887
+#: ../calendar/gui/dialogs/event-page.c:1907
 msgid "Atte_ndees"
 msgstr "Atte_ndees"
 
-#: ../calendar/gui/dialogs/event-page.c:2921
+#: ../calendar/gui/dialogs/event-page.c:2941
 #, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "Unable to open the calendar '%s': %s"
@@ -3011,277 +3037,283 @@ msgstr "Unable to open the calendar '%s': %s"
 #. * on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. * on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2998
-#: ../calendar/gui/dialogs/memo-page.c:1012
-#: ../calendar/gui/dialogs/task-page.c:1838
+#: ../calendar/gui/dialogs/event-page.c:3019
+#: ../calendar/gui/dialogs/memo-page.c:1025
+#: ../calendar/gui/dialogs/task-page.c:1858
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "You are acting on behalf of %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3325
+#: ../calendar/gui/dialogs/event-page.c:3361
 #, 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/dialogs/event-page.c:3331
+#: ../calendar/gui/dialogs/event-page.c:3367
 #, 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/dialogs/event-page.c:3337
+#: ../calendar/gui/dialogs/event-page.c:3373
 #, 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/dialogs/event-page.c:3356
+#: ../calendar/gui/dialogs/event-page.c:3392
 msgid "Customize"
 msgstr "Customise"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3362
+#: ../calendar/gui/dialogs/event-page.c:3398
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "None"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:564
-msgid "Atte_ndees..."
-msgstr "Atte_ndeesâ"
+#. 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/dialogs/event-page.ui.h:5
-msgid "Custom Reminder:"
-msgstr "Custom Reminder:"
+#. 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"
 
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Event Description"
-msgstr "Event Description"
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "15 minutes before appointment"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Time _zone:"
-msgstr "Time _zone:"
+#. 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"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:347
-msgid "_Description:"
-msgstr "_Description:"
+#. 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:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
 msgstr "_Location:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-msgid "_Reminder"
-msgstr "_Reminder"
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:7
+#: ../widgets/misc/e-attachment-dialog.c:350
+msgid "_Description:"
+msgstr "_Description:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:14
-msgid "_Summary:"
-msgstr "_Summary:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "_Time:"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-msgctxt "eventpage"
-msgid "1 day before appointment"
-msgstr "1 day before appointment"
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Time _zone:"
+msgstr "Time _zone:"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-msgctxt "eventpage"
-msgid "1 hour before appointment"
-msgstr "1 hour before appointment"
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgid "_Summary:"
+msgstr "_Summary:"
 
-#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
-msgctxt "eventpage"
-msgid "15 minutes before appointment"
-msgstr "15 minutes before appointment"
+msgid "Event Description"
+msgstr "Event Description"
 
-#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-msgctxt "eventpage"
-msgid "for"
-msgstr "for"
+#: ../calendar/gui/dialogs/task-page.ui.h:8
+#: ../calendar/gui/e-meeting-time-sel.c:579
+msgid "Atte_ndees..."
+msgstr "Atte_ndeesâ"
 
-#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#: ../calendar/gui/dialogs/event-page.ui.h:25
-msgctxt "eventpage"
-msgid "until"
-msgstr "until"
+#: ../calendar/gui/dialogs/event-page.ui.h:26
+msgid "_Reminder"
+msgstr "_Reminder"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+msgid "Custom Reminder:"
+msgstr "Custom Reminder:"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:1
-msgid "April"
-msgstr "April"
+msgid "January"
+msgstr "January"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:2
-msgid "August"
-msgstr "August"
+msgid "February"
+msgstr "February"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:3
-msgid "December"
-msgstr "December"
+msgid "March"
+msgstr "March"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:4
-msgid "February"
-msgstr "February"
+msgid "April"
+msgstr "April"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:5
-msgid "January"
-msgstr "January"
+msgid "May"
+msgstr "May"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:6
-msgid "July"
-msgstr "July"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
 msgid "June"
 msgstr "June"
 
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "July"
+msgstr "July"
+
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:8
-msgid "March"
-msgstr "March"
+msgid "August"
+msgstr "August"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:9
-msgid "May"
-msgstr "May"
+msgid "September"
+msgstr "September"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:10
-msgid "November"
-msgstr "November"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
 msgid "October"
 msgstr "October"
 
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "November"
+msgstr "November"
+
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "December"
+msgstr "December"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
 msgid "Select Date"
 msgstr "Select Date"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
 #: ../modules/calendar/e-cal-shell-view-actions.c:1363
 msgid "Select _Today"
 msgstr "Select _Today"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-msgid "September"
-msgstr "September"
-
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3314
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3331
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-editor.c:156
+#: ../calendar/gui/dialogs/memo-editor.c:159
 msgid "Print this memo"
 msgstr "Print this memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:405
+#: ../calendar/gui/dialogs/memo-page.c:423
 msgid "Memo's start date is in the past"
 msgstr "Memo's start date is in the past"
 
-#: ../calendar/gui/dialogs/memo-page.c:442
+#: ../calendar/gui/dialogs/memo-page.c:460
 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/memo-page.c:446
+#: ../calendar/gui/dialogs/memo-page.c:464
 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/memo-page.c:936
+#: ../calendar/gui/dialogs/memo-page.c:949
 #, c-format
 msgid "Unable to open memos in '%s': %s"
 msgstr "Unable to open memos in '%s': %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1144 ../em-format/em-format-quote.c:319
-#: ../em-format/em-format.c:1062 ../mail/em-format-html.c:2592
-#: ../mail/em-format-html.c:2657 ../mail/em-format-html.c:2681
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
+#: ../calendar/gui/dialogs/memo-page.c:1156 ../em-format/em-format.c:1065
+#: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2666
+#: ../mail/em-format-html.c:2731 ../mail/em-format-html.c:2755
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "To"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.ui.h:5
-msgid "Sta_rt date:"
-msgstr "Sta_rt date:"
+#: ../calendar/gui/dialogs/task-page.c:342
+#: ../calendar/gui/dialogs/task-page.ui.h:9
+msgid "_List:"
+msgstr "_List:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "Su_mmary:"
+#: ../calendar/gui/dialogs/task-page.c:350
+#: ../calendar/gui/dialogs/task-page.ui.h:2
+msgid "Organi_zer:"
+msgstr "Organi_ser:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "T_o:"
 
+#: ../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/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:333
-#: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_List:"
-msgstr "_List:"
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+msgid "Su_mmary:"
+msgstr "Su_mmary:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../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/dialogs/recur-comp.c:57
+#: ../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/dialogs/recur-comp.c:61
+#: ../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/dialogs/recur-comp.c:65
+#: ../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/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This Instance Only"
 msgstr "This Instance Only"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:93
 msgid "This and Prior Instances"
 msgstr "This and Prior Instances"
 
-#: ../calendar/gui/dialogs/recur-comp.c:101
+#: ../calendar/gui/dialogs/recur-comp.c:99
 msgid "This and Future Instances"
 msgstr "This and Future Instances"
 
-#: ../calendar/gui/dialogs/recur-comp.c:106
+#: ../calendar/gui/dialogs/recur-comp.c:104
 msgid "All Instances"
 msgstr "All Instances"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:575
+#: ../calendar/gui/dialogs/recurrence-page.c:576
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:964
+#: ../calendar/gui/dialogs/recurrence-page.c:965
 msgid "Recurrence date is invalid"
 msgstr "Recurrence date is invalid"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1004
+#: ../calendar/gui/dialogs/recurrence-page.c:1005
 msgid "End time of the recurrence was before event's start"
 msgstr "End time of the recurrence was before event's start"
 
 #. 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:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1035
 msgid "on"
 msgstr "on"
 
@@ -3289,7 +3321,7 @@ msgstr "on"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
+#: ../calendar/gui/dialogs/recurrence-page.c:1098
 msgid "first"
 msgstr "first"
 
@@ -3298,7 +3330,7 @@ msgstr "first"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1103
+#: ../calendar/gui/dialogs/recurrence-page.c:1104
 msgid "second"
 msgstr "second"
 
@@ -3306,7 +3338,7 @@ msgstr "second"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1108
+#: ../calendar/gui/dialogs/recurrence-page.c:1109
 msgid "third"
 msgstr "third"
 
@@ -3314,7 +3346,7 @@ msgstr "third"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 msgid "fourth"
 msgstr "fourth"
 
@@ -3322,7 +3354,7 @@ msgstr "fourth"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
 msgid "fifth"
 msgstr "fifth"
 
@@ -3330,13 +3362,13 @@ 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:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1124
 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:1147
+#: ../calendar/gui/dialogs/recurrence-page.c:1148
 msgid "Other Date"
 msgstr "Other Date"
 
@@ -3344,7 +3376,7 @@ msgstr "Other Date"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1153
+#: ../calendar/gui/dialogs/recurrence-page.c:1154
 msgid "1st to 10th"
 msgstr "1st to 10th"
 
@@ -3352,7 +3384,7 @@ msgstr "1st to 10th"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1159
+#: ../calendar/gui/dialogs/recurrence-page.c:1160
 msgid "11th to 20th"
 msgstr "11th to 20th"
 
@@ -3360,97 +3392,99 @@ 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:1165
+#: ../calendar/gui/dialogs/recurrence-page.c:1166
 msgid "21st to 31st"
 msgstr "21st to 31st"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1191
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Monday"
 msgstr "Monday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1192
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1193
-#: ../modules/calendar/e-calendar-preferences.ui.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1194
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "Thursday"
 msgstr "Thursday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1195
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "Friday"
 msgstr "Friday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1196
-#: ../modules/calendar/e-calendar-preferences.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "Saturday"
 msgstr "Saturday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1197
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1198
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
 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:1321
+#: ../calendar/gui/dialogs/recurrence-page.c:1322
 msgid "on the"
 msgstr "on the"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1496
+#: ../calendar/gui/dialogs/recurrence-page.c:1501
 msgid "occurrences"
 msgstr "occurrences"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2214
+#: ../calendar/gui/dialogs/recurrence-page.c:2217
 msgid "Add exception"
 msgstr "Add exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2255
+#: ../calendar/gui/dialogs/recurrence-page.c:2258
 msgid "Could not get a selection to modify."
 msgstr "Could not get a selection to modify."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2261
+#: ../calendar/gui/dialogs/recurrence-page.c:2264
 msgid "Modify exception"
 msgstr "Modify exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2305
+#: ../calendar/gui/dialogs/recurrence-page.c:2308
 msgid "Could not get a selection to delete."
 msgstr "Could not get a selection to delete."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2439
+#: ../calendar/gui/dialogs/recurrence-page.c:2447
 msgid "Date/Time"
 msgstr "Date/Time"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
-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
-msgid "Exceptions"
-msgstr "Exceptions"
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "day(s)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
-msgid "Preview"
-msgstr "Preview"
+#. 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"
+msgid "week(s)"
+msgstr "week(s)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
-msgid "This appointment rec_urs"
-msgstr "This appointment rec_urs"
+#. 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"
+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"
-msgid "day(s)"
-msgstr "day(s)"
+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
@@ -3461,156 +3495,155 @@ 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"
-msgid "forever"
-msgstr "forever"
+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"
-msgid "month(s)"
-msgstr "month(s)"
+msgid "forever"
+msgstr "forever"
 
-#. 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:16
-msgctxt "recurrpage"
-msgid "until"
-msgstr "until"
+msgid "This appointment rec_urs"
+msgstr "This appointment rec_urs"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:17
+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:18
-msgctxt "recurrpage"
-msgid "week(s)"
-msgstr "week(s)"
+msgid "Exceptions"
+msgstr "Exceptions"
 
-#. 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:20
-msgctxt "recurrpage"
-msgid "year(s)"
-msgstr "year(s)"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20 ../mail/mail-config.ui.h:27
+msgid "Preview"
+msgstr "Preview"
 
-#: ../calendar/gui/dialogs/send-comp.c:198
+#: ../calendar/gui/dialogs/send-comp.c:196
 msgid "Send my reminders with this event"
 msgstr "Send my reminders with this event"
 
-#: ../calendar/gui/dialogs/send-comp.c:200
+#: ../calendar/gui/dialogs/send-comp.c:198
 msgid "Notify new attendees _only"
 msgstr "Notify new attendees _only"
 
-#: ../calendar/gui/dialogs/task-details-page.c:351
-#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:355
+#: ../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:488
+#: ../calendar/gui/dialogs/task-details-page.c:489
 msgid "Web Page"
 msgstr "Web Page"
 
-#. To Translators: This is task status
+#. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:300
-#: ../calendar/gui/e-cal-model-tasks.c:440
-#: ../calendar/gui/e-cal-model-tasks.c:725 ../calendar/gui/e-task-table.c:219
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:606
-#: ../calendar/gui/print.c:3400 ../mail/em-sync-stream.c:152
-#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
-#, c-format
-msgid "Canceled"
-msgstr "Cancelled"
+#: ../calendar/gui/e-cal-component-preview.c:326
+#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:19
+#: ../mail/message-list.c:1285 ../widgets/misc/e-send-options.ui.h:2
+msgid "High"
+msgstr "High"
 
-#. To Translators: This is task status
+#. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:297
-#: ../calendar/gui/e-cal-model-tasks.c:438
-#: ../calendar/gui/e-cal-model-tasks.c:723
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3397
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
-msgid "Completed"
-msgstr "Completed"
+#: ../calendar/gui/e-cal-component-preview.c:328
+#: ../calendar/gui/e-cal-model.c:1623 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1284
+#: ../widgets/misc/e-send-options.ui.h:5
+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:319
-#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1274 ../widgets/misc/e-send-options.ui.h:13
-msgid "High"
-msgstr "High"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:294
-#: ../calendar/gui/e-cal-model-tasks.c:436
-#: ../calendar/gui/e-cal-model-tasks.c:721
-#: ../calendar/gui/e-cal-model-tasks.c:799 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:604
-#: ../calendar/gui/print.c:3394
-msgid "In Progress"
-msgstr "In Progress"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:323
-#: ../calendar/gui/e-task-table.c:528 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1272 ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:330
+#: ../calendar/gui/e-task-table.c:584 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1283 ../widgets/misc/e-send-options.ui.h:4
 msgid "Low"
 msgstr "Low"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-cal-model.c:1578 ../calendar/gui/e-task-table.c:527
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1273
-#: ../widgets/misc/e-send-options.ui.h:16
-msgid "Normal"
-msgstr "Normal"
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-task-table.c:585 ../calendar/gui/tasktypes.xml.h:22
+#: ../widgets/misc/e-send-options.ui.h:1
+msgid "Undefined"
+msgstr "Undefined"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:304
-#: ../calendar/gui/e-cal-model-tasks.c:434
-#: ../calendar/gui/e-cal-model-tasks.c:719 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:603
-#: ../calendar/gui/print.c:3391 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-model-tasks.c:490
+#: ../calendar/gui/e-cal-model-tasks.c:775 ../calendar/gui/e-task-table.c:230
+#: ../calendar/gui/e-task-table.c:245 ../calendar/gui/e-task-table.c:659
+#: ../calendar/gui/print.c:3408 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Not Started"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:16
-msgid "P_ercent complete:"
-msgstr "P_ercent complete:"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:12
+#: ../calendar/gui/e-cal-component-preview.c:301
+#: ../calendar/gui/e-cal-model-tasks.c:492
+#: ../calendar/gui/e-cal-model-tasks.c:777
+#: ../calendar/gui/e-cal-model-tasks.c:855 ../calendar/gui/e-task-table.c:232
+#: ../calendar/gui/e-task-table.c:247 ../calendar/gui/e-task-table.c:660
+#: ../calendar/gui/print.c:3411
+msgid "In Progress"
+msgstr "In Progress"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:17
-msgid "Stat_us:"
-msgstr "Stat_us:"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../calendar/gui/e-cal-model-tasks.c:494
+#: ../calendar/gui/e-cal-model-tasks.c:779
+#: ../calendar/gui/e-meeting-store.c:214 ../calendar/gui/e-meeting-store.c:237
+#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:249
+#: ../calendar/gui/e-task-table.c:661 ../calendar/gui/print.c:3414
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:387
+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:307
+#: ../calendar/gui/e-cal-model-tasks.c:496
+#: ../calendar/gui/e-cal-model-tasks.c:781 ../calendar/gui/e-task-table.c:236
+#: ../calendar/gui/e-task-table.c:251 ../calendar/gui/e-task-table.c:662
+#: ../calendar/gui/print.c:3417 ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
+#, c-format
+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:18
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1854
-#: ../calendar/gui/e-meeting-list-view.c:635
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
-#: ../mail/message-list.etspec.h:17
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-cal-model.c:3522
+#: ../calendar/gui/e-meeting-list-view.c:680
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:1
 msgid "Status"
 msgstr "Status"
 
-#. To Translators: This is task priority
+#: ../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
-#: ../calendar/gui/e-task-table.c:529 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:27
-msgid "Undefined"
-msgstr "Undefined"
+#: ../widgets/misc/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:22
-#: ../widgets/misc/e-send-options.ui.h:35
-msgid "_Priority:"
-msgstr "_Priority:"
-
 #: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "_Web Page:"
@@ -3627,8 +3660,8 @@ msgstr "Click to change or view the status details of the task"
 msgid "_Send Options"
 msgstr "_Send Options"
 
-#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3312
-#: ../widgets/misc/e-send-options.c:535
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3329
+#: ../widgets/misc/e-send-options.c:553
 msgid "Task"
 msgstr "Task"
 
@@ -3636,54 +3669,208 @@ msgstr "Task"
 msgid "Task Details"
 msgstr "Task Details"
 
-#: ../calendar/gui/dialogs/task-editor.c:366
+#: ../calendar/gui/dialogs/task-editor.c:368
 msgid "Print this task"
 msgstr "Print this task"
 
-#: ../calendar/gui/dialogs/task-page.c:251
+#: ../calendar/gui/dialogs/task-page.c:254
 msgid "Task's start date is in the past"
 msgstr "Task's start date is in the past"
 
-#: ../calendar/gui/dialogs/task-page.c:252
+#: ../calendar/gui/dialogs/task-page.c:255
 msgid "Task's due date is in the past"
 msgstr "Task's due date is in the past"
 
-#: ../calendar/gui/dialogs/task-page.c:286
+#: ../calendar/gui/dialogs/task-page.c:289
 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:290
+#: ../calendar/gui/dialogs/task-page.c:293
 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:341
-#: ../calendar/gui/dialogs/task-page.ui.h:4
-msgid "Organi_zer:"
-msgstr "Organi_ser:"
+#: ../calendar/gui/dialogs/task-page.c:297
+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:801
+#: ../calendar/gui/dialogs/task-page.c:822
 msgid "Due date is wrong"
 msgstr "Due date is wrong"
 
-#: ../calendar/gui/dialogs/task-page.c:1757
+#: ../calendar/gui/dialogs/task-page.c:1777
 #, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "Unable to open tasks in '%s': %s"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:2
-msgid "Categor_ies..."
-msgstr "Categor_iesâ"
-
 #: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "D_ue date:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:6
 msgid "Time zone:"
 msgstr "Time zone:"
 
+#: ../calendar/gui/ea-cal-view.c:320
+msgid "New Appointment"
+msgstr "New Appointment"
+
+#: ../calendar/gui/ea-cal-view.c:321
+msgid "New All Day Event"
+msgstr "New All Day Event"
+
+#: ../calendar/gui/ea-cal-view.c:322
+msgid "New Meeting"
+msgstr "New Meeting"
+
+#: ../calendar/gui/ea-cal-view.c:323
+msgid "Go to Today"
+msgstr "Go to Today"
+
+#: ../calendar/gui/ea-cal-view.c:324
+msgid "Go to Date"
+msgstr "Go to Date"
+
+#: ../calendar/gui/ea-cal-view-event.c:291
+msgid "It has reminders."
+msgstr "It has reminders."
+
+#: ../calendar/gui/ea-cal-view-event.c:294
+msgid "It has recurrences."
+msgstr "It has recurrences."
+
+#: ../calendar/gui/ea-cal-view-event.c:297
+msgid "It is a meeting."
+msgstr "It is a meeting."
+
+#: ../calendar/gui/ea-cal-view-event.c:304
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr "Calendar Event: Summary is %s."
+
+#: ../calendar/gui/ea-cal-view-event.c:307
+msgid "Calendar Event: It has no summary."
+msgstr "Calendar Event: It has no summary."
+
+#: ../calendar/gui/ea-cal-view-event.c:329
+msgid "calendar view event"
+msgstr "calendar view event"
+
+#: ../calendar/gui/ea-cal-view-event.c:558
+msgid "Grab Focus"
+msgstr "Grab Focus"
+
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
+#, 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:156 ../calendar/gui/ea-week-view.c:154
+msgid "It has no events."
+msgstr "It has no events."
+
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:163
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "Work Week View: %s. %s"
+
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:169
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "Day View: %s. %s"
+
+#: ../calendar/gui/ea-day-view.c:203
+msgid "calendar view for a work week"
+msgstr "calendar view for a work week"
+
+#: ../calendar/gui/ea-day-view.c:205
+msgid "calendar view for one or more days"
+msgstr "calendar view for one or more days"
+
+#: ../calendar/gui/ea-day-view-main-item.c:319
+#: ../calendar/gui/ea-week-view-main-item.c:345
+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-gnome-calendar.c:50
+#: ../calendar/gui/ea-gnome-calendar.c:58
+#: ../calendar/importers/icalendar-importer.c:1084
+msgid "Gnome Calendar"
+msgstr "Gnome Calendar"
+
+#: ../calendar/gui/ea-gnome-calendar.c:201
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
+msgid "%A %d %b %Y"
+msgstr "%A %d %b %Y"
+
+#. 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:204 ../calendar/gui/e-day-view.c:1850
+#: ../calendar/gui/e-day-view-top-item.c:837
+#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../calendar/gui/ea-gnome-calendar.c:213
+#: ../modules/calendar/e-cal-shell-view-private.c:1057
+#: ../modules/calendar/e-cal-shell-view-private.c:1063
+#: ../modules/calendar/e-cal-shell-view-private.c:1066
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
+
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../calendar/gui/ea-gnome-calendar.c:236
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../calendar/gui/ea-gnome-calendar.c:244
+#: ../modules/calendar/e-cal-shell-view-private.c:1083
+#: ../modules/calendar/e-cal-shell-view-private.c:1094
+#: ../modules/calendar/e-cal-shell-view-private.c:1101
+#: ../modules/calendar/e-cal-shell-view-private.c:1104
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
+
+#. 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:234 ../calendar/gui/e-day-view.c:1866
+#: ../calendar/gui/e-day-view-top-item.c:841
+#: ../calendar/gui/e-week-view-main-item.c:245
+#: ../modules/calendar/e-cal-shell-view-private.c:1090
+msgid "%d %b"
+msgstr "%d %b"
+
+#: ../calendar/gui/ea-jump-button.c:151
+msgid "Jump button"
+msgstr "Jump button"
+
+#: ../calendar/gui/ea-jump-button.c:160
+msgid "Click here, you can find more events."
+msgstr "Click here, you can find more events."
+
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:393
+#: ../calendar/gui/e-alarm-list.c:359
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3691,299 +3878,214 @@ msgstr[0] "%d day"
 msgstr[1] "%d days"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:399
+#: ../calendar/gui/e-alarm-list.c:365
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d week"
 msgstr[1] "%d weeks"
 
-#: ../calendar/gui/e-alarm-list.c:461
+#: ../calendar/gui/e-alarm-list.c:427
 msgid "Unknown action to be performed"
 msgstr "Unknown action to be performed"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:475
+#: ../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"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:480
+#: ../calendar/gui/e-alarm-list.c:446
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s after the start of the appointment"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:487
+#: ../calendar/gui/e-alarm-list.c:453
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s at the start of the appointment"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:498
+#: ../calendar/gui/e-alarm-list.c:464
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s before the end of the appointment"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:503
+#: ../calendar/gui/e-alarm-list.c:469
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s after the end of the appointment"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:510
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s at the end of the appointment"
 
 #. 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:534
+#: ../calendar/gui/e-alarm-list.c:500
 #, c-format
 msgid "%s at %s"
 msgstr "%s at %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:542
+#: ../calendar/gui/e-alarm-list.c:508
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:671
+#: ../calendar/gui/ea-week-view.c:159
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "Month View: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:163
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "Week View: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:197
+msgid "calendar view for a month"
+msgstr "calendar view for a month"
+
+#: ../calendar/gui/ea-week-view.c:199
+msgid "calendar view for one or more weeks"
+msgstr "calendar view for one or more weeks"
+
+#: ../calendar/gui/e-cal-component-preview.c:201 ../filter/e-filter-rule.c:691
 msgid "Untitled"
 msgstr "Untitled"
 
-#: ../calendar/gui/e-cal-component-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:207
 msgid "Categories:"
 msgstr "Categories:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:246
 msgid "Summary:"
 msgstr "Summary:"
 
-#: ../calendar/gui/e-cal-component-preview.c:249
-#: ../calendar/gui/e-cal-component-preview.c:263
+#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Start Date:"
 msgstr "Start Date:"
 
-#: ../calendar/gui/e-cal-component-preview.c:277
+#: ../calendar/gui/e-cal-component-preview.c:284
 msgid "Due Date:"
 msgstr "Due Date:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:290
-#: ../plugins/itip-formatter/itip-view.c:1083
+#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../plugins/itip-formatter/itip-view.c:1082
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-cal-component-preview.c:324
 msgid "Priority:"
 msgstr "Priority:"
 
-#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:349 ../mail/mail-config.ui.h:159
 msgid "Description:"
 msgstr "Description:"
 
-#: ../calendar/gui/e-cal-component-preview.c:373
+#: ../calendar/gui/e-cal-component-preview.c:380
 msgid "Web Page:"
 msgstr "Web Page:"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:2
-#: ../calendar/gui/e-calendar-table.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:388
-msgid "Created"
-msgstr "Created"
+#: ../calendar/gui/e-calendar-table.etspec.h:1
+msgid "Click to add a task"
+msgstr "Click to add a task"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
-msgid "End Date"
-msgstr "End Date"
+#: ../calendar/gui/e-calendar-table.etspec.h:2
+msgid "Start date"
+msgstr "Start date"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:9
-#: ../calendar/gui/e-memo-table.etspec.h:4
-msgid "Last modified"
-msgstr "Last modified"
+#: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-meeting-list-view.c:640
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../mail/e-mail-account-tree-view.c:139
+#: ../widgets/misc/e-attachment-tree-view.c:586
+msgid "Type"
+msgstr "Type"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:5
-msgid "Start Date"
-msgstr "Start Date"
+#: ../calendar/gui/e-calendar-table.etspec.h:5
+msgid "Completion date"
+msgstr "Completion date"
 
-#: ../calendar/gui/e-cal-model-calendar.c:188
-#: ../calendar/gui/e-task-table.c:580
-msgid "Free"
-msgstr "Free"
+#: ../calendar/gui/e-calendar-table.etspec.h:6
+msgid "Complete"
+msgstr "Complete"
 
-#: ../calendar/gui/e-cal-model-calendar.c:191
-#: ../calendar/gui/e-meeting-time-sel.c:547 ../calendar/gui/e-task-table.c:581
-msgid "Busy"
-msgstr "Busy"
-
-#: ../calendar/gui/e-cal-model-tasks.c:665
-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"
-
-#. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:717
-msgctxt "cal-task-status"
-msgid "None"
-msgstr "None"
-
-#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
-#: ../calendar/gui/e-meeting-store.c:1053
-msgid "Yes"
-msgstr "Yes"
-
-#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:190
-msgid "No"
-msgstr "No"
-
-#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1151
-#: ../calendar/gui/print.c:1168 ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:102
-#: ../plugins/itip-formatter/itip-formatter.c:469
-#: ../plugins/itip-formatter/itip-formatter.c:2697
-msgid "Unknown"
-msgstr "Unknown"
-
-#: ../calendar/gui/e-cal-model.c:1580
-msgid "Recurring"
-msgstr "Recurring"
-
-#: ../calendar/gui/e-cal-model.c:1582
-msgid "Assigned"
-msgstr "Assigned"
-
-#: ../calendar/gui/e-cal-model.c:2910
-#, c-format
-msgid "Opening %s"
-msgstr "Opening %s"
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+msgid "Due date"
+msgstr "Due date"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:9
 #, no-c-format
 msgid "% Complete"
 msgstr "% Complete"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-msgid "Click to add a task"
-msgstr "Click to add a task"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:5
-msgid "Complete"
-msgstr "Complete"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:6
-msgid "Completion date"
-msgstr "Completion date"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:8
-msgid "Due date"
-msgstr "Due date"
-
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:18
 #: ../plugins/save-calendar/csv-format.c:394
 msgid "Priority"
 msgstr "Priority"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-msgid "Start date"
-msgstr "Start date"
+#: ../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:388
+msgid "Created"
+msgstr "Created"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:598
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:584
-msgid "Type"
-msgstr "Type"
+msgid "Last modified"
+msgstr "Last modified"
 
-#: ../calendar/gui/e-calendar-view.c:420
+#: ../calendar/gui/e-calendar-view.c:434
 msgid "Cut selected events to the clipboard"
 msgstr "Cut selected events to the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:426
+#: ../calendar/gui/e-calendar-view.c:440
 msgid "Copy selected events to the clipboard"
 msgstr "Copy selected events to the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:432
+#: ../calendar/gui/e-calendar-view.c:446
 msgid "Paste events from the clipboard"
 msgstr "Paste events from the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:438
+#: ../calendar/gui/e-calendar-view.c:452
 msgid "Delete selected events"
 msgstr "Delete selected events"
 
-#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
-#: ../calendar/gui/e-task-table.c:269
+#: ../calendar/gui/e-calendar-view.c:472 ../calendar/gui/e-memo-table.c:198
+#: ../calendar/gui/e-task-table.c:286
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
 
-#: ../calendar/gui/e-calendar-view.c:650 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/e-task-table.c:1104
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:878
+#: ../calendar/gui/e-task-table.c:1161
 msgid "Updating objects"
 msgstr "Updating objects"
 
-#: ../calendar/gui/e-calendar-view.c:1801
-#: ../calendar/gui/e-meeting-list-view.c:214
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2685
-msgid "Accepted"
-msgstr "Accepted"
-
-#: ../calendar/gui/e-calendar-view.c:1802
-#: ../calendar/gui/e-meeting-list-view.c:215
-#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2691
-msgid "Declined"
-msgstr "Declined"
-
-#: ../calendar/gui/e-calendar-view.c:1803
-#: ../calendar/gui/e-meeting-list-view.c:216
-#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../calendar/gui/e-meeting-time-sel.c:546
-msgid "Tentative"
-msgstr "Tentative"
-
-#: ../calendar/gui/e-calendar-view.c:1804
-#: ../calendar/gui/e-meeting-list-view.c:217
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2694
-msgid "Delegated"
-msgstr "Delegated"
-
-#: ../calendar/gui/e-calendar-view.c:1805
-msgid "Needs action"
-msgstr "Needs action"
-
 #. 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:1949 ../calendar/gui/e-memo-table.c:539
-#: ../calendar/gui/e-task-table.c:770
+#: ../calendar/gui/e-calendar-view.c:1973 ../calendar/gui/e-memo-table.c:555
+#: ../calendar/gui/e-task-table.c:827
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organiser: %s <%s>"
@@ -3991,35 +4093,139 @@ msgstr "Organiser: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1953 ../calendar/gui/e-memo-table.c:544
-#: ../calendar/gui/e-task-table.c:774
+#: ../calendar/gui/e-calendar-view.c:1977 ../calendar/gui/e-memo-table.c:560
+#: ../calendar/gui/e-task-table.c:831
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organiser: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1969 ../calendar/gui/print.c:3346
+#: ../calendar/gui/e-calendar-view.c:1993 ../calendar/gui/print.c:3363
 #, c-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2000
+#: ../calendar/gui/e-calendar-view.c:2024
 #, c-format
 msgid "Time: %s %s"
 msgstr "Time: %s %s"
 
+#: ../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-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "End Date"
+
+#: ../calendar/gui/e-cal-model.c:813 ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:242 ../calendar/gui/print.c:1162
+#: ../calendar/gui/print.c:1179 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:101
+#: ../plugins/itip-formatter/itip-formatter.c:475
+#: ../plugins/itip-formatter/itip-formatter.c:2885
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../calendar/gui/e-cal-model.c:1625
+msgid "Recurring"
+msgstr "Recurring"
+
+#: ../calendar/gui/e-cal-model.c:1627
+msgid "Assigned"
+msgstr "Assigned"
+
+#: ../calendar/gui/e-cal-model.c:1629 ../calendar/gui/e-cal-model-tasks.c:1146
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/e-meeting-store.c:1062
+msgid "Yes"
+msgstr "Yes"
+
+#: ../calendar/gui/e-cal-model.c:1629 ../calendar/gui/e-cal-model-tasks.c:1146
+#: ../calendar/gui/e-meeting-list-view.c:207
+#: ../calendar/gui/e-meeting-store.c:198
+msgid "No"
+msgstr "No"
+
+#: ../calendar/gui/e-cal-model.c:3021
+#, c-format
+msgid "Opening %s"
+msgstr "Opening %s"
+
+#: ../calendar/gui/e-cal-model.c:3466
+#: ../calendar/gui/e-meeting-list-view.c:218
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../plugins/itip-formatter/itip-formatter.c:2873
+msgid "Accepted"
+msgstr "Accepted"
+
+#: ../calendar/gui/e-cal-model.c:3467
+#: ../calendar/gui/e-meeting-list-view.c:219
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
+#: ../plugins/itip-formatter/itip-formatter.c:2879
+msgid "Declined"
+msgstr "Declined"
+
+#: ../calendar/gui/e-cal-model.c:3468
+#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/e-meeting-store.c:233
+#: ../calendar/gui/e-meeting-time-sel.c:561
+msgid "Tentative"
+msgstr "Tentative"
+
+#: ../calendar/gui/e-cal-model.c:3469
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/e-meeting-store.c:235
+#: ../plugins/itip-formatter/itip-formatter.c:2882
+msgid "Delegated"
+msgstr "Delegated"
+
+#: ../calendar/gui/e-cal-model.c:3470
+msgid "Needs action"
+msgstr "Needs action"
+
+#: ../calendar/gui/e-cal-model-calendar.c:157
+#: ../calendar/gui/e-task-table.c:636
+msgid "Free"
+msgstr "Free"
+
+#: ../calendar/gui/e-cal-model-calendar.c:160
+#: ../calendar/gui/e-meeting-time-sel.c:562 ../calendar/gui/e-task-table.c:637
+msgid "Busy"
+msgstr "Busy"
+
+#: ../calendar/gui/e-cal-model-tasks.c:721
+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"
+
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:773
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "None"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:156
+#: ../calendar/gui/e-cell-date-edit-text.c:163
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:159
+#: ../calendar/gui/e-cell-date-edit-text.c:166
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:167
+#: ../calendar/gui/e-cell-date-edit-text.c:174
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4028,344 +4234,299 @@ msgstr ""
 "The date must be entered in the format: \n"
 "%s"
 
-#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
-#. * to change the length of the time division in the calendar 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:809
+#. String to use in 12-hour time format for times in the morning.
+#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:774
+#: ../calendar/gui/print.c:988 ../calendar/gui/print.c:1007
+#: ../calendar/gui/print.c:2498 ../calendar/gui/print.c:2518
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: ../calendar/gui/e-day-view.c:1025 ../calendar/gui/e-week-view.c:777
+#: ../calendar/gui/print.c:993 ../calendar/gui/print.c:1009
+#: ../calendar/gui/print.c:2503 ../calendar/gui/print.c:2520
+msgid "pm"
+msgstr "pm"
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. * %B = full month name. Don't use any other specifiers.
+#. strftime format %A = full weekday name, %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-day-view.c:1833 ../calendar/gui/e-day-view-top-item.c:833
+#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1982
+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:2650
+#, c-format
+msgid "Week %d"
+msgstr "Week %d"
+
+#. Translators: %02i is the number of minutes;
+#. * this is a context menu entry to change the
+#. * length of the time division in the calendar
+#. * 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:791
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minute divisions"
 
-#: ../calendar/gui/e-day-view-time-item.c:830
+#: ../calendar/gui/e-day-view-time-item.c:816
 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:847
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../calendar/gui/e-day-view-time-item.c:833
 #: ../modules/calendar/e-calendar-preferences.c:179
 #: ../modules/calendar/e-calendar-preferences.c:231
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "None"
 
-#: ../calendar/gui/e-day-view-time-item.c:879
-#: ../calendar/gui/e-timezone-entry.c:319
-#: ../modules/calendar/e-calendar-preferences.c:258
+#: ../calendar/gui/e-day-view-time-item.c:867
+#: ../calendar/gui/e-timezone-entry.c:322
+#: ../modules/calendar/e-calendar-preferences.c:262
 msgid "Select..."
 msgstr "Selectâ"
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. * %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %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-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1819
-#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1968
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. 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-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1836
-#: ../calendar/gui/e-week-view-main-item.c:224
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. 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-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1852
-#: ../calendar/gui/e-week-view-main-item.c:238
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../modules/calendar/e-cal-shell-view-private.c:1090
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1019 ../calendar/gui/e-week-view.c:757
-#: ../calendar/gui/print.c:977 ../calendar/gui/print.c:996
-#: ../calendar/gui/print.c:2484 ../calendar/gui/print.c:2504
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:982 ../calendar/gui/print.c:998
-#: ../calendar/gui/print.c:2489 ../calendar/gui/print.c:2506
-msgid "pm"
-msgstr "pm"
-
-#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2636
-#, c-format
-msgid "Week %d"
-msgstr "Week %d"
-
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "Chair Persons"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "Required Participants"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "Optional Participants"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "Resources"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1147
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/e-meeting-store.c:1056 ../calendar/gui/print.c:1158
 msgid "Individual"
 msgstr "Individual"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1148 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/print.c:1159 ../widgets/table/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Group"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1149
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:1160
 msgid "Resource"
 msgstr "Resource"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1150
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:1161
 msgid "Room"
 msgstr "Room"
 
-#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/print.c:1164
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/print.c:1175
 msgid "Chair"
 msgstr "Chair"
 
-#: ../calendar/gui/e-meeting-list-view.c:189
-#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1165
+#: ../calendar/gui/e-meeting-list-view.c:193
+#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:173
+#: ../calendar/gui/e-meeting-store.c:1059 ../calendar/gui/print.c:1176
 msgid "Required Participant"
 msgstr "Required Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1166
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:158 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/print.c:1177
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/print.c:1167
+#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-store.c:160 ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/print.c:1178
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:213
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/e-meeting-store.c:1060
+#: ../calendar/gui/e-meeting-list-view.c:217
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../calendar/gui/e-meeting-store.c:1069
 msgid "Needs Action"
 msgstr "Needs Action"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:615
 msgid "Attendee                          "
 msgstr "Attendee                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:623
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../calendar/gui/e-meeting-list-view.c:667
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
+#: ../calendar/gui/e-meeting-store.c:216 ../calendar/gui/e-meeting-store.c:239
 msgid "In Process"
 msgstr "In Process"
 
-#: ../calendar/gui/e-meeting-store.c:1876
+#: ../calendar/gui/e-meeting-store.c:1887
 #, 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:1886
+#: ../calendar/gui/e-meeting-store.c:1897
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Failure reason: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1891
-#: ../plugins/caldav/caldav-browse-server.c:957
-#: ../plugins/google-account-setup/google-source.c:460
-#: ../plugins/publish-calendar/publish-calendar.c:345
-#: ../smime/gui/component.c:53
+#: ../calendar/gui/e-meeting-store.c:1902
+#: ../plugins/caldav/caldav-browse-server.c:958
+#: ../plugins/google-account-setup/google-source.c:453
+#: ../plugins/publish-calendar/publish-calendar.c:339
+#: ../smime/gui/component.c:54
 msgid "Enter password"
 msgstr "Enter password"
 
-#. This is a strftime() format string %A = full weekday name,
-#. * %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:445
-#: ../calendar/gui/e-meeting-time-sel.c:2379
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. * name, %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. * %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:449
-#: ../calendar/gui/e-meeting-time-sel.c:2410
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. * %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:453
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#: ../calendar/gui/e-meeting-time-sel.c:548
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Out of Office"
 msgstr "Out of Office"
 
-#: ../calendar/gui/e-meeting-time-sel.c:549
+#: ../calendar/gui/e-meeting-time-sel.c:564
 msgid "No Information"
 msgstr "No Information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:602
 msgid "O_ptions"
 msgstr "O_ptions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:603
+#: ../calendar/gui/e-meeting-time-sel.c:620
 msgid "Show _only working hours"
 msgstr "Show _only working hours"
 
-#: ../calendar/gui/e-meeting-time-sel.c:614
+#: ../calendar/gui/e-meeting-time-sel.c:632
 msgid "Show _zoomed out"
 msgstr "Show _zoomed out"
 
-#: ../calendar/gui/e-meeting-time-sel.c:630
+#: ../calendar/gui/e-meeting-time-sel.c:649
 msgid "_Update free/busy"
 msgstr "_Update free/busy"
 
-#: ../calendar/gui/e-meeting-time-sel.c:645
+#: ../calendar/gui/e-meeting-time-sel.c:665
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:663
+#: ../calendar/gui/e-meeting-time-sel.c:684
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: ../calendar/gui/e-meeting-time-sel.c:678
+#: ../calendar/gui/e-meeting-time-sel.c:700
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:696
+#: ../calendar/gui/e-meeting-time-sel.c:719
 msgid "_All people and resources"
 msgstr "_All people and resources"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "All _people and one resource"
 msgstr "All _people and one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:716
+#: ../calendar/gui/e-meeting-time-sel.c:741
 msgid "_Required people"
 msgstr "_Required people"
 
-#: ../calendar/gui/e-meeting-time-sel.c:725
+#: ../calendar/gui/e-meeting-time-sel.c:751
 msgid "Required people and _one resource"
 msgstr "Required people and _one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:774
+#: ../calendar/gui/e-meeting-time-sel.c:802
 msgid "_Start time:"
 msgstr "_Start time:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:814
+#: ../calendar/gui/e-meeting-time-sel.c:843
 msgid "_End time:"
 msgstr "_End time:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Click here to add an attendee"
 msgstr "Click here to add an attendee"
 
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Common Name"
+msgid "Member"
+msgstr "Member"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Delegated To"
+msgstr "Delegated To"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Delegated From"
 msgstr "Delegated From"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegated To"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+msgid "Common Name"
+msgstr "Common Name"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Language"
 msgstr "Language"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Member"
-
-#: ../calendar/gui/e-memo-table.c:420
-#: ../modules/calendar/e-cal-shell-content.c:473
+#: ../calendar/gui/e-memo-table.c:436
+#: ../modules/calendar/e-cal-shell-content.c:474
 #: ../modules/calendar/e-memo-shell-view-actions.c:231
 #: ../modules/calendar/e-memo-shell-view-actions.c:246
 #: ../modules/calendar/e-memo-shell-view.c:293
-#: ../plugins/caldav/caldav-browse-server.c:458
+#: ../plugins/caldav/caldav-browse-server.c:459
 msgid "Memos"
 msgstr "Memos"
 
-#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:733
+#: ../calendar/gui/e-memo-table.c:517 ../calendar/gui/e-task-table.c:790
 msgid "* No Summary *"
 msgstr "* No Summary *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:817
+#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:874
 msgid "Start: "
 msgstr "Start: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:835
+#: ../calendar/gui/e-memo-table.c:623 ../calendar/gui/e-task-table.c:892
 msgid "Due: "
 msgstr "Due: "
 
-#: ../calendar/gui/e-memo-table.c:726
+#: ../calendar/gui/e-memo-table.c:742
 msgid "Cut selected memos to the clipboard"
 msgstr "Cut selected memos to the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:732
+#: ../calendar/gui/e-memo-table.c:748
 msgid "Copy selected memos to the clipboard"
 msgstr "Copy selected memos to the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:738
+#: ../calendar/gui/e-memo-table.c:754
 msgid "Paste memos from the clipboard"
 msgstr "Paste memos from the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:744
-#: ../modules/calendar/e-memo-shell-view-actions.c:587
+#: ../calendar/gui/e-memo-table.c:760
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "Delete selected memos"
 msgstr "Delete selected memos"
 
-#: ../calendar/gui/e-memo-table.c:750
+#: ../calendar/gui/e-memo-table.c:766
 msgid "Select all visible memos"
 msgstr "Select all visible memos"
 
-#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.etspec.h:1
 msgid "Click to add a memo"
 msgstr "Click to add a memo"
 
@@ -4373,233 +4534,85 @@ msgstr "Click to add a memo"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:555
+#: ../calendar/gui/e-task-table.c:611
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2273
+#: ../calendar/gui/e-task-table.c:708 ../calendar/gui/print.c:2287
 #: ../calendar/importers/icalendar-importer.c:85
-#: ../calendar/importers/icalendar-importer.c:1043
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
-#: ../modules/calendar/e-cal-shell-content.c:434
+#: ../calendar/importers/icalendar-importer.c:1048
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
+#: ../modules/calendar/e-cal-shell-content.c:435
 #: ../modules/calendar/e-task-shell-view-actions.c:254
 #: ../modules/calendar/e-task-shell-view-actions.c:269
 #: ../modules/calendar/e-task-shell-view.c:448
-#: ../plugins/caldav/caldav-browse-server.c:456
+#: ../plugins/caldav/caldav-browse-server.c:457
 msgid "Tasks"
 msgstr "Tasks"
 
-#: ../calendar/gui/e-task-table.c:968
+#: ../calendar/gui/e-task-table.c:1025
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cut selected tasks to the clipboard"
 
-#: ../calendar/gui/e-task-table.c:974
+#: ../calendar/gui/e-task-table.c:1031
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copy selected tasks to the clipboard"
 
-#: ../calendar/gui/e-task-table.c:980
+#: ../calendar/gui/e-task-table.c:1037
 msgid "Paste tasks from the clipboard"
 msgstr "Paste tasks from the clipboard"
 
-#: ../calendar/gui/e-task-table.c:986
-#: ../modules/calendar/e-task-shell-view-actions.c:711
+#: ../calendar/gui/e-task-table.c:1043
+#: ../modules/calendar/e-task-shell-view-actions.c:710
 msgid "Delete selected tasks"
 msgstr "Delete selected tasks"
 
-#: ../calendar/gui/e-task-table.c:992
+#: ../calendar/gui/e-task-table.c:1049
 msgid "Select all visible tasks"
 msgstr "Select all visible tasks"
 
-#: ../calendar/gui/e-timezone-entry.c:330
+#: ../calendar/gui/e-timezone-entry.c:333
 msgid "Select Timezone"
 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:232 ../calendar/gui/print.c:1949
+#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1963
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:290
-msgid "It has reminders."
-msgstr "It has reminders."
-
-#: ../calendar/gui/ea-cal-view-event.c:293
-msgid "It has recurrences."
-msgstr "It has recurrences."
-
-#: ../calendar/gui/ea-cal-view-event.c:296
-msgid "It is a meeting."
-msgstr "It is a meeting."
-
-#: ../calendar/gui/ea-cal-view-event.c:303
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "Calendar Event: Summary is %s."
-
-#: ../calendar/gui/ea-cal-view-event.c:306
-msgid "Calendar Event: It has no summary."
-msgstr "Calendar Event: It has no summary."
-
-#: ../calendar/gui/ea-cal-view-event.c:328
-msgid "calendar view event"
-msgstr "calendar view event"
-
-#: ../calendar/gui/ea-cal-view-event.c:557
-msgid "Grab Focus"
-msgstr "Grab Focus"
-
-#: ../calendar/gui/ea-cal-view.c:315
-msgid "New Appointment"
-msgstr "New Appointment"
-
-#: ../calendar/gui/ea-cal-view.c:316
-msgid "New All Day Event"
-msgstr "New All Day Event"
-
-#: ../calendar/gui/ea-cal-view.c:317
-msgid "New Meeting"
-msgstr "New Meeting"
-
-#: ../calendar/gui/ea-cal-view.c:318
-msgid "Go to Today"
-msgstr "Go to Today"
-
-#: ../calendar/gui/ea-cal-view.c:319
-msgid "Go to Date"
-msgstr "Go to Date"
-
-#: ../calendar/gui/ea-day-view-main-item.c:318
-#: ../calendar/gui/ea-week-view-main-item.c:344
-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-day-view.c:151 ../calendar/gui/ea-week-view.c:151
-#, 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:156 ../calendar/gui/ea-week-view.c:154
-msgid "It has no events."
-msgstr "It has no events."
-
-#. To translators: First %s is the week, for example "July 10th -
-#. July 14th, 2006". Second %s is the number of events in this work
-#. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:163
-#, c-format
-msgid "Work Week View: %s. %s"
-msgstr "Work Week View: %s. %s"
-
-#. To translators: First %s is the day, for example "Thursday July
-#. 13th, 2006". Second %s is the number of events on this day, for
-#. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:169
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "Day View: %s. %s"
-
-#: ../calendar/gui/ea-day-view.c:203
-msgid "calendar view for a work week"
-msgstr "calendar view for a work week"
-
-#: ../calendar/gui/ea-day-view.c:205
-msgid "calendar view for one or more days"
-msgstr "calendar view for one or more days"
-
-#: ../calendar/gui/ea-gnome-calendar.c:50
-#: ../calendar/gui/ea-gnome-calendar.c:58
-#: ../calendar/importers/icalendar-importer.c:1077
-msgid "Gnome Calendar"
-msgstr "Gnome Calendar"
-
-#: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
-msgid "%A %d %b %Y"
-msgstr "%A %d %b %Y"
-
-#: ../calendar/gui/ea-gnome-calendar.c:206
-#: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../modules/calendar/e-cal-shell-view-private.c:1057
-#: ../modules/calendar/e-cal-shell-view-private.c:1063
-#: ../modules/calendar/e-cal-shell-view-private.c:1066
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
-
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../calendar/gui/ea-gnome-calendar.c:236
-#: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../calendar/gui/ea-gnome-calendar.c:244
-#: ../modules/calendar/e-cal-shell-view-private.c:1083
-#: ../modules/calendar/e-cal-shell-view-private.c:1094
-#: ../modules/calendar/e-cal-shell-view-private.c:1101
-#: ../modules/calendar/e-cal-shell-view-private.c:1104
-msgid "%d %b %Y"
-msgstr "%d %b %Y"
-
-#: ../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."
-
-#: ../calendar/gui/ea-week-view.c:159
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "Month View: %s. %s"
-
-#: ../calendar/gui/ea-week-view.c:163
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "Week View: %s. %s"
-
-#: ../calendar/gui/ea-week-view.c:197
-msgid "calendar view for a month"
-msgstr "calendar view for a month"
-
-#: ../calendar/gui/ea-week-view.c:199
-msgid "calendar view for one or more weeks"
-msgstr "calendar view for one or more weeks"
-
-#: ../calendar/gui/gnome-cal.c:2250
+#: ../calendar/gui/gnome-cal.c:2253
 msgid "Purging"
 msgstr "Purging"
 
-#: ../calendar/gui/itip-utils.c:511 ../calendar/gui/itip-utils.c:566
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:571
+#: ../calendar/gui/itip-utils.c:684
 msgid "An organizer must be set."
 msgstr "An organiser must be set."
 
-#: ../calendar/gui/itip-utils.c:558
+#: ../calendar/gui/itip-utils.c:563
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: ../calendar/gui/itip-utils.c:755 ../calendar/gui/itip-utils.c:916
+#: ../calendar/gui/itip-utils.c:770 ../calendar/gui/itip-utils.c:931
 msgid "Event information"
 msgstr "Event information"
 
-#: ../calendar/gui/itip-utils.c:758 ../calendar/gui/itip-utils.c:919
+#: ../calendar/gui/itip-utils.c:773 ../calendar/gui/itip-utils.c:934
 msgid "Task information"
 msgstr "Task information"
 
-#: ../calendar/gui/itip-utils.c:761 ../calendar/gui/itip-utils.c:922
+#: ../calendar/gui/itip-utils.c:776 ../calendar/gui/itip-utils.c:937
 msgid "Memo information"
 msgstr "Memo information"
 
-#: ../calendar/gui/itip-utils.c:764 ../calendar/gui/itip-utils.c:940
+#: ../calendar/gui/itip-utils.c:779 ../calendar/gui/itip-utils.c:955
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
-#: ../calendar/gui/itip-utils.c:767
+#: ../calendar/gui/itip-utils.c:782
 msgid "Calendar information"
 msgstr "Calendar information"
 
@@ -4607,7 +4620,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:804
+#: ../calendar/gui/itip-utils.c:819
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Accepted"
@@ -4616,7 +4629,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:811
+#: ../calendar/gui/itip-utils.c:826
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
@@ -4628,7 +4641,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:818 ../calendar/gui/itip-utils.c:866
+#: ../calendar/gui/itip-utils.c:833 ../calendar/gui/itip-utils.c:881
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Declined"
@@ -4637,7 +4650,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:825
+#: ../calendar/gui/itip-utils.c:840
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegated"
@@ -4645,7 +4658,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:838
+#: ../calendar/gui/itip-utils.c:853
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Updated"
@@ -4653,7 +4666,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:845
+#: ../calendar/gui/itip-utils.c:860
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancel"
@@ -4661,7 +4674,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:852
+#: ../calendar/gui/itip-utils.c:867
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Refresh"
@@ -4669,273 +4682,273 @@ 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:859
+#: ../calendar/gui/itip-utils.c:874
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
 
-#: ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:952
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy information (%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:945
+#: ../calendar/gui/itip-utils.c:960
 msgid "iCalendar information"
 msgstr "iCalendar information"
 
-#: ../calendar/gui/itip-utils.c:970
+#: ../calendar/gui/itip-utils.c:987
 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:974
+#: ../calendar/gui/itip-utils.c:991
 msgid "Unable to book a resource, error: "
 msgstr "Unable to book a resource, error: "
 
-#: ../calendar/gui/itip-utils.c:1137
+#: ../calendar/gui/itip-utils.c:1156
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:592
 msgid "1st"
 msgstr "1st"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:592
 msgid "2nd"
 msgstr "2nd"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:592
 msgid "3rd"
 msgstr "3rd"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:592
 msgid "4th"
 msgstr "4th"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:592
 msgid "5th"
 msgstr "5th"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:593
 msgid "6th"
 msgstr "6th"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:593
 msgid "7th"
 msgstr "7th"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:593
 msgid "8th"
 msgstr "8th"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:593
 msgid "9th"
 msgstr "9th"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:593
 msgid "10th"
 msgstr "10th"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:594
 msgid "11th"
 msgstr "11th"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:594
 msgid "12th"
 msgstr "12th"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:594
 msgid "13th"
 msgstr "13th"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:594
 msgid "14th"
 msgstr "14th"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:594
 msgid "15th"
 msgstr "15th"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:595
 msgid "16th"
 msgstr "16th"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:595
 msgid "17th"
 msgstr "17th"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:595
 msgid "18th"
 msgstr "18th"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:595
 msgid "19th"
 msgstr "19th"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:595
 msgid "20th"
 msgstr "20th"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:596
 msgid "21st"
 msgstr "21st"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:596
 msgid "22nd"
 msgstr "22nd"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:596
 msgid "23rd"
 msgstr "23rd"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:596
 msgid "24th"
 msgstr "24th"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:596
 msgid "25th"
 msgstr "25th"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:597
 msgid "26th"
 msgstr "26th"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:597
 msgid "27th"
 msgstr "27th"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:597
 msgid "28th"
 msgstr "28th"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:597
 msgid "29th"
 msgstr "29th"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:597
 msgid "30th"
 msgstr "30th"
 
-#: ../calendar/gui/print.c:587
+#: ../calendar/gui/print.c:598
 msgid "31st"
 msgstr "31st"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:655
 msgid "Su"
 msgstr "Su"
 
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:655
 msgid "Mo"
 msgstr "Mo"
 
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:655
 msgid "Tu"
 msgstr "Tu"
 
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:655
 msgid "We"
 msgstr "We"
 
-#: ../calendar/gui/print.c:645
+#: ../calendar/gui/print.c:656
 msgid "Th"
 msgstr "Th"
 
-#: ../calendar/gui/print.c:645
+#: ../calendar/gui/print.c:656
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:645
+#: ../calendar/gui/print.c:656
 msgid "Sa"
 msgstr "Sa"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3139
+#: ../calendar/gui/print.c:3156
 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:3149
+#: ../calendar/gui/print.c:3166
 msgid " (Completed "
 msgstr " (Completed "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3155
+#: ../calendar/gui/print.c:3172
 msgid "Completed "
 msgstr "Completed "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3165
+#: ../calendar/gui/print.c:3182
 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:3172
+#: ../calendar/gui/print.c:3189
 msgid "Due "
 msgstr "Due "
 
-#: ../calendar/gui/print.c:3337
+#: ../calendar/gui/print.c:3354
 #, c-format
 msgid "Summary: %s"
 msgstr "Summary: %s"
 
-#: ../calendar/gui/print.c:3364
+#: ../calendar/gui/print.c:3381
 msgid "Attendees: "
 msgstr "Attendees: "
 
-#: ../calendar/gui/print.c:3407
+#: ../calendar/gui/print.c:3424
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:3422
+#: ../calendar/gui/print.c:3439
 #, c-format
 msgid "Priority: %s"
 msgstr "Priority: %s"
 
-#: ../calendar/gui/print.c:3440
+#: ../calendar/gui/print.c:3457
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percent Complete: %i"
 
-#: ../calendar/gui/print.c:3451
+#: ../calendar/gui/print.c:3468
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3464
+#: ../calendar/gui/print.c:3481
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: ../calendar/gui/print.c:3475
+#: ../calendar/gui/print.c:3492
 msgid "Contacts: "
 msgstr "Contacts: "
 
-#: ../calendar/gui/tasktypes.xml.h:2
-#, no-c-format
-msgid "% Completed"
-msgstr "% Completed"
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "In progress"
+msgstr "In progress"
 
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
 msgstr "Cancelled"
 
-#: ../calendar/gui/tasktypes.xml.h:15
-msgid "In progress"
-msgstr "In progress"
+#: ../calendar/gui/tasktypes.xml.h:25
+#, no-c-format
+msgid "% Completed"
+msgstr "% Completed"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:37
 msgid "is greater than"
 msgstr "is greater than"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:38
 msgid "is less than"
 msgstr "is less than"
 
@@ -4943,181 +4956,181 @@ msgstr "is less than"
 msgid "Appointments and Meetings"
 msgstr "Appointments and Meetings"
 
-#: ../calendar/importers/icalendar-importer.c:435
-#: ../calendar/importers/icalendar-importer.c:868
-#: ../plugins/itip-formatter/itip-formatter.c:2170
+#: ../calendar/importers/icalendar-importer.c:437
+#: ../calendar/importers/icalendar-importer.c:870
+#: ../plugins/itip-formatter/itip-formatter.c:2499
 msgid "Opening calendar"
 msgstr "Opening calendar"
 
-#: ../calendar/importers/icalendar-importer.c:583
+#: ../calendar/importers/icalendar-importer.c:585
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar files (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:586
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:674
+#: ../calendar/importers/icalendar-importer.c:676
 msgid "Reminder!"
 msgstr "Reminder!"
 
-#: ../calendar/importers/icalendar-importer.c:758
+#: ../calendar/importers/icalendar-importer.c:760
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar files (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:759
+#: ../calendar/importers/icalendar-importer.c:761
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:1038
+#: ../calendar/importers/icalendar-importer.c:1041
 msgid "Calendar Events"
 msgstr "Calendar Events"
 
-#: ../calendar/importers/icalendar-importer.c:1078
+#: ../calendar/importers/icalendar-importer.c:1085
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution Calendar intelligent importer"
 
-#: ../calendar/importers/icalendar-importer.c:1146
-#: ../calendar/importers/icalendar-importer.c:1464
+#: ../calendar/importers/icalendar-importer.c:1153
+#: ../calendar/importers/icalendar-importer.c:1471
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Meeting"
 
-#: ../calendar/importers/icalendar-importer.c:1146
-#: ../calendar/importers/icalendar-importer.c:1464
+#: ../calendar/importers/icalendar-importer.c:1153
+#: ../calendar/importers/icalendar-importer.c:1471
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Event"
 
-#: ../calendar/importers/icalendar-importer.c:1149
-#: ../calendar/importers/icalendar-importer.c:1465
+#: ../calendar/importers/icalendar-importer.c:1156
+#: ../calendar/importers/icalendar-importer.c:1472
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Task"
 
-#: ../calendar/importers/icalendar-importer.c:1152
-#: ../calendar/importers/icalendar-importer.c:1466
+#: ../calendar/importers/icalendar-importer.c:1159
+#: ../calendar/importers/icalendar-importer.c:1473
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/importers/icalendar-importer.c:1161
+#: ../calendar/importers/icalendar-importer.c:1168
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "has recurrences"
 
-#: ../calendar/importers/icalendar-importer.c:1166
+#: ../calendar/importers/icalendar-importer.c:1173
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "is an instance"
 
-#: ../calendar/importers/icalendar-importer.c:1171
+#: ../calendar/importers/icalendar-importer.c:1178
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "has reminders"
 
-#: ../calendar/importers/icalendar-importer.c:1176
+#: ../calendar/importers/icalendar-importer.c:1183
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "has attachments"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1189
+#: ../calendar/importers/icalendar-importer.c:1196
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Public"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1192
+#: ../calendar/importers/icalendar-importer.c:1199
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Private"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1195
+#: ../calendar/importers/icalendar-importer.c:1202
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Confidential"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1206
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Classification"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1204
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1211
+#: ../calendar/importers/icalendar-importer.c:1512
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Summary"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1210
+#: ../calendar/importers/icalendar-importer.c:1217
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Location"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:1218
-#: ../calendar/importers/icalendar-importer.c:1501
+#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1508
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Start"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1229
+#: ../calendar/importers/icalendar-importer.c:1236
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Due"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1241
+#: ../calendar/importers/icalendar-importer.c:1248
 msgctxt "iCalImp"
 msgid "End"
 msgstr "End"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1251
+#: ../calendar/importers/icalendar-importer.c:1258
 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:1275
+#: ../calendar/importers/icalendar-importer.c:1282
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Completed"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1283
+#: ../calendar/importers/icalendar-importer.c:1290
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1294
-#: ../calendar/importers/icalendar-importer.c:1297
+#: ../calendar/importers/icalendar-importer.c:1301
+#: ../calendar/importers/icalendar-importer.c:1304
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organiser"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1317
-#: ../calendar/importers/icalendar-importer.c:1320
+#: ../calendar/importers/icalendar-importer.c:1324
+#: ../calendar/importers/icalendar-importer.c:1327
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Attendees"
 
-#: ../calendar/importers/icalendar-importer.c:1334
+#: ../calendar/importers/icalendar-importer.c:1341
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Description"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1497
+#: ../calendar/importers/icalendar-importer.c:1504
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Type"
@@ -5671,7 +5684,6 @@ msgid "America/Nassau"
 msgstr "America/Nassau"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "America/New_York"
 msgstr "America/New_York"
 
@@ -6671,164 +6683,471 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: ../composer/e-composer-actions.c:208
-msgid "Save as..."
-msgstr "Save asâ"
-
-#: ../composer/e-composer-actions.c:296
-#: ../widgets/misc/e-signature-editor.c:207
-msgid "_Close"
-msgstr "_Close"
-
-#: ../composer/e-composer-actions.c:298
-msgid "Close the current file"
-msgstr "Close the current file"
-
-#: ../composer/e-composer-actions.c:303
-msgid "New _Message"
-msgstr "New _Message"
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplet/anjal-settings-main.c:161
+msgid "ID of the socket to embed in"
+msgstr "ID of the socket to embed in"
 
-#: ../composer/e-composer-actions.c:305
-msgid "Open New Message window"
-msgstr "Open New Message window"
+#: ../capplet/anjal-settings-main.c:162
+msgid "socket"
+msgstr "socket"
 
-#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
-msgid "Configure Evolution"
-msgstr "Configure Evolution"
+#: ../capplet/settings/mail-account-view.c:77
+msgid "Please enter your full name."
+msgstr "Please enter your full name."
 
-#: ../composer/e-composer-actions.c:319
-msgid "Save the current file"
-msgstr "Save the current file"
+#: ../capplet/settings/mail-account-view.c:78
+msgid "Please enter your email address."
+msgstr "Please enter your e-mail address."
 
-#: ../composer/e-composer-actions.c:324
-msgid "Save _As..."
-msgstr "Save _Asâ"
+#: ../capplet/settings/mail-account-view.c:79
+msgid "The email address you have entered is invalid."
+msgstr "The e-mail address you have entered is invalid."
 
-#: ../composer/e-composer-actions.c:326
-msgid "Save the current file with a different name"
-msgstr "Save the current file with a different name"
+#: ../capplet/settings/mail-account-view.c:80
+msgid "Please enter your password."
+msgstr "Please enter your password."
 
-#: ../composer/e-composer-actions.c:333
-msgid "Character _Encoding"
-msgstr "Character _Encoding"
+#: ../capplet/settings/mail-account-view.c:282
+#: ../mail/em-account-editor.c:5436 ../plugins/caldav/caldav-source.c:68
+msgid "CalDAV"
+msgstr "CalDAV"
 
-#: ../composer/e-composer-actions.c:350
-msgid "_Print..."
-msgstr "_Printâ"
+#: ../capplet/settings/mail-account-view.c:376
+#: ../capplet/settings/mail-account-view.c:421
+#: ../mail/em-account-editor.c:5307 ../mail/em-account-editor.c:5364
+#: ../modules/online-accounts/e-online-accounts-google.c:295
+#: ../modules/online-accounts/e-online-accounts-google.c:369
+#: ../plugins/google-account-setup/google-contacts-source.c:55
+#: ../plugins/google-account-setup/google-source.c:83
+msgid "Google"
+msgstr "Google"
 
-#: ../composer/e-composer-actions.c:357
-msgid "Print Pre_view"
-msgstr "Print Pre_view"
+#: ../capplet/settings/mail-account-view.c:497
+#: ../capplet/settings/mail-account-view.c:601
+#: ../mail/em-account-editor.c:4840 ../mail/em-account-editor.c:4875
+msgid "Always (SSL)"
+msgstr "Always (SSL)"
 
-#: ../composer/e-composer-actions.c:364
-msgid "Save as _Draft"
-msgstr "Save as _Draft"
+#: ../capplet/settings/mail-account-view.c:500
+#: ../capplet/settings/mail-account-view.c:604
+#: ../mail/em-account-editor.c:4843 ../mail/em-account-editor.c:4878
+msgid "When possible (TLS)"
+msgstr "When possible (TLS)"
 
-#: ../composer/e-composer-actions.c:366
-msgid "Save as draft"
-msgstr "Save as draft"
+#: ../capplet/settings/mail-account-view.c:503
+#: ../capplet/settings/mail-account-view.c:607
+#: ../mail/em-account-editor.c:1752 ../mail/em-account-editor.c:4846
+#: ../mail/em-account-editor.c:4881
+msgid "Never"
+msgstr "Never"
 
-#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
-msgid "S_end"
-msgstr "S_end"
+#: ../capplet/settings/mail-account-view.c:511
+msgid "Personal details:"
+msgstr "Personal details:"
 
-#: ../composer/e-composer-actions.c:373
-msgid "Send this message"
-msgstr "Send this message"
+#: ../capplet/settings/mail-account-view.c:518 ../mail/mail-config.ui.h:180
+msgid "Name:"
+msgstr "Name:"
 
-#: ../composer/e-composer-actions.c:381
-msgid "PGP _Encrypt"
-msgstr "PGP _Encrypt"
+#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:181
+msgid "Email address:"
+msgstr "E-mail address:"
 
-#: ../composer/e-composer-actions.c:383
-msgid "Encrypt this message with PGP"
-msgstr "Encrypt this message with PGP"
+#: ../capplet/settings/mail-account-view.c:537 ../mail/mail-config.ui.h:182
+msgid "Details:"
+msgstr "Details:"
 
-#: ../composer/e-composer-actions.c:389
-msgid "PGP _Sign"
-msgstr "PGP _Sign"
+#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:183
+msgid "Receiving"
+msgstr "Receiving"
 
-#: ../composer/e-composer-actions.c:391
-msgid "Sign this message with your PGP key"
-msgstr "Sign this message with your PGP key"
+#: ../capplet/settings/mail-account-view.c:552 ../mail/mail-config.ui.h:185
+msgid "Server type:"
+msgstr "Server type:"
 
-#: ../composer/e-composer-actions.c:397
-msgid "_Picture Gallery"
-msgstr "_Picture Gallery"
+#: ../capplet/settings/mail-account-view.c:561 ../mail/mail-config.ui.h:186
+msgid "Server address:"
+msgstr "Server address:"
 
-#: ../composer/e-composer-actions.c:399
-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"
+#: ../capplet/settings/mail-account-view.c:570 ../mail/mail-config.ui.h:187
+msgid "Username:"
+msgstr "Username:"
 
-#: ../composer/e-composer-actions.c:405
-msgid "_Prioritize Message"
-msgstr "_Prioritise Message"
+#: ../capplet/settings/mail-account-view.c:579
+msgid "Use encryption:"
+msgstr "Use encryption:"
 
-#: ../composer/e-composer-actions.c:407
-msgid "Set the message priority to high"
-msgstr "Set the message priority to high"
+#: ../capplet/settings/mail-account-view.c:612 ../mail/mail-config.ui.h:184
+msgid "Sending"
+msgstr "Sending"
 
-#: ../composer/e-composer-actions.c:413
-msgid "Re_quest Read Receipt"
-msgstr "Re_quest Read Receipt"
+#: ../capplet/settings/mail-account-view.c:655
+msgid ""
+"To use the email application you'll need to setup an account. Put your email "
+"address and password in below and we'll try and work out all the settings. "
+"If we can't do it automatically you'll need your server details as well."
+msgstr ""
+"To use the e-mail application you'll need to set up an account. Put your e-"
+"mail address and password in below and we'll try and work out all the "
+"settings. If we can't do it automatically you'll need your server details as "
+"well."
 
-#: ../composer/e-composer-actions.c:415
+#: ../capplet/settings/mail-account-view.c:657
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+
+#: ../capplet/settings/mail-account-view.c:659
+msgid "You can specify more options to configure the account."
+msgstr "You can specify more options to configure the account."
+
+#: ../capplet/settings/mail-account-view.c:661
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+
+#: ../capplet/settings/mail-account-view.c:662
+msgid "You can specify your default settings for your account."
+msgstr "You can specify your default settings for your account."
+
+#: ../capplet/settings/mail-account-view.c:663
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+msgstr ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+
+#: ../capplet/settings/mail-account-view.c:678
+#: ../mail/em-account-editor.c:2955 ../mail/em-account-editor.c:3094
+msgid "Identity"
+msgstr "Identity"
+
+#: ../capplet/settings/mail-account-view.c:678
+msgid "Next - Receiving mail"
+msgstr "Next â Receiving mail"
+
+#: ../capplet/settings/mail-account-view.c:679
+msgid "Receiving mail"
+msgstr "Receiving mail"
+
+#: ../capplet/settings/mail-account-view.c:679
+#: ../capplet/settings/mail-account-view.c:680
+msgid "Next - Sending mail"
+msgstr "Next â Sending mail"
+
+#: ../capplet/settings/mail-account-view.c:679
+msgid "Back - Identity"
+msgstr "Back â Identity"
+
+#: ../capplet/settings/mail-account-view.c:679
+msgid "Next - Receiving options"
+msgstr "Next â Receiving options"
+
+#: ../capplet/settings/mail-account-view.c:680
+msgid "Receiving options"
+msgstr "Receiving options"
+
+#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-account-view.c:682
+msgid "Back - Receiving mail"
+msgstr "Back â Receiving mail"
+
+#: ../capplet/settings/mail-account-view.c:682
+msgid "Sending mail"
+msgstr "Sending mail"
+
+#: ../capplet/settings/mail-account-view.c:682
+#: ../capplet/settings/mail-account-view.c:683
+msgid "Next - Review account"
+msgstr "Next â Review account"
+
+#: ../capplet/settings/mail-account-view.c:682
+msgid "Next - Defaults"
+msgstr "Next â Defaults"
+
+#: ../capplet/settings/mail-account-view.c:682
+msgid "Back - Receiving options"
+msgstr "Back â Receiving options"
+
+#: ../capplet/settings/mail-account-view.c:683
+#: ../mail/em-account-editor.c:4107
+msgid "Defaults"
+msgstr "Defaults"
+
+#: ../capplet/settings/mail-account-view.c:683
+msgid "Back - Sending mail"
+msgstr "Back â Sending mail"
+
+#: ../capplet/settings/mail-account-view.c:685
+msgid "Review account"
+msgstr "Review account"
+
+#: ../capplet/settings/mail-account-view.c:685
+msgid "Finish"
+msgstr "Finish"
+
+#: ../capplet/settings/mail-account-view.c:685
+msgid "Back - Sending"
+msgstr "Back â Sending"
+
+#: ../capplet/settings/mail-account-view.c:855
+msgid "Setup Google contacts with Evolution"
+msgstr "Set up Google Contacts with Evolution"
+
+#: ../capplet/settings/mail-account-view.c:856
+msgid "Setup Google calendar with Evolution"
+msgstr "Set up Google Calendar with Evolution"
+
+#: ../capplet/settings/mail-account-view.c:861
+#: ../mail/em-account-editor.c:4935
+msgid "You may need to enable IMAP access."
+msgstr "You may need to enable IMAP access."
+
+#: ../capplet/settings/mail-account-view.c:869
+#: ../mail/em-account-editor.c:4912
+msgid "Google account settings:"
+msgstr "Google account settings:"
+
+#: ../capplet/settings/mail-account-view.c:895
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "Setup Yahoo calendar with Evolution"
+
+#: ../capplet/settings/mail-account-view.c:899
+#: ../mail/em-account-editor.c:4982
+msgid ""
+"Yahoo calendars are named as firstname_lastname. We have tried to form the "
+"calendar name. So please confirm and re-enter the calendar name if it is not "
+"correct."
+msgstr ""
+"Yahoo calendars are named as firstname_lastname. We have tried to form the "
+"calendar name. So please confirm and re-enter the calendar name if it is not "
+"correct."
+
+#: ../capplet/settings/mail-account-view.c:908
+#: ../mail/em-account-editor.c:4967
+msgid "Yahoo account settings:"
+msgstr "Yahoo account settings:"
+
+#: ../capplet/settings/mail-account-view.c:922
+msgid "Yahoo Calendar name:"
+msgstr "Yahoo Calendar name:"
+
+#: ../capplet/settings/mail-account-view.c:1119
+msgid "Password:"
+msgstr "Password:"
+
+#: ../capplet/settings/mail-account-view.c:1173
+#: ../capplet/settings/mail-settings-view.c:262
+msgid "Close Tab"
+msgstr "Close Tab"
+
+#: ../capplet/settings/mail-account-view.c:1185
+msgid "Account Wizard"
+msgstr "Account Wizard"
+
+#: ../capplet/settings/mail-capplet-shell.c:212
+msgid "Evolution account assistant"
+msgstr "Evolution account assistant"
+
+#. create the local source group
+#: ../capplet/settings/mail-capplet-shell.c:377
+#: ../libemail-engine/e-mail-session.c:536
+#: ../modules/addressbook/e-book-shell-backend.c:106
+#: ../modules/addressbook/e-book-shell-migrate.c:136
+#: ../modules/calendar/e-cal-shell-backend.c:119
+#: ../modules/calendar/e-cal-shell-migrate.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:112
+#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-task-shell-backend.c:108
+#: ../modules/calendar/e-task-shell-migrate.c:121
+msgid "On This Computer"
+msgstr "On This Computer"
+
+#: ../capplet/settings/mail-settings-view.c:152
+#, c-format
+msgid "Modify %s..."
+msgstr "Modify %sâ"
+
+#: ../capplet/settings/mail-settings-view.c:154
+msgid "Add a new account"
+msgstr "Add a new account"
+
+#: ../capplet/settings/mail-settings-view.c:194
+msgid "Account management"
+msgstr "Account management"
+
+#: ../capplet/settings/mail-settings-view.c:274
+msgid "Settings"
+msgstr "Settings"
+
+#: ../composer/e-composer-actions.c:208
+msgid "Save as..."
+msgstr "Save asâ"
+
+#: ../composer/e-composer-actions.c:295
+#: ../widgets/misc/e-signature-editor.c:211
+msgid "_Close"
+msgstr "_Close"
+
+#: ../composer/e-composer-actions.c:297
+msgid "Close the current file"
+msgstr "Close the current file"
+
+#: ../composer/e-composer-actions.c:302
+msgid "New _Message"
+msgstr "New _Message"
+
+#: ../composer/e-composer-actions.c:304
+msgid "Open New Message window"
+msgstr "Open New Message window"
+
+#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1523
+msgid "Configure Evolution"
+msgstr "Configure Evolution"
+
+#: ../composer/e-composer-actions.c:318
+msgid "Save the current file"
+msgstr "Save the current file"
+
+#: ../composer/e-composer-actions.c:323
+msgid "Save _As..."
+msgstr "Save _Asâ"
+
+#: ../composer/e-composer-actions.c:325
+msgid "Save the current file with a different name"
+msgstr "Save the current file with a different name"
+
+#: ../composer/e-composer-actions.c:332
+msgid "Character _Encoding"
+msgstr "Character _Encoding"
+
+#: ../composer/e-composer-actions.c:349
+msgid "_Print..."
+msgstr "_Printâ"
+
+#: ../composer/e-composer-actions.c:356
+msgid "Print Pre_view"
+msgstr "Print Pre_view"
+
+#: ../composer/e-composer-actions.c:363
+msgid "Save as _Draft"
+msgstr "Save as _Draft"
+
+#: ../composer/e-composer-actions.c:365
+msgid "Save as draft"
+msgstr "Save as draft"
+
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:317
+msgid "S_end"
+msgstr "S_end"
+
+#: ../composer/e-composer-actions.c:372
+msgid "Send this message"
+msgstr "Send this message"
+
+#: ../composer/e-composer-actions.c:380
+msgid "PGP _Encrypt"
+msgstr "PGP _Encrypt"
+
+#: ../composer/e-composer-actions.c:382
+msgid "Encrypt this message with PGP"
+msgstr "Encrypt this message with PGP"
+
+#: ../composer/e-composer-actions.c:388
+msgid "PGP _Sign"
+msgstr "PGP _Sign"
+
+#: ../composer/e-composer-actions.c:390
+msgid "Sign this message with your PGP key"
+msgstr "Sign this message with your PGP key"
+
+#: ../composer/e-composer-actions.c:396
+msgid "_Picture Gallery"
+msgstr "_Picture Gallery"
+
+#: ../composer/e-composer-actions.c:398
+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:404
+msgid "_Prioritize Message"
+msgstr "_Prioritise Message"
+
+#: ../composer/e-composer-actions.c:406
+msgid "Set the message priority to high"
+msgstr "Set the message priority to high"
+
+#: ../composer/e-composer-actions.c:412
+msgid "Re_quest Read Receipt"
+msgstr "Re_quest Read Receipt"
+
+#: ../composer/e-composer-actions.c:414
 msgid "Get delivery notification when your message is read"
 msgstr "Get delivery notification when your message is read"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:420
 msgid "S/MIME En_crypt"
 msgstr "S/MIME En_crypt"
 
-#: ../composer/e-composer-actions.c:423
+#: ../composer/e-composer-actions.c:422
 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:429
+#: ../composer/e-composer-actions.c:428
 msgid "S/MIME Sig_n"
 msgstr "S/MIME Sig_n"
 
-#: ../composer/e-composer-actions.c:431
+#: ../composer/e-composer-actions.c:430
 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:437
+#: ../composer/e-composer-actions.c:436
 msgid "_Bcc Field"
 msgstr "_Bcc Field"
 
-#: ../composer/e-composer-actions.c:439
+#: ../composer/e-composer-actions.c:438
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Toggles whether the Bcc field is displayed"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:444
 msgid "_Cc Field"
 msgstr "_Cc Field"
 
-#: ../composer/e-composer-actions.c:447
+#: ../composer/e-composer-actions.c:446
 msgid "Toggles whether the CC field is displayed"
 msgstr "Toggles whether the Cc field is displayed"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:452
 msgid "_Reply-To Field"
 msgstr "_Reply-To Field"
 
-#: ../composer/e-composer-actions.c:455
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Toggles whether the Reply-To field is displayed"
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:513
 msgid "Save Draft"
 msgstr "Save Draft"
 
-#: ../composer/e-composer-header-table.c:40
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the recipients of the message"
 msgstr "Enter the recipients of the message"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:44
 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:45
+#: ../composer/e-composer-header-table.c:47
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6836,74 +7155,74 @@ 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:1021
+#: ../composer/e-composer-header-table.c:779
 msgid "Fr_om:"
 msgstr "Fr_om:"
 
-#: ../composer/e-composer-header-table.c:1030
+#: ../composer/e-composer-header-table.c:788
 msgid "_Reply-To:"
 msgstr "_Reply-To:"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:792
 msgid "_To:"
 msgstr "_To:"
 
-#: ../composer/e-composer-header-table.c:1039
+#: ../composer/e-composer-header-table.c:797
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1044
+#: ../composer/e-composer-header-table.c:802
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:1049
+#: ../composer/e-composer-header-table.c:807
 msgid "_Post To:"
 msgstr "_Post To:"
 
-#: ../composer/e-composer-header-table.c:1053
+#: ../composer/e-composer-header-table.c:811
 msgid "S_ubject:"
 msgstr "S_ubject:"
 
-#: ../composer/e-composer-header-table.c:1062
+#: ../composer/e-composer-header-table.c:820
 msgid "Si_gnature:"
 msgstr "Si_gnature:"
 
-#: ../composer/e-composer-name-header.c:141
+#: ../composer/e-composer-name-header.c:145
 msgid "Click here for the address book"
 msgstr "Click here for the address book"
 
-#: ../composer/e-composer-post-header.c:131
+#: ../composer/e-composer-post-header.c:135
 msgid "Click here to select folders to post to"
 msgstr "Click here to select folders to post to"
 
-#: ../composer/e-composer-private.c:249
+#: ../composer/e-composer-private.c:215
 msgid "Undo the last action"
 msgstr "Undo the last action"
 
-#: ../composer/e-composer-private.c:253
+#: ../composer/e-composer-private.c:219
 msgid "Redo the last undone action"
 msgstr "Redo the last undone action"
 
-#: ../composer/e-composer-private.c:257
+#: ../composer/e-composer-private.c:223
 msgid "Search for text"
 msgstr "Search for text"
 
-#: ../composer/e-composer-private.c:261
+#: ../composer/e-composer-private.c:227
 msgid "Search for and replace text"
 msgstr "Search for and replace text"
 
-#: ../composer/e-composer-private.c:372
+#: ../composer/e-composer-private.c:337
 msgid "Save draft"
 msgstr "Save draft"
 
-#: ../composer/e-msg-composer.c:812
+#: ../composer/e-msg-composer.c:813
 #, 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:821
+#: ../composer/e-msg-composer.c:822
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6912,70 +7231,83 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
-#: ../composer/e-msg-composer.c:1695 ../composer/e-msg-composer.c:2079
+#: ../composer/e-msg-composer.c:1609 ../composer/e-msg-composer.c:1996
 msgid "Compose Message"
 msgstr "Compose Message"
 
-#: ../composer/e-msg-composer.c:4224
+#: ../composer/e-msg-composer.c:4163
 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:4929
+#: ../composer/e-msg-composer.c:4867
 msgid "Untitled Message"
 msgstr "Untitled Message"
 
 #: ../composer/mail-composer.error.xml.h:1
-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 "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "You cannot attach the file &quot;{0}&quot; to this message."
 
 #: ../composer/mail-composer.error.xml.h:2
-msgid "All accounts have been removed."
-msgstr "All accounts have been removed."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr "The file '{0}' is not a regular file and cannot be sent in a message."
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid "An error occurred while saving to your Drafts folder."
-msgstr "An error occurred while saving to your Drafts folder."
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Could not retrieve messages to attach from {0}."
 
 #: ../composer/mail-composer.error.xml.h:4
-msgid "An error occurred while saving to your Outbox folder."
-msgstr "An error occurred while saving to your Outbox folder."
+msgid "Because &quot;{1}&quot;."
+msgstr "Because &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:5
-msgid "An error occurred while sending. How do you want to proceed?"
-msgstr "An error occurred while sending. How do you want to proceed?"
+msgid "Do you want to recover unfinished messages?"
+msgstr "Do you want to recover unfinished messages?"
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 
 #: ../composer/mail-composer.error.xml.h:7
-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."
+msgid "_Do not Recover"
+msgstr "_Do not Recover"
 
 #: ../composer/mail-composer.error.xml.h:8
-msgid "Because &quot;{1}&quot;."
-msgstr "Because &quot;{1}&quot;."
+msgid "_Recover"
+msgstr "_Recover"
 
 #: ../composer/mail-composer.error.xml.h:9
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr "Could not save to autosave file &quot;{0}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:10
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr "Error saving to autosave because &quot;{1}&quot;."
+
+#: ../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 ""
-"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."
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
 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."
+" 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:10
+#: ../composer/mail-composer.error.xml.h:14
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+
+#: ../composer/mail-composer.error.xml.h:15
 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 "
@@ -6985,4855 +7317,5928 @@ msgstr ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 
-#: ../composer/mail-composer.error.xml.h:11
-msgid "Could not create message."
-msgstr "Could not create message."
-
-#: ../composer/mail-composer.error.xml.h:12
-msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "Could not read signature file &quot;{0}&quot;."
-
-#: ../composer/mail-composer.error.xml.h:13
-msgid "Could not retrieve messages to attach from {0}."
-msgstr "Could not retrieve messages to attach from {0}."
-
-#: ../composer/mail-composer.error.xml.h:14
-msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr "Could not save to autosave file &quot;{0}&quot;."
-
-#: ../composer/mail-composer.error.xml.h:15
-msgid "Do you want to recover unfinished messages?"
-msgstr "Do you want to recover unfinished messages?"
-
-#: ../composer/mail-composer.error.xml.h:16
-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:17
-msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr "Error saving to autosave because &quot;{1}&quot;."
-
+#. Response codes were chosen somewhat arbitrarily.
 #: ../composer/mail-composer.error.xml.h:18
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+msgid "_Continue Editing"
+msgstr "_Continue Editing"
 
 #: ../composer/mail-composer.error.xml.h:19
-msgid "Saving message to Outbox."
-msgstr "Saving message to Outbox."
+msgid "_Save Draft"
+msgstr "_Save Draft"
 
 #: ../composer/mail-composer.error.xml.h:20
-msgid "The file '{0}' is not a regular file and cannot be sent in a message."
-msgstr "The file '{0}' is not a regular file and cannot be sent in a message."
+msgid "Could not create message."
+msgstr "Could not create message."
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
-msgid "The reported error was &quot;{0}&quot;."
-msgstr "The reported error was &quot;{0}&quot;."
+#: ../composer/mail-composer.error.xml.h:21
+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
-msgid ""
-"The reported error was &quot;{0}&quot;. The message has most likely not been "
-"saved."
-msgstr ""
-"The reported error was &quot;{0}&quot;. The message has most likely not been "
-"saved."
+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
-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."
+msgid "All accounts have been removed."
+msgstr "All accounts have been removed."
 
 #: ../composer/mail-composer.error.xml.h:24
-msgid "You cannot attach the file &quot;{0}&quot; to this message."
-msgstr "You cannot attach the file &quot;{0}&quot; to this message."
-
-#: ../composer/mail-composer.error.xml.h:25
 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
+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
-msgid "Your message was sent, but an error occurred during post-processing."
-msgstr "Your message was sent, but an error occurred during post-processing."
+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."
 
-#. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:28
-msgid "_Continue Editing"
-msgstr "_Continue Editing"
+#: ../composer/mail-composer.error.xml.h:27
+msgid "An error occurred while saving to your Drafts folder."
+msgstr "An error occurred while saving to your Drafts folder."
 
-#: ../composer/mail-composer.error.xml.h:30
-msgid "_Do not Recover"
-msgstr "_Do not Recover"
+#: ../composer/mail-composer.error.xml.h:28
+msgid ""
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
+msgstr ""
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
 
-#: ../composer/mail-composer.error.xml.h:31
-msgid "_Recover"
-msgstr "_Recover"
+#: ../composer/mail-composer.error.xml.h:29
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr "An error occurred while sending. How do you want to proceed?"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Draft"
-msgstr "_Save Draft"
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:157
+msgid "The reported error was &quot;{0}&quot;."
+msgstr "The reported error was &quot;{0}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Save to Outbox"
 msgstr "_Save to Outbox"
 
-#: ../composer/mail-composer.error.xml.h:35
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Try Again"
 msgstr "_Try Again"
 
-#. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:154
-msgid "ID of the socket to embed in"
-msgstr "ID of the socket to embed in"
-
-#: ../capplet/anjal-settings-main.c:155
-msgid "socket"
-msgstr "socket"
-
-#: ../capplet/settings/mail-account-view.c:77
-msgid "Please enter your full name."
-msgstr "Please enter your full name."
-
-#: ../capplet/settings/mail-account-view.c:78
-msgid "Please enter your email address."
-msgstr "Please enter your e-mail address."
-
-#: ../capplet/settings/mail-account-view.c:79
-msgid "The email address you have entered is invalid."
-msgstr "The e-mail address you have entered is invalid."
-
-#: ../capplet/settings/mail-account-view.c:80
-msgid "Please enter your password."
-msgstr "Please enter your password."
-
-#: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:67
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../capplet/settings/mail-account-view.c:361
-#: ../capplet/settings/mail-account-view.c:413
-#: ../modules/online-accounts/e-online-accounts-google.c:287
-#: ../modules/online-accounts/e-online-accounts-google.c:359
-#: ../plugins/google-account-setup/google-contacts-source.c:55
-#: ../plugins/google-account-setup/google-source.c:87
-msgid "Google"
-msgstr "Google"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "Your message was sent, but an error occurred during post-processing."
+msgstr "Your message was sent, but an error occurred during post-processing."
 
-#: ../capplet/settings/mail-account-view.c:480
-msgid "Personal details:"
-msgstr "Personal details:"
+#: ../composer/mail-composer.error.xml.h:34
+msgid "Saving message to Outbox."
+msgstr "Saving message to Outbox."
 
-#: ../capplet/settings/mail-account-view.c:487
-msgid "Name:"
-msgstr "Name:"
+#: ../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."
+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."
 
-#: ../capplet/settings/mail-account-view.c:496
-msgid "Email address:"
-msgstr "E-mail address:"
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+msgid "Evolution Alarm Notify"
+msgstr "Evolution Alarm Notify"
 
-#: ../capplet/settings/mail-account-view.c:506
-msgid "Details:"
-msgstr "Details:"
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Calendar event notifications"
+msgstr "Calendar event notifications"
 
-#: ../capplet/settings/mail-account-view.c:514
-msgid "Receiving"
-msgstr "Receiving"
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:941
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../shell/e-shell-window-private.c:243
+msgid "Evolution"
+msgstr "Evolution"
 
-#: ../capplet/settings/mail-account-view.c:521
-msgid "Server type:"
-msgstr "Server type:"
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:654
+msgid "Groupware Suite"
+msgstr "Groupware Suite"
 
-#: ../capplet/settings/mail-account-view.c:530
-msgid "Server address:"
-msgstr "Server address:"
+#: ../data/evolution.desktop.in.in.h:3
+msgid "Evolution Mail and Calendar"
+msgstr "Evolution Mail and Calendar"
 
-#: ../capplet/settings/mail-account-view.c:539
-msgid "Username:"
-msgstr "Username:"
+#: ../data/evolution.desktop.in.in.h:4
+msgid "Manage your email, contacts and schedule"
+msgstr "Manage your e-mail, contacts and schedule"
 
-#: ../capplet/settings/mail-account-view.c:548
-msgid "Use encryption:"
-msgstr "Use encryption:"
+#: ../data/evolution-settings.desktop.in.in.h:1
+msgid "Email Settings"
+msgstr "E-mail Settings"
 
-#: ../capplet/settings/mail-account-view.c:553
-#: ../capplet/settings/mail-account-view.c:588
-msgid "never"
-msgstr "never"
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Configure email accounts"
+msgstr "Configure e-mail accounts"
 
-#: ../capplet/settings/mail-account-view.c:565
-msgid "Sending"
-msgstr "Sending"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
+msgid "Enable address formatting"
+msgstr "Enable address formatting"
 
-#: ../capplet/settings/mail-account-view.c:607
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
 msgid ""
-"To use the email application you'll need to setup an account. Put your email "
-"address and password in below and we'll try and work out all the settings. "
-"If we can't do it automatically you'll need your server details as well."
+"Whether addresses should be formatted according to standard in their "
+"destination country"
 msgstr ""
-"To use the e-mail application you'll need to set up an account. Put your e-"
-"mail address and password in below and we'll try and work out all the "
-"settings. If we can't do it automatically you'll need your server details as "
-"well."
+"Whether addresses should be formatted according to standard in their "
+"destination country"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Autocomplete length"
+msgstr "Autocomplete length"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
 msgid ""
-"Sorry, we can't work out the settings to get your mail automatically. Please "
-"enter them below. We've tried to make a start with the details you just "
-"entered but you may need to change them."
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
 msgstr ""
-"Sorry, we can't work out the settings to get your mail automatically. Please "
-"enter them below. We've tried to make a start with the details you just "
-"entered but you may need to change them."
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
 
-#: ../capplet/settings/mail-account-view.c:611
-msgid "You can specify more options to configure the account."
-msgstr "You can specify more options to configure the account."
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "Show autocompleted name with an address"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
 msgid ""
-"Now we need your settings for sending mail. We've tried to make some guesses "
-"but you should check them over to make sure."
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
 msgstr ""
-"Now we need your settings for sending mail. We've tried to make some guesses "
-"but you should check them over to make sure."
+"Whether to force showing the e-mail address with the name of the "
+"autocompleted contact in the entry."
 
-#: ../capplet/settings/mail-account-view.c:614
-msgid "You can specify your default settings for your account."
-msgstr "You can specify your default settings for your account."
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "URI for the folder last used in the select names dialog"
+msgstr "URI for the folder last used in the select names dialogue"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "URI for the folder last used in the select names dialog."
+msgstr "URI for the folder last used in the select names dialogue."
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Contact layout style"
+msgstr "Contact layout style"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid ""
-"Time to check things over before we try and connect to the server and fetch "
-"your mail."
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
 msgstr ""
-"Time to check things over before we try and connect to the server and fetch "
-"your mail."
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
 
-#: ../capplet/settings/mail-account-view.c:630
-#: ../mail/em-account-editor.c:2289 ../mail/em-account-editor.c:2425
-msgid "Identity"
-msgstr "Identity"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid "Contact preview pane position (horizontal)"
+msgstr "Contact preview pane position (horizontal)"
 
-#: ../capplet/settings/mail-account-view.c:630
-msgid "Next - Receiving mail"
-msgstr "Next â Receiving mail"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr "Position of the contact preview pane when oriented horizontally."
 
-#: ../capplet/settings/mail-account-view.c:631
-msgid "Receiving mail"
-msgstr "Receiving mail"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid "Contact preview pane position (vertical)"
+msgstr "Contact preview pane position (vertical)"
 
-#: ../capplet/settings/mail-account-view.c:631
-#: ../capplet/settings/mail-account-view.c:632
-msgid "Next - Sending mail"
-msgstr "Next â Sending mail"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr "Position of the contact preview pane when oriented vertically."
 
-#: ../capplet/settings/mail-account-view.c:631
-msgid "Back - Identity"
-msgstr "Back â Identity"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+msgid "Show maps"
+msgstr "Show maps"
 
-#: ../capplet/settings/mail-account-view.c:631
-msgid "Next - Receiving options"
-msgstr "Next â Receiving options"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
+msgid "Whether to show maps in preview pane"
+msgstr "Whether to show maps in preview pane"
 
-#: ../capplet/settings/mail-account-view.c:632
-msgid "Receiving options"
-msgstr "Receiving options"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid "Primary address book"
+msgstr "Primary address book"
 
-#: ../capplet/settings/mail-account-view.c:632
-#: ../capplet/settings/mail-account-view.c:634
-msgid "Back - Receiving mail"
-msgstr "Back â Receiving mail"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
+msgid ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view"
+msgstr ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view"
 
-#: ../capplet/settings/mail-account-view.c:634
-msgid "Sending mail"
-msgstr "Sending mail"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+msgid "Show preview pane"
+msgstr "Show preview pane"
 
-#: ../capplet/settings/mail-account-view.c:634
-#: ../capplet/settings/mail-account-view.c:635
-msgid "Next - Review account"
-msgstr "Next â Review account"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+msgid "Whether to show the preview pane."
+msgstr "Whether to show the preview pane."
 
-#: ../capplet/settings/mail-account-view.c:634
-msgid "Next - Defaults"
-msgstr "Next â Defaults"
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "Convert mail messages to Unicode"
 
-#: ../capplet/settings/mail-account-view.c:634
-msgid "Back - Receiving options"
-msgstr "Back â Receiving options"
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
 
-#: ../capplet/settings/mail-account-view.c:635
-#: ../mail/em-account-editor.c:3377
-msgid "Defaults"
-msgstr "Defaults"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
+msgid "Save directory for reminder audio"
+msgstr "Save directory for reminder audio"
 
-#: ../capplet/settings/mail-account-view.c:635
-msgid "Back - Sending mail"
-msgstr "Back â Sending mail"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
+msgid "Directory for saving reminder audio files"
+msgstr "Directory for saving reminder audio files"
 
-#: ../capplet/settings/mail-account-view.c:637
-msgid "Review account"
-msgstr "Review account"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
+msgid "Birthday and anniversary reminder value"
+msgstr "Birthday and anniversary reminder value"
 
-#: ../capplet/settings/mail-account-view.c:637
-msgid "Finish"
-msgstr "Finish"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr "Number of units for determining a birthday or anniversary reminder"
 
-#: ../capplet/settings/mail-account-view.c:637
-msgid "Back - Sending"
-msgstr "Back â Sending"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
+msgid "Birthday and anniversary reminder units"
+msgstr "Birthday and anniversary reminder units"
 
-#: ../capplet/settings/mail-account-view.c:760
-msgid "Setup Google contacts with Evolution"
-msgstr "Set up Google Contacts with Evolution"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
+msgstr ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or \"days\""
 
-#: ../capplet/settings/mail-account-view.c:761
-msgid "Setup Google calendar with Evolution"
-msgstr "Set up Google Calendar with Evolution"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Compress weekends in month view"
+msgstr "Compress weekends in month view"
 
-#: ../capplet/settings/mail-account-view.c:766
-msgid "You may need to enable IMAP access."
-msgstr "You may need to enable IMAP access."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday"
+msgstr ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday"
 
-#: ../capplet/settings/mail-account-view.c:774
-msgid "Google account settings:"
-msgstr "Google account settings:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
+msgid "Ask for confirmation when deleting items"
+msgstr "Ask for confirmation when deleting items"
 
-#: ../capplet/settings/mail-account-view.c:800
-msgid "Setup Yahoo calendar with Evolution"
-msgstr "Setup Yahoo calendar with Evolution"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
+msgid "Whether to ask for confirmation when deleting an appointment or task"
+msgstr "Whether to ask for confirmation when deleting an appointment or task"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
+msgid "Confirm expunge"
+msgstr "Confirm expunge"
 
-#: ../capplet/settings/mail-account-view.c:804
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
+msgid "Whether to ask for confirmation when expunging appointments and tasks"
+msgstr "Whether to ask for confirmation when expunging appointments and tasks"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+msgid "Month view vertical pane position"
+msgstr "Month view vertical pane position"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
 msgid ""
-"Yahoo calendars are named as firstname_lastname. We have tried to form the "
-"calendar name. So please confirm and re-enter the calendar name if it is not "
-"correct."
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar"
 msgstr ""
-"Yahoo calendars are named as firstname_lastname. We have tried to form the "
-"calendar name. So please confirm and re-enter the calendar name if it is not "
-"correct."
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar"
 
-#: ../capplet/settings/mail-account-view.c:813
-msgid "Yahoo account settings:"
-msgstr "Yahoo account settings:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+msgid "Workday end hour"
+msgstr "Workday end hour"
 
-#: ../capplet/settings/mail-account-view.c:827
-msgid "Yahoo Calendar name:"
-msgstr "Yahoo Calendar name:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+msgstr "Hour the workday ends on, in twenty four hour format, 0 to 23"
 
-#: ../capplet/settings/mail-account-view.c:1098
-msgid "Password:"
-msgstr "Password:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+msgid "Workday end minute"
+msgstr "Workday end minute"
 
-#: ../capplet/settings/mail-account-view.c:1150
-#: ../capplet/settings/mail-settings-view.c:254
-msgid "Close Tab"
-msgstr "Close Tab"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "Minute the workday ends on, 0 to 59."
 
-#: ../capplet/settings/mail-account-view.c:1160
-msgid "Account Wizard"
-msgstr "Account Wizard"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Workday start hour"
+msgstr "Workday start hour"
 
-#: ../capplet/settings/mail-capplet-shell.c:215
-msgid "Evolution account assistant"
-msgstr "Evolution account assistant"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr "Hour the workday starts on, in twenty four hour format, 0 to 23."
 
-#. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:377 ../mail/e-mail-local.c:81
-#: ../mail/e-mail-migrate.c:750 ../mail/em-folder-tree-model.c:153
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:159
-#: ../mail/em-folder-tree-model.c:161 ../mail/em-folder-tree-model.c:168
-#: ../mail/em-folder-tree-model.c:170
-#: ../modules/addressbook/e-book-shell-backend.c:100
-#: ../modules/addressbook/e-book-shell-migrate.c:136
-#: ../modules/calendar/e-cal-shell-backend.c:113
-#: ../modules/calendar/e-cal-shell-migrate.c:154
-#: ../modules/calendar/e-memo-shell-backend.c:102
-#: ../modules/calendar/e-memo-shell-migrate.c:109
-#: ../modules/calendar/e-task-shell-backend.c:102
-#: ../modules/calendar/e-task-shell-migrate.c:121
-msgid "On This Computer"
-msgstr "On This Computer"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+msgid "Workday start minute"
+msgstr "Workday start minute"
 
-#: ../capplet/settings/mail-settings-view.c:150
-#, c-format
-msgid "Modify %s..."
-msgstr "Modify %sâ"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "Minute the workday starts on, 0 to 59."
 
-#: ../capplet/settings/mail-settings-view.c:152
-msgid "Add a new account"
-msgstr "Add a new account"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+msgid "The second timezone for a Day View"
+msgstr "The second timezone for a Day View"
 
-#: ../capplet/settings/mail-settings-view.c:188
-msgid "Account management"
-msgstr "Account management"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key"
+msgstr ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key"
 
-#: ../capplet/settings/mail-settings-view.c:264
-msgid "Settings"
-msgstr "Settings"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+msgid "Recently used second time zones in a Day View"
+msgstr "Recently used second time zones in a Day View"
 
-#: ../data/evolution-alarm-notify.desktop.in.in.h:1
-msgid "Calendar event notifications"
-msgstr "Calendar event notifications"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+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/evolution-alarm-notify.desktop.in.in.h:2
-msgid "Evolution Alarm Notify"
-msgstr "Evolution Alarm Notify"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+msgid "Maximum number of recently used timezones to remember"
+msgstr "Maximum number of recently used timezones to remember"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:999
-#: ../modules/mailto-handler/evolution-mailto-handler.c:215
-#: ../shell/e-shell-window-private.c:257
-msgid "Evolution"
-msgstr "Evolution"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+msgid ""
+"Maximum number of recently used timezones to remember in a 'day-second-"
+"zones' list"
+msgstr ""
+"Maximum number of recently used timezones to remember in a 'day-second-"
+"zones' list"
 
-#: ../data/evolution.desktop.in.in.h:2
-msgid "Evolution Mail and Calendar"
-msgstr "Evolution Mail and Calendar"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
+msgid "Default reminder value"
+msgstr "Default reminder value"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
-msgid "Groupware Suite"
-msgstr "Groupware Suite"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+msgid "Number of units for determining a default reminder"
+msgstr "Number of units for determining a default reminder"
 
-#: ../data/evolution.desktop.in.in.h:4
-msgid "Manage your email, contacts and schedule"
-msgstr "Manage your e-mail, contacts and schedule"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
+msgid "Default reminder units"
+msgstr "Default reminder units"
 
-#: ../data/evolution-settings.desktop.in.in.h:1
-msgid "Configure email accounts"
-msgstr "Configure e-mail accounts"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
+msgstr "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Email Settings"
-msgstr "E-mail Settings"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "Show categories field in the event/meeting/task editor"
 
-#. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:227
-#, c-format
-msgid "%s (cancelled)"
-msgstr "%s (cancelled)"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "Whether to show categories field in the event/meeting editor"
 
-#. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:230
-#, c-format
-msgid "%s (completed)"
-msgstr "%s (completed)"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "Show Role field in the event/task/meeting editor"
 
-#. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:233
-#, c-format
-msgid "%s (waiting)"
-msgstr "%s (waiting)"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "Whether to show role field in the event/task/meeting editor"
 
-#. Translators: This is a running activity which
-#. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:237
-#, c-format
-msgid "%s (cancelling)"
-msgstr "%s (cancelling)"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "Show RSVP field in the event/task/meeting editor"
 
-#: ../e-util/e-activity.c:239
-#, c-format
-msgid "%s"
-msgstr "%s"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "Whether to show RSVP field in the event/task/meeting editor"
 
-#: ../e-util/e-activity.c:244
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% complete)"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Show status field in the event/task/meeting editor"
+msgstr "Show status field in the event/task/meeting editor"
 
-#: ../e-util/e-charset.c:53
-msgid "Arabic"
-msgstr "Arabic"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr "Whether to show status field in the event/task/meeting editor"
 
-#: ../e-util/e-charset.c:54
-msgid "Baltic"
-msgstr "Baltic"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+msgid "Show timezone field in the event/meeting editor"
+msgstr "Show timezone field in the event/meeting editor"
 
-#: ../e-util/e-charset.c:55
-msgid "Central European"
-msgstr "Central European"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "Whether to show timezone field in the event/meeting editor"
 
-#: ../e-util/e-charset.c:56
-msgid "Chinese"
-msgstr "Chinese"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+msgid "Show type field in the event/task/meeting editor"
+msgstr "Show type field in the event/task/meeting editor"
 
-#: ../e-util/e-charset.c:57
-msgid "Cyrillic"
-msgstr "Cyrillic"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "Whether to show type field in the event/task/meeting editor"
 
-#: ../e-util/e-charset.c:58
-msgid "Greek"
-msgstr "Greek"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
+msgid "Hide completed tasks"
+msgstr "Hide completed tasks"
 
-#: ../e-util/e-charset.c:59
-msgid "Hebrew"
-msgstr "Hebrew"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
+msgid "Whether to hide completed tasks in the tasks view"
+msgstr "Whether to hide completed tasks in the tasks view"
 
-#: ../e-util/e-charset.c:60
-msgid "Japanese"
-msgstr "Japanese"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
+msgid "Hide task units"
+msgstr "Hide task units"
 
-#: ../e-util/e-charset.c:61
-msgid "Korean"
-msgstr "Korean"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
+msgstr "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
 
-#: ../e-util/e-charset.c:62
-msgid "Thai"
-msgstr "Thai"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+msgid "Hide task value"
+msgstr "Hide task value"
 
-#: ../e-util/e-charset.c:63
-msgid "Turkish"
-msgstr "Turkish"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+msgid "Number of units for determining when to hide tasks"
+msgstr "Number of units for determining when to hide tasks"
 
-#: ../e-util/e-charset.c:64
-msgid "Unicode"
-msgstr "Unicode"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+msgid "Horizontal pane position"
+msgstr "Horizontal pane position"
 
-#: ../e-util/e-charset.c:65
-msgid "Western European"
-msgstr "Western European"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels"
+msgstr ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels"
 
-#: ../e-util/e-charset.c:66
-msgid "Western European, New"
-msgstr "Western European, New"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
+msgid "Last reminder time"
+msgstr "Last reminder time"
 
-#. Translators: Character set "Chinese, Traditional"
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
-msgid "Traditional"
-msgstr "Traditional"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+msgid "Time the last reminder ran, in time_t"
+msgstr "Time the last reminder ran, in time_t"
 
-#. 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
-msgid "Simplified"
-msgstr "Simplified"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
+msgid "Marcus Bains Line Color - Day View"
+msgstr "Marcus Bains Line Colour â Day View"
 
-#. Translators: Character set "Cyrillic, Ukrainian"
-#: ../e-util/e-charset.c:101
-msgid "Ukrainian"
-msgstr "Ukrainian"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+msgid "Color to draw the Marcus Bains line in the Day View"
+msgstr "Colour to draw the Marcus Bains line in the Day View"
 
-#. Translators: Character set "Hebrew, Visual"
-#: ../e-util/e-charset.c:105
-msgid "Visual"
-msgstr "Visual"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
+msgid "Marcus Bains Line Color - Time bar"
+msgstr "Marcus Bains Line Colour â Time bar"
 
-#. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1856
-#: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:307
-msgid "Today"
-msgstr "Today"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+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)"
 
-#. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:219
-msgid "Tomorrow"
-msgstr "Tomorrow"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
+msgid "Marcus Bains Line"
+msgstr "Marcus Bains Line"
 
-#: ../e-util/e-datetime-format.c:219
-msgid "Yesterday"
-msgstr "Yesterday"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+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"
 
-#. 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:227
-msgctxt "DateFmt"
-msgid "Next Mon"
-msgstr "Next Mon"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+msgid "Memo preview pane position (horizontal)"
+msgstr "Memo preview pane position (horizontal)"
 
-#. 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:233
-msgctxt "DateFmt"
-msgid "Next Tue"
-msgstr "Next Tue"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+msgid "Position of the task preview pane when oriented horizontally"
+msgstr "Position of the task preview pane when oriented horizontally"
 
-#. 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:239
-msgctxt "DateFmt"
-msgid "Next Wed"
-msgstr "Next Wed"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+msgid "Memo layout style"
+msgstr "Memo layout style"
 
-#. 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:245
-msgctxt "DateFmt"
-msgid "Next Thu"
-msgstr "Next Thu"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list"
+msgstr ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list"
 
-#. 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:251
-msgctxt "DateFmt"
-msgid "Next Fri"
-msgstr "Next Fri"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+msgid "Memo preview pane position (vertical)"
+msgstr "Memo preview pane position (vertical)"
 
-#. 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:257
-msgctxt "DateFmt"
-msgid "Next Sat"
-msgstr "Next Sat"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+msgid "Position of the memo preview pane when oriented vertically"
+msgstr "Position of the memo preview pane when oriented vertically"
 
-#. 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:263
-msgctxt "DateFmt"
-msgid "Next Sun"
-msgstr "Next Sun"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+msgid "Month view horizontal pane position"
+msgstr "Month view horizontal pane position"
 
-#: ../e-util/e-datetime-format.c:350 ../e-util/e-datetime-format.c:360
-#: ../e-util/e-datetime-format.c:369
-msgid "Use locale default"
-msgstr "Use locale default"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels"
+msgstr ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels"
 
-#: ../e-util/e-datetime-format.c:574
-msgid "Format:"
-msgstr "Format:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+msgid "Scroll Month View by a week, not by a month"
+msgstr "Scroll Month View by a week, not by a month"
 
-#: ../e-util/e-file-utils.c:151
-msgid "(Unknown Filename)"
-msgstr "(Unknown Filename)"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+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"
 
-#. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:155
-#, c-format
-msgid "Writing \"%s\""
-msgstr "Writing \"%s\""
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
+msgid "Reminder programs"
+msgstr "Reminder programs"
 
-#. 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:160
-#, c-format
-msgid "Writing \"%s\" to %s"
-msgstr "Writing \"%s\" to %s"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+msgid "Programs that are allowed to be run by reminders"
+msgstr "Programs that are allowed to be run by reminders"
 
-#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:388
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
-msgid "weeks"
-msgstr "weeks"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
+msgid "Show display reminders in notification tray"
+msgstr "Show display reminders in notification tray"
 
-#: ../e-util/e-print.c:161
-msgid "An error occurred while printing"
-msgstr "An error occurred while printing"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+msgid "Whether or not to use the notification tray for display reminders"
+msgstr "Whether or not to use the notification tray for display reminders"
 
-#: ../e-util/e-print.c:168
-msgid "The printing system reported the following details about the error:"
-msgstr "The printing system reported the following details about the error:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+msgid "Preferred New button item"
+msgstr "Preferred New button item"
 
-#: ../e-util/e-print.c:174
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+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
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
+msgid "Primary calendar"
+msgstr "Primary calendar"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 msgid ""
-"The printing system did not report any additional details about the error."
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view"
 msgstr ""
-"The printing system did not report any additional details about the error."
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view"
 
-#: ../e-util/e-signature.c:708
-msgid "Autogenerated"
-msgstr "Autogenerated"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
+msgid "Primary memo list"
+msgstr "Primary memo list"
 
-#: ../e-util/e-system.error.xml.h:1
-msgid "Because \"{1}\"."
-msgstr "Because \"{1}\"."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+msgid ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view"
+msgstr ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view"
 
-#: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file \"{0}\"."
-msgstr "Cannot open file \"{0}\"."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
+msgid "Primary task list"
+msgstr "Primary task list"
 
-#: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file \"{0}\"."
-msgstr "Cannot save file \"{0}\"."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+msgid ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view"
+msgstr ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view"
 
-#: ../e-util/e-system.error.xml.h:4
-msgid "Do you wish to overwrite it?"
-msgstr "Do you wish to overwrite it?"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
+msgid "Free/busy template URL"
+msgstr "Free/busy template URL"
 
-#: ../e-util/e-system.error.xml.h:5
-msgid "File exists \"{0}\"."
-msgstr "File exists \"{0}\"."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain"
+msgstr ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
-msgid "_Overwrite"
-msgstr "_Overwrite"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
+msgid "Recurrent Events in Italic"
+msgstr "Recurrent Events in Italic"
 
-#: ../e-util/e-util.c:117
-msgid "Could not open the link."
-msgstr "Could not open the link."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+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"
 
-#: ../e-util/e-util.c:164
-msgid "Could not display help for Evolution."
-msgstr "Could not display help for Evolution."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+msgid "List of selected calendars"
+msgstr "List of selected calendars"
 
-#: ../e-util/gconf-bridge.c:1332
-#, c-format
-msgid "GConf error: %s"
-msgstr "GConf error: %s"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+msgid "List of calendars to load"
+msgstr "List of calendars to load"
 
-#: ../e-util/gconf-bridge.c:1343
-msgid "All further errors shown only on terminal."
-msgstr "All further errors shown only on terminal."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+msgid "List of selected memo lists"
+msgstr "List of selected memo lists"
 
-#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1060
-#: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:72
-msgid "From"
-msgstr "From"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+msgid "List of memo lists to load"
+msgstr "List of memo lists to load"
 
-#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1061
-#: ../modules/mail/em-mailer-prefs.c:73
-msgid "Reply-To"
-msgstr "Reply-To"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+msgid "List of selected task lists"
+msgstr "List of selected task lists"
 
-#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1063
-#: ../mail/em-format-html.c:2593 ../mail/em-format-html.c:2661
-#: ../mail/em-format-html.c:2684 ../modules/mail/em-mailer-prefs.c:75
-msgid "Cc"
-msgstr "Cc"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+msgid "List of task lists to load"
+msgstr "List of task lists to load"
 
-#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1064
-#: ../mail/em-format-html.c:2594 ../mail/em-format-html.c:2665
-#: ../mail/em-format-html.c:2687 ../modules/mail/em-mailer-prefs.c:76
-msgid "Bcc"
-msgstr "Bcc"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
+msgid "Show appointment end times in week and month views"
+msgstr "Show appointment end times in week and month views"
 
-#: ../em-format/em-format-quote.c:464 ../em-format/em-format.c:1065
-#: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
-#: ../smime/lib/e-cert.c:1151
-msgid "Subject"
-msgstr "Subject"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+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"
 
-#. pseudo-header
-#: ../em-format/em-format-quote.c:475 ../mail/em-format-html.c:2786
-#: ../modules/mail/em-mailer-prefs.c:1028
-msgid "Mailer"
-msgstr "Mailer"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+msgid "Show the memo preview pane"
+msgstr "Show the memo preview pane"
 
-#: ../em-format/em-format-quote.c:565 ../mail/em-composer-utils.c:1203
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Forwarded Message --------"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+msgid "If \"true\", show the memo preview pane in the main window"
+msgstr "If \"true\", show the memo preview pane in the main window"
 
-#: ../em-format/em-format.c:1066 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:523
-#: ../widgets/misc/e-dateedit.c:545
-msgid "Date"
-msgstr "Date"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+msgid "Show the task preview pane"
+msgstr "Show the task preview pane"
 
-#: ../em-format/em-format.c:1067 ../modules/mail/em-mailer-prefs.c:79
-msgid "Newsgroups"
-msgstr "Newsgroups"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+msgid "If \"true\", show the task preview pane in the main window"
+msgstr "If \"true\", show the task preview pane in the main window"
 
-#: ../em-format/em-format.c:1068 ../modules/mail/em-mailer-prefs.c:80
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "Face"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+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"
 
-#: ../em-format/em-format.c:1472
-#, c-format
-msgid "%s attachment"
-msgstr "%s attachment"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+msgid "Whether to show week numbers in various places in the Calendar"
+msgstr "Whether to show week numbers in various places in the Calendar"
 
-#: ../em-format/em-format.c:1583
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Could not parse S/MIME message: Unknown error"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+msgid "Vertical position for the tag pane"
+msgstr "Vertical position for the tag pane"
 
-#: ../em-format/em-format.c:1777 ../em-format/em-format.c:2005
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Could not parse MIME message. Displaying as source."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+msgid "Highlight tasks due today"
+msgstr "Highlight tasks due today"
 
-#: ../em-format/em-format.c:1788
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Unsupported encryption type for multipart/encrypted"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+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)"
 
-#: ../em-format/em-format.c:1808
-msgid "Could not parse PGP/MIME message"
-msgstr "Could not parse PGP/MIME message"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+msgid "Tasks due today color"
+msgstr "Tasks due today colour"
 
-#: ../em-format/em-format.c:1809
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "Could not parse PGP/MIME message: Unknown error"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+msgid ""
+"Background color of tasks that are due today, in \"#rrggbb\" format. Used "
+"together with task-due-today-highlight"
+msgstr ""
+"Background colour of tasks that are due today, in \"#rrggbb\" format. Used "
+"together with task-due-today-highlight"
 
-#: ../em-format/em-format.c:2030
-msgid "Unsupported signature format"
-msgstr "Unsupported signature format"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Task preview pane position (horizontal)"
+msgstr "Task preview pane position (horizontal)"
 
-#: ../em-format/em-format.c:2043 ../em-format/em-format.c:2225
-msgid "Error verifying signature"
-msgstr "Error verifying signature"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+msgid "Task layout style"
+msgstr "Task layout style"
 
-#: ../em-format/em-format.c:2044 ../em-format/em-format.c:2210
-#: ../em-format/em-format.c:2226
-msgid "Unknown error verifying signature"
-msgstr "Unknown error verifying signature"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list"
+msgstr ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list"
 
-#: ../em-format/em-format.c:2318
-msgid "Could not parse PGP message: "
-msgstr "Could not parse PGP message: "
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+msgid "Task preview pane position (vertical)"
+msgstr "Task preview pane position (vertical)"
 
-#. 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
-#: ../filter/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"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+msgid "Position of the task preview pane when oriented vertically"
+msgstr "Position of the task preview pane when oriented vertically"
 
-#: ../filter/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"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+msgid "Highlight overdue tasks"
+msgstr "Highlight overdue tasks"
 
-#: ../filter/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"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+msgid ""
+"Whether highlight overdue tasks with a special color (task-overdue-color)"
+msgstr ""
+"Whether highlight overdue tasks with a special colour (task-overdue-color)"
 
-#: ../filter/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"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+msgid "Overdue tasks color"
+msgstr "Overdue tasks colour"
 
-#: ../filter/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"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+msgid ""
+"Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
+"together with task-overdue-highlight."
+msgstr ""
+"Background colour of tasks that are overdue, in \"#rrggbb\" format. Used "
+"together with task-overdue-highlight."
 
-#: ../filter/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"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+msgid "Time divisions"
+msgstr "Time divisions"
 
-#: ../filter/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"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+msgid "Intervals shown in Day and Work Week views, in minutes"
+msgstr "Intervals shown in Day and Work Week views, in minutes"
 
-#: ../filter/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"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+msgid "Timezone"
+msgstr "Timezone"
 
-#: ../filter/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"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olson timezone database location like \"America/New York\""
+msgstr ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olson timezone database location like \"America/New York\""
 
-#: ../filter/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"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+msgid "Twenty four hour time format"
+msgstr "Twenty four hour time format"
 
-#: ../filter/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"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+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"
 
-#: ../filter/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"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+msgid "Birthday and anniversary reminder"
+msgstr "Birthday and anniversary reminder"
 
-#: ../filter/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"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr "Whether to set a reminder for birthdays and anniversaries"
 
-#: ../filter/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"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+msgid "Default appointment reminder"
+msgstr "Default appointment reminder"
 
-#: ../filter/e-filter-datespec.c:129
-msgid "<click here to select a date>"
-msgstr "<click here to select a date>"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+msgid "Whether to set a default reminder for appointments"
+msgstr "Whether to set a default reminder for appointments"
 
-#: ../filter/e-filter-datespec.c:132 ../filter/e-filter-datespec.c:143
-#: ../filter/e-filter-datespec.c:154
-msgid "now"
-msgstr "now"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+msgid "Use system timezone"
+msgstr "Use system timezone"
 
-#. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:139
-msgid "%d-%b-%Y"
-msgstr "%d-%b-%Y"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+msgid "Use the system timezone instead of the timezone selected in Evolution"
+msgstr "Use the system timezone instead of the timezone selected in Evolution"
 
-#: ../filter/e-filter-datespec.c:286
-msgid "Select a time to compare against"
-msgstr "Select a time to compare against"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+msgid "Week start"
+msgstr "Week start"
 
-#: ../filter/e-filter-file.c:190
-msgid "Choose a File"
-msgstr "Choose a File"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
+msgstr "Weekday the week starts on, from Sunday (0) to Saturday (6)"
 
-#: ../filter/e-filter-rule.c:666
-msgid "R_ule name:"
-msgstr "R_ule name:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+msgid "Work days"
+msgstr "Work days"
 
-#: ../filter/e-filter-rule.c:696
-msgid "Find items that meet the following conditions"
-msgstr "Find items that meet the following conditions"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+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"
 
-#: ../filter/e-filter-rule.c:721
-msgid "If all conditions are met"
-msgstr "If all conditions are met"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:1
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+msgid "Configuration version"
+msgstr "Configuration version"
 
-#: ../filter/e-filter-rule.c:722
-msgid "If any conditions are met"
-msgstr "If any conditions are met"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:2
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
 
-#: ../filter/e-filter-rule.c:725
-msgid "_Find items:"
-msgstr "_Find items:"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Last upgraded configuration version"
+msgstr "Last upgraded configuration version"
 
-#. Translators: "None" for not including threads;
-#. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:754
-msgid "None"
-msgstr "None"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:4
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
 
-#: ../filter/e-filter-rule.c:755
-msgid "All related"
-msgstr "All related"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:5
+msgid "List of disabled plugins"
+msgstr "List of disabled plugins"
 
-#: ../filter/e-filter-rule.c:756 ../widgets/misc/e-send-options.ui.h:19
-msgid "Replies"
-msgstr "Replies"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:6
+msgid "The list of disabled plugins in Evolution"
+msgstr "The list of disabled plugins in Evolution"
 
-#: ../filter/e-filter-rule.c:757
-msgid "Replies and parents"
-msgstr "Replies and parents"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:7
+msgid "The window's X coordinate"
+msgstr "The window's X coordinate"
 
-#: ../filter/e-filter-rule.c:758
-msgid "No reply or parent"
-msgstr "No reply or parent"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:8
+msgid "The window's Y coordinate"
+msgstr "The window's Y coordinate"
 
-#: ../filter/e-filter-rule.c:761
-msgid "I_nclude threads:"
-msgstr "I_nclude threads:"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:9
+msgid "The window's width in pixels"
+msgstr "The window's width in pixels"
 
-#: ../filter/e-filter-rule.c:786
-msgid "A_dd Condition"
-msgstr "A_dd Condition"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:10
+msgid "The window's height in pixels"
+msgstr "The window's height in pixels"
 
-#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:321
-msgid "Incoming"
-msgstr "Incoming"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:11
+msgid "Whether the window is maximized"
+msgstr "Whether the window is maximised"
 
-#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:322
-msgid "Outgoing"
-msgstr "Outgoing"
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
+msgid "Gnome Calendar's calendar import done"
+msgstr "Gnome Calendar's calendar import done"
 
-#: ../filter/e-rule-editor.c:270
-msgid "Add Rule"
-msgstr "Add Rule"
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
+msgid "Whether calendar from Gnome Calendar has been imported or not"
+msgstr "Whether calendar from Gnome Calendar has been imported or not"
 
-#: ../filter/e-rule-editor.c:359
-msgid "Edit Rule"
-msgstr "Edit Rule"
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
+msgid "Gnome Calendar's tasks import done"
+msgstr "Gnome Calendar's tasks import done"
 
-#: ../filter/filter.error.xml.h:1
-msgid "Bad regular expression &quot;{0}&quot;."
-msgstr "Bad regular expression &quot;{0}&quot;."
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
+msgid "Whether tasks from Gnome Calendar have been imported or not"
+msgstr "Whether tasks from Gnome Calendar have been imported or not"
 
-#: ../filter/filter.error.xml.h:2
-msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr "Could not compile regular expression &quot;{1}&quot;."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Check whether Evolution is the default mailer"
 
-#: ../filter/filter.error.xml.h:3
-msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "File &quot;{0}&quot; does not exist or is not a regular file."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "Every time Evolution starts, check whether it is the default mailer."
 
-#: ../filter/filter.error.xml.h:4
-msgid "Missing date."
-msgstr "Missing date."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:1
+msgid "Default charset in which to compose messages"
+msgstr "Default charset in which to compose messages"
 
-#: ../filter/filter.error.xml.h:5
-msgid "Missing file name."
-msgstr "Missing file name."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "Default charset in which to compose messages."
+msgstr "Default charset in which to compose messages."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
-msgid "Missing name."
-msgstr "Missing name."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:51
+msgid "Path where picture gallery should search for its content"
+msgstr "Path where picture gallery should search for its content"
 
-#: ../filter/filter.error.xml.h:7
-msgid "Name &quot;{0}&quot; already used."
-msgstr "Name &quot;{0}&quot; already used."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
+msgid ""
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder"
+msgstr ""
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder"
 
-#: ../filter/filter.error.xml.h:8
-msgid "Please choose another name."
-msgstr "Please choose another name."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "Spell check inline"
+msgstr "Spell check inline"
 
-#: ../filter/filter.error.xml.h:9
-msgid "You must choose a date."
-msgstr "You must choose a date."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "Draw spelling error indicators on words as you type."
+msgstr "Draw spelling error indicators on words as you type."
 
-#: ../filter/filter.error.xml.h:10
-msgid "You must name this filter."
-msgstr "You must name this filter."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "Automatic link recognition"
+msgstr "Automatic link recognition"
 
-#: ../filter/filter.error.xml.h:11
-msgid "You must specify a file name."
-msgstr "You must specify a file name."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "Recognize links in text and replace them."
+msgstr "Recognise links in text and replace them."
 
-#: ../filter/filter.ui.h:1
-msgid "Compare against"
-msgstr "Compare against"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:7
+msgid "Automatic emoticon recognition"
+msgstr "Automatic emoticon recognition"
 
-#: ../filter/filter.ui.h:3
-msgid "Show filters for mail:"
-msgstr "Show filters for mail:"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:8
+msgid "Recognize emoticons in text and replace them with images."
+msgstr "Recognise emoticons in text and replace them with images."
 
-#: ../filter/filter.ui.h:4
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+msgid "Attribute message"
+msgstr "Attribute message"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
 msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author"
 msgstr ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
+"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
+msgid "Forward message"
+msgstr "Forward message"
 
-#: ../filter/filter.ui.h:6
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
 msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows"
 msgstr ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows"
 
-#: ../filter/filter.ui.h:8
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+msgid "Original message"
+msgstr "Original message"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
 msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows"
 msgstr ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:194
-msgid "_Filter Rules"
-msgstr "_Filter Rules"
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows"
 
-#: ../filter/filter.ui.h:12
-msgid "a time relative to the current time"
-msgstr "a time relative to the current time"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:9
+msgid "Group Reply replies to list"
+msgstr "Group Reply replies to list"
 
-#: ../filter/filter.ui.h:13
-msgid "ago"
-msgstr "ago"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:10
+msgid ""
+"Instead of the normal \"Reply to All\" behaviour, this option will make the "
+"'Group Reply' toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you're "
+"replying."
+msgstr ""
+"Instead of the normal \"Reply to All\" behaviour, this option will make the "
+"'Group Reply' toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you're "
+"replying."
 
-#: ../filter/filter.ui.h:16
-msgid "in the future"
-msgstr "in the future"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:13
+msgid "Put the cursor at the bottom of replies"
+msgstr "Put the cursor at the bottom of replies"
 
-#: ../filter/filter.ui.h:18
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
-msgid "months"
-msgstr "months"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:14
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+msgstr ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
 
-#: ../filter/filter.ui.h:19
-msgid "seconds"
-msgstr "seconds"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:15
+msgid "Always request read receipt"
+msgstr "Always request read receipt"
 
-#: ../filter/filter.ui.h:20
-msgid "the current time"
-msgstr "the current time"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:16
+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."
 
-#: ../filter/filter.ui.h:21
-msgid "the time you specify"
-msgstr "the time you specify"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Send HTML mail by default"
+msgstr "Send HTML mail by default"
 
-#: ../filter/filter.ui.h:23
-msgid "years"
-msgstr "years"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid "Send HTML mail by default."
+msgstr "Send HTML mail by default."
 
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:863 ../widgets/misc/e-signature-combo-box.c:75
-msgctxt "mail-signature"
-msgid "None"
-msgstr "None"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Spell checking color"
+msgstr "Spell checking colour"
 
-#: ../mail/em-account-editor.c:946
-msgid "Never"
-msgstr "Never"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr "Underline colour for misspelt words when using inline spelling."
 
-#: ../mail/em-account-editor.c:947
-msgid "Always"
-msgstr "Always"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid "Spell checking languages"
+msgstr "Spell checking languages"
 
-#: ../mail/em-account-editor.c:948
-msgid "Ask for each message"
-msgstr "Ask for each message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:22
+msgid "List of dictionary language codes used for spell checking."
+msgstr "List of dictionary language codes used for spell checking."
 
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1833 ../widgets/misc/e-account-tree-view.c:131
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "None"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:23
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "Show \"Bcc\" field when sending a mail message"
 
-#: ../mail/em-account-editor.c:2237
-msgid "Fil_e:"
-msgstr "Fil_e:"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 
-#: ../mail/em-account-editor.c:2237 ../mail/mail-config.ui.h:157
-msgid "_Path:"
-msgstr "_Path:"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "Show \"Cc\" field when sending a mail message"
 
-#: ../mail/em-account-editor.c:2286
-msgid "Mail Configuration"
-msgstr "Mail Configuration"
-
-#: ../mail/em-account-editor.c:2287
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Continue\" to begin."
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 msgstr ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Continue\" to begin."
+"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
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "Show \"Reply To\" field when sending a mail message"
 
-#: ../mail/em-account-editor.c:2290
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
 msgstr ""
-"Please enter your name and e-mail address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in e-mails you send."
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
 
-#: ../mail/em-account-editor.c:2292 ../mail/em-account-editor.c:2484
-msgid "Receiving Email"
-msgstr "Receiving E-mail"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "Show \"From\" field when posting to a newsgroup"
 
-#: ../mail/em-account-editor.c:2293
-msgid "Please configure the following account settings."
-msgstr "Please configure the following account settings."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
 
-#: ../mail/em-account-editor.c:2295 ../mail/em-account-editor.c:3081
-msgid "Sending Email"
-msgstr "Sending E-mail"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr "Show \"Reply To\" field when posting to a newsgroup"
 
-#: ../mail/em-account-editor.c:2296
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
 msgstr ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
 
-#: ../mail/em-account-editor.c:2298 ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "Account Information"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+msgid "Digitally sign replies when the original message is signed"
+msgstr "Digitally sign replies when the original message is signed"
 
-#: ../mail/em-account-editor.c:2299
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
+"Automatically enable PGP or S/MIME signatures when replying to a message "
+"which is also PGP or S/MIME signed."
 msgstr ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
+"Automatically enable PGP or S/MIME signatures when replying to a message "
+"which is also PGP or S/MIME signed."
 
-#: ../mail/em-account-editor.c:2303
-msgid "Done"
-msgstr "Done"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid "Encode filenames in an Outlook/GMail way"
+msgstr "Encode filenames in an Outlook/GMail way"
 
-#: ../mail/em-account-editor.c:2304
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
+"Encode filenames in the mail headers same as Outlook or GMail do, to let "
+"them display correctly filenames with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive e-mail using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
+"Encode filenames in the mail headers same as Outlook or GMail do, to let "
+"them display correctly filenames with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 
-#: ../mail/em-account-editor.c:2843
-msgid "Check for _new messages every"
-msgstr "Check for _new messages every"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:35
+msgid "Put personalized signatures at the top of replies"
+msgstr "Put personalised signatures at the top of replies"
 
-#: ../mail/em-account-editor.c:2851
-msgid "minu_tes"
-msgstr "minu_tes"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:36
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+msgstr ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
 
-#: ../mail/em-account-editor.c:3520 ../mail/mail-config.ui.h:101
-msgid "Security"
-msgstr "Security"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:37
+msgid "Do not add signature delimiter"
+msgstr "Do not add signature delimiter"
 
-#. Most sections for this is auto-generated from the camel config
-#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3575 ../mail/em-account-editor.c:3658
-msgid "Receiving Options"
-msgstr "Receiving Options"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
 
-#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
-msgid "Checking for New Messages"
-msgstr "Checking for New Messages"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Ignore list Reply-To:"
+msgstr "Ignore list Reply-To:"
 
-#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1416 ../mail/mail-config.ui.h:14
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
-#: ../widgets/misc/e-attachment-paned.c:133
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Attachment"
-msgstr[1] "Attachments"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
 
-#: ../mail/e-mail-attachment-bar.c:608
-#: ../widgets/misc/e-attachment-paned.c:623
-msgid "Icon View"
-msgstr "Icon View"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+msgid "List of localized 'Re'"
+msgstr "List of localised 'Re'"
 
-#: ../mail/e-mail-attachment-bar.c:610
-#: ../widgets/misc/e-attachment-paned.c:625
-msgid "List View"
-msgstr "List View"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+msgid ""
+"Comma-separated list of localized 'Re' abbreviations to skip in a subject "
+"text when replying to a message, as an addition to the standard \"Re\" "
+"prefix. An example is 'SV,AV'."
+msgstr ""
+"Comma-separated list of localised 'Re' abbreviations to skip in a subject "
+"text when replying to a message, as an addition to the standard \"Re\" prefix. "
+"An example is 'SV,AV'."
 
-#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
-#: ../shell/e-shell-window-actions.c:1434
-#: ../shell/e-shell-window-actions.c:1441
-msgid "Close this window"
-msgstr "Close this window"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:53
+msgid "Show image animations"
+msgstr "Show image animations"
 
-#: ../mail/e-mail-browser.c:293
-msgid "(No Subject)"
-msgstr "(No Subject)"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:54
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
 
-#: ../mail/e-mail-display.c:66
-msgid "_Add to Address Book..."
-msgstr "_Add to Address Bookâ"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid "Enable or disable type ahead search feature"
+msgstr "Enable or disable type ahead search feature"
 
-#: ../mail/e-mail-display.c:73
-msgid "_To This Address"
-msgstr "_To this Address"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:56
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+msgstr ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 
-#: ../mail/e-mail-display.c:80
-msgid "_From This Address"
-msgstr "_From This Address"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr "Disable or enable ellipsizing of folder names in side bar"
 
-#: ../mail/e-mail-display.c:87
-msgid "Send _Reply To..."
-msgstr "Send _Reply Toâ"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:58
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr ""
+"Whether to disable ellipsizing feature of folder names in the side bar."
 
-#: ../mail/e-mail-display.c:89
-msgid "Send a reply message to this address"
-msgstr "Send a reply message to this address"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid "Enable or disable magic space bar"
+msgstr "Enable or disable magic space bar"
 
-#: ../mail/e-mail-display.c:96
-msgid "Create Search _Folder"
-msgstr "Create Search _Folder"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:60
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
 
-#: ../mail/e-mail-folder-utils.c:111
-#, c-format
-msgid "Saving message to folder '%s'"
-msgstr "Saving message to folder '%s'"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:61
+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"
 
-#: ../mail/e-mail-folder-utils.c:274
-msgid "Forwarded messages"
-msgstr "Forwarded messages"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:62
+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."
 
-#: ../mail/e-mail-folder-utils.c:391
-msgid "Scanning messages for duplicates"
-msgstr "Scanning messages for duplicates"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid "Mark citations in the message \"Preview\""
+msgstr "Mark citations in the message \"Preview\""
 
-#: ../mail/e-mail-folder-utils.c:584
-#, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "Retrieving %d message"
-msgstr[1] "Retrieving %d messages"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:64
+msgid "Mark citations in the message \"Preview\"."
+msgstr "Mark citations in the message \"Preview\"."
 
-#: ../mail/e-mail-folder-utils.c:834
-#, c-format
-msgid "Removing folder '%s'"
-msgstr "Removing folder '%s'"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:65
+msgid "Citation highlight color"
+msgstr "Citation highlight colour"
 
-#: ../mail/e-mail-folder-utils.c:968
-#, c-format
-msgid "File \"%s\" has been removed."
-msgstr "File \"%s\" has been removed."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid "Citation highlight color."
+msgstr "Citation highlight colour."
 
-#: ../mail/e-mail-folder-utils.c:972
-msgid "File has been removed."
-msgstr "File has been removed."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:67
+msgid "Enable/disable caret mode"
+msgstr "Enable/disable caret mode"
 
-#: ../mail/e-mail-folder-utils.c:1031
-msgid "Removing attachments"
-msgstr "Removing attachments"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:68
+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."
 
-#: ../mail/e-mail-folder-utils.c:1195
-#, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messages"
-msgstr[0] "Saving %d message"
-msgstr[1] "Saving %d messages"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:69
+msgid "Default charset in which to display messages"
+msgstr "Default charset in which to display messages"
 
-#: ../mail/e-mail-folder-utils.c:1539 ../mail/em-folder-utils.c:613
-#, c-format
-msgid "Invalid folder URI '%s'"
-msgstr "Invalid folder URI '%s'"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Default charset in which to display messages."
+msgstr "Default charset in which to display messages."
 
-#. 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
-msgid "Junk filtering software:"
-msgstr "Junk filtering software:"
-
-#: ../mail/e-mail-label-dialog.c:223
-msgid "_Label name:"
-msgstr "_Label name:"
-
-#: ../mail/e-mail-label-list-store.c:41
-msgid "I_mportant"
-msgstr "I_mportant"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "Load images for HTML messages over HTTP"
+msgstr "Load images for HTML messages over HTTP"
 
-#. red
-#: ../mail/e-mail-label-list-store.c:42
-msgid "_Work"
-msgstr "_Work"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:72
+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."
 
-#. orange
-#: ../mail/e-mail-label-list-store.c:43
-msgid "_Personal"
-msgstr "_Personal"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid "Show Animations"
+msgstr "Show Animations"
 
-#. green
-#: ../mail/e-mail-label-list-store.c:44
-msgid "_To Do"
-msgstr "_To Do"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid "Show animated images as animations."
+msgstr "Show animated images as animations."
 
-#. blue
-#: ../mail/e-mail-label-list-store.c:45
-msgid "_Later"
-msgstr "_Later"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "Show all message headers"
+msgstr "Show all message headers"
 
-#: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:684
-msgid "Add Label"
-msgstr "Add Label"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "Show all the headers when viewing a messages."
+msgstr "Show all the headers when viewing a messages."
 
-#: ../mail/e-mail-label-manager.c:216
-msgid "Edit Label"
-msgstr "Edit Label"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "List of custom headers and whether they are enabled."
+msgstr "List of custom headers and whether they are enabled."
 
-#: ../mail/e-mail-label-manager.c:350
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
-"Note: Underscore in the label name is used\n"
-"as mnemonic identifier in menu."
+"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 ""
-"Note: Underscore in the label name is used\n"
-"as mnemonic identifier in menu."
+"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."
 
-#: ../mail/e-mail-label-tree-view.c:88
-msgid "Color"
-msgstr "Colour"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid "Show photo of the sender"
+msgstr "Show photo of the sender"
 
-#: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
-#: ../plugins/caldav/caldav-browse-server.c:1358
-#: ../widgets/menus/gal-define-views-dialog.c:347
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
-msgid "Name"
-msgstr "Name"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid "Show the photo of the sender in the message reading pane."
+msgstr "Show the photo of the sender in the message reading pane."
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:312
-#: ../mail/em-folder-tree-model.c:720
-#: ../modules/mail/e-mail-shell-view-private.c:1066
-#: ../modules/mail/e-mail-shell-view-private.c:1077
-msgid "Inbox"
-msgstr "Inbox"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:81
+msgid "Search for the sender photo in local address books"
+msgstr "Search for the sender photo in local address books"
 
-#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:713
-#: ../modules/mail/e-mail-shell-view-private.c:1064
-msgid "Drafts"
-msgstr "Drafts"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "This option would help in improving the speed of fetching."
+msgstr "This option would help in improving the speed of fetching."
 
-#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:724
-#: ../modules/mail/e-mail-shell-view-private.c:1068
-msgid "Outbox"
-msgstr "Outbox"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:83
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "List of MIME types to check for Bonobo component viewers"
 
-#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:728
-#: ../modules/mail/e-mail-shell-view-private.c:1070
-msgid "Sent"
-msgstr "Sent"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:84
+msgid ""
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
+msgstr ""
+"If there isn't a built-in viewer for a particular MIME type inside "
+"Evolution, any MIME types appearing in this list which map to a Bonobo "
+"component viewer in GNOME's MIME type database may be used for displaying "
+"content."
 
-#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:716
-#: ../modules/mail/e-mail-shell-view-private.c:1072
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:1034 ../plugins/templates/templates.c:1312
-#: ../plugins/templates/templates.c:1322
-msgid "Templates"
-msgstr "Templates"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid "Mark as Seen after specified timeout"
+msgstr "Mark as Seen after specified timeout"
 
-#: ../mail/e-mail-migrate.c:134
-msgid "Migrating..."
-msgstr "Migratingâ"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:86
+msgid "Mark as Seen after specified timeout."
+msgstr "Mark as Seen after specified timeout."
 
-#: ../mail/e-mail-migrate.c:169
-msgid "Migration"
-msgstr "Migration"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid "Timeout for marking messages as seen"
+msgstr "Timeout for marking messages as seen"
 
-#: ../mail/e-mail-migrate.c:210
-#, c-format
-msgid "Migrating '%s':"
-msgstr "Migrating '%s':"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid "Timeout in milliseconds for marking messages as seen."
+msgstr "Timeout in milliseconds for marking messages as seen."
 
-#: ../mail/e-mail-migrate.c:728
-msgid "Migrating Folders"
-msgstr "Migrating Folders"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid "Sender email-address column in the message list"
+msgstr "Sender e-mail address column in the message list"
 
-#: ../mail/e-mail-migrate.c:729
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
+"Show the email-address of the sender in a separate column in the message "
+"list."
 msgstr ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your foldersâ"
+"Show the e-mail address of the sender in a separate column in the message "
+"list."
 
-#: ../mail/e-mail-migrate.c:1527
-#, c-format
-msgid "Unable to create local mail folders at '%s': %s"
-msgstr "Unable to create local mail folders at '%s': %s"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+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"
 
-#: ../mail/e-mail-notebook-view.c:621
-msgid "Please select a folder"
-msgstr "Please select a folder"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:89
+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."
 
-#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "Copy to Folder"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:92
+msgid "Show deleted messages in the message-list"
+msgstr "Show deleted messages in the message-list"
 
-#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:487
-msgid "C_opy"
-msgstr "C_opy"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr "Show deleted messages (with a strike-through) in the message-list."
 
-#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
-msgid "Move to Folder"
-msgstr "Move to Folder"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
+msgid "Enable local folders"
+msgstr "Enable local folders"
 
-#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:487
-msgid "_Move"
-msgstr "_Move"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+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"
 
-#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
-#: ../mail/e-mail-reader.c:1403
-msgid "_Do not ask me again."
-msgstr "_Do not ask me again."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid "Enable search folders"
+msgstr "Enable search folders"
 
-#: ../mail/e-mail-reader.c:1409
-msgid "_Always ignore Reply-To: for mailing lists."
-msgstr "_Always ignore Reply-To: for mailing lists."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:95
+msgid "Enable search folders on startup."
+msgstr "Enable search folders on startup."
 
-#: ../mail/e-mail-reader.c:1775
-msgid "A_dd Sender to Address Book"
-msgstr "A_dd Sender to Address Book"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:98
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "Hides the per-folder preview and removes the selection"
 
-#: ../mail/e-mail-reader.c:1777
-msgid "Add sender to address book"
-msgstr "Add sender to address book"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:99
+msgid ""
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
+msgstr ""
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
 
-#: ../mail/e-mail-reader.c:1782
-msgid "Check for _Junk"
-msgstr "Check for _Junk"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid "Height of the message-list pane"
+msgstr "Height of the message-list pane"
 
-#: ../mail/e-mail-reader.c:1784
-msgid "Filter the selected messages for junk status"
-msgstr "Filter the selected messages for junk status"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:101
+msgid "Height of the message-list pane."
+msgstr "Height of the message-list pane."
 
-#: ../mail/e-mail-reader.c:1789
-msgid "_Copy to Folder..."
-msgstr "_Copy to Folderâ"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "State of message headers in paned view"
+msgstr "State of message headers in paned view"
 
-#: ../mail/e-mail-reader.c:1791
-msgid "Copy selected messages to another folder"
-msgstr "Copy selected messages to another folder"
+#: ../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"
 
-#: ../mail/e-mail-reader.c:1796
-msgid "_Delete Message"
-msgstr "_Delete Message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Width of the message-list pane"
+msgstr "Width of the message-list pane"
 
-#: ../mail/e-mail-reader.c:1798
-msgid "Mark the selected messages for deletion"
-msgstr "Mark the selected messages for deletion"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Width of the message-list pane."
+msgstr "Width of the message-list pane."
 
-#: ../mail/e-mail-reader.c:1803
-msgid "Filter on Mailing _List..."
-msgstr "Filter on Mailing _Listâ"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Layout style"
+msgstr "Layout style"
 
-#: ../mail/e-mail-reader.c:1805
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "Create a rule to filter messages to this mailing list"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:105
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
 
-#: ../mail/e-mail-reader.c:1810
-msgid "Filter on _Recipients..."
-msgstr "Filter on _Recipientsâ"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:106
+msgid "Variable width font"
+msgstr "Variable width font"
 
-#: ../mail/e-mail-reader.c:1812
-msgid "Create a rule to filter messages to these recipients"
-msgstr "Create a rule to filter messages to these recipients"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:107
+msgid "The variable width font for mail display."
+msgstr "The variable width font for mail display."
 
-#: ../mail/e-mail-reader.c:1817
-msgid "Filter on Se_nder..."
-msgstr "Filter on Se_nderâ"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:108
+msgid "Terminal font"
+msgstr "Terminal font"
 
-#: ../mail/e-mail-reader.c:1819
-msgid "Create a rule to filter messages from this sender"
-msgstr "Create a rule to filter messages from this sender"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:109
+msgid "The terminal font for mail display."
+msgstr "The terminal font for mail display."
 
-#: ../mail/e-mail-reader.c:1824
-msgid "Filter on _Subject..."
-msgstr "Filter on _Subjectâ"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "Use custom fonts"
+msgstr "Use custom fonts"
 
-#: ../mail/e-mail-reader.c:1826
-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:1831
-msgid "A_pply Filters"
-msgstr "A_pply Filters"
-
-#: ../mail/e-mail-reader.c:1833
-msgid "Apply filter rules to the selected messages"
-msgstr "Apply filter rules to the selected messages"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:111
+msgid "Use custom fonts for displaying mail."
+msgstr "Use custom fonts for displaying mail."
 
-#: ../mail/e-mail-reader.c:1838
-msgid "_Find in Message..."
-msgstr "_Find in Messageâ"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr "Compress display of addresses in To/Cc/Bcc"
 
-#: ../mail/e-mail-reader.c:1840
-msgid "Search for text in the body of the displayed message"
-msgstr "Search for text in the body of the displayed message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+"Compress display of addresses in To/Cc/Bcc to the number specified in "
+"address_count."
 
-#: ../mail/e-mail-reader.c:1845
-msgid "_Clear Flag"
-msgstr "_Clear Flag"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Display only message texts not exceeding certain size"
+msgstr "Display only message texts not exceeding certain size"
 
-#: ../mail/e-mail-reader.c:1847
-msgid "Remove the follow-up flag from the selected messages"
-msgstr "Remove the follow-up flag from the selected messages"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
+"Enable display only of message texts not exceeding size defined in "
+"'message_text_part_limit' key."
 
-#: ../mail/e-mail-reader.c:1852
-msgid "_Flag Completed"
-msgstr "_Flag Completed"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid "Message text limit for display"
+msgstr "Message text limit for display"
 
-#: ../mail/e-mail-reader.c:1854
-msgid "Set the follow-up flag to completed on the selected messages"
-msgstr "Set the follow-up flag to completed on the selected messages"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid ""
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
+msgstr ""
+"This decides the maximum size of the message text that will be displayed "
+"under Evolution, specified in terms of KB. The default is 4096 (4MB). This "
+"value is used only when the 'force_message_limit' key is activated."
 
-#: ../mail/e-mail-reader.c:1859
-msgid "Follow _Up..."
-msgstr "Follow _Upâ"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr "Number of addresses to display in To/Cc/Bcc"
 
-#: ../mail/e-mail-reader.c:1861
-msgid "Flag the selected messages for follow-up"
-msgstr "Flag the selected messages for follow-up"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:119
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a 'â' is shown."
 
-#: ../mail/e-mail-reader.c:1866
-msgid "_Attached"
-msgstr "_Attached"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:120
+msgid "Thread the message-list based on Subject"
+msgstr "Thread the message-list based on Subject"
 
-#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
-msgid "Forward the selected message to someone as an attachment"
-msgstr "Forward the selected message to someone as an attachment"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:121
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+"Whether to fall back on threading by subjects when the messages do not "
+"contain In-Reply-To or References headers."
 
-#: ../mail/e-mail-reader.c:1873
-msgid "Forward As _Attached"
-msgstr "Forward As _Attached"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "Default value for thread expand state"
+msgstr "Default value for thread expand state"
 
-#: ../mail/e-mail-reader.c:1880
-msgid "_Inline"
-msgstr "_Inline"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
 
-#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
-msgid "Forward the selected message in the body of a new message"
-msgstr "Forward the selected message in the body of a new message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Whether sort threads based on latest message in that thread"
+msgstr "Whether sort threads based on latest message in that thread"
 
-#: ../mail/e-mail-reader.c:1887
-msgid "Forward As _Inline"
-msgstr "Forward As _Inline"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message's date. Evolution requires a "
+"restart."
+msgstr ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message's date. Evolution requires a "
+"restart."
 
-#: ../mail/e-mail-reader.c:1894
-msgid "_Quoted"
-msgstr "_Quoted"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Sort accounts alphabetically in a folder tree"
+msgstr "Sort accounts alphabetically in a folder tree"
 
-#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
-msgid "Forward the selected message quoted like a reply"
-msgstr "Forward the selected message quoted like a reply"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+msgid ""
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
+"true accounts are sorted alphabetically, with an exception of On This "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user"
+msgstr ""
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
+"true accounts are sorted alphabetically, with an exception of On This "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user"
 
-#: ../mail/e-mail-reader.c:1901
-msgid "Forward As _Quoted"
-msgstr "Forward As _Quoted"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid "Log filter actions"
+msgstr "Log filter actions"
 
-#: ../mail/e-mail-reader.c:1908
-msgid "_Load Images"
-msgstr "_Load Images"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid "Log filter actions to the specified log file."
+msgstr "Log filter actions to the specified log file."
 
-#: ../mail/e-mail-reader.c:1910
-msgid "Force images in HTML mail to be loaded"
-msgstr "Force images in HTML mail to be loaded"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:144
+msgid "Logfile to log filter actions"
+msgstr "Logfile to log filter actions"
 
-#: ../mail/e-mail-reader.c:1915
-msgid "_Important"
-msgstr "_Important"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid "Logfile to log filter actions."
+msgstr "Logfile to log filter actions."
 
-#: ../mail/e-mail-reader.c:1917
-msgid "Mark the selected messages as important"
-msgstr "Mark the selected messages as important"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:146
+msgid "Flush Outbox after filtering"
+msgstr "Flush Outbox after filtering"
 
-#: ../mail/e-mail-reader.c:1922
-msgid "_Junk"
-msgstr "_Junk"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:147
+msgid ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any 'Forward to' filter action and approximately "
+"one minute after the last action invocation."
+msgstr ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when a 'Forward to' filter action is used and approximately one minute "
+"after the last action invocation."
 
-#: ../mail/e-mail-reader.c:1924
-msgid "Mark the selected messages as junk"
-msgstr "Mark the selected messages as junk"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:148
+msgid "Default forward style"
+msgstr "Default forward style"
 
-#: ../mail/e-mail-reader.c:1929
-msgid "_Not Junk"
-msgstr "_Not Junk"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/e-mail-reader.c:1931
-msgid "Mark the selected messages as not being junk"
-msgstr "Mark the selected messages as not being junk"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Prompt on empty subject"
+msgstr "Prompt on empty subject"
 
-#: ../mail/e-mail-reader.c:1936
-msgid "_Read"
-msgstr "_Read"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:152
+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."
 
-#: ../mail/e-mail-reader.c:1938
-msgid "Mark the selected messages as having been read"
-msgstr "Mark the selected messages as having been read"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+msgid "Prompt when emptying the trash"
+msgstr "Prompt when emptying the wastebasket"
 
-#: ../mail/e-mail-reader.c:1943
-msgid "Uni_mportant"
-msgstr "Uni_mportant"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+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."
 
-#: ../mail/e-mail-reader.c:1945
-msgid "Mark the selected messages as unimportant"
-msgstr "Mark the selected messages as unimportant"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid "Prompt when user expunges"
+msgstr "Prompt when user expunges"
 
-#: ../mail/e-mail-reader.c:1950
-msgid "_Unread"
-msgstr "_Unread"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:154
+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."
 
-#: ../mail/e-mail-reader.c:1952
-msgid "Mark the selected messages as not having been read"
-msgstr "Mark the selected messages as not having been read"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr "Prompt before sending to recipients not entered as mail addresses"
 
-#: ../mail/e-mail-reader.c:1957
-msgid "_Edit as New Message..."
-msgstr "_Edit as New Messageâ"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:174
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
+msgstr ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
 
-#: ../mail/e-mail-reader.c:1959
-msgid "Open the selected messages in the composer for editing"
-msgstr "Open the selected messages in the composer for editing"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:155
+msgid "Prompt when user only fills Bcc"
+msgstr "Prompt when user only fills Bcc"
 
-#: ../mail/e-mail-reader.c:1964
-msgid "Compose _New Message"
-msgstr "Compose _New Message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:156
+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."
 
-#: ../mail/e-mail-reader.c:1966
-msgid "Open a window for composing a mail message"
-msgstr "Open a window for composing a mail message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr "Prompt when user tries to send unwanted HTML"
 
-#: ../mail/e-mail-reader.c:1971
-msgid "_Open in New Window"
-msgstr "_Open in New Window"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
 
-#: ../mail/e-mail-reader.c:1973
-msgid "Open the selected messages in a new window"
-msgstr "Open the selected messages in a new window"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:159
+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"
 
-#: ../mail/e-mail-reader.c:1978
-msgid "_Move to Folder..."
-msgstr "_Move to Folderâ"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
 
-#: ../mail/e-mail-reader.c:1980
-msgid "Move selected messages to another folder"
-msgstr "Move selected messages to another folder"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:161
+msgid "Prompt while marking multiple messages"
+msgstr "Prompt while marking multiple messages"
 
-#: ../mail/e-mail-reader.c:1985
-msgid "_Switch to Folder"
-msgstr "_Switch to Folder"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "Enable or disable the prompt whilst marking multiple messages."
 
-#: ../mail/e-mail-reader.c:1987
-msgid "Display the parent folder"
-msgstr "Display the parent folder"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:163
+msgid "Prompt when deleting messages in search folder"
+msgstr "Prompt when deleting messages in search folder"
 
-#: ../mail/e-mail-reader.c:1992
-msgid "Switch to _next tab"
-msgstr "Switch to _next tab"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:164
+msgid ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
+msgstr ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
 
-#: ../mail/e-mail-reader.c:1994
-msgid "Switch to the next tab"
-msgstr "Switch to the next tab"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:165
+msgid "Prompt when replying privately to list messages"
+msgstr "Prompt when replying privately to list messages"
 
-#: ../mail/e-mail-reader.c:1999
-msgid "Switch to _previous tab"
-msgstr "Switch to _previous tab"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:166
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+msgstr ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
 
-#: ../mail/e-mail-reader.c:2001
-msgid "Switch to the previous tab"
-msgstr "Switch to the previous tab"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:167
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "Prompt when mailing list hijacks private replies"
 
-#: ../mail/e-mail-reader.c:2006
-msgid "Cl_ose current tab"
-msgstr "Cl_ose current tab"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:168
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying sending "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list."
 
-#: ../mail/e-mail-reader.c:2008
-msgid "Close current tab"
-msgstr "Close current tab"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:169
+msgid "Prompt when replying to many recipients"
+msgstr "Prompt when replying to many recipients"
 
-#: ../mail/e-mail-reader.c:2013
-msgid "_Next Message"
-msgstr "_Next Message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:170
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
 
-#: ../mail/e-mail-reader.c:2015
-msgid "Display the next message"
-msgstr "Display the next message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:171
+msgid ""
+"Asks whether to close the message window when the user forwards or replies "
+"to the message shown in the window"
+msgstr ""
+"Asks whether to close the message window when the user forwards or replies "
+"to the message shown in the window"
 
-#: ../mail/e-mail-reader.c:2020
-msgid "Next _Important Message"
-msgstr "Next _Important Message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+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."
 
-#: ../mail/e-mail-reader.c:2022
-msgid "Display the next important message"
-msgstr "Display the next important message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:175
+msgid "Empty Trash folders on exit"
+msgstr "Empty Wastebasket folders on exit"
 
-#: ../mail/e-mail-reader.c:2027
-msgid "Next _Thread"
-msgstr "Next _Thread"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Empty all Wastebasket folders when exiting Evolution."
 
-#: ../mail/e-mail-reader.c:2029
-msgid "Display the next thread"
-msgstr "Display the next thread"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:177
+msgid "Minimum days between emptying the trash on exit"
+msgstr "Minimum number of days between emptying the wastebasket on exit"
 
-#: ../mail/e-mail-reader.c:2034
-msgid "Next _Unread Message"
-msgstr "Next _Unread Message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr "Minimum time between emptying the wastebasket on exit, in days."
 
-#: ../mail/e-mail-reader.c:2036
-msgid "Display the next unread message"
-msgstr "Display the next unread message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid "Last time Empty Trash was run"
+msgstr "Last time Empty Wastebasket was run"
 
-#: ../mail/e-mail-reader.c:2041
-msgid "_Previous Message"
-msgstr "_Previous Message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:180
+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)."
 
-#: ../mail/e-mail-reader.c:2043
-msgid "Display the previous message"
-msgstr "Display the previous message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:181
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+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."
 
-#: ../mail/e-mail-reader.c:2048
-msgid "Pr_evious Important Message"
-msgstr "Pr_evious Important Message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:182
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+msgid "Level beyond which the message should be logged."
+msgstr "Level beyond which the message should be logged."
 
-#: ../mail/e-mail-reader.c:2050
-msgid "Display the previous important message"
-msgstr "Display the previous important message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 
-#: ../mail/e-mail-reader.c:2055
-msgid "Previous T_hread"
-msgstr "Previous T_hread"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Show original \"Date\" header value."
+msgstr "Show original \"Date\" header value."
 
-#: ../mail/e-mail-reader.c:2057
-msgid "Display the previous thread"
-msgstr "Display the previous thread"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:185
+msgid ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
+msgstr ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
 
-#: ../mail/e-mail-reader.c:2062
-msgid "P_revious Unread Message"
-msgstr "P_revious Unread Message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:186
+msgid "List of Labels and their associated colors"
+msgstr "List of Labels and their associated colours"
 
-#: ../mail/e-mail-reader.c:2064
-msgid "Display the previous unread message"
-msgstr "Display the previous unread message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:187
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
+msgstr ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
 
-#: ../mail/e-mail-reader.c:2071
-msgid "Print this message"
-msgstr "Print this message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:188
+msgid "Check incoming mail being junk"
+msgstr "Check incoming mail being junk"
 
-#: ../mail/e-mail-reader.c:2078
-msgid "Preview the message to be printed"
-msgstr "Preview the message to be printed"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:189
+msgid "Run junk test on incoming mail."
+msgstr "Run junk test on incoming mail."
 
-#: ../mail/e-mail-reader.c:2083
-msgid "Re_direct"
-msgstr "Re_direct"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:190
+msgid "Empty Junk folders on exit"
+msgstr "Empty Junk folders on exit"
 
-#: ../mail/e-mail-reader.c:2085
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "Redirect (bounce) the selected message to someone"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:191
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "Empty all Junk folders when exiting Evolution."
 
-#: ../mail/e-mail-reader.c:2090
-msgid "Remo_ve Attachments"
-msgstr "Remo_ve Attachments"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "Minimum days between emptying the junk on exit"
+msgstr "Minimum days between emptying the junk on exit"
 
-#: ../mail/e-mail-reader.c:2092
-msgid "Remove attachments"
-msgstr "Remove attachments"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:193
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr "Minimum time between emptying the junk on exit, in days."
 
-#: ../mail/e-mail-reader.c:2097
-msgid "Remove Du_plicate Messages"
-msgstr "Remove Du_plicate Messages"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:194
+msgid "Last time Empty Junk was run"
+msgstr "Last time Empty Junk was run"
 
-#: ../mail/e-mail-reader.c:2099
-msgid "Checks selected messages for duplicates"
-msgstr "Checks selected messages for duplicates"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:195
+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)."
 
-#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
-#: ../modules/mail/e-mail-attachment-handler.c:177
-msgid "Reply to _All"
-msgstr "Reply to _All"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:196
+msgid "The default plugin for Junk hook"
+msgstr "The default plugin for Junk hook"
 
-#: ../mail/e-mail-reader.c:2106
-msgid "Compose a reply to all the recipients of the selected message"
-msgstr "Compose a reply to all the recipients of the selected message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:197
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won't fall back "
+"to the other available plugins."
+msgstr ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won't fall back "
+"to the other available plugins."
 
-#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
-msgid "Reply to _List"
-msgstr "Reply to _List"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:198
+msgid "Determines whether to lookup in address book for sender email"
+msgstr "Determines whether to look up in address book for sender e-mail"
 
-#: ../mail/e-mail-reader.c:2113
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Compose a reply to the mailing list of the selected message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:199
+msgid ""
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
+msgstr ""
+"Determines whether to look up the sender e-mail in the address book. If "
+"found, it shouldn't be a spam. It looks up in the books marked for "
+"autocompletion. It can be slow, if remote address books (like LDAP) are "
+"marked for autocompletion."
 
-#: ../mail/e-mail-reader.c:2118
-#: ../modules/mail/e-mail-attachment-handler.c:184
-msgid "_Reply to Sender"
-msgstr "_Reply to Sender"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:200
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 
-#: ../mail/e-mail-reader.c:2120
-msgid "Compose a reply to the sender of the selected message"
-msgstr "Compose a reply to the sender of the selected message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:201
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local address book only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local address book only to exclude "
+"mail sent by known contacts from junk filtering."
 
-#: ../mail/e-mail-reader.c:2125
-msgid "_Save as mbox..."
-msgstr "_Save as mboxâ"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:202
+msgid "Determines whether to use custom headers to check for junk"
+msgstr "Determines whether to use custom headers to check for junk"
 
-#: ../mail/e-mail-reader.c:2127
-msgid "Save selected messages as an mbox file"
-msgstr "Save selected messages as an mbox file"
-
-#: ../mail/e-mail-reader.c:2132
-msgid "_Message Source"
-msgstr "_Message Source"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:203
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
+msgstr ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
 
-#: ../mail/e-mail-reader.c:2134
-msgid "Show the raw email source of the message"
-msgstr "Show the raw e-mail source of the message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:204
+msgid "Custom headers to use while checking for junk."
+msgstr "Custom headers to use while checking for junk."
 
-#: ../mail/e-mail-reader.c:2146
-msgid "_Undelete Message"
-msgstr "_Undelete Message"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:205
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"Custom headers to use while checking for junk. The list elements are strings "
+"in the format \"headername=value\"."
 
-#: ../mail/e-mail-reader.c:2148
-msgid "Undelete the selected messages"
-msgstr "Undelete the selected messages"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:206
+msgid "UID string of the default account."
+msgstr "UID string of the default account."
 
-#: ../mail/e-mail-reader.c:2153
-msgid "_Normal Size"
-msgstr "_Normal Size"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:211
+msgid "Save directory"
+msgstr "Save directory"
 
-#: ../mail/e-mail-reader.c:2155
-msgid "Reset the text to its original size"
-msgstr "Reset the text to its original size"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:212
+msgid "Directory for saving mail component files."
+msgstr "Directory for saving mail component files."
 
-#: ../mail/e-mail-reader.c:2160
-msgid "_Zoom In"
-msgstr "_Zoom In"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+msgid "Composer load/attach directory"
+msgstr "Composer load/attach directory"
 
-#: ../mail/e-mail-reader.c:2162
-msgid "Increase the text size"
-msgstr "Increase the text size"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+msgid "Directory for loading/attaching files to composer."
+msgstr "Directory for loading/attaching files to composer."
 
-#: ../mail/e-mail-reader.c:2167
-msgid "Zoom _Out"
-msgstr "Zoom _Out"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:219
+msgid "Check for new messages on start"
+msgstr "Check for new messages on start"
 
-#: ../mail/e-mail-reader.c:2169
-msgid "Decrease the text size"
-msgstr "Decrease the text size"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+msgid ""
+"Whether to check for new messages when Evolution is started. This includes "
+"also sending messages from Outbox."
+msgstr ""
+"Whether to check for new messages when Evolution is started. This includes "
+"also sending messages from Outbox."
 
-#: ../mail/e-mail-reader.c:2176
-msgid "Create R_ule"
-msgstr "Create R_ule"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:221
+msgid "Check for new messages in all active accounts"
+msgstr "Check for new messages in all active accounts"
 
-#: ../mail/e-mail-reader.c:2183
-msgid "Ch_aracter Encoding"
-msgstr "Ch_aracter Encoding"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+msgid ""
+"Whether to check for new messages in all active accounts regardless of the "
+"account \"Check for new messages every X minutes\" option when Evolution is "
+"started. This option is used only together with 'send_recv_on_start' option."
+msgstr ""
+"Whether to check for new messages in all active accounts regardless of the "
+"account \"Check for new messages every X minutes\" option when Evolution is "
+"started. This option is used only together with 'send_recv_on_start' option."
 
-#: ../mail/e-mail-reader.c:2190
-msgid "F_orward As"
-msgstr "F_orward As"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:239
+msgid "Server synchronization interval"
+msgstr "Server synchronisation interval"
 
-#: ../mail/e-mail-reader.c:2197
-msgid "_Group Reply"
-msgstr "_Group Reply"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:240
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"Controls how frequently local changes are synchronised with the remote mail "
+"server. The interval must be at least 30 seconds."
 
-#: ../mail/e-mail-reader.c:2204
-msgid "_Go To"
-msgstr "_Go To"
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:1
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
 
-#: ../mail/e-mail-reader.c:2211
-msgid "Mar_k As"
-msgstr "Mar_k As"
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:2
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
 
-#: ../mail/e-mail-reader.c:2218
-msgid "_Message"
-msgstr "_Message"
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:1
+msgid "Address book source"
+msgstr "Address book source"
 
-#: ../mail/e-mail-reader.c:2225
-msgid "_Zoom"
-msgstr "_Zoom"
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
+msgid "Address book to use for storing automatically synced contacts"
+msgstr "Address book to use for storing automatically synced contacts"
 
-#: ../mail/e-mail-reader.c:2235
-msgid "Search Folder from Mailing _List..."
-msgstr "Search Folder from Mailing _Listâ"
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
+msgid "Auto sync GAIM contacts"
+msgstr "Auto sync GAIM contacts"
 
-#: ../mail/e-mail-reader.c:2237
-msgid "Create a search folder for this mailing list"
-msgstr "Create a search folder for this mailing list"
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
+msgid "Whether GAIM contacts should be automaticall synced"
+msgstr "Whether GAIM contacts should be automatically synced"
 
-#: ../mail/e-mail-reader.c:2242
-msgid "Search Folder from Recipien_ts..."
-msgstr "Search Folder from Recipien_tsâ"
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
+msgid "Enable autocontacts"
+msgstr "Enable autocontacts"
 
-#: ../mail/e-mail-reader.c:2244
-msgid "Create a search folder for these recipients"
-msgstr "Create a search folder for these recipients"
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
+msgid ""
+"Whether contacts should be automatically added to the user's addressbook"
+msgstr ""
+"Whether contacts should be automatically added to the user's addressbook"
 
-#: ../mail/e-mail-reader.c:2249
-msgid "Search Folder from Sen_der..."
-msgstr "Search Folder from Sen_derâ"
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
+msgid "GAIM address book source"
+msgstr "GAIM address book source"
 
-#: ../mail/e-mail-reader.c:2251
-msgid "Create a search folder for this sender"
-msgstr "Create a search folder for this sender"
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
+msgid "Address book to use for storing automatically synced contacts from GAIM"
+msgstr "Address book to use for storing automatically synced contacts from GAIM"
 
-#: ../mail/e-mail-reader.c:2256
-msgid "Search Folder from S_ubject..."
-msgstr "Search Folder from S_ubjectâ"
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
+msgid "GAIM check interval"
+msgstr "GAIM check interval"
 
-#: ../mail/e-mail-reader.c:2258
-msgid "Create a search folder for this subject"
-msgstr "Create a search folder for this subject"
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
+msgid "Check interval for GAIM syncing of contacts"
+msgstr "Check interval for GAIM syncing of contacts"
 
-#: ../mail/e-mail-reader.c:2281
-msgid "Mark for Follo_w Up..."
-msgstr "Mark for Follo_w Upâ"
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
+msgid "GAIM last sync MD5"
+msgstr "GAIM last sync MD5"
 
-#: ../mail/e-mail-reader.c:2289
-msgid "Mark as _Important"
-msgstr "Mark as _Important"
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
+msgid "GAIM last sync time"
+msgstr "GAIM last sync time"
 
-#: ../mail/e-mail-reader.c:2293
-msgid "Mark as _Junk"
-msgstr "Mark as _Junk"
+#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "List of Custom Headers"
 
-#: ../mail/e-mail-reader.c:2297
-msgid "Mark as _Not Junk"
-msgstr "Mark as _Not Junk"
+#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
 
-#: ../mail/e-mail-reader.c:2301
-msgid "Mar_k as Read"
-msgstr "Mar_k as Read"
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "Default External Editor"
 
-#: ../mail/e-mail-reader.c:2305
-msgid "Mark as Uni_mportant"
-msgstr "Mark as Uni_mportant"
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr "The default command that must be used as the editor."
 
-#: ../mail/e-mail-reader.c:2309
-msgid "Mark as _Unread"
-msgstr "Mark as _Unread"
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
+#: ../plugins/external-editor/external-editor.c:125
+msgid "Automatically launch when a new mail is edited"
+msgstr "Automatically launch when a new mail is edited"
 
-#: ../mail/e-mail-reader.c:2353
-msgid "_Caret Mode"
-msgstr "_Caret Mode"
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
+msgid "Automatically launch editor when key is pressed in the mail composer."
+msgstr "Automatically launch editor when key is pressed in the mail composer."
 
-#: ../mail/e-mail-reader.c:2355
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Show a blinking cursor in the body of displayed messages"
+#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr "Insert Face picture by default"
 
-#: ../mail/e-mail-reader.c:2361
-msgid "All Message _Headers"
-msgstr "All Message _Headers"
+#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
 
-#: ../mail/e-mail-reader.c:2363
-msgid "Show messages with all email headers"
-msgstr "Show messages with all e-mail headers"
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
+msgid "Delete processed"
+msgstr "Delete processed"
 
-#: ../mail/e-mail-reader.c:2659
-#, c-format
-msgid "Retrieving message '%s'"
-msgstr "Retrieving message '%s'"
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:2
+msgid "Whether to delete processed iTip objects"
+msgstr "Whether to delete processed iTip objects"
 
-#. we changed user, thus reset the chosen calendar combo too, because
-#. * other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3246 ../mail/mail-config.ui.h:32
-#: ../plugins/google-account-setup/google-source.c:316
-#: ../plugins/google-account-setup/google-source.c:565
-#: ../plugins/google-account-setup/google-source.c:704
-#: ../widgets/misc/e-account-tree-view.c:253
-msgid "Default"
-msgstr "Default"
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Notify new messages for Inbox only."
+msgstr "Notify new messages for Inbox only."
 
-#: ../mail/e-mail-reader.c:3415
-#: ../modules/mail/e-mail-attachment-handler.c:170
-msgid "_Forward"
-msgstr "_Forward"
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr "Whether to notify new messages in Inbox folder only."
 
-#: ../mail/e-mail-reader.c:3416
-msgid "Forward the selected message to someone"
-msgstr "Forward the selected message to someone"
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:3
+msgid "Enable D-Bus messages."
+msgstr "Enable D-Bus messages."
 
-#: ../mail/e-mail-reader.c:3435
-msgid "Group Reply"
-msgstr "Group Reply"
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "Generates a D-Bus message when new mail messages arrive."
 
-#: ../mail/e-mail-reader.c:3436
-msgid "Reply to the mailing list, or to all recipients"
-msgstr "Reply to the mailing list, or to all recipients"
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Enable icon in notification area."
+msgstr "Enable icon in notification area."
 
-#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
-msgid "Delete"
-msgstr "Delete"
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr "Show new mail icon in notification area when new messages arrive."
 
-#: ../mail/e-mail-reader.c:3522
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
-#: ../widgets/misc/e-calendar.c:202
-msgid "Next"
-msgstr "Next"
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:7
+msgid "Popup message together with the icon."
+msgstr "Popup message together with the icon."
 
-#: ../mail/e-mail-reader.c:3526
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
-#: ../widgets/misc/e-calendar.c:178
-msgid "Previous"
-msgstr "Previous"
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:8
+msgid "Whether show message over the icon when new messages arrive."
+msgstr "Whether show message over the icon when new messages arrive."
 
-#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
-msgid "Reply"
-msgstr "Reply"
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Play sound when new messages arrive."
+msgstr "Play sound when new messages arrive."
 
-#: ../mail/e-mail-reader.c:4205
-#, c-format
-msgid "Folder '%s'"
-msgstr "Folder '%s'"
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid "Whether play sound or beep when new messages arrive."
+msgstr "Whether play sound or beep when new messages arrive."
 
-#: ../mail/e-mail-reader-utils.c:145
-msgid "Do not warn me again"
-msgstr "Do not warn me again"
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Beep or play sound file."
+msgstr "Beep or play sound file."
 
-#. Translators: %s is replaced with a folder
-#. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:670
-#, c-format
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid ""
-"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
-"it?"
-msgid_plural ""
-"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
-"them?"
-msgstr[0] ""
-"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
-"it?"
-msgstr[1] ""
-"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
-"them?"
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 
-#: ../mail/e-mail-reader-utils.c:1047
-msgid "Save Message"
-msgid_plural "Save Messages"
-msgstr[0] "Save Message"
-msgstr[1] "Save Messages"
-
-#. Translators: This is part of a suggested file name
-#. * used when saving a message or multiple messages to
-#. * 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:1068
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "Message"
-msgstr[1] "Messages"
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Sound filename to be played."
+msgstr "Sound filename to be played."
 
-#: ../mail/e-mail-session.c:870
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Enter Passphrase for %s"
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr "Sound file to be played when new messages arrive, if not in beep mode."
 
-#: ../mail/e-mail-session.c:874
-msgid "Enter Passphrase"
-msgstr "Enter Passphrase"
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
+msgid "FIXME"
+msgstr "FIXME"
 
-#: ../mail/e-mail-session.c:878
-#, c-format
-msgid "Enter Password for %s"
-msgstr "Enter Password for %s"
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Use sound theme"
+msgstr "Use sound theme"
 
-#: ../mail/e-mail-session.c:882
-msgid "Enter Password"
-msgstr "Enter Password"
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr "Play themed sound when new messages arrive, if not in beep mode."
 
-#: ../mail/e-mail-session.c:933
-#, c-format
-msgid "User canceled operation."
-msgstr "User cancelled operation."
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
+msgid "Mode to use when displaying mails"
+msgstr "Mode to use when displaying mails"
 
-#: ../mail/e-mail-session.c:1046
-#, c-format
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
 msgid ""
-"No destination address provided, forward of the message has been cancelled."
+"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"
 msgstr ""
-"No destination address provided; forward of the message has been cancelled."
+"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"
 
-#: ../mail/e-mail-session.c:1055
-#, c-format
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "No account found to use; forward of the message has been cancelled."
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
+msgid "Whether to show suppressed HTML output"
+msgstr "Whether to show suppressed HTML output"
 
-#: ../mail/e-mail-session-utils.c:419
-#, c-format
-msgid "Cannot get transport for account '%s'"
-msgstr "Cannot get transport for account '%s'"
+#: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
 
-#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:634
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Failed to apply outgoing filters: %s"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
+#: ../shell/apps_evolution_shell.schemas.in.h:5
+msgid "Skip development warning dialog"
+msgstr "Skip development warning dialogue"
 
-#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
-#: ../mail/mail-ops.c:653 ../mail/mail-ops.c:687
-#, c-format
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
+"Whether the warning dialogue in development versions of Evolution is skipped."
 
-#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:707
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "Failed to append to local 'Sent' folder: %s"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:7
+msgid "Initial attachment view"
+msgstr "Initial attachment view"
 
-#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:810
-#: ../mail/mail-ops.c:906
-msgid "Sending message"
-msgstr "Sending message"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
 
-#: ../mail/e-mail-session-utils.c:873
-#, c-format
-msgid "Unsubscribing from folder '%s'"
-msgstr "Unsubscribing from folder '%s'"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
+msgid "Initial file chooser folder"
+msgstr "Initial file chooser folder"
 
-#: ../mail/e-mail-store-utils.c:168
-#, c-format
-msgid "Disconnecting from '%s'"
-msgstr "Disconnecting from '%s'"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "Initial folder for GtkFileChooser dialogues."
 
-#: ../mail/e-mail-store-utils.c:259
-#, c-format
-msgid "Reconnecting to '%s'"
-msgstr "Reconnecting to '%s'"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:9 ../shell/main.c:316
+msgid "Start in offline mode"
+msgstr "Start in offline mode"
 
-#: ../mail/e-mail-store-utils.c:334
-#, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "Preparing account '%s' for offline"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr ""
+"Whether Evolution will start up in offline mode instead of online mode."
 
-#: ../mail/e-mail-tag-editor.c:291
-msgid "Flag to Follow Up"
-msgstr "Flag to Follow Up"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
+msgid "Offline folder paths"
+msgstr "Offline folder paths"
 
-#. 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:1197
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
 msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
+"List of paths for the folders to be synchronized to disk for offline usage."
 msgstr ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
+"List of paths for the folders to be synchronised to disk for offline usage."
 
-#: ../mail/em-composer-utils.c:1208
-msgid "-----Original Message-----"
-msgstr "-----Original Message-----"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:61
+msgid "Enable express mode"
+msgstr "Enable express mode"
 
-#. Translators: First %s is an email address, second %s
-#. * is the subject of the email, third %s is the date.
-#: ../mail/em-composer-utils.c:1992
-#, 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."
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:62
+msgid "Flag that enables a much simplified user interface."
+msgstr "Flag that enables a much simplified user interface."
 
-#: ../mail/em-composer-utils.c:2052
-#, c-format
-msgid "Delivery Notification for: \"%s\""
-msgstr "Delivery Notification for: \"%s\""
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Window buttons are visible"
+msgstr "Window buttons are visible"
 
-#: ../mail/em-composer-utils.c:2592
-msgid "an unknown sender"
-msgstr "an unknown sender"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Whether the window buttons should be visible."
+msgstr "Whether the window buttons should be visible."
 
-#: ../mail/em-composer-utils.c:2998
-msgid "Posting destination"
-msgstr "Posting destination"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Window button style"
+msgstr "Window button style"
 
-#: ../mail/em-composer-utils.c:2999
-msgid "Choose folders to post the message to."
-msgstr "Choose folders to post the message to."
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+msgid ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
+"by the GNOME toolbar setting."
+msgstr ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
+"by the GNOME toolbar setting."
 
-#: ../mail/em-filter-folder-element.c:241
-msgid "Select Folder"
-msgstr "Select Folder"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:26
+msgid "Toolbar is visible"
+msgstr "Toolbar is visible"
 
-#. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Adjust Score"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+msgid "Whether the toolbar should be visible."
+msgstr "Whether the toolbar should be visible."
 
-#: ../mail/em-filter-i18n.h:3
-msgid "Assign Color"
-msgstr "Assign Colour"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid "Sidebar is visible"
+msgstr "Sidebar is visible"
 
-#: ../mail/em-filter-i18n.h:4
-msgid "Assign Score"
-msgstr "Assign Score"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:29
+msgid "Whether the sidebar should be visible."
+msgstr "Whether the sidebar should be visible."
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+msgid "Statusbar is visible"
+msgstr "Statusbar is visible"
 
-#: ../mail/em-filter-i18n.h:7
-msgid "Beep"
-msgstr "Beep"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:31
+msgid "Whether the status bar should be visible."
+msgstr "Whether the status bar should be visible."
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:32
+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."
 
-#: ../mail/em-filter-i18n.h:9
-msgid "Completed On"
-msgstr "Completed On"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:33
+msgid "Default sidebar width"
+msgstr "Default sidebar width"
 
-#: ../mail/em-filter-i18n.h:12
-msgid "Date received"
-msgstr "Date received"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+msgid "The default width for the sidebar, in pixels."
+msgstr "The default width for the sidebar, in pixels."
 
-#: ../mail/em-filter-i18n.h:13
-msgid "Date sent"
-msgstr "Date sent"
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use only local spam tests."
+msgstr "Use only local spam tests."
 
-#: ../mail/em-filter-i18n.h:15
-msgid "Deleted"
-msgstr "Deleted"
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use only the local spam tests (no DNS)."
+msgstr "Use only the local spam tests (no DNS)."
 
-#: ../mail/em-filter-i18n.h:17
-msgid "does not end with"
-msgstr "does not end with"
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
+msgid "Socket path for SpamAssassin"
+msgstr "Socket path for SpamAssassin"
 
-#: ../mail/em-filter-i18n.h:18
-msgid "does not exist"
-msgstr "does not exist"
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use SpamAssassin daemon and client"
+msgstr "Use SpamAssassin daemon and client"
 
-#: ../mail/em-filter-i18n.h:19
-msgid "does not return"
-msgstr "does not return"
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
 
-#: ../mail/em-filter-i18n.h:20
-msgid "does not sound like"
-msgstr "does not sound like"
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
+msgid "SpamAssassin client binary"
+msgstr "SpamAssassin client binary"
 
-#: ../mail/em-filter-i18n.h:21
-msgid "does not start with"
-msgstr "does not start with"
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:7
+msgid "SpamAssassin daemon binary"
+msgstr "SpamAssassin daemon binary"
 
-#: ../mail/em-filter-i18n.h:23
-msgid "Draft"
-msgstr "Draft"
+#: ../em-format/em-format.c:1063 ../em-format/em-format-quote.c:318
+#: ../mail/e-mail-tag-editor.c:327 ../mail/message-list.etspec.h:5
+#: ../modules/mail/em-mailer-prefs.c:70
+msgid "From"
+msgstr "From"
 
-#: ../mail/em-filter-i18n.h:24
-msgid "ends with"
-msgstr "ends with"
+#: ../em-format/em-format.c:1064 ../em-format/em-format-quote.c:318
+#: ../modules/mail/em-mailer-prefs.c:71
+msgid "Reply-To"
+msgstr "Reply-To"
 
-#: ../mail/em-filter-i18n.h:26
-msgid "exists"
-msgstr "exists"
+#: ../em-format/em-format.c:1066 ../em-format/em-format-quote.c:318
+#: ../mail/em-format-html.c:2667 ../mail/em-format-html.c:2735
+#: ../mail/em-format-html.c:2758 ../modules/mail/em-mailer-prefs.c:73
+msgid "Cc"
+msgstr "Cc"
 
-#: ../mail/em-filter-i18n.h:27
-msgid "Expression"
-msgstr "Expression"
+#: ../em-format/em-format.c:1067 ../em-format/em-format-quote.c:318
+#: ../mail/em-format-html.c:2668 ../mail/em-format-html.c:2739
+#: ../mail/em-format-html.c:2761 ../modules/mail/em-mailer-prefs.c:74
+msgid "Bcc"
+msgstr "Bcc"
 
-#: ../mail/em-filter-i18n.h:28
-msgid "Follow Up"
-msgstr "Follow Up"
+#: ../em-format/em-format.c:1068 ../em-format/em-format-quote.c:465
+#: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
+#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:75
+#: ../smime/lib/e-cert.c:1126
+msgid "Subject"
+msgstr "Subject"
 
-#: ../mail/em-filter-i18n.h:29
-msgid "Forward to"
-msgstr "Forward to"
+#: ../em-format/em-format.c:1069 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:526
+#: ../widgets/misc/e-dateedit.c:548
+msgid "Date"
+msgstr "Date"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "Important"
+#: ../em-format/em-format.c:1070 ../modules/mail/em-mailer-prefs.c:77
+msgid "Newsgroups"
+msgstr "Newsgroups"
 
-#: ../mail/em-filter-i18n.h:32
-msgid "is after"
-msgstr "is after"
+#: ../em-format/em-format.c:1071 ../modules/mail/em-mailer-prefs.c:78
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Face"
+msgstr "Face"
 
-#: ../mail/em-filter-i18n.h:33
-msgid "is before"
-msgstr "is before"
+#: ../em-format/em-format.c:1474
+#, c-format
+msgid "%s attachment"
+msgstr "%s attachment"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is Flagged"
-msgstr "is Flagged"
+#: ../em-format/em-format.c:1588
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Could not parse S/MIME message: Unknown error"
 
-#: ../mail/em-filter-i18n.h:38
-msgid "is not Flagged"
-msgstr "is not Flagged"
+#: ../em-format/em-format.c:1782 ../em-format/em-format.c:2010
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Could not parse MIME message. Displaying as source."
 
-#: ../mail/em-filter-i18n.h:39
-msgid "is not set"
-msgstr "is not set"
+#: ../em-format/em-format.c:1793
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: ../mail/em-filter-i18n.h:40
-msgid "is set"
-msgstr "is set"
+#: ../em-format/em-format.c:1813
+msgid "Could not parse PGP/MIME message"
+msgstr "Could not parse PGP/MIME message"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
-msgid "Junk"
-msgstr "Junk"
+#: ../em-format/em-format.c:1814
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "Could not parse PGP/MIME message: Unknown error"
 
-#: ../mail/em-filter-i18n.h:42
-msgid "Junk Test"
-msgstr "Junk Test"
+#: ../em-format/em-format.c:2035
+msgid "Unsupported signature format"
+msgstr "Unsupported signature format"
 
-#: ../mail/em-filter-i18n.h:43
-msgid "Label"
-msgstr "Label"
+#: ../em-format/em-format.c:2048 ../em-format/em-format.c:2230
+msgid "Error verifying signature"
+msgstr "Error verifying signature"
 
-#: ../mail/em-filter-i18n.h:44
-msgid "Mailing list"
-msgstr "Mailing list"
+#: ../em-format/em-format.c:2049 ../em-format/em-format.c:2215
+#: ../em-format/em-format.c:2231
+msgid "Unknown error verifying signature"
+msgstr "Unknown error verifying signature"
 
-#: ../mail/em-filter-i18n.h:45
-msgid "Match All"
-msgstr "Match All"
+#: ../em-format/em-format.c:2324
+msgid "Could not parse PGP message: "
+msgstr "Could not parse PGP message: "
 
-#: ../mail/em-filter-i18n.h:46
-msgid "Message Body"
-msgstr "Message Body"
+#. pseudo-header
+#: ../em-format/em-format-quote.c:476 ../mail/em-format-html.c:2860
+#: ../modules/mail/em-mailer-prefs.c:1046
+msgid "Mailer"
+msgstr "Mailer"
 
-#: ../mail/em-filter-i18n.h:47
-msgid "Message Header"
-msgstr "Message Header"
+#: ../em-format/em-format-quote.c:566 ../mail/em-composer-utils.c:1235
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Forwarded Message --------"
 
-#: ../mail/em-filter-i18n.h:48
-msgid "Message is Junk"
-msgstr "Message is Junk"
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:248
+#, c-format
+msgid "%s (cancelled)"
+msgstr "%s (cancelled)"
 
-#: ../mail/em-filter-i18n.h:49
-msgid "Message is not Junk"
-msgstr "Message is not Junk"
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:251
+#, c-format
+msgid "%s (completed)"
+msgstr "%s (completed)"
 
-#: ../mail/em-filter-i18n.h:50
-msgid "Message Location"
-msgstr "Message Location"
+#. Translators: This is an activity waiting to run.
+#: ../e-util/e-activity.c:254
+#, c-format
+msgid "%s (waiting)"
+msgstr "%s (waiting)"
 
-#: ../mail/em-filter-i18n.h:52
-msgid "Pipe to Program"
-msgstr "Pipe to Program"
+#. Translators: This is a running activity which
+#. *              the user has requested to cancel.
+#: ../e-util/e-activity.c:258
+#, c-format
+msgid "%s (cancelling)"
+msgstr "%s (cancelling)"
 
-#: ../mail/em-filter-i18n.h:53
-msgid "Play Sound"
-msgstr "Play Sound"
+#: ../e-util/e-activity.c:260
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
-msgid "Read"
-msgstr "Read"
+#: ../e-util/e-activity.c:265
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% complete)"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
-msgid "Recipients"
-msgstr "Recipients"
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "Arabic"
 
-#: ../mail/em-filter-i18n.h:56
-msgid "Regex Match"
-msgstr "Regex Match"
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "Baltic"
 
-#: ../mail/em-filter-i18n.h:57
-msgid "Replied to"
-msgstr "Replied to"
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "Central European"
 
-#: ../mail/em-filter-i18n.h:58
-msgid "returns"
-msgstr "returns"
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "Chinese"
 
-#: ../mail/em-filter-i18n.h:59
-msgid "returns greater than"
-msgstr "returns greater than"
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "Cyrillic"
 
-#: ../mail/em-filter-i18n.h:60
-msgid "returns less than"
-msgstr "returns less than"
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "Greek"
 
-#: ../mail/em-filter-i18n.h:61
-msgid "Run Program"
-msgstr "Run Program"
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "Hebrew"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
-msgid "Score"
-msgstr "Score"
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "Japanese"
 
-#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
-msgid "Sender"
-msgstr "Sender"
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "Korean"
 
-#: ../mail/em-filter-i18n.h:64
-msgid "Sender or Recipients"
-msgstr "Sender or Recipients"
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "Thai"
 
-#: ../mail/em-filter-i18n.h:65
-msgid "Set Label"
-msgstr "Set Label"
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "Turkish"
 
-#: ../mail/em-filter-i18n.h:66
-msgid "Set Status"
-msgstr "Set Status"
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "Unicode"
 
-#: ../mail/em-filter-i18n.h:67
-msgid "Size (kB)"
-msgstr "Size (kB)"
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "Western European"
 
-#: ../mail/em-filter-i18n.h:68
-msgid "sounds like"
-msgstr "sounds like"
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "Western European, New"
 
-#: ../mail/em-filter-i18n.h:69
-msgid "Source Account"
-msgstr "Source Account"
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
+msgid "Traditional"
+msgstr "Traditional"
 
-#: ../mail/em-filter-i18n.h:70
-msgid "Specific header"
-msgstr "Specific header"
+#. 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
+msgid "Simplified"
+msgstr "Simplified"
 
-#: ../mail/em-filter-i18n.h:71
-msgid "starts with"
-msgstr "starts with"
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
+msgid "Ukrainian"
+msgstr "Ukrainian"
 
-#: ../mail/em-filter-i18n.h:73
-msgid "Stop Processing"
-msgstr "Stop Processing"
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
+msgid "Visual"
+msgstr "Visual"
 
-#: ../mail/em-filter-i18n.h:75
-msgid "Unset Status"
-msgstr "Unset Status"
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:206
+#: ../modules/calendar/e-cal-shell-view-actions.c:1863
+#: ../plugins/itip-formatter/itip-view.c:194
+#: ../widgets/table/e-cell-date-edit.c:307
+msgid "Today"
+msgstr "Today"
 
-#. and now for the action area
-#: ../mail/em-filter-rule.c:561
-msgid "Then"
-msgstr "Then"
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:222
+msgid "Tomorrow"
+msgstr "Tomorrow"
 
-#: ../mail/em-filter-rule.c:592
-msgid "Add Ac_tion"
-msgstr "Add Ac_tion"
+#: ../e-util/e-datetime-format.c:219
+msgid "Yesterday"
+msgstr "Yesterday"
 
-#: ../mail/em-folder-properties.c:145
-msgid "Unread messages:"
-msgid_plural "Unread messages:"
-msgstr[0] "Unread messages:"
-msgstr[1] "Unread messages:"
+#. 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:227
+msgctxt "DateFmt"
+msgid "Next Mon"
+msgstr "Next Mon"
 
-#: ../mail/em-folder-properties.c:156
-msgid "Total messages:"
-msgid_plural "Total messages:"
-msgstr[0] "Total messages:"
-msgstr[1] "Total messages:"
-
-#: ../mail/em-folder-properties.c:177
-#, c-format
-msgid "Quota usage (%s):"
-msgstr "Quota usage (%s):"
+#. 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:233
+msgctxt "DateFmt"
+msgid "Next Tue"
+msgstr "Next Tue"
 
-#: ../mail/em-folder-properties.c:179
-#, c-format
-msgid "Quota usage"
-msgstr "Quota usage"
+#. 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:239
+msgctxt "DateFmt"
+msgid "Next Wed"
+msgstr "Next Wed"
 
-#: ../mail/em-folder-properties.c:317
-msgid "Folder Properties"
-msgstr "Folder Properties"
+#. 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:245
+msgctxt "DateFmt"
+msgid "Next Thu"
+msgstr "Next Thu"
 
-#: ../mail/em-folder-selection-button.c:79
-msgid "<click here to select a folder>"
-msgstr "<click here to select a folder>"
+#. 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:251
+msgctxt "DateFmt"
+msgid "Next Fri"
+msgstr "Next Fri"
 
-#: ../mail/em-folder-selector.c:436
-msgid "C_reate"
-msgstr "C_reate"
+#. 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:257
+msgctxt "DateFmt"
+msgid "Next Sat"
+msgstr "Next Sat"
 
-#: ../mail/em-folder-selector.c:442
-msgid "Folder _name:"
-msgstr "Folder _name:"
+#. 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:263
+msgctxt "DateFmt"
+msgid "Next Sun"
+msgstr "Next Sun"
 
-#: ../mail/em-folder-tree.c:647
-msgid "Folder names cannot contain '/'"
-msgstr "Folder names cannot contain '/'"
+#: ../e-util/e-datetime-format.c:350 ../e-util/e-datetime-format.c:360
+#: ../e-util/e-datetime-format.c:369
+msgid "Use locale default"
+msgstr "Use locale default"
 
-#: ../mail/em-folder-tree.c:768
-#, c-format
-msgctxt "folder-display"
-msgid "%s (%u%s)"
-msgstr "%s (%u%s)"
+#: ../e-util/e-datetime-format.c:574
+msgid "Format:"
+msgstr "Format:"
 
-#: ../mail/em-folder-tree.c:1590
-msgid "Mail Folder Tree"
-msgstr "Mail Folder Tree"
+#: ../e-util/e-file-utils.c:150
+msgid "(Unknown Filename)"
+msgstr "(Unknown Filename)"
 
-#: ../mail/em-folder-tree.c:2069 ../mail/em-folder-utils.c:115
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:154
 #, c-format
-msgid "Moving folder %s"
-msgstr "Moving folder %s"
+msgid "Writing \"%s\""
+msgstr "Writing \"%s\""
 
-#: ../mail/em-folder-tree.c:2072 ../mail/em-folder-utils.c:117
+#. 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
 #, c-format
-msgid "Copying folder %s"
-msgstr "Copying folder %s"
+msgid "Writing \"%s\" to %s"
+msgstr "Writing \"%s\" to %s"
 
-#: ../mail/em-folder-tree.c:2079 ../mail/message-list.c:2303
-#, c-format
-msgid "Moving messages into folder %s"
-msgstr "Moving messages into folder %s"
+#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:9
+#: ../plugins/google-account-setup/google-contacts-source.c:392
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "weeks"
 
-#: ../mail/em-folder-tree.c:2083 ../mail/message-list.c:2305
-#, c-format
-msgid "Copying messages into folder %s"
-msgstr "Copying messages into folder %s"
+#: ../e-util/e-print.c:161
+msgid "An error occurred while printing"
+msgstr "An error occurred while printing"
 
-#: ../mail/em-folder-tree.c:2102
-#, c-format
-msgid "Cannot drop message(s) into toplevel store"
-msgstr "Cannot drop message(s) into toplevel store"
+#: ../e-util/e-print.c:168
+msgid "The printing system reported the following details about the error:"
+msgstr "The printing system reported the following details about the error:"
 
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:157
-#: ../mail/em-folder-tree-model.c:163 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
-#: ../mail/mail-vfolder.c:1125 ../mail/mail-vfolder.c:1239
-msgid "Search Folders"
-msgstr "Search Folders"
+#: ../e-util/e-print.c:174
+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."
 
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:179 ../mail/em-folder-tree-model.c:181
-msgid "UNMATCHED"
-msgstr "UNMATCHED"
+#: ../e-util/e-system.error.xml.h:1
+msgid "A file named \"{0}\" already exists. Do you want to replace it?"
+msgstr "A file named \"{0}\" already exists. Do you want to replace it?"
 
-#: ../mail/em-folder-tree-model.c:790 ../mail/em-folder-tree-model.c:1075
-msgid "Loading..."
-msgstr "Loadingâ"
+#: ../e-util/e-system.error.xml.h:2
+msgid ""
+"The file already exists in \"{0}\". Replacing it will overwrite its contents."
+msgstr ""
+"The file already exists in \"{0}\". Replacing it will overwrite its contents."
 
-#: ../mail/em-folder-utils.c:488
-msgid "Move Folder To"
-msgstr "Move Folder To"
+#: ../e-util/e-system.error.xml.h:3
+msgid "_Replace"
+msgstr "_Replace"
 
-#: ../mail/em-folder-utils.c:488
-msgid "Copy Folder To"
-msgstr "Copy Folder To"
+#: ../e-util/e-system.error.xml.h:4
+msgid "Cannot save file \"{0}\"."
+msgstr "Cannot save file \"{0}\"."
 
-#: ../mail/em-folder-utils.c:590
-msgid "Create Folder"
-msgstr "Create Folder"
+#: ../e-util/e-system.error.xml.h:5
+msgid "Because \"{1}\"."
+msgstr "Because \"{1}\"."
 
-#: ../mail/em-folder-utils.c:591
-msgid "Specify where to create the folder:"
-msgstr "Specify where to create the folder:"
+#: ../e-util/e-system.error.xml.h:6
+msgid "Cannot open file \"{0}\"."
+msgstr "Cannot open file \"{0}\"."
 
-#: ../mail/em-format-html.c:166
-msgid "Formatting message"
-msgstr "Formatting message"
+#: ../e-util/e-util.c:245
+msgid "Could not open the link."
+msgstr "Could not open the link."
 
-#: ../mail/em-format-html.c:378
-msgid "Formatting Message..."
-msgstr "Formatting Messageâ"
+#: ../e-util/e-util.c:292
+msgid "Could not display help for Evolution."
+msgstr "Could not display help for Evolution."
 
-#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1572
+#. 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
+#: ../filter/e-filter-datespec.c:69
 #, c-format
-msgid "Retrieving '%s'"
-msgstr "Retrieving '%s'"
-
-#: ../mail/em-format-html.c:1723 ../mail/em-format-html-display.c:89
-msgid "Unsigned"
-msgstr "Unsigned"
-
-#: ../mail/em-format-html.c:1724 ../mail/em-format-html-display.c:90
-msgid "Valid signature"
-msgstr "Valid signature"
-
-#: ../mail/em-format-html.c:1725 ../mail/em-format-html-display.c:91
-msgid "Invalid signature"
-msgstr "Invalid signature"
-
-#: ../mail/em-format-html.c:1726 ../mail/em-format-html-display.c:92
-msgid "Valid signature, but cannot verify sender"
-msgstr "Valid signature, but cannot verify sender"
-
-#: ../mail/em-format-html.c:1727 ../mail/em-format-html-display.c:93
-msgid "Signature exists, but need public key"
-msgstr "Signature exists, but need public key"
+msgid "1 second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 second ago"
+msgstr[1] "%d seconds ago"
 
-#: ../mail/em-format-html.c:1733 ../mail/em-format-html-display.c:100
-msgid "Unencrypted"
-msgstr "Unencrypted"
+#: ../filter/e-filter-datespec.c:70
+#, 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"
 
-#: ../mail/em-format-html.c:1734 ../mail/em-format-html-display.c:101
-msgid "Encrypted, weak"
-msgstr "Encrypted, weak"
+#: ../filter/e-filter-datespec.c:71
+#, c-format
+msgid "1 minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 minute ago"
+msgstr[1] "%d minutes ago"
 
-#: ../mail/em-format-html.c:1735 ../mail/em-format-html-display.c:102
-msgid "Encrypted"
-msgstr "Encrypted"
+#: ../filter/e-filter-datespec.c:72
+#, 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"
 
-#: ../mail/em-format-html.c:1736 ../mail/em-format-html-display.c:103
-msgid "Encrypted, strong"
-msgstr "Encrypted, strong"
+#: ../filter/e-filter-datespec.c:73
+#, c-format
+msgid "1 hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "1 hour ago"
+msgstr[1] "%d hours ago"
 
-#: ../mail/em-format-html.c:2136
-msgid "Unknown external-body part."
-msgstr "Unknown external-body part."
+#: ../filter/e-filter-datespec.c:74
+#, 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"
 
-#: ../mail/em-format-html.c:2146
-msgid "Malformed external-body part."
-msgstr "Malformed external-body part."
+#: ../filter/e-filter-datespec.c:75
+#, c-format
+msgid "1 day ago"
+msgid_plural "%d days ago"
+msgstr[0] "1 day ago"
+msgstr[1] "%d days ago"
 
-#: ../mail/em-format-html.c:2177
+#: ../filter/e-filter-datespec.c:76
 #, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pointer to FTP site (%s)"
+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"
 
-#: ../mail/em-format-html.c:2188
+#: ../filter/e-filter-datespec.c:77
 #, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Pointer to local file (%s) valid at site \"%s\""
+msgid "1 week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 week ago"
+msgstr[1] "%d weeks ago"
 
-#: ../mail/em-format-html.c:2190
+#: ../filter/e-filter-datespec.c:78
 #, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pointer to local file (%s)"
+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"
 
-#: ../mail/em-format-html.c:2211
+#: ../filter/e-filter-datespec.c:79
 #, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pointer to remote data (%s)"
+msgid "1 month ago"
+msgid_plural "%d months ago"
+msgstr[0] "1 month ago"
+msgstr[1] "%d months ago"
 
-#: ../mail/em-format-html.c:2226
+#: ../filter/e-filter-datespec.c:80
 #, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pointer to unknown external data (\"%s\" type)"
+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"
 
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../mail/em-format-html.c:2934
-#: ../plugins/mail-notification/mail-notification.c:402
+#: ../filter/e-filter-datespec.c:81
 #, c-format
-msgid "From: %s"
-msgstr "From: %s"
-
-#: ../mail/em-format-html.c:2956
-msgid "(no subject)"
-msgstr "(no subject)"
+msgid "1 year ago"
+msgid_plural "%d years ago"
+msgstr[0] "1 year ago"
+msgstr[1] "%d years ago"
 
-#: ../mail/em-format-html.c:3032
+#: ../filter/e-filter-datespec.c:82
 #, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr "This message was sent by %s on behalf of %s"
+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"
 
-#: ../mail/em-format-html-display.c:89
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: ../filter/e-filter-datespec.c:132
+msgid "<click here to select a date>"
+msgstr "<click here to select a date>"
 
-#: ../mail/em-format-html-display.c:90
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+#: ../filter/e-filter-datespec.c:135 ../filter/e-filter-datespec.c:146
+#: ../filter/e-filter-datespec.c:157
+msgid "now"
+msgstr "now"
 
-#: ../mail/em-format-html-display.c:91
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: ../filter/e-filter-datespec.c:142
+msgid "%d-%b-%Y"
+msgstr "%d-%b-%Y"
 
-#: ../mail/em-format-html-display.c:92
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: ../filter/e-filter-datespec.c:289
+msgid "Select a time to compare against"
+msgstr "Select a time to compare against"
 
-#: ../mail/em-format-html-display.c:93
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
-msgstr ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+#: ../filter/e-filter-file.c:188
+msgid "Choose a File"
+msgstr "Choose a File"
 
-#: ../mail/em-format-html-display.c:100
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
-msgstr ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
+#: ../filter/e-filter-rule.c:686
+msgid "R_ule name:"
+msgstr "R_ule name:"
 
-#: ../mail/em-format-html-display.c:101
-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 "
-"message in a practical amount of time."
-msgstr ""
-"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 "
-"message in a practical amount of time."
+#: ../filter/e-filter-rule.c:718
+msgid "Find items that meet the following conditions"
+msgstr "Find items that meet the following conditions"
 
-#: ../mail/em-format-html-display.c:102
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+#: ../filter/e-filter-rule.c:743
+msgid "If all conditions are met"
+msgstr "If all conditions are met"
 
-#: ../mail/em-format-html-display.c:103
-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 "
-"practical amount of time."
-msgstr ""
-"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 "
-"practical amount of time."
+#: ../filter/e-filter-rule.c:744
+msgid "If any conditions are met"
+msgstr "If any conditions are met"
 
-#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
-msgid "_View Certificate"
-msgstr "_View Certificate"
+#: ../filter/e-filter-rule.c:747
+msgid "_Find items:"
+msgstr "_Find items:"
 
-#: ../mail/em-format-html-display.c:254
-msgid "This certificate is not viewable"
-msgstr "This certificate is not viewable"
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#. protocol:
+#. name:
+#: ../filter/e-filter-rule.c:776 ../libemail-engine/camel-null-store.c:28
+msgid "None"
+msgstr "None"
 
-#: ../mail/em-format-html-display.c:566
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"Evolution cannot render this e-mail as it is too large to process. You can "
-"view it unformatted or with an external text editor."
+#: ../filter/e-filter-rule.c:777
+msgid "All related"
+msgstr "All related"
 
-#: ../mail/em-format-html-display.c:756
-msgid "Save Image"
-msgstr "Save Image"
+#: ../filter/e-filter-rule.c:778 ../widgets/misc/e-send-options.ui.h:19
+msgid "Replies"
+msgstr "Replies"
 
-#: ../mail/em-format-html-display.c:804
-msgid "Save _Image..."
-msgstr "Save _Imageâ"
+#: ../filter/e-filter-rule.c:779
+msgid "Replies and parents"
+msgstr "Replies and parents"
 
-#: ../mail/em-format-html-display.c:806
-msgid "Save the image to a file"
-msgstr "Save the image to a file"
+#: ../filter/e-filter-rule.c:780
+msgid "No reply or parent"
+msgstr "No reply or parent"
 
-#: ../mail/em-format-html-display.c:1034
-msgid "Completed on"
-msgstr "Completed on"
+#: ../filter/e-filter-rule.c:783
+msgid "I_nclude threads:"
+msgstr "I_nclude threads:"
 
-#: ../mail/em-format-html-display.c:1046
-msgid "Overdue:"
-msgstr "Overdue:"
+#: ../filter/e-filter-rule.c:808
+msgid "A_dd Condition"
+msgstr "A_dd Condition"
 
-#: ../mail/em-format-html-display.c:1054
-msgid "by"
-msgstr "by"
+#: ../filter/e-filter-rule.c:1162 ../filter/filter.ui.h:1
+#: ../mail/em-utils.c:306
+msgid "Incoming"
+msgstr "Incoming"
 
-#: ../mail/em-format-html-display.c:1335 ../mail/em-format-html-display.c:1386
-msgid "View _Unformatted"
-msgstr "View _Unformatted"
+#: ../filter/e-filter-rule.c:1162 ../mail/em-utils.c:307
+msgid "Outgoing"
+msgstr "Outgoing"
 
-#: ../mail/em-format-html-display.c:1337
-msgid "Hide _Unformatted"
-msgstr "Hide _Unformatted"
+#: ../filter/e-rule-editor.c:273
+msgid "Add Rule"
+msgstr "Add Rule"
 
-#: ../mail/em-format-html-display.c:1408
-msgid "O_pen With"
-msgstr "O_pen With"
+#: ../filter/e-rule-editor.c:366
+msgid "Edit Rule"
+msgstr "Edit Rule"
 
-#: ../mail/em-format-html-print.c:176
-#, c-format
-msgid "Page %d of %d"
-msgstr "Page %d of %d"
+#: ../filter/filter.error.xml.h:1
+msgid "Missing date."
+msgstr "Missing date."
 
-#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
-#: ../mail/em-html-stream.c:122
-#, c-format
-msgid "No HTML stream available"
-msgstr "No HTML stream available"
+#: ../filter/filter.error.xml.h:2
+msgid "You must choose a date."
+msgstr "You must choose a date."
 
-#: ../mail/em-subscription-editor.c:1162
-msgid "Folder Subscriptions"
-msgstr "Folder Subscriptions"
+#: ../filter/filter.error.xml.h:3
+msgid "Missing filename."
+msgstr "Missing filename."
 
-#: ../mail/em-subscription-editor.c:1201
-msgid "_Account:"
-msgstr "_Account:"
+#: ../filter/filter.error.xml.h:4
+msgid "You must specify a filename."
+msgstr "You must specify a filename."
 
-#: ../mail/em-subscription-editor.c:1216
-msgid "Clear Search"
-msgstr "Clear Search"
+#: ../filter/filter.error.xml.h:5
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr "File &quot;{0}&quot; does not exist or is not a regular file."
 
-#: ../mail/em-subscription-editor.c:1234
-msgid "Sho_w items that contain:"
-msgstr "Sho_w items that contain:"
+#: ../filter/filter.error.xml.h:6
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr "Bad regular expression &quot;{0}&quot;."
 
-#: ../mail/em-subscription-editor.c:1273
-msgid "Subscribe to the selected folder"
-msgstr "Subscribe to the selected folder"
+#: ../filter/filter.error.xml.h:7
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr "Could not compile regular expression &quot;{1}&quot;."
 
-#: ../mail/em-subscription-editor.c:1274
-msgid "Su_bscribe"
-msgstr "Su_bscribe"
+#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
+msgid "Missing name."
+msgstr "Missing name."
 
-#: ../mail/em-subscription-editor.c:1285
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
-msgid "Unsubscribe from the selected folder"
-msgstr "Unsubscribe from the selected folder"
+#: ../filter/filter.error.xml.h:9
+msgid "You must name this filter."
+msgstr "You must name this filter."
 
-#: ../mail/em-subscription-editor.c:1286
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
-msgid "_Unsubscribe"
-msgstr "_Unsubscribe"
+#: ../filter/filter.error.xml.h:10
+msgid "Name &quot;{0}&quot; already used."
+msgstr "Name &quot;{0}&quot; already used."
 
-#: ../mail/em-subscription-editor.c:1297
-msgid "Collapse all folders"
-msgstr "Collapse all folders"
+#: ../filter/filter.error.xml.h:11
+msgid "Please choose another name."
+msgstr "Please choose another name."
 
-#: ../mail/em-subscription-editor.c:1298
-msgid "C_ollapse All"
-msgstr "C_ollapse All"
+#: ../filter/filter.ui.h:2
+msgid "the current time"
+msgstr "the current time"
 
-#: ../mail/em-subscription-editor.c:1308
-msgid "Expand all folders"
-msgstr "Expand all folders"
+#: ../filter/filter.ui.h:3
+msgid "the time you specify"
+msgstr "the time you specify"
 
-#: ../mail/em-subscription-editor.c:1309
-msgid "E_xpand All"
-msgstr "E_xpand All"
+#: ../filter/filter.ui.h:4
+msgid "a time relative to the current time"
+msgstr "a time relative to the current time"
 
-#: ../mail/em-subscription-editor.c:1319
-msgid "Refresh the folder list"
-msgstr "Refresh the folder list"
+#: ../filter/filter.ui.h:5
+msgid "seconds"
+msgstr "seconds"
 
-#: ../mail/em-subscription-editor.c:1331
-msgid "Stop the current operation"
-msgstr "Stop the current operation"
+#: ../filter/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "months"
 
-#. 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:102
-#, 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?"
+#: ../filter/filter.ui.h:11
+msgid "years"
+msgstr "years"
 
-#: ../mail/em-utils.c:158
-#: ../modules/mailto-handler/evolution-mailto-handler.c:154
-msgid "_Do not show this message again"
-msgstr "_Do not show this message again"
+#: ../filter/filter.ui.h:12
+msgid "ago"
+msgstr "ago"
 
-#: ../mail/em-utils.c:333
-msgid "Message Filters"
-msgstr "Message Filters"
+#: ../filter/filter.ui.h:13
+msgid "in the future"
+msgstr "in the future"
 
-#: ../mail/em-utils.c:918
-#, c-format
-msgid "Messages from %s"
-msgstr "Messages from %s"
+#: ../filter/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "Show filters for mail:"
 
-#: ../mail/em-vfolder-editor.c:108
-msgid "Search _Folders"
-msgstr "Search _Folders"
+#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:165
+msgid "_Filter Rules"
+msgstr "_Filter Rules"
 
-#: ../mail/em-vfolder-rule.c:618
-msgid "Add Folder"
-msgstr "Add Folder"
+#: ../filter/filter.ui.h:17
+msgid "Compare against"
+msgstr "Compare against"
 
-#: ../mail/evolution-mail.schemas.in.h:1
-msgid "\"Filter Editor\" window height"
-msgstr "\"Filter Editor\" window height"
+#: ../filter/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."
 
-#: ../mail/evolution-mail.schemas.in.h:2
-msgid "\"Filter Editor\" window maximize state"
-msgstr "\"Filter Editor\" window maximise state"
+#: ../filter/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."
 
-#: ../mail/evolution-mail.schemas.in.h:3
-msgid "\"Filter Editor\" window width"
-msgstr "\"Filter Editor\" window width"
+#: ../filter/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."
 
-#: ../mail/evolution-mail.schemas.in.h:4
-msgid "\"Folder Subscriptions\" window height"
-msgstr "\"Folder Subscriptions\" window height"
+#: ../libemail-engine/e-mail-folder-utils.c:109
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "Saving message to folder '%s'"
 
-#: ../mail/evolution-mail.schemas.in.h:5
-msgid "\"Folder Subscriptions\" window maximize state"
-msgstr "\"Folder Subscriptions\" window maximise state"
+#: ../libemail-engine/e-mail-folder-utils.c:270
+msgid "Forwarded messages"
+msgstr "Forwarded messages"
 
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "\"Folder Subscriptions\" window width"
-msgstr "\"Folder Subscriptions\" window width"
+#: ../libemail-engine/e-mail-folder-utils.c:378
+#: ../libemail-engine/e-mail-folder-utils.c:627
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Retrieving %d message"
+msgstr[1] "Retrieving %d messages"
 
-#: ../mail/evolution-mail.schemas.in.h:7
-msgid "\"Search Folder Editor\" window height"
-msgstr "\"Search Folder Editor\" window height"
+#: ../libemail-engine/e-mail-folder-utils.c:472
+msgid "Scanning messages for duplicates"
+msgstr "Scanning messages for duplicates"
 
-#: ../mail/evolution-mail.schemas.in.h:8
-msgid "\"Search Folder Editor\" window maximize state"
-msgstr "\"Search Folder Editor\" window maximise state"
+#: ../libemail-engine/e-mail-folder-utils.c:875
+#, c-format
+msgid "Removing folder '%s'"
+msgstr "Removing folder '%s'"
 
-#: ../mail/evolution-mail.schemas.in.h:9
-msgid "\"Search Folder Editor\" window width"
-msgstr "\"Search Folder Editor\" window width"
+#: ../libemail-engine/e-mail-folder-utils.c:1009
+#, c-format
+msgid "File \"%s\" has been removed."
+msgstr "File \"%s\" has been removed."
 
-#: ../mail/evolution-mail.schemas.in.h:10
-msgid "\"Send and Receive Mail\" window height"
-msgstr "\"Send and Receive Mail\" window height"
+#: ../libemail-engine/e-mail-folder-utils.c:1013
+msgid "File has been removed."
+msgstr "File has been removed."
 
-#: ../mail/evolution-mail.schemas.in.h:11
-msgid "\"Send and Receive Mail\" window maximize state"
-msgstr "\"Send and Receive Mail\" window maximise state"
+#: ../libemail-engine/e-mail-folder-utils.c:1072
+msgid "Removing attachments"
+msgstr "Removing attachments"
 
-#: ../mail/evolution-mail.schemas.in.h:12
-msgid "\"Send and Receive Mail\" window width"
-msgstr "\"Send and Receive Mail\" window width"
+#: ../libemail-engine/e-mail-folder-utils.c:1234
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messages"
+msgstr[0] "Saving %d message"
+msgstr[1] "Saving %d messages"
 
-#: ../mail/evolution-mail.schemas.in.h:13
-msgid "Always request read receipt"
-msgstr "Always request read receipt"
+#: ../libemail-engine/e-mail-folder-utils.c:1588 ../mail/em-folder-utils.c:624
+#, c-format
+msgid "Invalid folder URI '%s'"
+msgstr "Invalid folder URI '%s'"
 
-#: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-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."
+#: ../libemail-engine/e-mail-session.c:108 ../mail/em-folder-properties.c:333
+#: ../mail/em-folder-tree-model.c:719
+#: ../modules/mail/e-mail-shell-view-private.c:1095
+#: ../modules/mail/e-mail-shell-view-private.c:1106
+msgid "Inbox"
+msgstr "Inbox"
 
-#: ../mail/evolution-mail.schemas.in.h:15
-msgid ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
-msgstr ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
+#. E_MAIL_LOCAL_FOLDER_INBOX
+#: ../libemail-engine/e-mail-session.c:109 ../mail/em-folder-tree-model.c:712
+#: ../modules/mail/e-mail-shell-view-private.c:1093
+msgid "Drafts"
+msgstr "Drafts"
 
-#: ../mail/evolution-mail.schemas.in.h:16
-msgid "Attribute message."
-msgstr "Attribute message."
+#. E_MAIL_LOCAL_FOLDER_DRAFTS
+#: ../libemail-engine/e-mail-session.c:110 ../mail/em-folder-tree-model.c:723
+#: ../modules/mail/e-mail-shell-view-private.c:1097
+msgid "Outbox"
+msgstr "Outbox"
 
-#: ../mail/evolution-mail.schemas.in.h:17
-msgid "Automatic emoticon recognition"
-msgstr "Automatic emoticon recognition"
+#. E_MAIL_LOCAL_FOLDER_OUTBOX
+#: ../libemail-engine/e-mail-session.c:111 ../mail/em-folder-tree-model.c:727
+#: ../modules/mail/e-mail-shell-view-private.c:1099
+msgid "Sent"
+msgstr "Sent"
 
-#: ../mail/evolution-mail.schemas.in.h:18
-msgid "Automatic link recognition"
-msgstr "Automatic link recognition"
+#. E_MAIL_LOCAL_FOLDER_SENT
+#: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:715
+#: ../modules/mail/e-mail-shell-view-private.c:1101
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+#: ../plugins/templates/templates.c:1041 ../plugins/templates/templates.c:1341
+#: ../plugins/templates/templates.c:1351
+msgid "Templates"
+msgstr "Templates"
 
-#: ../mail/evolution-mail.schemas.in.h:19
-msgid "Check for new messages in all active accounts"
-msgstr "Check for new messages in all active accounts"
+#: ../libemail-engine/e-mail-session.c:697 ../mail/mail-vfolder-ui.c:79
+msgid "Search Folders"
+msgstr "Search Folders"
 
-#: ../mail/evolution-mail.schemas.in.h:20
-msgid "Check for new messages on start"
-msgstr "Check for new messages on start"
+#: ../libemail-engine/e-mail-session.c:975
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "Enter Passphrase for %s"
 
-#: ../mail/evolution-mail.schemas.in.h:21
-msgid "Check incoming mail being junk"
-msgstr "Check incoming mail being junk"
+#: ../libemail-engine/e-mail-session.c:979
+msgid "Enter Passphrase"
+msgstr "Enter Passphrase"
 
-#: ../mail/evolution-mail.schemas.in.h:22
-msgid "Citation highlight color"
-msgstr "Citation highlight colour"
+#: ../libemail-engine/e-mail-session.c:983
+#, c-format
+msgid "Enter Password for %s"
+msgstr "Enter Password for %s"
 
-#: ../mail/evolution-mail.schemas.in.h:23
-msgid "Citation highlight color."
-msgstr "Citation highlight colour."
+#: ../libemail-engine/e-mail-session.c:987
+msgid "Enter Password"
+msgstr "Enter Password"
 
-#: ../mail/evolution-mail.schemas.in.h:24
-msgid "Composer Window default height"
-msgstr "Composer Window default height"
+#: ../libemail-engine/e-mail-session.c:1038
+#, c-format
+msgid "User canceled operation."
+msgstr "User cancelled operation."
 
-#: ../mail/evolution-mail.schemas.in.h:25
-msgid "Composer Window default width"
-msgstr "Composer Window default width"
+#: ../libemail-engine/e-mail-session.c:1157
+#, c-format
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+"No destination address provided; forward of the message has been cancelled."
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Composer load/attach directory"
-msgstr "Composer load/attach directory"
+#: ../libemail-engine/e-mail-session.c:1166
+#, c-format
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "No account found to use; forward of the message has been cancelled."
 
-#: ../mail/evolution-mail.schemas.in.h:27
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Compress display of addresses in To/Cc/Bcc"
+#: ../libemail-engine/e-mail-session.c:1320
+#, c-format
+msgid "%s authentication failed"
+msgstr "%s authentication failed"
 
-#: ../mail/evolution-mail.schemas.in.h:28
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"Compress display of addresses in To/Cc/Bcc to the number specified in "
-"address_count."
+#: ../libemail-engine/e-mail-session.c:1394
+#, c-format
+msgid "No password was provided"
+msgstr "No password was provided"
 
-#: ../mail/evolution-mail.schemas.in.h:29
-msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
-msgstr ""
-"Controls how frequently local changes are synchronised with the remote mail "
-"server. The interval must be at least 30 seconds."
+#: ../libemail-engine/e-mail-session-utils.c:416
+#, c-format
+msgid "Cannot get transport for account '%s'"
+msgstr "Cannot get transport for account '%s'"
 
-#: ../mail/evolution-mail.schemas.in.h:30
-msgid "Custom headers to use while checking for junk."
-msgstr "Custom headers to use while checking for junk."
+#: ../libemail-engine/e-mail-session-utils.c:505
+#: ../libemail-engine/mail-ops.c:616
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Failed to apply outgoing filters: %s"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../libemail-engine/e-mail-session-utils.c:531
+#: ../libemail-engine/e-mail-session-utils.c:565
+#: ../libemail-engine/mail-ops.c:635 ../libemail-engine/mail-ops.c:671
+#, c-format
 msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format \"headername=value\"."
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
 msgstr ""
-"Custom headers to use while checking for junk. The list elements are strings "
-"in the format \"headername=value\"."
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
 
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Default charset in which to compose messages"
-msgstr "Default charset in which to compose messages"
+#: ../libemail-engine/e-mail-session-utils.c:585
+#: ../libemail-engine/mail-ops.c:693
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Failed to append to local 'Sent' folder: %s"
 
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Default charset in which to compose messages."
-msgstr "Default charset in which to compose messages."
+#: ../libemail-engine/e-mail-session-utils.c:795
+#: ../libemail-engine/mail-ops.c:821 ../libemail-engine/mail-ops.c:922
+msgid "Sending message"
+msgstr "Sending message"
 
-#: ../mail/evolution-mail.schemas.in.h:34
-msgid "Default charset in which to display messages"
-msgstr "Default charset in which to display messages"
+#: ../libemail-engine/e-mail-session-utils.c:869
+#, c-format
+msgid "Unsubscribing from folder '%s'"
+msgstr "Unsubscribing from folder '%s'"
 
-#: ../mail/evolution-mail.schemas.in.h:35
-msgid "Default charset in which to display messages."
-msgstr "Default charset in which to display messages."
+#: ../libemail-engine/e-mail-store-utils.c:169
+#, c-format
+msgid "Disconnecting from '%s'"
+msgstr "Disconnecting from '%s'"
 
-#: ../mail/evolution-mail.schemas.in.h:36
-msgid "Default forward style"
-msgstr "Default forward style"
+#: ../libemail-engine/e-mail-store-utils.c:260
+#, c-format
+msgid "Reconnecting to '%s'"
+msgstr "Reconnecting to '%s'"
 
-#: ../mail/evolution-mail.schemas.in.h:37
-msgid "Default height of the Composer Window."
-msgstr "Default height of the Composer Window."
+#: ../libemail-engine/e-mail-store-utils.c:335
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "Preparing account '%s' for offline"
 
-#: ../mail/evolution-mail.schemas.in.h:38
-msgid "Default height of the mail browser window."
-msgstr "Default height of the mail browser window."
+#: ../libemail-engine/mail-folder-cache.c:882
+#, c-format
+msgid "Pinging %s"
+msgstr "Pinging %s"
 
-#: ../mail/evolution-mail.schemas.in.h:39
-msgid "Default maximized state of the mail browser window."
-msgstr "Default maximised state of the mail browser window."
+#: ../libemail-engine/mail-ops.c:87
+msgid "Filtering Selected Messages"
+msgstr "Filtering Selected Messages"
 
-#: ../mail/evolution-mail.schemas.in.h:40
-msgid "Default reply style"
-msgstr "Default reply style"
-
-#: ../mail/evolution-mail.schemas.in.h:41
-msgid "Default value for thread expand state"
-msgstr "Default value for thread expand state"
+#: ../libemail-engine/mail-ops.c:209
+msgid "Fetching Mail"
+msgstr "Fetching Mail"
 
-#: ../mail/evolution-mail.schemas.in.h:42
-msgid "Default width of the Composer Window."
-msgstr "Default width of the Composer Window."
+#: ../libemail-engine/mail-ops.c:832
+#, c-format
+msgid "Sending message %d of %d"
+msgstr "Sending message %d of %d"
 
-#: ../mail/evolution-mail.schemas.in.h:43
-msgid "Default width of the mail browser window."
-msgstr "Default width of the mail browser window."
+#. Translators: The string is distinguished by total
+#. * count of messages to be sent.  Failed messages is
+#. * always more than zero.
+#: ../libemail-engine/mail-ops.c:883
+#, 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"
 
-#: ../mail/evolution-mail.schemas.in.h:44
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded \"1\" = collapsed"
-msgstr ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded \"1\" = collapsed"
+#: ../libemail-engine/mail-ops.c:889 ../mail/mail-send-recv.c:885
+msgid "Canceled."
+msgstr "Cancelled."
 
-#: ../mail/evolution-mail.schemas.in.h:45
-msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
-msgstr ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
+#: ../libemail-engine/mail-ops.c:891 ../mail/mail-send-recv.c:887
+msgid "Complete."
+msgstr "Complete."
 
-#: ../mail/evolution-mail.schemas.in.h:46
-msgid "Determines whether to lookup in address book for sender email"
-msgstr "Determines whether to look up in address book for sender e-mail"
+#: ../libemail-engine/mail-ops.c:1003
+#, c-format
+msgid "Moving messages to '%s'"
+msgstr "Moving messages to '%s'"
 
-#: ../mail/evolution-mail.schemas.in.h:47
-msgid ""
-"Determines whether to lookup the sender email in address book. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
-msgstr ""
-"Determines whether to look up the sender e-mail in the address book. If "
-"found, it shouldn't be a spam. It looks up in the books marked for "
-"autocompletion. It can be slow, if remote address books (like LDAP) are "
-"marked for autocompletion."
+#: ../libemail-engine/mail-ops.c:1004
+#, c-format
+msgid "Copying messages to '%s'"
+msgstr "Copying messages to '%s'"
 
-#: ../mail/evolution-mail.schemas.in.h:48
-msgid "Determines whether to use custom headers to check for junk"
-msgstr "Determines whether to use custom headers to check for junk"
+#: ../libemail-engine/mail-ops.c:1121
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "Storing folder '%s'"
 
-#: ../mail/evolution-mail.schemas.in.h:49
-msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
-msgstr ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
+#: ../libemail-engine/mail-ops.c:1194
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr "Expunging and storing account '%s'"
 
-#: ../mail/evolution-mail.schemas.in.h:50
-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."
+#: ../libemail-engine/mail-ops.c:1195
+#, c-format
+msgid "Storing account '%s'"
+msgstr "Storing account '%s'"
 
-#: ../mail/evolution-mail.schemas.in.h:51
-msgid "Directory for loading/attaching files to composer."
-msgstr "Directory for loading/attaching files to composer."
+#: ../libemail-engine/mail-ops.c:1257
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "Refreshing folder '%s'"
 
-#: ../mail/evolution-mail.schemas.in.h:52
-msgid "Directory for saving mail component files."
-msgstr "Directory for saving mail component files."
+#: ../libemail-engine/mail-ops.c:1475
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "Expunging folder '%s'"
 
-#: ../mail/evolution-mail.schemas.in.h:53
-msgid "Disable or enable ellipsizing of folder names in side bar"
-msgstr "Disable or enable ellipsizing of folder names in side bar"
+#: ../libemail-engine/mail-ops.c:1568
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr "Emptying wastebasket in '%s'"
 
-#: ../mail/evolution-mail.schemas.in.h:54
-msgid "Display only message texts not exceeding certain size"
-msgstr "Display only message texts not exceeding certain size"
+#: ../libemail-engine/mail-ops.c:1664
+#, c-format
+msgid "Disconnecting %s"
+msgstr "Disconnecting %s"
 
-#: ../mail/evolution-mail.schemas.in.h:55
-msgid "Do not add signature delimiter"
-msgstr "Do not add signature delimiter"
+#: ../libemail-engine/mail-tools.c:71
+#, c-format
+msgid "Could not create spool directory '%s': %s"
+msgstr "Could not create spool directory '%s': %s"
 
-#: ../mail/evolution-mail.schemas.in.h:56
-msgid "Draw spelling error indicators on words as you type."
-msgstr "Draw spelling error indicators on words as you type."
+#: ../libemail-engine/mail-tools.c:112
+#, c-format
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr "Trying to movemail a non-mbox source '%s'"
 
-#: ../mail/evolution-mail.schemas.in.h:57
-msgid "Empty Junk folders on exit"
-msgstr "Empty Junk folders on exit"
+#: ../libemail-engine/mail-tools.c:224
+#, c-format
+msgid "Forwarded message - %s"
+msgstr "Forwarded message â %s"
 
-#: ../mail/evolution-mail.schemas.in.h:58
-msgid "Empty Trash folders on exit"
-msgstr "Empty Wastebasket folders on exit"
+#: ../libemail-engine/mail-tools.c:226
+msgid "Forwarded message"
+msgstr "Forwarded message"
 
-#: ../mail/evolution-mail.schemas.in.h:59
-msgid "Empty all Junk folders when exiting Evolution."
-msgstr "Empty all Junk folders when exiting Evolution."
+#: ../libemail-engine/mail-vfolder.c:77
+#, c-format
+msgid "Setting up Search Folder: %s"
+msgstr "Setting up Search Folder: %s"
 
-#: ../mail/evolution-mail.schemas.in.h:60
-msgid "Empty all Trash folders when exiting Evolution."
-msgstr "Empty all Wastebasket folders when exiting Evolution."
+#: ../libemail-engine/mail-vfolder.c:214
+#, c-format
+msgid "Updating Search Folders for '%s' - %s"
+msgstr "Updating Search Folders for '%s' - %s"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * removed folder. For more than one search folder is
+#. * each of them on a separate line, with four spaces
+#. * in front of its name, without quotes.
+#: ../libemail-engine/mail-vfolder.c:554
+#, c-format
 msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
-msgstr ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
+"The Search Folder \"%s\" has been modified to account for the deleted "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"The Search Folder \"%s\" has been modified to account for the deleted "
+"folder\n"
+"\"%s\"."
+msgstr[1] ""
+"The following Search Folders\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
 
-#: ../mail/evolution-mail.schemas.in.h:62
-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."
+#: ../libemail-utils/e-signature.c:710
+msgid "Autogenerated"
+msgstr "Autogenerated"
 
-#: ../mail/evolution-mail.schemas.in.h:63
-msgid "Enable or disable magic space bar"
-msgstr "Enable or disable magic space bar"
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:1660 ../widgets/misc/e-signature-combo-box.c:79
+msgctxt "mail-signature"
+msgid "None"
+msgstr "None"
 
-#: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable or disable the prompt whilst marking multiple messages."
-msgstr "Enable or disable the prompt whilst marking multiple messages."
+#: ../mail/em-account-editor.c:1753
+msgid "Always"
+msgstr "Always"
 
-#: ../mail/evolution-mail.schemas.in.h:65
-msgid "Enable or disable type ahead search feature"
-msgstr "Enable or disable type ahead search feature"
+#: ../mail/em-account-editor.c:1754
+msgid "Ask for each message"
+msgstr "Ask for each message"
 
-#: ../mail/evolution-mail.schemas.in.h:66
-msgid "Enable search folders"
-msgstr "Enable search folders"
+#: ../mail/em-account-editor.c:2912 ../mail/mail-config.ui.h:164
+msgid "_Path:"
+msgstr "_Path:"
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "Enable search folders on startup."
-msgstr "Enable search folders on startup."
+#: ../mail/em-account-editor.c:2915
+msgid "Fil_e:"
+msgstr "Fil_e:"
 
-#: ../mail/evolution-mail.schemas.in.h:68
-msgid ""
-"Enable the side bar search feature to allow interactive searching of folder "
-"names."
-msgstr ""
-"Enable the side bar search feature to allow interactive searching of folder "
-"names."
+#: ../mail/em-account-editor.c:2952
+msgid "Mail Configuration"
+msgstr "Mail Configuration"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/em-account-editor.c:2953
 msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
 msgstr ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/em-account-editor.c:2956
 msgid ""
-"Enable to display only message texts not exceeding size defined in "
-"'message_text_part_limit' key."
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
-"Enable display only of message texts not exceeding size defined in "
-"'message_text_part_limit' key."
-
-#: ../mail/evolution-mail.schemas.in.h:71
-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"
+"Please enter your name and e-mail address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in e-mails you send."
 
-#: ../mail/evolution-mail.schemas.in.h:72
-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."
+#: ../mail/em-account-editor.c:2958 ../mail/em-account-editor.c:3167
+msgid "Receiving Email"
+msgstr "Receiving E-mail"
 
-#: ../mail/evolution-mail.schemas.in.h:73
-msgid "Enable/disable caret mode"
-msgstr "Enable/disable caret mode"
+#: ../mail/em-account-editor.c:2959
+msgid "Please configure the following account settings."
+msgstr "Please configure the following account settings."
 
-#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
-msgid "Encode file names in an Outlook/GMail way"
-msgstr "Encode file names in an Outlook/GMail way"
+#: ../mail/em-account-editor.c:2961 ../mail/em-account-editor.c:3786
+msgid "Sending Email"
+msgstr "Sending E-mail"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/em-account-editor.c:2962
 msgid ""
-"Encode file names in the mail headers same as Outlook or GMail do, to let "
-"them display correctly file names with UTF-8 letters sent by Evolution, "
-"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
-"standard."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"Encode file names in the mail headers same as Outlook or GMail do, to let "
-"them display correctly file names with UTF-8 letters sent by Evolution, "
-"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
-"standard."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
 
-#: ../mail/evolution-mail.schemas.in.h:76
-msgid "Flush Outbox after filtering"
-msgstr "Flush Outbox after filtering"
-
-#: ../mail/evolution-mail.schemas.in.h:77
-msgid "Forward message."
-msgstr "Forward message."
-
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "Group Reply replies to list"
-msgstr "Group Reply replies to list"
-
-#: ../mail/evolution-mail.schemas.in.h:79
-msgid "Height of the message-list pane"
-msgstr "Height of the message-list pane"
-
-#: ../mail/evolution-mail.schemas.in.h:80
-msgid "Height of the message-list pane."
-msgstr "Height of the message-list pane."
-
-#: ../mail/evolution-mail.schemas.in.h:81
-msgid "Hides the per-folder preview and removes the selection"
-msgstr "Hides the per-folder preview and removes the selection"
+#: ../mail/em-account-editor.c:2964
+msgid "Account Summary"
+msgstr "Account Summary"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/em-account-editor.c:2965
 msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
+"This is a summary of the settings which will be used to access your mail."
 msgstr ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
+"This is a summary of the settings which will be used to access your mail."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/em-account-editor.c:2969
+msgid "Done"
+msgstr "Done"
+
+#: ../mail/em-account-editor.c:2970
 msgid ""
-"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
-"any MIME types appearing in this list which map to a Bonobo component viewer "
-"in GNOME's MIME type database may be used for displaying content."
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
 msgstr ""
-"If there isn't a built-in viewer for a particular MIME type inside "
-"Evolution, any MIME types appearing in this list which map to a Bonobo "
-"component viewer in GNOME's MIME type database may be used for displaying "
-"content."
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive e-mail using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
 
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Ignore list Reply-To:"
-msgstr "Ignore list Reply-To:"
+#: ../mail/em-account-editor.c:3533
+msgid "Check for _new messages every"
+msgstr "Check for _new messages every"
 
-#: ../mail/evolution-mail.schemas.in.h:85
-msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
-msgstr ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
+#: ../mail/em-account-editor.c:3541
+msgid "minu_tes"
+msgstr "minu_tes"
 
-#: ../mail/evolution-mail.schemas.in.h:86
-msgid ""
-"Initial height of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Initial height of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window vertically."
+#: ../mail/em-account-editor.c:4259 ../mail/mail-config.ui.h:166
+msgid "Security"
+msgstr "Security"
 
-#: ../mail/evolution-mail.schemas.in.h:87
-msgid ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
+#. Most sections for this is auto-generated from the camel config
+#. Most sections for this is auto-generated fromt the camel config
+#: ../mail/em-account-editor.c:4314 ../mail/em-account-editor.c:4416
+msgid "Receiving Options"
+msgstr "Receiving Options"
 
-#: ../mail/evolution-mail.schemas.in.h:88
-msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
+#: ../mail/em-account-editor.c:4315 ../mail/em-account-editor.c:4417
+msgid "Checking for New Messages"
+msgstr "Checking for New Messages"
 
-#: ../mail/evolution-mail.schemas.in.h:89
-msgid ""
-"Initial maximize state of the \"Filter Editor\" window. The value updates "
-"when the user maximizes or unmaximizes the window. Note, this particular "
-"value is not used by Evolution since the \"Filter Editor\" window cannot be "
-"maximized. This key exists only as an implementation detail."
-msgstr ""
-"Initial maximise state of the \"Filter Editor\" window. The value updates "
-"when the user maximises or unmaximises the window. Note, this particular "
-"value is not used by Evolution since the \"Filter Editor\" window cannot be "
-"maximised. This key exists only as an implementation detail."
+#: ../mail/em-account-editor.c:4920
+msgid "Setup Google con_tacts with Evolution"
+msgstr "Setup Google con_tacts with Evolution"
 
-#: ../mail/evolution-mail.schemas.in.h:90
-msgid ""
-"Initial maximize state of the \"Folder Subscriptions\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Folder Subscriptions\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-"Initial maximise state of the \"Folder Subscriptions\" window. The value "
-"updates when the user maximises or unmaximises the window. Note, this "
-"particular value is not used by Evolution since the \"Folder Subscriptions\" "
-"window cannot be maximised. This key exists only as an implementation detail."
+#: ../mail/em-account-editor.c:4927
+msgid "Setup Google ca_lendar with Evolution"
+msgstr "Setup Google ca_lendar with Evolution"
 
-#: ../mail/evolution-mail.schemas.in.h:91
-msgid ""
-"Initial maximize state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-"Initial maximise state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximises or unmaximises the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximised. This key exists only as an implementation detail."
+#: ../mail/em-account-editor.c:4975
+msgid "Setup _Yahoo calendar with Evolution"
+msgstr "Setup _Yahoo calendar with Evolution"
 
-#: ../mail/evolution-mail.schemas.in.h:92
-msgid ""
-"Initial maximize state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
-msgstr ""
-"Initial maximise state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximises or unmaximises the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximised. This key exists only as an implementation "
-"detail."
+#: ../mail/em-account-editor.c:5000
+msgid "Yahoo Calen_dar name:"
+msgstr "Yahoo Calen_dar name:"
 
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid ""
-"Initial width of the \"Filter Editor\" window. The value updates as the user "
-"resizes the window horizontally."
-msgstr ""
-"Initial width of the \"Filter Editor\" window. The value updates as the user "
-"resizes the window horizontally."
+#: ../mail/e-mail-account-manager.c:405
+msgid "_Restore Default"
+msgstr "_Restore Default"
 
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid ""
-"Initial width of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Initial width of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window horizontally."
+#: ../mail/e-mail-account-manager.c:418
+msgid "You can drag and drop account names to reorder them."
+msgstr "You can drag and drop account names to reorder them."
 
-#: ../mail/evolution-mail.schemas.in.h:95
-msgid ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
+#: ../mail/e-mail-account-manager.c:463
+msgid "De_fault"
+msgstr "De_fault"
 
-#: ../mail/evolution-mail.schemas.in.h:96
-msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
+#: ../mail/e-mail-account-tree-view.c:85
+#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/plugin-manager/evolution-plugin-manager.c:360
+#: ../plugins/publish-calendar/publish-calendar.c:855
+msgid "Enabled"
+msgstr "Enabled"
 
-#: ../mail/evolution-mail.schemas.in.h:97
-msgid ""
-"Instead of the normal \"Reply to All\" behaviour, this option will make the "
-"'Group Reply' toolbar button try to reply only to the mailing list through "
-"which you happened to receive the copy of the message to which you're "
-"replying."
-msgstr ""
-"Instead of the normal \"Reply to All\" behaviour, this option will make the "
-"'Group Reply' toolbar button try to reply only to the mailing list through "
-"which you happened to receive the copy of the message to which you're "
-"replying."
+#: ../mail/e-mail-account-tree-view.c:105
+msgid "Account Name"
+msgstr "Account Name"
 
-#: ../mail/evolution-mail.schemas.in.h:98
-msgid ""
-"It disables/enables the repeated prompts to warn that deleting messages from "
-"a search folder permanently deletes the message, not simply removing it from "
-"the search results."
-msgstr ""
-"It disables/enables the repeated prompts to warn that deleting messages from "
-"a search folder permanently deletes the message, not simply removing it from "
-"the search results."
+#. we changed user, thus reset the chosen calendar combo too, because
+#. * other user means other calendars subscribed
+#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3439
+#: ../mail/mail-config.ui.h:51
+#: ../plugins/google-account-setup/google-source.c:311
+#: ../plugins/google-account-setup/google-source.c:553
+#: ../plugins/google-account-setup/google-source.c:690
+msgid "Default"
+msgstr "Default"
 
-#: ../mail/evolution-mail.schemas.in.h:99
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"private reply to a message which arrived via a mailing list."
-msgstr ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"private reply to a message which arrived via a mailing list."
+#: ../mail/e-mail-attachment-bar.c:102 ../mail/e-mail-attachment-bar.c:107
+#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-paned.c:176
+#: ../widgets/misc/e-attachment-paned.c:181
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Attachment"
+msgstr[1] "Attachments"
 
-#: ../mail/evolution-mail.schemas.in.h:100
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
-msgstr ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
+#: ../mail/e-mail-attachment-bar.c:619
+#: ../widgets/misc/e-attachment-paned.c:703
+msgid "Icon View"
+msgstr "Icon View"
 
-#: ../mail/evolution-mail.schemas.in.h:101
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying sending "
-"a private reply to a message which arrived via a mailing list, but the list "
-"sets a Reply-To: header which redirects your reply back to the list"
-msgstr ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a private reply to a message which arrived via a mailing list, but the list "
-"sets a Reply-To: header which redirects your reply back to the list."
+#: ../mail/e-mail-attachment-bar.c:621
+#: ../widgets/misc/e-attachment-paned.c:705
+msgid "List View"
+msgstr "List View"
 
-#: ../mail/evolution-mail.schemas.in.h:102
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a message to recipients not entered as mail addresses"
-msgstr ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a message to recipients not entered as mail addresses"
+#: ../mail/e-mail-backend.c:661
+msgid "Unknown background operation"
+msgstr "Unknown background operation"
 
-#: ../mail/evolution-mail.schemas.in.h:103
-msgid "Last time Empty Junk was run"
-msgstr "Last time Empty Junk was run"
+#: ../mail/e-mail-browser.c:130 ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1446
+#: ../shell/e-shell-window-actions.c:1453
+msgid "Close this window"
+msgstr "Close this window"
 
-#: ../mail/evolution-mail.schemas.in.h:104
-msgid "Last time Empty Trash was run"
-msgstr "Last time Empty Wastebasket was run"
+#: ../mail/e-mail-browser.c:289
+msgid "(No Subject)"
+msgstr "(No Subject)"
 
-#: ../mail/evolution-mail.schemas.in.h:105
-msgid "Layout style"
-msgstr "Layout style"
+#: ../mail/e-mail-display.c:68
+msgid "_Add to Address Book..."
+msgstr "_Add to Address Bookâ"
 
-#: ../mail/evolution-mail.schemas.in.h:106
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Level beyond which the message should be logged."
-msgstr "Level beyond which the message should be logged."
+#: ../mail/e-mail-display.c:75
+msgid "_To This Address"
+msgstr "_To this Address"
 
-#: ../mail/evolution-mail.schemas.in.h:107
-msgid "List of Labels and their associated colors"
-msgstr "List of Labels and their associated colours"
+#: ../mail/e-mail-display.c:82
+msgid "_From This Address"
+msgstr "_From This Address"
 
-#: ../mail/evolution-mail.schemas.in.h:108
-msgid "List of MIME types to check for Bonobo component viewers"
-msgstr "List of MIME types to check for Bonobo component viewers"
+#: ../mail/e-mail-display.c:89
+msgid "Send _Reply To..."
+msgstr "Send _Reply Toâ"
 
-#: ../mail/evolution-mail.schemas.in.h:109
-msgid "List of accepted licenses"
-msgstr "List of accepted licences"
+#: ../mail/e-mail-display.c:91
+msgid "Send a reply message to this address"
+msgstr "Send a reply message to this address"
 
-#: ../mail/evolution-mail.schemas.in.h:110
-msgid "List of accounts"
-msgstr "List of accounts"
+#: ../mail/e-mail-display.c:98
+msgid "Create Search _Folder"
+msgstr "Create Search _Folder"
 
-#: ../mail/evolution-mail.schemas.in.h:111
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+#. 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
+msgid "Junk filtering software:"
+msgstr "Junk filtering software:"
 
-#: ../mail/evolution-mail.schemas.in.h:112
-msgid "List of custom headers and whether they are enabled."
-msgstr "List of custom headers and whether they are enabled."
+#: ../mail/e-mail-label-dialog.c:225
+msgid "_Label name:"
+msgstr "_Label name:"
 
-#: ../mail/evolution-mail.schemas.in.h:113
-msgid "List of dictionary language codes used for spell checking."
-msgstr "List of dictionary language codes used for spell checking."
+#: ../mail/e-mail-label-list-store.c:49
+msgid "I_mportant"
+msgstr "I_mportant"
 
-#: ../mail/evolution-mail.schemas.in.h:114
-msgid ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:color where color uses the HTML hex encoding."
-msgstr ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+#. red
+#: ../mail/e-mail-label-list-store.c:50
+msgid "_Work"
+msgstr "_Work"
 
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "List of protocol names whose license has been accepted."
-msgstr "List of protocol names whose licence has been accepted."
+#. orange
+#: ../mail/e-mail-label-list-store.c:51
+msgid "_Personal"
+msgstr "_Personal"
 
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid "Load images for HTML messages over HTTP"
-msgstr "Load images for HTML messages over HTTP"
+#. green
+#: ../mail/e-mail-label-list-store.c:52
+msgid "_To Do"
+msgstr "_To Do"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#. blue
+#: ../mail/e-mail-label-list-store.c:53
+msgid "_Later"
+msgstr "_Later"
+
+#: ../mail/e-mail-label-manager.c:170
+#: ../modules/mail/e-mail-shell-view-actions.c:736
+msgid "Add Label"
+msgstr "Add Label"
+
+#: ../mail/e-mail-label-manager.c:221
+msgid "Edit Label"
+msgstr "Edit Label"
+
+#: ../mail/e-mail-label-manager.c:353
 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."
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
 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."
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
 
-#: ../mail/evolution-mail.schemas.in.h:118
-msgid "Log filter actions"
-msgstr "Log filter actions"
+#: ../mail/e-mail-label-tree-view.c:89
+msgid "Color"
+msgstr "Colour"
 
-#: ../mail/evolution-mail.schemas.in.h:119
-msgid "Log filter actions to the specified log file."
-msgstr "Log filter actions to the specified log file."
+#: ../mail/e-mail-label-tree-view.c:99
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../plugins/caldav/caldav-browse-server.c:1359
+#: ../widgets/menus/gal-define-views-dialog.c:352
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
+msgid "Name"
+msgstr "Name"
 
-#: ../mail/evolution-mail.schemas.in.h:120
-msgid "Logfile to log filter actions"
-msgstr "Logfile to log filter actions"
+#: ../mail/e-mail-migrate.c:1269
+#, c-format
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "Unable to create local mail folders at '%s': %s"
 
-#: ../mail/evolution-mail.schemas.in.h:121
-msgid "Logfile to log filter actions."
-msgstr "Logfile to log filter actions."
+#: ../mail/e-mail-notebook-view.c:627
+msgid "Please select a folder"
+msgstr "Please select a folder"
 
-#: ../mail/evolution-mail.schemas.in.h:122
-msgid "Mail browser height"
-msgstr "Mail browser height"
+#: ../mail/e-mail-reader.c:314 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "Copy to Folder"
 
-#: ../mail/evolution-mail.schemas.in.h:123
-msgid "Mail browser maximized"
-msgstr "Mail browser maximised"
+#: ../mail/e-mail-reader.c:314 ../mail/em-folder-utils.c:488
+msgid "C_opy"
+msgstr "C_opy"
 
-#: ../mail/evolution-mail.schemas.in.h:124
-msgid "Mail browser width"
-msgstr "Mail browser width"
+#: ../mail/e-mail-reader.c:841 ../mail/em-filter-i18n.h:53
+msgid "Move to Folder"
+msgstr "Move to Folder"
 
-#: ../mail/evolution-mail.schemas.in.h:125
-msgid "Mark as Seen after specified timeout"
-msgstr "Mark as Seen after specified timeout"
+#: ../mail/e-mail-reader.c:841 ../mail/em-folder-utils.c:488
+msgid "_Move"
+msgstr "_Move"
 
-#: ../mail/evolution-mail.schemas.in.h:126
-msgid "Mark as Seen after specified timeout."
-msgstr "Mark as Seen after specified timeout."
+#: ../mail/e-mail-reader.c:1202 ../mail/e-mail-reader.c:1384
+#: ../mail/e-mail-reader.c:1424
+msgid "_Do not ask me again."
+msgstr "_Do not ask me again."
 
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid "Mark citations in the message \"Preview\""
-msgstr "Mark citations in the message \"Preview\""
+#: ../mail/e-mail-reader.c:1430
+msgid "_Always ignore Reply-To: for mailing lists."
+msgstr "_Always ignore Reply-To: for mailing lists."
 
-#: ../mail/evolution-mail.schemas.in.h:128
-msgid "Mark citations in the message \"Preview\"."
-msgstr "Mark citations in the message \"Preview\"."
+#: ../mail/e-mail-reader.c:1795
+msgid "A_dd Sender to Address Book"
+msgstr "A_dd Sender to Address Book"
 
-#: ../mail/evolution-mail.schemas.in.h:129
-msgid "Message text limit for display"
-msgstr "Message text limit for display"
+#: ../mail/e-mail-reader.c:1797
+msgid "Add sender to address book"
+msgstr "Add sender to address book"
 
-#: ../mail/evolution-mail.schemas.in.h:130
-msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
+#: ../mail/e-mail-reader.c:1802
+msgid "Check for _Junk"
+msgstr "Check for _Junk"
 
-#: ../mail/evolution-mail.schemas.in.h:131
-msgid "Minimum days between emptying the junk on exit"
-msgstr "Minimum days between emptying the junk on exit"
+#: ../mail/e-mail-reader.c:1804
+msgid "Filter the selected messages for junk status"
+msgstr "Filter the selected messages for junk status"
 
-#: ../mail/evolution-mail.schemas.in.h:132
-msgid "Minimum days between emptying the trash on exit"
-msgstr "Minimum number of days between emptying the wastebasket on exit"
+#: ../mail/e-mail-reader.c:1809
+msgid "_Copy to Folder..."
+msgstr "_Copy to Folderâ"
 
-#: ../mail/evolution-mail.schemas.in.h:133
-msgid "Minimum time between emptying the junk on exit, in days."
-msgstr "Minimum time between emptying the junk on exit, in days."
+#: ../mail/e-mail-reader.c:1811
+msgid "Copy selected messages to another folder"
+msgstr "Copy selected messages to another folder"
 
-#: ../mail/evolution-mail.schemas.in.h:134
-msgid "Minimum time between emptying the trash on exit, in days."
-msgstr "Minimum time between emptying the wastebasket on exit, in days."
+#: ../mail/e-mail-reader.c:1816
+msgid "_Delete Message"
+msgstr "_Delete Message"
 
-#: ../mail/evolution-mail.schemas.in.h:135
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Number of addresses to display in To/Cc/Bcc"
+#: ../mail/e-mail-reader.c:1818
+msgid "Mark the selected messages for deletion"
+msgstr "Mark the selected messages for deletion"
 
-#: ../mail/evolution-mail.schemas.in.h:136
-msgid "Original message."
-msgstr "Original message."
+#: ../mail/e-mail-reader.c:1823
+msgid "Filter on Mailing _List..."
+msgstr "Filter on Mailing _Listâ"
 
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid "Path where picture gallery should search for its content"
-msgstr "Path where picture gallery should search for its content"
+#: ../mail/e-mail-reader.c:1825
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Create a rule to filter messages to this mailing list"
 
-#: ../mail/evolution-mail.schemas.in.h:138
-msgid ""
-"Possible values are: never - to never close browser window always - to "
-"always close browser window ask - (or any other value) will ask user"
-msgstr ""
-"Possible values are: never â to never close browser window; always â to "
-"always close browser window; ask â (or any other value) will ask user"
+#: ../mail/e-mail-reader.c:1830
+msgid "Filter on _Recipients..."
+msgstr "Filter on _Recipientsâ"
 
-#: ../mail/evolution-mail.schemas.in.h:139
-msgid "Prompt before sending to recipients not entered as mail addresses"
-msgstr "Prompt before sending to recipients not entered as mail addresses"
+#: ../mail/e-mail-reader.c:1832
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Create a rule to filter messages to these recipients"
 
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "Prompt on empty subject"
-msgstr "Prompt on empty subject"
+#: ../mail/e-mail-reader.c:1837
+msgid "Filter on Se_nder..."
+msgstr "Filter on Se_nderâ"
 
-#: ../mail/evolution-mail.schemas.in.h:141
-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."
+#: ../mail/e-mail-reader.c:1839
+msgid "Create a rule to filter messages from this sender"
+msgstr "Create a rule to filter messages from this sender"
 
-#: ../mail/evolution-mail.schemas.in.h:142
-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."
+#: ../mail/e-mail-reader.c:1844
+msgid "Filter on _Subject..."
+msgstr "Filter on _Subjectâ"
 
-#: ../mail/evolution-mail.schemas.in.h:143
-msgid "Prompt when deleting messages in search folder"
-msgstr "Prompt when deleting messages in search folder"
+#: ../mail/e-mail-reader.c:1846
+msgid "Create a rule to filter messages with this subject"
+msgstr "Create a rule to filter messages with this subject"
 
-#: ../mail/evolution-mail.schemas.in.h:144
-msgid "Prompt when mailing list hijacks private replies"
-msgstr "Prompt when mailing list hijacks private replies"
+#: ../mail/e-mail-reader.c:1851
+msgid "A_pply Filters"
+msgstr "A_pply Filters"
 
-#: ../mail/evolution-mail.schemas.in.h:145
-msgid "Prompt when replying privately to list messages"
-msgstr "Prompt when replying privately to list messages"
+#: ../mail/e-mail-reader.c:1853
+msgid "Apply filter rules to the selected messages"
+msgstr "Apply filter rules to the selected messages"
 
-#: ../mail/evolution-mail.schemas.in.h:146
-msgid "Prompt when replying to many recipients"
-msgstr "Prompt when replying to many recipients"
+#: ../mail/e-mail-reader.c:1858
+msgid "_Find in Message..."
+msgstr "_Find in Messageâ"
 
-#: ../mail/evolution-mail.schemas.in.h:147
-msgid "Prompt when user expunges"
-msgstr "Prompt when user expunges"
+#: ../mail/e-mail-reader.c:1860
+msgid "Search for text in the body of the displayed message"
+msgstr "Search for text in the body of the displayed message"
 
-#: ../mail/evolution-mail.schemas.in.h:148
-msgid "Prompt when user only fills Bcc"
-msgstr "Prompt when user only fills Bcc"
+#: ../mail/e-mail-reader.c:1865
+msgid "_Clear Flag"
+msgstr "_Clear Flag"
 
-#: ../mail/evolution-mail.schemas.in.h:149
-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"
+#: ../mail/e-mail-reader.c:1867
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "Remove the follow-up flag from the selected messages"
 
-#: ../mail/evolution-mail.schemas.in.h:150
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
-msgstr ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
+#: ../mail/e-mail-reader.c:1872
+msgid "_Flag Completed"
+msgstr "_Flag Completed"
 
-#: ../mail/evolution-mail.schemas.in.h:151
-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."
+#: ../mail/e-mail-reader.c:1874
+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/evolution-mail.schemas.in.h:152
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr "Prompt when user tries to send unwanted HTML"
+#: ../mail/e-mail-reader.c:1879
+msgid "Follow _Up..."
+msgstr "Follow _Upâ"
 
-#: ../mail/evolution-mail.schemas.in.h:153
-msgid "Prompt while marking multiple messages"
-msgstr "Prompt while marking multiple messages"
+#: ../mail/e-mail-reader.c:1881
+msgid "Flag the selected messages for follow-up"
+msgstr "Flag the selected messages for follow-up"
 
-#: ../mail/evolution-mail.schemas.in.h:154
-msgid "Put personalized signatures at the top of replies"
-msgstr "Put personalised signatures at the top of replies"
+#: ../mail/e-mail-reader.c:1886
+msgid "_Attached"
+msgstr "_Attached"
 
-#: ../mail/evolution-mail.schemas.in.h:155
-msgid "Put the cursor at the bottom of replies"
-msgstr "Put the cursor at the bottom of replies"
+#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Forward the selected message to someone as an attachment"
 
-#: ../mail/evolution-mail.schemas.in.h:156
-msgid "Recognize emoticons in text and replace them with images."
-msgstr "Recognise emoticons in text and replace them with images."
+#: ../mail/e-mail-reader.c:1893
+msgid "Forward As _Attached"
+msgstr "Forward As _Attached"
 
-#: ../mail/evolution-mail.schemas.in.h:157
-msgid "Recognize links in text and replace them."
-msgstr "Recognise links in text and replace them."
+#: ../mail/e-mail-reader.c:1900
+msgid "_Inline"
+msgstr "_Inline"
 
-#: ../mail/evolution-mail.schemas.in.h:158
-msgid "Run junk test on incoming mail."
-msgstr "Run junk test on incoming mail."
+#: ../mail/e-mail-reader.c:1902 ../mail/e-mail-reader.c:1909
+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/evolution-mail.schemas.in.h:159
-msgid "Save directory"
-msgstr "Save directory"
+#: ../mail/e-mail-reader.c:1907
+msgid "Forward As _Inline"
+msgstr "Forward As _Inline"
 
-#: ../mail/evolution-mail.schemas.in.h:160
-msgid "Search for the sender photo in local address books"
-msgstr "Search for the sender photo in local address books"
+#: ../mail/e-mail-reader.c:1914
+msgid "_Quoted"
+msgstr "_Quoted"
 
-#: ../mail/evolution-mail.schemas.in.h:161
-msgid "Send HTML mail by default"
-msgstr "Send HTML mail by default"
+#: ../mail/e-mail-reader.c:1916 ../mail/e-mail-reader.c:1923
+msgid "Forward the selected message quoted like a reply"
+msgstr "Forward the selected message quoted like a reply"
 
-#: ../mail/evolution-mail.schemas.in.h:162
-msgid "Send HTML mail by default."
-msgstr "Send HTML mail by default."
+#: ../mail/e-mail-reader.c:1921
+msgid "Forward As _Quoted"
+msgstr "Forward As _Quoted"
 
-#: ../mail/evolution-mail.schemas.in.h:163
-msgid "Sender email-address column in the message list"
-msgstr "Sender e-mail address column in the message list"
+#: ../mail/e-mail-reader.c:1928
+msgid "_Load Images"
+msgstr "_Load Images"
 
-#: ../mail/evolution-mail.schemas.in.h:164
-msgid "Server synchronization interval"
-msgstr "Server synchronisation interval"
+#: ../mail/e-mail-reader.c:1930
+msgid "Force images in HTML mail to be loaded"
+msgstr "Force images in HTML mail to be loaded"
 
-#: ../mail/evolution-mail.schemas.in.h:165
-msgid ""
-"Set to TRUE in case you do not want to add signature delimiter before your "
-"signature when composing a mail."
-msgstr ""
-"Set to TRUE in case you do not want to add signature delimiter before your "
-"signature when composing a mail."
+#: ../mail/e-mail-reader.c:1935
+msgid "_Important"
+msgstr "_Important"
 
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "Show \"Bcc\" field when sending a mail message"
-msgstr "Show \"Bcc\" field when sending a mail message"
+#: ../mail/e-mail-reader.c:1937
+msgid "Mark the selected messages as important"
+msgstr "Mark the selected messages as important"
 
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "Show \"Cc\" field when sending a mail message"
-msgstr "Show \"Cc\" field when sending a mail message"
+#: ../mail/e-mail-reader.c:1942
+msgid "_Junk"
+msgstr "_Junk"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Show \"From\" field when posting to a newsgroup"
-msgstr "Show \"From\" field when posting to a newsgroup"
+#: ../mail/e-mail-reader.c:1944
+msgid "Mark the selected messages as junk"
+msgstr "Mark the selected messages as junk"
 
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr "Show \"Reply To\" field when posting to a newsgroup"
+#: ../mail/e-mail-reader.c:1949
+msgid "_Not Junk"
+msgstr "_Not Junk"
 
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "Show \"Reply To\" field when sending a mail message"
-msgstr "Show \"Reply To\" field when sending a mail message"
+#: ../mail/e-mail-reader.c:1951
+msgid "Mark the selected messages as not being junk"
+msgstr "Mark the selected messages as not being junk"
 
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "Show Animations"
-msgstr "Show Animations"
+#: ../mail/e-mail-reader.c:1956
+msgid "_Read"
+msgstr "_Read"
 
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "Show all message headers"
-msgstr "Show all message headers"
+#: ../mail/e-mail-reader.c:1958
+msgid "Mark the selected messages as having been read"
+msgstr "Mark the selected messages as having been read"
 
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "Show all the headers when viewing a messages."
-msgstr "Show all the headers when viewing a messages."
+#: ../mail/e-mail-reader.c:1963
+msgid "Uni_mportant"
+msgstr "Uni_mportant"
 
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "Show animated images as animations."
-msgstr "Show animated images as animations."
+#: ../mail/e-mail-reader.c:1965
+msgid "Mark the selected messages as unimportant"
+msgstr "Mark the selected messages as unimportant"
 
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "Show deleted messages (with a strike-through) in the message-list."
+#: ../mail/e-mail-reader.c:1970
+msgid "_Unread"
+msgstr "_Unread"
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Show deleted messages in the message-list"
-msgstr "Show deleted messages in the message-list"
+#: ../mail/e-mail-reader.c:1972
+msgid "Mark the selected messages as not having been read"
+msgstr "Mark the selected messages as not having been read"
 
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Show image animations"
-msgstr "Show image animations"
+#: ../mail/e-mail-reader.c:1977
+msgid "_Edit as New Message..."
+msgstr "_Edit as New Messageâ"
 
-#: ../mail/evolution-mail.schemas.in.h:178
-msgid "Show original \"Date\" header value."
-msgstr "Show original \"Date\" header value."
+#: ../mail/e-mail-reader.c:1979
+msgid "Open the selected messages in the composer for editing"
+msgstr "Open the selected messages in the composer for editing"
 
-#: ../mail/evolution-mail.schemas.in.h:179
-msgid "Show photo of the sender"
-msgstr "Show photo of the sender"
+#: ../mail/e-mail-reader.c:1984
+msgid "Compose _New Message"
+msgstr "Compose _New Message"
 
-#: ../mail/evolution-mail.schemas.in.h:180
-msgid ""
-"Show the \"Bcc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"Show the \"Bcc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
+#: ../mail/e-mail-reader.c:1986
+msgid "Open a window for composing a mail message"
+msgstr "Open a window for composing a mail message"
 
-#: ../mail/evolution-mail.schemas.in.h:181
-msgid ""
-"Show the \"Cc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"Show the \"Cc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
+#: ../mail/e-mail-reader.c:1991
+msgid "_Open in New Window"
+msgstr "_Open in New Window"
 
-#: ../mail/evolution-mail.schemas.in.h:182
-msgid ""
-"Show the \"From\" field when posting to a newsgroup. This is controlled from "
-"the View menu when a news account is chosen."
-msgstr ""
-"Show the \"From\" field when posting to a newsgroup. This is controlled from "
-"the View menu when a news account is chosen."
+#: ../mail/e-mail-reader.c:1993
+msgid "Open the selected messages in a new window"
+msgstr "Open the selected messages in a new window"
 
-#: ../mail/evolution-mail.schemas.in.h:183
-msgid ""
-"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
-"from the View menu when a news account is chosen."
-msgstr ""
-"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
-"from the View menu when a news account is chosen."
+#: ../mail/e-mail-reader.c:1998
+msgid "_Move to Folder..."
+msgstr "_Move to Folderâ"
 
-#: ../mail/evolution-mail.schemas.in.h:184
-msgid ""
-"Show the \"Reply To\" field when sending a mail message. This is controlled "
-"from the View menu when a mail account is chosen."
-msgstr ""
-"Show the \"Reply To\" field when sending a mail message. This is controlled "
-"from the View menu when a mail account is chosen."
+#: ../mail/e-mail-reader.c:2000
+msgid "Move selected messages to another folder"
+msgstr "Move selected messages to another folder"
 
-#: ../mail/evolution-mail.schemas.in.h:185
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
-msgstr ""
-"Show the e-mail address of the sender in a separate column in the message "
-"list."
+#: ../mail/e-mail-reader.c:2005
+msgid "_Switch to Folder"
+msgstr "_Switch to Folder"
 
-#: ../mail/evolution-mail.schemas.in.h:186
-msgid ""
-"Show the original \"Date\" header (with a local time only if the time zone "
-"differs). Otherwise always show \"Date\" header value in a user preferred "
-"format and local time zone."
-msgstr ""
-"Show the original \"Date\" header (with a local time only if the time zone "
-"differs). Otherwise always show \"Date\" header value in a user preferred "
-"format and local time zone."
+#: ../mail/e-mail-reader.c:2007
+msgid "Display the parent folder"
+msgstr "Display the parent folder"
 
-#: ../mail/evolution-mail.schemas.in.h:187
-msgid "Show the photo of the sender in the message reading pane."
-msgstr "Show the photo of the sender in the message reading pane."
+#: ../mail/e-mail-reader.c:2012
+msgid "Switch to _next tab"
+msgstr "Switch to _next tab"
 
-#: ../mail/evolution-mail.schemas.in.h:188
-msgid ""
-"Some mailing lists set a Reply-To: header to trick users into sending "
-"replies to the list, even when they ask Evolution to make a private reply. "
-"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
-"so that Evolution will do as you ask it. If you use the private reply "
-"action, it will reply privately, while if you use the 'Reply to List' action "
-"it will do that. It works by comparing the Reply-To: header with a List-"
-"Post: header, if there is one."
-msgstr ""
-"Some mailing lists set a Reply-To: header to trick users into sending "
-"replies to the list, even when they ask Evolution to make a private reply. "
-"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
-"so that Evolution will do as you ask it. If you use the private reply "
-"action, it will reply privately, while if you use the 'Reply to List' action "
-"it will do that. It works by comparing the Reply-To: header with a List-"
-"Post: header, if there is one."
+#: ../mail/e-mail-reader.c:2014
+msgid "Switch to the next tab"
+msgstr "Switch to the next tab"
 
-#: ../mail/evolution-mail.schemas.in.h:189
-msgid "Spell check inline"
-msgstr "Spell check inline"
+#: ../mail/e-mail-reader.c:2019
+msgid "Switch to _previous tab"
+msgstr "Switch to _previous tab"
 
-#: ../mail/evolution-mail.schemas.in.h:190
-msgid "Spell checking color"
-msgstr "Spell checking colour"
+#: ../mail/e-mail-reader.c:2021
+msgid "Switch to the previous tab"
+msgstr "Switch to the previous tab"
 
-#: ../mail/evolution-mail.schemas.in.h:191
-msgid "Spell checking languages"
-msgstr "Spell checking languages"
+#: ../mail/e-mail-reader.c:2026
+msgid "Cl_ose current tab"
+msgstr "Cl_ose current tab"
+
+#: ../mail/e-mail-reader.c:2028
+msgid "Close current tab"
+msgstr "Close current tab"
+
+#: ../mail/e-mail-reader.c:2033
+msgid "_Next Message"
+msgstr "_Next Message"
+
+#: ../mail/e-mail-reader.c:2035
+msgid "Display the next message"
+msgstr "Display the next message"
+
+#: ../mail/e-mail-reader.c:2040
+msgid "Next _Important Message"
+msgstr "Next _Important Message"
+
+#: ../mail/e-mail-reader.c:2042
+msgid "Display the next important message"
+msgstr "Display the next important message"
+
+#: ../mail/e-mail-reader.c:2047
+msgid "Next _Thread"
+msgstr "Next _Thread"
+
+#: ../mail/e-mail-reader.c:2049
+msgid "Display the next thread"
+msgstr "Display the next thread"
+
+#: ../mail/e-mail-reader.c:2054
+msgid "Next _Unread Message"
+msgstr "Next _Unread Message"
+
+#: ../mail/e-mail-reader.c:2056
+msgid "Display the next unread message"
+msgstr "Display the next unread message"
+
+#: ../mail/e-mail-reader.c:2061
+msgid "_Previous Message"
+msgstr "_Previous Message"
+
+#: ../mail/e-mail-reader.c:2063
+msgid "Display the previous message"
+msgstr "Display the previous message"
+
+#: ../mail/e-mail-reader.c:2068
+msgid "Pr_evious Important Message"
+msgstr "Pr_evious Important Message"
+
+#: ../mail/e-mail-reader.c:2070
+msgid "Display the previous important message"
+msgstr "Display the previous important message"
+
+#: ../mail/e-mail-reader.c:2075
+msgid "Previous T_hread"
+msgstr "Previous T_hread"
+
+#: ../mail/e-mail-reader.c:2077
+msgid "Display the previous thread"
+msgstr "Display the previous thread"
+
+#: ../mail/e-mail-reader.c:2082
+msgid "P_revious Unread Message"
+msgstr "P_revious Unread Message"
+
+#: ../mail/e-mail-reader.c:2084
+msgid "Display the previous unread message"
+msgstr "Display the previous unread message"
+
+#: ../mail/e-mail-reader.c:2091
+msgid "Print this message"
+msgstr "Print this message"
+
+#: ../mail/e-mail-reader.c:2098
+msgid "Preview the message to be printed"
+msgstr "Preview the message to be printed"
+
+#: ../mail/e-mail-reader.c:2103
+msgid "Re_direct"
+msgstr "Re_direct"
+
+#: ../mail/e-mail-reader.c:2105
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Redirect (bounce) the selected message to someone"
+
+#: ../mail/e-mail-reader.c:2110
+msgid "Remo_ve Attachments"
+msgstr "Remo_ve Attachments"
+
+#: ../mail/e-mail-reader.c:2112
+msgid "Remove attachments"
+msgstr "Remove attachments"
+
+#: ../mail/e-mail-reader.c:2117
+msgid "Remove Du_plicate Messages"
+msgstr "Remove Du_plicate Messages"
+
+#: ../mail/e-mail-reader.c:2119
+msgid "Checks selected messages for duplicates"
+msgstr "Checks selected messages for duplicates"
+
+#: ../mail/e-mail-reader.c:2124 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-attachment-handler.c:181
+msgid "Reply to _All"
+msgstr "Reply to _All"
+
+#: ../mail/e-mail-reader.c:2126
+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:2131 ../mail/mail.error.xml.h:25
+msgid "Reply to _List"
+msgstr "Reply to _List"
+
+#: ../mail/e-mail-reader.c:2133
+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:2138
+#: ../modules/mail/e-mail-attachment-handler.c:188
+msgid "_Reply to Sender"
+msgstr "_Reply to Sender"
+
+#: ../mail/e-mail-reader.c:2140
+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:2145
+msgid "_Save as mbox..."
+msgstr "_Save as mboxâ"
+
+#: ../mail/e-mail-reader.c:2147
+msgid "Save selected messages as an mbox file"
+msgstr "Save selected messages as an mbox file"
+
+#: ../mail/e-mail-reader.c:2152
+msgid "_Message Source"
+msgstr "_Message Source"
+
+#: ../mail/e-mail-reader.c:2154
+msgid "Show the raw email source of the message"
+msgstr "Show the raw e-mail source of the message"
+
+#: ../mail/e-mail-reader.c:2166
+msgid "_Undelete Message"
+msgstr "_Undelete Message"
+
+#: ../mail/e-mail-reader.c:2168
+msgid "Undelete the selected messages"
+msgstr "Undelete the selected messages"
+
+#: ../mail/e-mail-reader.c:2173
+msgid "_Normal Size"
+msgstr "_Normal Size"
+
+#: ../mail/e-mail-reader.c:2175
+msgid "Reset the text to its original size"
+msgstr "Reset the text to its original size"
+
+#: ../mail/e-mail-reader.c:2180
+msgid "_Zoom In"
+msgstr "_Zoom In"
+
+#: ../mail/e-mail-reader.c:2182
+msgid "Increase the text size"
+msgstr "Increase the text size"
+
+#: ../mail/e-mail-reader.c:2187
+msgid "Zoom _Out"
+msgstr "Zoom _Out"
+
+#: ../mail/e-mail-reader.c:2189
+msgid "Decrease the text size"
+msgstr "Decrease the text size"
+
+#: ../mail/e-mail-reader.c:2196
+msgid "Create R_ule"
+msgstr "Create R_ule"
+
+#: ../mail/e-mail-reader.c:2203
+msgid "Ch_aracter Encoding"
+msgstr "Ch_aracter Encoding"
+
+#: ../mail/e-mail-reader.c:2210
+msgid "F_orward As"
+msgstr "F_orward As"
+
+#: ../mail/e-mail-reader.c:2217
+msgid "_Group Reply"
+msgstr "_Group Reply"
+
+#: ../mail/e-mail-reader.c:2224
+msgid "_Go To"
+msgstr "_Go To"
+
+#: ../mail/e-mail-reader.c:2231
+msgid "Mar_k As"
+msgstr "Mar_k As"
+
+#: ../mail/e-mail-reader.c:2238
+msgid "_Message"
+msgstr "_Message"
+
+#: ../mail/e-mail-reader.c:2245
+msgid "_Zoom"
+msgstr "_Zoom"
+
+#: ../mail/e-mail-reader.c:2255
+msgid "Search Folder from Mailing _List..."
+msgstr "Search Folder from Mailing _Listâ"
+
+#: ../mail/e-mail-reader.c:2257
+msgid "Create a search folder for this mailing list"
+msgstr "Create a search folder for this mailing list"
+
+#: ../mail/e-mail-reader.c:2262
+msgid "Search Folder from Recipien_ts..."
+msgstr "Search Folder from Recipien_tsâ"
+
+#: ../mail/e-mail-reader.c:2264
+msgid "Create a search folder for these recipients"
+msgstr "Create a search folder for these recipients"
+
+#: ../mail/e-mail-reader.c:2269
+msgid "Search Folder from Sen_der..."
+msgstr "Search Folder from Sen_derâ"
+
+#: ../mail/e-mail-reader.c:2271
+msgid "Create a search folder for this sender"
+msgstr "Create a search folder for this sender"
+
+#: ../mail/e-mail-reader.c:2276
+msgid "Search Folder from S_ubject..."
+msgstr "Search Folder from S_ubjectâ"
+
+#: ../mail/e-mail-reader.c:2278
+msgid "Create a search folder for this subject"
+msgstr "Create a search folder for this subject"
+
+#: ../mail/e-mail-reader.c:2301
+msgid "Mark for Follo_w Up..."
+msgstr "Mark for Follo_w Upâ"
+
+#: ../mail/e-mail-reader.c:2309
+msgid "Mark as _Important"
+msgstr "Mark as _Important"
+
+#: ../mail/e-mail-reader.c:2313
+msgid "Mark as _Junk"
+msgstr "Mark as _Junk"
+
+#: ../mail/e-mail-reader.c:2317
+msgid "Mark as _Not Junk"
+msgstr "Mark as _Not Junk"
+
+#: ../mail/e-mail-reader.c:2321
+msgid "Mar_k as Read"
+msgstr "Mar_k as Read"
+
+#: ../mail/e-mail-reader.c:2325
+msgid "Mark as Uni_mportant"
+msgstr "Mark as Uni_mportant"
+
+#: ../mail/e-mail-reader.c:2329
+msgid "Mark as _Unread"
+msgstr "Mark as _Unread"
+
+#: ../mail/e-mail-reader.c:2373
+msgid "_Caret Mode"
+msgstr "_Caret Mode"
+
+#: ../mail/e-mail-reader.c:2375
+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:2381
+msgid "All Message _Headers"
+msgstr "All Message _Headers"
+
+#: ../mail/e-mail-reader.c:2383
+msgid "Show messages with all email headers"
+msgstr "Show messages with all e-mail headers"
+
+#: ../mail/e-mail-reader.c:2712
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "Retrieving message '%s'"
+
+#: ../mail/e-mail-reader.c:3632
+#: ../modules/mail/e-mail-attachment-handler.c:174
+msgid "_Forward"
+msgstr "_Forward"
+
+#: ../mail/e-mail-reader.c:3633
+msgid "Forward the selected message to someone"
+msgstr "Forward the selected message to someone"
+
+#: ../mail/e-mail-reader.c:3652
+msgid "Group Reply"
+msgstr "Group Reply"
+
+#: ../mail/e-mail-reader.c:3653
+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:3710 ../mail/em-filter-i18n.h:14
+msgid "Delete"
+msgstr "Delete"
+
+#: ../mail/e-mail-reader.c:3743
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../widgets/misc/e-calendar.c:202
+msgid "Next"
+msgstr "Next"
+
+#: ../mail/e-mail-reader.c:3747
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../widgets/misc/e-calendar.c:178
+msgid "Previous"
+msgstr "Previous"
+
+#: ../mail/e-mail-reader.c:3756 ../mail/mail-dialogs.ui.h:20
+msgid "Reply"
+msgstr "Reply"
+
+#: ../mail/e-mail-reader.c:4457
+#, c-format
+msgid "Folder '%s'"
+msgstr "Folder '%s'"
+
+#: ../mail/e-mail-reader-utils.c:146
+msgid "Do not warn me again"
+msgstr "Do not warn me again"
+
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:641
+#, c-format
+msgid ""
+"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] ""
+"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"it?"
+msgstr[1] ""
+"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"them?"
+
+#: ../mail/e-mail-reader-utils.c:1020
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "Save Message"
+msgstr[1] "Save Messages"
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * 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:1041
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "Message"
+msgstr[1] "Messages"
+
+#: ../mail/e-mail-tag-editor.c:293
+msgid "Flag to Follow Up"
+msgstr "Flag to Follow Up"
+
+#. 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:1229
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+
+#: ../mail/em-composer-utils.c:1240
+msgid "-----Original Message-----"
+msgstr "-----Original Message-----"
+
+#: ../mail/em-composer-utils.c:2467
+msgid "an unknown sender"
+msgstr "an unknown sender"
+
+#: ../mail/em-composer-utils.c:2862
+msgid "Posting destination"
+msgstr "Posting destination"
+
+#: ../mail/em-composer-utils.c:2863
+msgid "Choose folders to post the message to."
+msgstr "Choose folders to post the message to."
+
+#: ../mail/em-filter-editor-folder-element.c:156
+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 "Assign Color"
+msgstr "Assign Colour"
+
+#: ../mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Assign Score"
+
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
+#: ../mail/em-filter-i18n.h:7
+msgid "Beep"
+msgstr "Beep"
+
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
+#: ../mail/em-filter-i18n.h:9
+msgid "Completed On"
+msgstr "Completed On"
+
+#: ../mail/em-filter-i18n.h:12
+msgid "Date received"
+msgstr "Date received"
+
+#: ../mail/em-filter-i18n.h:13
+msgid "Date sent"
+msgstr "Date sent"
+
+#: ../mail/em-filter-i18n.h:15
+msgid "Deleted"
+msgstr "Deleted"
+
+#: ../mail/em-filter-i18n.h:17
+msgid "does not end with"
+msgstr "does not end with"
+
+#: ../mail/em-filter-i18n.h:18
+msgid "does not exist"
+msgstr "does not exist"
+
+#: ../mail/em-filter-i18n.h:19
+msgid "does not have words"
+msgstr "does not have words"
+
+#: ../mail/em-filter-i18n.h:20
+msgid "does not return"
+msgstr "does not return"
+
+#: ../mail/em-filter-i18n.h:21
+msgid "does not sound like"
+msgstr "does not sound like"
+
+#: ../mail/em-filter-i18n.h:22
+msgid "does not start with"
+msgstr "does not start with"
+
+#: ../mail/em-filter-i18n.h:24
+msgid "Draft"
+msgstr "Draft"
+
+#: ../mail/em-filter-i18n.h:25
+msgid "ends with"
+msgstr "ends with"
+
+#: ../mail/em-filter-i18n.h:27
+msgid "exists"
+msgstr "exists"
+
+#: ../mail/em-filter-i18n.h:28
+msgid "Expression"
+msgstr "Expression"
+
+#: ../mail/em-filter-i18n.h:29
+msgid "Follow Up"
+msgstr "Follow Up"
+
+#: ../mail/em-filter-i18n.h:30
+msgid "Forward to"
+msgstr "Forward to"
+
+#: ../mail/em-filter-i18n.h:31
+msgid "has words"
+msgstr "has words"
+
+#: ../mail/em-filter-i18n.h:32
+msgid "Important"
+msgstr "Important"
+
+#: ../mail/em-filter-i18n.h:34
+msgid "is after"
+msgstr "is after"
+
+#: ../mail/em-filter-i18n.h:35
+msgid "is before"
+msgstr "is before"
+
+#: ../mail/em-filter-i18n.h:36
+msgid "is Flagged"
+msgstr "is Flagged"
+
+#: ../mail/em-filter-i18n.h:40
+msgid "is not Flagged"
+msgstr "is not Flagged"
+
+#: ../mail/em-filter-i18n.h:41
+msgid "is not set"
+msgstr "is not set"
+
+#: ../mail/em-filter-i18n.h:42
+msgid "is set"
+msgstr "is set"
+
+#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:114
+msgid "Junk"
+msgstr "Junk"
 
-#: ../mail/evolution-mail.schemas.in.h:192
-msgid "State of message headers in paned view"
-msgstr "State of message headers in paned view"
+#: ../mail/em-filter-i18n.h:44
+msgid "Junk Test"
+msgstr "Junk Test"
 
-#: ../mail/evolution-mail.schemas.in.h:193
-msgid "Terminal font"
-msgstr "Terminal font"
+#: ../mail/em-filter-i18n.h:45
+msgid "Label"
+msgstr "Label"
 
-#: ../mail/evolution-mail.schemas.in.h:194
-msgid "The default plugin for Junk hook"
-msgstr "The default plugin for Junk hook"
+#: ../mail/em-filter-i18n.h:46
+msgid "Mailing list"
+msgstr "Mailing list"
 
-#: ../mail/evolution-mail.schemas.in.h:195
-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)."
+#: ../mail/em-filter-i18n.h:47
+msgid "Match All"
+msgstr "Match All"
 
-#: ../mail/evolution-mail.schemas.in.h:196
-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)."
+#: ../mail/em-filter-i18n.h:48
+msgid "Message Body"
+msgstr "Message Body"
 
-#: ../mail/evolution-mail.schemas.in.h:197
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the message list. \"0\" (Classic View) places the preview pane below the "
-"message list. \"1\" (Vertical View) places the preview pane next to the "
-"message list."
-msgstr ""
-"The layout style determines where to place the preview pane in relation to "
-"the message list. \"0\" (Classic View) places the preview pane below the "
-"message list. \"1\" (Vertical View) places the preview pane next to the "
-"message list."
+#: ../mail/em-filter-i18n.h:49
+msgid "Message Header"
+msgstr "Message Header"
 
-#: ../mail/evolution-mail.schemas.in.h:198
-msgid "The terminal font for mail display."
-msgstr "The terminal font for mail display."
+#: ../mail/em-filter-i18n.h:50
+msgid "Message is Junk"
+msgstr "Message is Junk"
 
-#: ../mail/evolution-mail.schemas.in.h:199
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
-msgstr ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
+#: ../mail/em-filter-i18n.h:51
+msgid "Message is not Junk"
+msgstr "Message is not Junk"
 
-#: ../mail/evolution-mail.schemas.in.h:200
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows."
-msgstr ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows."
+#: ../mail/em-filter-i18n.h:52
+msgid "Message Location"
+msgstr "Message Location"
 
-#: ../mail/evolution-mail.schemas.in.h:201
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
-msgstr ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
+#: ../mail/em-filter-i18n.h:54
+msgid "Pipe to Program"
+msgstr "Pipe to Program"
 
-#: ../mail/evolution-mail.schemas.in.h:202
-msgid "The variable width font for mail display."
-msgstr "The variable width font for mail display."
+#: ../mail/em-filter-i18n.h:55
+msgid "Play Sound"
+msgstr "Play Sound"
 
-#: ../mail/evolution-mail.schemas.in.h:203
-msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
-msgstr ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:19
+msgid "Read"
+msgstr "Read"
 
-#: ../mail/evolution-mail.schemas.in.h:204
-msgid ""
-"This decides the max size of the message text that will be displayed under "
-"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
-"is used only when 'force_message_limit' key is activated."
-msgstr ""
-"This decides the maximum size of the message text that will be displayed "
-"under Evolution, specified in terms of KB. The default is 4096 (4MB). This "
-"value is used only when the 'force_message_limit' key is activated."
+#: ../mail/em-filter-i18n.h:57 ../mail/message-list.etspec.h:16
+msgid "Recipients"
+msgstr "Recipients"
 
-#: ../mail/evolution-mail.schemas.in.h:205
-msgid ""
-"This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won't fall back "
-"to the other available plugins."
-msgstr ""
-"This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won't fall back "
-"to the other available plugins."
+#: ../mail/em-filter-i18n.h:58
+msgid "Regex Match"
+msgstr "Regex Match"
 
-#: ../mail/evolution-mail.schemas.in.h:206
-msgid ""
-"This key is read only once and reset to \"false\" after read. This unselects "
-"the mail in the list and removes the preview for that folder."
-msgstr ""
-"This key is read only once and reset to \"false\" after read. This unselects "
-"the mail in the list and removes the preview for that folder."
+#: ../mail/em-filter-i18n.h:59
+msgid "Replied to"
+msgstr "Replied to"
 
-#: ../mail/evolution-mail.schemas.in.h:207
-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."
+#: ../mail/em-filter-i18n.h:60
+msgid "returns"
+msgstr "returns"
 
-#: ../mail/evolution-mail.schemas.in.h:208
-msgid ""
-"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local address book only to exclude "
-"mail sent by known contacts from junk filtering."
-msgstr ""
-"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local address book only to exclude "
-"mail sent by known contacts from junk filtering."
+#: ../mail/em-filter-i18n.h:61
+msgid "returns greater than"
+msgstr "returns greater than"
+
+#: ../mail/em-filter-i18n.h:62
+msgid "returns less than"
+msgstr "returns less than"
+
+#: ../mail/em-filter-i18n.h:63
+msgid "Run Program"
+msgstr "Run Program"
+
+#: ../mail/em-filter-i18n.h:64 ../mail/message-list.etspec.h:3
+msgid "Score"
+msgstr "Score"
+
+#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:15
+msgid "Sender"
+msgstr "Sender"
+
+#: ../mail/em-filter-i18n.h:66
+msgid "Sender or Recipients"
+msgstr "Sender or Recipients"
+
+#: ../mail/em-filter-i18n.h:67
+msgid "Set Label"
+msgstr "Set Label"
+
+#: ../mail/em-filter-i18n.h:68
+msgid "Set Status"
+msgstr "Set Status"
+
+#: ../mail/em-filter-i18n.h:69
+msgid "Size (kB)"
+msgstr "Size (kB)"
+
+#: ../mail/em-filter-i18n.h:70
+msgid "sounds like"
+msgstr "sounds like"
+
+#: ../mail/em-filter-i18n.h:71
+msgid "Source Account"
+msgstr "Source Account"
+
+#: ../mail/em-filter-i18n.h:72
+msgid "Specific header"
+msgstr "Specific header"
+
+#: ../mail/em-filter-i18n.h:73
+msgid "starts with"
+msgstr "starts with"
+
+#: ../mail/em-filter-i18n.h:75
+msgid "Stop Processing"
+msgstr "Stop Processing"
+
+#: ../mail/em-filter-i18n.h:77
+msgid "Unset Color"
+msgstr "Unset Colour"
+
+#: ../mail/em-filter-i18n.h:78
+msgid "Unset Status"
+msgstr "Unset Status"
+
+#. and now for the action area
+#: ../mail/em-filter-rule.c:527
+msgid "Then"
+msgstr "Then"
+
+#: ../mail/em-filter-rule.c:558
+msgid "Add Ac_tion"
+msgstr "Add Ac_tion"
+
+#: ../mail/em-folder-properties.c:145
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] "Unread messages:"
+msgstr[1] "Unread messages:"
+
+#: ../mail/em-folder-properties.c:156
+msgid "Total messages:"
+msgid_plural "Total messages:"
+msgstr[0] "Total messages:"
+msgstr[1] "Total messages:"
+
+#: ../mail/em-folder-properties.c:177
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Quota usage (%s):"
+
+#: ../mail/em-folder-properties.c:179
+#, c-format
+msgid "Quota usage"
+msgstr "Quota usage"
+
+#: ../mail/em-folder-properties.c:338
+msgid "Folder Properties"
+msgstr "Folder Properties"
+
+#: ../mail/em-folder-selection-button.c:80
+msgid "<click here to select a folder>"
+msgstr "<click here to select a folder>"
+
+#: ../mail/em-folder-selector.c:389
+msgid "C_reate"
+msgstr "C_reate"
+
+#: ../mail/em-folder-selector.c:395
+msgid "Folder _name:"
+msgstr "Folder _name:"
+
+#: ../mail/em-folder-tree.c:647
+msgid "Folder names cannot contain '/'"
+msgstr "Folder names cannot contain '/'"
+
+#: ../mail/em-folder-tree.c:783
+#, c-format
+msgctxt "folder-display"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
 
-#: ../mail/evolution-mail.schemas.in.h:209
-msgid "This option would help in improving the speed of fetching."
-msgstr "This option would help in improving the speed of fetching."
+#: ../mail/em-folder-tree.c:1606
+msgid "Mail Folder Tree"
+msgstr "Mail Folder Tree"
 
-#: ../mail/evolution-mail.schemas.in.h:210
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a 'â' is shown."
+#: ../mail/em-folder-tree.c:2097 ../mail/em-folder-utils.c:115
+#, c-format
+msgid "Moving folder %s"
+msgstr "Moving folder %s"
 
-#: ../mail/evolution-mail.schemas.in.h:211
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
-msgstr ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
+#: ../mail/em-folder-tree.c:2100 ../mail/em-folder-utils.c:117
+#, c-format
+msgid "Copying folder %s"
+msgstr "Copying folder %s"
 
-#: ../mail/evolution-mail.schemas.in.h:212
-msgid ""
-"This setting specifies whether the threads should be sorted based on latest "
-"message in each thread, rather than by message's date. Evolution requires a "
-"restart."
-msgstr ""
-"This setting specifies whether the threads should be sorted based on latest "
-"message in each thread, rather than by message's date. Evolution requires a "
-"restart."
+#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2304
+#, c-format
+msgid "Moving messages into folder %s"
+msgstr "Moving messages into folder %s"
 
-#: ../mail/evolution-mail.schemas.in.h:213
-msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder."
-msgstr ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder."
+#: ../mail/em-folder-tree.c:2111 ../mail/message-list.c:2306
+#, c-format
+msgid "Copying messages into folder %s"
+msgstr "Copying messages into folder %s"
 
-#: ../mail/evolution-mail.schemas.in.h:214
-msgid "Thread the message-list based on Subject"
-msgstr "Thread the message-list based on Subject"
+#: ../mail/em-folder-tree.c:2130
+#, c-format
+msgid "Cannot drop message(s) into toplevel store"
+msgstr "Cannot drop message(s) into toplevel store"
 
-#: ../mail/evolution-mail.schemas.in.h:215
-msgid "Timeout for marking message as seen"
-msgstr "Timeout for marking message as seen"
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:161 ../mail/em-folder-tree-model.c:163
+msgid "UNMATCHED"
+msgstr "UNMATCHED"
 
-#: ../mail/evolution-mail.schemas.in.h:216
-msgid "Timeout for marking message as seen."
-msgstr "Timeout for marking message as seen."
+#: ../mail/em-folder-tree-model.c:789 ../mail/em-folder-tree-model.c:1077
+msgid "Loading..."
+msgstr "Loadingâ"
 
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid "UID string of the default account."
-msgstr "UID string of the default account."
+#: ../mail/em-folder-utils.c:489
+msgid "Move Folder To"
+msgstr "Move Folder To"
 
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid "Underline color for misspelled words when using inline spelling."
-msgstr "Underline colour for misspelt words when using inline spelling."
+#: ../mail/em-folder-utils.c:489
+msgid "Copy Folder To"
+msgstr "Copy Folder To"
 
-#: ../mail/evolution-mail.schemas.in.h:219
-msgid "Use custom fonts"
-msgstr "Use custom fonts"
+#: ../mail/em-folder-utils.c:601
+msgid "Create Folder"
+msgstr "Create Folder"
 
-#: ../mail/evolution-mail.schemas.in.h:220
-msgid "Use custom fonts for displaying mail."
-msgstr "Use custom fonts for displaying mail."
+#: ../mail/em-folder-utils.c:602
+msgid "Specify where to create the folder:"
+msgstr "Specify where to create the folder:"
 
-#: ../mail/evolution-mail.schemas.in.h:221
-msgid ""
-"Users get all up in arms over where the cursor should go when replying to a "
-"message. This determines whether the cursor is placed at the top of the "
-"message or the bottom."
-msgstr ""
-"Users get all up in arms over where the cursor should go when replying to a "
-"message. This determines whether the cursor is placed at the top of the "
-"message or the bottom."
+#: ../mail/em-format-html.c:178
+msgid "Formatting message"
+msgstr "Formatting message"
 
-#: ../mail/evolution-mail.schemas.in.h:222
-msgid ""
-"Users get all up in arms over where their signature should go when replying "
-"to a message. This determines whether the signature is placed at the top of "
-"the message or the bottom."
-msgstr ""
-"Users get all up in arms over where their signature should go when replying "
-"to a message. This determines whether the signature is placed at the top of "
-"the message or the bottom."
+#: ../mail/em-format-html.c:393
+msgid "Formatting Message..."
+msgstr "Formatting Messageâ"
 
-#: ../mail/evolution-mail.schemas.in.h:223
-msgid "Variable width font"
-msgstr "Variable width font"
+#: ../mail/em-format-html.c:1637 ../mail/em-format-html.c:1651
+#, c-format
+msgid "Retrieving '%s'"
+msgstr "Retrieving '%s'"
 
-#: ../mail/evolution-mail.schemas.in.h:224
-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."
+#: ../mail/em-format-html.c:1802 ../mail/em-format-html-display.c:97
+msgid "Unsigned"
+msgstr "Unsigned"
 
-#: ../mail/evolution-mail.schemas.in.h:225
-msgid ""
-"Whether check for new messages in all active accounts regardless of the "
-"account \"Check for new messages every X minutes\" option when Evolution is "
-"started. This option is used only together with 'send_recv_on_start' option."
-msgstr ""
-"Whether to check for new messages in all active accounts regardless of the "
-"account's \"Check for new messages every X minutes\" option when Evolution "
-"is started. This option is used only together with 'send_recv_on_start' "
-"option."
+#: ../mail/em-format-html.c:1803 ../mail/em-format-html-display.c:98
+msgid "Valid signature"
+msgstr "Valid signature"
 
-#: ../mail/evolution-mail.schemas.in.h:226
-msgid ""
-"Whether check for new messages when Evolution is started. This includes also "
-"sending messages from Outbox."
-msgstr ""
-"Whether to check for new messages when Evolution is started. This includes "
-"also sending messages from the Outbox."
+#: ../mail/em-format-html.c:1804 ../mail/em-format-html-display.c:99
+msgid "Invalid signature"
+msgstr "Invalid signature"
 
-#: ../mail/evolution-mail.schemas.in.h:227
-msgid "Whether disable ellipsizing feature of folder names in side bar."
-msgstr ""
-"Whether to disable ellipsizing feature of folder names in the side bar."
+#: ../mail/em-format-html.c:1805 ../mail/em-format-html-display.c:100
+msgid "Valid signature, but cannot verify sender"
+msgstr "Valid signature, but cannot verify sender"
 
-#: ../mail/evolution-mail.schemas.in.h:228
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
-msgstr ""
-"Whether to fall back on threading by subjects when the messages do not "
-"contain In-Reply-To or References headers."
+#: ../mail/em-format-html.c:1806 ../mail/em-format-html-display.c:101
+msgid "Signature exists, but need public key"
+msgstr "Signature exists, but need public key"
 
-#: ../mail/evolution-mail.schemas.in.h:229
-msgid "Whether sort threads based on latest message in that thread"
-msgstr "Whether sort threads based on latest message in that thread"
+#: ../mail/em-format-html.c:1812 ../mail/em-format-html-display.c:108
+msgid "Unencrypted"
+msgstr "Unencrypted"
 
-#: ../mail/evolution-mail.schemas.in.h:230
-msgid ""
-"Whether to flush Outbox after filtering is done. Outbox flush will happen "
-"only when there was used any 'Forward to' filter action and approximately "
-"one minute after the last action invocation."
-msgstr ""
-"Whether to flush Outbox after filtering is done. Outbox flush will happen "
-"only when a 'Forward to' filter action is used and approximately one minute "
-"after the last action invocation."
+#: ../mail/em-format-html.c:1813 ../mail/em-format-html-display.c:109
+msgid "Encrypted, weak"
+msgstr "Encrypted, weak"
 
-#: ../mail/evolution-mail.schemas.in.h:231
-msgid "Width of the message-list pane"
-msgstr "Width of the message-list pane"
+#: ../mail/em-format-html.c:1814 ../mail/em-format-html-display.c:110
+msgid "Encrypted"
+msgstr "Encrypted"
 
-#: ../mail/evolution-mail.schemas.in.h:232
-msgid "Width of the message-list pane."
-msgstr "Width of the message-list pane."
+#: ../mail/em-format-html.c:1815 ../mail/em-format-html-display.c:111
+msgid "Encrypted, strong"
+msgstr "Encrypted, strong"
 
-#: ../mail/importers/elm-importer.c:181
-msgid "Importing Elm data"
-msgstr "Importing Elm data"
+#: ../mail/em-format-html.c:2210
+msgid "Unknown external-body part."
+msgstr "Unknown external-body part."
 
-#: ../mail/importers/elm-importer.c:351 ../mail/importers/pine-importer.c:458
-#: ../modules/mail/e-mail-shell-view.c:1051
-#: ../widgets/misc/e-send-options.c:520
-msgid "Mail"
-msgstr "Mail"
+#: ../mail/em-format-html.c:2220
+msgid "Malformed external-body part."
+msgstr "Malformed external-body part."
 
-#: ../mail/importers/elm-importer.c:396
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm importer"
+#: ../mail/em-format-html.c:2251
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pointer to FTP site (%s)"
 
-#: ../mail/importers/elm-importer.c:397
-msgid "Import mail from Elm."
-msgstr "Import mail from Elm."
+#: ../mail/em-format-html.c:2262
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Pointer to local file (%s) valid at site \"%s\""
 
-#: ../mail/importers/evolution-mbox-importer.c:138
-#: ../plugins/dbx-import/dbx-importer.c:250
-msgid "_Destination folder:"
-msgstr "_Destination folder:"
+#: ../mail/em-format-html.c:2264
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pointer to local file (%s)"
 
-#: ../mail/importers/evolution-mbox-importer.c:145
-#: ../plugins/dbx-import/dbx-importer.c:260
-#: ../plugins/pst-import/pst-importer.c:460
-msgid "Select folder"
-msgstr "Select folder"
+#: ../mail/em-format-html.c:2285
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pointer to remote data (%s)"
 
-#: ../mail/importers/evolution-mbox-importer.c:146
-#: ../plugins/dbx-import/dbx-importer.c:261
-#: ../plugins/pst-import/pst-importer.c:461
-msgid "Select folder to import into"
-msgstr "Select folder to import into"
+#: ../mail/em-format-html.c:2300
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pointer to unknown external data (\"%s\" type)"
 
-#: ../mail/importers/evolution-mbox-importer.c:433
-msgctxt "mboxImp"
-msgid "Subject"
-msgstr "Subject"
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../mail/em-format-html.c:3008
+#: ../plugins/mail-notification/mail-notification.c:395
+#, c-format
+msgid "From: %s"
+msgstr "From: %s"
 
-#: ../mail/importers/evolution-mbox-importer.c:438
-msgctxt "mboxImp"
-msgid "From"
-msgstr "From"
+#: ../mail/em-format-html.c:3030
+msgid "(no subject)"
+msgstr "(no subject)"
 
-#: ../mail/importers/evolution-mbox-importer.c:482
-#: ../shell/e-shell-utils.c:221
-msgid "Berkeley Mailbox (mbox)"
-msgstr "Berkeley Mailbox (mbox)"
+#: ../mail/em-format-html.c:3106
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "This message was sent by %s on behalf of %s"
 
-#: ../mail/importers/evolution-mbox-importer.c:483
-msgid "Importer Berkeley Mailbox format folders"
-msgstr "Importer Berkeley Mailbox format folders"
+#: ../mail/em-format-html-display.c:97
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+
+#: ../mail/em-format-html-display.c:98
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+
+#: ../mail/em-format-html-display.c:99
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 
-#: ../mail/importers/mail-importer.c:64
-msgid "Importing mailbox"
-msgstr "Importing mailbox"
+#: ../mail/em-format-html-display.c:100
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 
-#. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:610
-#: ../plugins/pst-import/pst-importer.c:648
-#, c-format
-msgid "Importing '%s'"
-msgstr "Importing '%s'"
+#: ../mail/em-format-html-display.c:101
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
 
-#: ../mail/importers/mail-importer.c:316
-#, c-format
-msgid "Scanning %s"
-msgstr "Scanning %s"
+#: ../mail/em-format-html-display.c:108
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
 
-#: ../mail/importers/pine-importer.c:260
-msgid "Importing Pine data"
-msgstr "Importing Pine data"
+#: ../mail/em-format-html-display.c:109
+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 "
+"message in a practical amount of time."
+msgstr ""
+"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 "
+"message in a practical amount of time."
 
-#: ../mail/importers/pine-importer.c:463
-#: ../modules/addressbook/addressbook-config.c:1081
-msgid "Address Book"
-msgstr "Address Book"
+#: ../mail/em-format-html-display.c:110
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
 
-#: ../mail/importers/pine-importer.c:509
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine importer"
+#: ../mail/em-format-html-display.c:111
+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 "
+"practical amount of time."
+msgstr ""
+"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 "
+"practical amount of time."
 
-#: ../mail/importers/pine-importer.c:510
-msgid "Import mail from Pine."
-msgstr "Import mail from Pine."
+#: ../mail/em-format-html-display.c:259 ../smime/gui/smime-ui.ui.h:43
+msgid "_View Certificate"
+msgstr "_View Certificate"
 
-#: ../mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Mail to %s"
+#: ../mail/em-format-html-display.c:274
+msgid "This certificate is not viewable"
+msgstr "This certificate is not viewable"
 
-#: ../mail/mail-autofilter.c:228 ../mail/mail-autofilter.c:271
-#, c-format
-msgid "Mail from %s"
-msgstr "Mail from %s"
+#: ../mail/em-format-html-display.c:589
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"Evolution cannot render this e-mail as it is too large to process. You can "
+"view it unformatted or with an external text editor."
 
-#: ../mail/mail-autofilter.c:254
-#, c-format
-msgid "Subject is %s"
-msgstr "Subject is %s"
+#: ../mail/em-format-html-display.c:773
+msgid "Save Image"
+msgstr "Save Image"
 
-#: ../mail/mail-autofilter.c:295
-#, c-format
-msgid "%s mailing list"
-msgstr "%s mailing list"
+#: ../mail/em-format-html-display.c:821
+msgid "Save _Image..."
+msgstr "Save _Imageâ"
 
-#: ../mail/mail-autofilter.c:404
-msgid "Add Filter Rule"
-msgstr "Add Filter Rule"
+#: ../mail/em-format-html-display.c:823
+msgid "Save the image to a file"
+msgstr "Save the image to a file"
 
-#. Translators: The first %s is name of the affected
-#. * filter rule(s), the second %s is URI of the removed
-#. * 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:507
-#, c-format
-msgid ""
-"The filter rule \"%s\" has been modified to account for the deleted folder\n"
-"\"%s\"."
-msgid_plural ""
-"The following filter rules\n"
-"%s have been modified to account for the deleted folder\n"
-"\"%s\"."
-msgstr[0] ""
-"The filter rule \"%s\" has been modified to account for the deleted folder\n"
-"\"%s\"."
-msgstr[1] ""
-"The following filter rules\n"
-"%s have been modified to account for the deleted folder\n"
-"\"%s\"."
+#: ../mail/em-format-html-display.c:1024
+msgid "Completed on"
+msgstr "Completed on"
 
-#: ../mail/mail-config.ui.h:2
-msgid "Add Ne_w Signature..."
-msgstr "Add Ne_w Signatureâ"
+#: ../mail/em-format-html-display.c:1036
+msgid "Overdue:"
+msgstr "Overdue:"
 
-#: ../mail/mail-config.ui.h:3
-msgid "Al_ways sign outgoing messages when using this account"
-msgstr "Al_ways sign outgoing messages when using this account"
+#: ../mail/em-format-html-display.c:1044
+msgid "by"
+msgstr "by"
 
-#: ../mail/mail-config.ui.h:4
-msgid ""
-"All new emails with header that matches given content will be automatically "
-"filtered as junk"
-msgstr ""
-"All new e-mails with header that matches given content will be automatically "
-"filtered as junk"
+#: ../mail/em-format-html-display.c:1325 ../mail/em-format-html-display.c:1376
+msgid "View _Unformatted"
+msgstr "View _Unformatted"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:6
-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"
+#: ../mail/em-format-html-display.c:1327
+msgid "Hide _Unformatted"
+msgstr "Hide _Unformatted"
 
-#: ../mail/mail-config.ui.h:7
-msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "Also encrypt to sel_f when sending encrypted messages"
+#: ../mail/em-format-html-display.c:1398
+msgid "O_pen With"
+msgstr "O_pen With"
 
-#: ../mail/mail-config.ui.h:8
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Alway_s carbon-copy (cc) to:"
+#. Translators: Name of an Attachment button for a11y object
+#: ../mail/em-format-html-display.c:1407
+msgctxt "Button"
+msgid "Attachment"
+msgstr "Attachment"
 
-#: ../mail/mail-config.ui.h:9
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Always _blind carbon-copy (bcc) to:"
+#: ../mail/em-format-html-print.c:157
+#, c-format
+msgid "Page %d of %d"
+msgstr "Page %d of %d"
 
-#: ../mail/mail-config.ui.h:10
-msgid "Always _trust keys in my keyring when encrypting"
-msgstr "Always _trust keys in my keyring when encrypting"
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
+#, c-format
+msgid "No HTML stream available"
+msgstr "No HTML stream available"
 
-#: ../mail/mail-config.ui.h:11
-msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "Always encrypt to _myself when sending encrypted messages"
+#: ../mail/em-subscription-editor.c:870
+msgid "_Subscribe"
+msgstr "_Subscribe"
 
-#: ../mail/mail-config.ui.h:12
-msgid "Always request rea_d receipt"
-msgstr "Always request rea_d receipt"
+#: ../mail/em-subscription-editor.c:879
+msgid "Su_bscribe To Shown"
+msgstr "Su_bscribe To Shown"
 
-#: ../mail/mail-config.ui.h:13
-msgid "Apply the same _view settings to all folders"
-msgstr "Apply the same _view settings to all folders"
+#: ../mail/em-subscription-editor.c:887
+msgid "Subscribe To _All"
+msgstr "Subscribe To _All"
 
-#: ../mail/mail-config.ui.h:15
-#: ../modules/addressbook/addressbook-config.c:1088
-msgid "Authentication"
-msgstr "Authentication"
+#: ../mail/em-subscription-editor.c:987 ../mail/em-subscription-editor.c:1840
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
+msgid "_Unsubscribe"
+msgstr "_Unsubscribe"
 
-#: ../mail/mail-config.ui.h:16
-msgid "Automatically insert _emoticon images"
-msgstr "Automatically insert _emoticon images"
+#: ../mail/em-subscription-editor.c:996
+msgid "Unsu_bscribe From Hidden"
+msgstr "Unsu_bscribe From Hidden"
 
-#: ../mail/mail-config.ui.h:17
-msgid "C_haracter set:"
-msgstr "C_haracter set:"
+#: ../mail/em-subscription-editor.c:1004
+msgid "Unsubscribe From _All"
+msgstr "Unsubscribe From _All"
 
-#: ../mail/mail-config.ui.h:18
-msgid "Ch_eck for Supported Types"
-msgstr "Ch_eck for Supported Types"
+#: ../mail/em-subscription-editor.c:1675
+msgid "Folder Subscriptions"
+msgstr "Folder Subscriptions"
 
-#: ../mail/mail-config.ui.h:19
-msgid "Check cu_stom headers for junk"
-msgstr "Check cu_stom headers for junk"
+#: ../mail/em-subscription-editor.c:1715
+msgid "_Account:"
+msgstr "_Account:"
 
-#: ../mail/mail-config.ui.h:20
-msgid "Check for new _messages on start"
-msgstr "Check for new _messages on start"
+#: ../mail/em-subscription-editor.c:1730
+msgid "Clear Search"
+msgstr "Clear Search"
 
-#: ../mail/mail-config.ui.h:21
-msgid "Check for new messa_ges in all active accounts"
-msgstr "Check for new messa_ges in all active accounts"
+#: ../mail/em-subscription-editor.c:1748
+msgid "Sho_w items that contain:"
+msgstr "Sho_w items that contain:"
 
-#: ../mail/mail-config.ui.h:22
-msgid "Check incoming _messages for junk"
-msgstr "Check incoming _messages for junk"
+#: ../mail/em-subscription-editor.c:1793
+msgid "Subscribe to the selected folder"
+msgstr "Subscribe to the selected folder"
 
-#: ../mail/mail-config.ui.h:23
-msgid "Check spelling while I _type"
-msgstr "Check spelling while I _type"
+#: ../mail/em-subscription-editor.c:1794
+msgid "Su_bscribe"
+msgstr "Su_bscribe"
 
-#: ../mail/mail-config.ui.h:24
-msgid "Cle_ar"
-msgstr "Cle_ar"
+#: ../mail/em-subscription-editor.c:1839
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
+msgid "Unsubscribe from the selected folder"
+msgstr "Unsubscribe from the selected folder"
 
-#: ../mail/mail-config.ui.h:25
-msgid "Clea_r"
-msgstr "Clea_r"
+#: ../mail/em-subscription-editor.c:1879
+msgid "Collapse all folders"
+msgstr "Collapse all folders"
 
-#: ../mail/mail-config.ui.h:26
-msgid "Color for _misspelled words:"
-msgstr "Colour for _misspelt words:"
+#: ../mail/em-subscription-editor.c:1880
+msgid "C_ollapse All"
+msgstr "C_ollapse All"
 
-#: ../mail/mail-config.ui.h:27
-msgid "Composing Messages"
-msgstr "Composing Messages"
+#: ../mail/em-subscription-editor.c:1890
+msgid "Expand all folders"
+msgstr "Expand all folders"
 
-#: ../mail/mail-config.ui.h:28
-#: ../modules/plugin-manager/evolution-plugin-manager.c:161
-msgid "Configuration"
-msgstr "Configuration"
+#: ../mail/em-subscription-editor.c:1891
+msgid "E_xpand All"
+msgstr "E_xpand All"
 
-#: ../mail/mail-config.ui.h:29
-msgid "Confirm _when expunging a folder"
-msgstr "Confirm _when expunging a folder"
+#: ../mail/em-subscription-editor.c:1901
+msgid "Refresh the folder list"
+msgstr "Refresh the folder list"
 
-#: ../mail/mail-config.ui.h:30
-msgid "Confirmations"
-msgstr "Confirmations"
+#: ../mail/em-subscription-editor.c:1913
+msgid "Stop the current operation"
+msgstr "Stop the current operation"
 
-#: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:188
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
-msgid "Date/Time Format"
-msgstr "Date/Time Format"
+#. 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:110
+#, 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/mail-config.ui.h:33
-msgid "Default Behavior"
-msgstr "Default Behaviour"
+#: ../mail/em-utils.c:166
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
+msgid "_Do not show this message again"
+msgstr "_Do not show this message again"
 
-#: ../mail/mail-config.ui.h:34
-msgid "Default character e_ncoding:"
-msgstr "Default character e_ncoding:"
+#: ../mail/em-utils.c:318
+msgid "Message Filters"
+msgstr "Message Filters"
 
-#: ../mail/mail-config.ui.h:35
-msgid "Delete Mail"
-msgstr "Delete Mail"
+#: ../mail/em-utils.c:979
+#, c-format
+msgid "Messages from %s"
+msgstr "Messages from %s"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Delete junk messages on e_xit"
-msgstr "Delete junk messages on e_xit"
+#: ../mail/em-vfolder-editor.c:105
+msgid "Search _Folders"
+msgstr "Search _Folders"
 
-#: ../mail/mail-config.ui.h:38
-msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "Digitally sign o_utgoing messages (by default)"
+#: ../mail/em-vfolder-editor-rule.c:339
+msgid "Add Folder"
+msgstr "Add Folder"
 
-#: ../mail/mail-config.ui.h:39
-msgid "Displayed Message Headers"
-msgstr "Displayed Message Headers"
+#: ../mail/evolution-mail.schemas.in.h:11
+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:40
-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/evolution-mail.schemas.in.h:39
+msgid "Composer Window default width"
+msgstr "Composer Window default width"
 
-#: ../mail/mail-config.ui.h:41
-msgid "Do not quote"
-msgstr "Do not quote"
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Default width of the Composer Window."
+msgstr "Default width of the Composer Window."
 
-#: ../mail/mail-config.ui.h:42
-msgid "Drafts _Folder:"
-msgstr "Drafts _Folder:"
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Composer Window default height"
+msgstr "Composer Window default height"
 
-#: ../mail/mail-config.ui.h:43
-msgid "Email _Address:"
-msgstr "E-mail _Address:"
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid "Default height of the Composer Window."
+msgstr "Default height of the Composer Window."
 
-#: ../mail/mail-config.ui.h:44
-msgid "Empty trash folders on e_xit"
-msgstr "Empty wastebasket folders on e_xit"
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid "Attribute message."
+msgstr "Attribute message."
 
-#: ../mail/mail-config.ui.h:46
-msgid "Encry_ption certificate:"
-msgstr "Encry_ption certificate:"
+#: ../mail/evolution-mail.schemas.in.h:46
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author."
+msgstr ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author."
 
-#: ../mail/mail-config.ui.h:47
-msgid "Encrypt out_going messages (by default)"
-msgstr "Encrypt out_going messages (by default)"
+#: ../mail/evolution-mail.schemas.in.h:47
+msgid "Forward message."
+msgstr "Forward message."
 
-#: ../mail/mail-config.ui.h:48
-msgid "F_all back to threading messages by subject"
-msgstr "F_all back to threading messages by subject"
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
+msgstr ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
 
-#: ../mail/mail-config.ui.h:49
-msgid "Fix_ed Width Font:"
-msgstr "Fix_ed Width Font:"
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid "Original message."
+msgstr "Original message."
 
-#: ../mail/mail-config.ui.h:50
-msgid "Format messages in _HTML"
-msgstr "Format messages in _HTML"
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows."
+msgstr ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows."
 
-#: ../mail/mail-config.ui.h:51
-msgid "Full Nam_e:"
-msgstr "Full Nam_e:"
+#: ../mail/evolution-mail.schemas.in.h:52
+msgid ""
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder."
+msgstr ""
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder."
 
-#: ../mail/mail-config.ui.h:53
-msgid "Group Reply goes only to mailing list, if possible"
-msgstr "Group Reply goes only to mailing list, if possible"
+#: ../mail/evolution-mail.schemas.in.h:97
+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."
 
-#: ../mail/mail-config.ui.h:54
-msgid "HTML Messages"
-msgstr "HTML Messages"
+#: ../mail/evolution-mail.schemas.in.h:123
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Requires a restart to apply."
+msgstr ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Requires a restart to apply."
 
-#: ../mail/mail-config.ui.h:55
-msgid "H_TTP Proxy:"
-msgstr "H_TTP Proxy:"
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid ""
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
+msgstr ""
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
 
-#: ../mail/mail-config.ui.h:56
-msgid "Header content"
-msgstr "Header content"
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid ""
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
+"true accounts are sorted alphabetically, with an exception of On This "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user."
+msgstr ""
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
+"true accounts are sorted alphabetically, with an exception of On This "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user."
 
-#: ../mail/mail-config.ui.h:57
-msgid "Header name"
-msgstr "Header name"
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Mail browser width"
+msgstr "Mail browser width"
 
-#: ../mail/mail-config.ui.h:58
-msgid "Headers"
-msgstr "Headers"
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Default width of the mail browser window."
+msgstr "Default width of the mail browser window."
 
-#: ../mail/mail-config.ui.h:59
-msgid "Highlight _quotations with"
-msgstr "Highlight _quotations with"
+#: ../mail/evolution-mail.schemas.in.h:132
+msgid "Mail browser height"
+msgstr "Mail browser height"
 
-#: ../mail/mail-config.ui.h:60
-msgid "Ignore Reply-To: for mailing lists"
-msgstr "Ignore Reply-To: for mailing lists"
+#: ../mail/evolution-mail.schemas.in.h:133
+msgid "Default height of the mail browser window."
+msgstr "Default height of the mail browser window."
 
-#: ../mail/mail-config.ui.h:61
-msgid "Inline"
-msgstr "Inline"
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Mail browser maximized"
+msgstr "Mail browser maximised"
 
-#: ../mail/mail-config.ui.h:62
-msgid "Inline (Outlook style)"
-msgstr "Inline (Outlook style)"
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "Default maximized state of the mail browser window."
+msgstr "Default maximised state of the mail browser window."
 
-#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
-msgid "Labels"
-msgstr "Labels"
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid "\"Folder Subscriptions\" window height"
+msgstr "\"Folder Subscriptions\" window height"
 
-#: ../mail/mail-config.ui.h:65
-msgid "Languages Table"
-msgstr "Languages Table"
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
 
-#: ../mail/mail-config.ui.h:66
-msgid "Loading Images"
-msgstr "Loading Images"
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "\"Folder Subscriptions\" window maximize state"
+msgstr "\"Folder Subscriptions\" window maximise state"
 
-#: ../mail/mail-config.ui.h:67
-msgid "Mail Headers Table"
-msgstr "Mail Headers Table"
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid ""
+"Initial maximize state of the \"Folder Subscriptions\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Folder Subscriptions\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"Initial maximise state of the \"Folder Subscriptions\" window. The value "
+"updates when the user maximises or unmaximises the window. Note, this "
+"particular value is not used by Evolution since the \"Folder Subscriptions\" "
+"window cannot be maximised. This key exists only as an implementation detail."
 
-#: ../mail/mail-config.ui.h:68
-msgid "Mailbox location"
-msgstr "Mailbox location"
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid "\"Folder Subscriptions\" window width"
+msgstr "\"Folder Subscriptions\" window width"
 
-#: ../mail/mail-config.ui.h:69
-msgid "Message Display"
-msgstr "Message Display"
+#: ../mail/evolution-mail.schemas.in.h:141
+msgid ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
 
-#: ../mail/mail-config.ui.h:70
-msgid "Message Receipts"
-msgstr "Message Receipts"
+#: ../mail/evolution-mail.schemas.in.h:149
+msgid "Default reply style"
+msgstr "Default reply style"
 
-#: ../mail/mail-config.ui.h:71
-msgid "No _Proxy for:"
-msgstr "No _Proxy for:"
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid ""
+"Possible values are: never - to never close browser window always - to "
+"always close browser window ask - (or any other value) will ask user"
+msgstr ""
+"Possible values are: never â to never close browser window; always â to "
+"always close browser window; ask â (or any other value) will ask user"
 
-#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "No encryption"
+#: ../mail/evolution-mail.schemas.in.h:207
+msgid "List of accounts"
+msgstr "List of accounts"
 
-#: ../mail/mail-config.ui.h:73
-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/evolution-mail.schemas.in.h:208
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
 
-#: ../mail/mail-config.ui.h:74
-#: ../plugins/publish-calendar/publish-calendar.ui.h:10
-msgid "Optional Information"
-msgstr "Optional Information"
+#: ../mail/evolution-mail.schemas.in.h:209
+msgid "List of accepted licenses"
+msgstr "List of accepted licences"
 
-#: ../mail/mail-config.ui.h:76
-msgid "Or_ganization:"
-msgstr "Or_ganisation:"
+#: ../mail/evolution-mail.schemas.in.h:210
+msgid "List of protocol names whose license has been accepted."
+msgstr "List of protocol names whose licence has been accepted."
 
-#: ../mail/mail-config.ui.h:77
-msgid "PGP/GPG _Key ID:"
-msgstr "PGP/GPG _Key ID:"
+#: ../mail/evolution-mail.schemas.in.h:213
+msgid "\"Filter Editor\" window height"
+msgstr "\"Filter Editor\" window height"
 
-#: ../mail/mail-config.ui.h:78
-msgid "Pass_word:"
-msgstr "Pass_word:"
+#: ../mail/evolution-mail.schemas.in.h:214
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
 
-#: ../mail/mail-config.ui.h:79
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
-msgid "Pick a color"
-msgstr "Pick a colour"
+#: ../mail/evolution-mail.schemas.in.h:215
+msgid "\"Filter Editor\" window maximize state"
+msgstr "\"Filter Editor\" window maximise state"
 
-#: ../mail/mail-config.ui.h:80
-msgid "Port:"
-msgstr "Port:"
+#: ../mail/evolution-mail.schemas.in.h:216
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
+msgstr ""
+"Initial maximise state of the \"Filter Editor\" window. The value updates "
+"when the user maximises or unmaximises the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximised. This key exists only as an implementation detail."
 
-#: ../mail/mail-config.ui.h:81
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Pretty Good Privacy (PGP/GPG)"
+#: ../mail/evolution-mail.schemas.in.h:217
+msgid "\"Filter Editor\" window width"
+msgstr "\"Filter Editor\" window width"
 
-#: ../mail/mail-config.ui.h:83
-msgid "Proxy Settings"
-msgstr "Proxy Settings"
+#: ../mail/evolution-mail.schemas.in.h:218
+msgid ""
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr ""
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
 
-#: ../mail/mail-config.ui.h:84
-msgid "Quoted"
-msgstr "Quoted"
+#: ../mail/evolution-mail.schemas.in.h:220
+msgid ""
+"Whether check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
+msgstr ""
+"Whether to check for new messages when Evolution is started. This includes "
+"also sending messages from the Outbox."
 
-#: ../mail/mail-config.ui.h:85
-msgid "Re_member password"
-msgstr "Re_member password"
+#: ../mail/evolution-mail.schemas.in.h:222
+msgid ""
+"Whether check for new messages in all active accounts regardless of the "
+"account \"Check for new messages every X minutes\" option when Evolution is "
+"started. This option is used only together with 'send_recv_on_start' option."
+msgstr ""
+"Whether to check for new messages in all active accounts regardless of the "
+"account's \"Check for new messages every X minutes\" option when Evolution "
+"is started. This option is used only together with 'send_recv_on_start' "
+"option."
 
-#: ../mail/mail-config.ui.h:86
-msgid "Re_ply-To:"
-msgstr "Re_ply-To:"
+#: ../mail/evolution-mail.schemas.in.h:223
+msgid "\"Send and Receive Mail\" window height"
+msgstr "\"Send and Receive Mail\" window height"
 
-#: ../mail/mail-config.ui.h:87
-msgid "Remember _password"
-msgstr "Remember _password"
+#: ../mail/evolution-mail.schemas.in.h:224
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
 
-#: ../mail/mail-config.ui.h:88
-msgid "Replies and Forwards"
-msgstr "Replies and Forwards"
+#: ../mail/evolution-mail.schemas.in.h:225
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "\"Send and Receive Mail\" window maximise state"
 
-#: ../mail/mail-config.ui.h:89
-msgid "Required Information"
-msgstr "Required Information"
+#: ../mail/evolution-mail.schemas.in.h:226
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+"Initial maximise state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximises or unmaximises the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximised. This key exists only as an implementation "
+"detail."
 
-#: ../mail/mail-config.ui.h:90
-msgid "SHA1"
-msgstr "SHA1"
+#: ../mail/evolution-mail.schemas.in.h:227
+msgid "\"Send and Receive Mail\" window width"
+msgstr "\"Send and Receive Mail\" window width"
 
-#: ../mail/mail-config.ui.h:91
-msgid "SHA256"
-msgstr "SHA256"
+#: ../mail/evolution-mail.schemas.in.h:228
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
 
-#: ../mail/mail-config.ui.h:92
-msgid "SHA384"
-msgstr "SHA384"
+#: ../mail/evolution-mail.schemas.in.h:229
+msgid "\"Search Folder Editor\" window height"
+msgstr "\"Search Folder Editor\" window height"
 
-#: ../mail/mail-config.ui.h:93
-msgid "SHA512"
-msgstr "SHA512"
+#: ../mail/evolution-mail.schemas.in.h:230
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
 
-#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "SSL encryption"
+#: ../mail/evolution-mail.schemas.in.h:231
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "\"Search Folder Editor\" window maximise state"
 
-#: ../mail/mail-config.ui.h:95
-msgid "SSL is not supported in this build of Evolution"
-msgstr "SSL is not supported in this build of Evolution"
+#: ../mail/evolution-mail.schemas.in.h:232
+msgid ""
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"Initial maximise state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximises or unmaximises the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximised. This key exists only as an implementation detail."
 
-#: ../mail/mail-config.ui.h:96
-msgid "S_earch for sender photograph only in local address books"
-msgstr "S_earch for sender photograph only in local address books"
+#: ../mail/evolution-mail.schemas.in.h:233
+msgid "\"Search Folder Editor\" window width"
+msgstr "\"Search Folder Editor\" window width"
 
-#: ../mail/mail-config.ui.h:97
-msgid "S_elect..."
-msgstr "S_electâ"
+#: ../mail/evolution-mail.schemas.in.h:234
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
 
-#: ../mail/mail-config.ui.h:98
-msgid "S_end message receipts:"
-msgstr "S_end message receipts:"
+#: ../mail/evolution-mail.schemas.in.h:235
+msgid "Drag'n'drop export format"
+msgstr "Drag'n'drop export format"
 
-#: ../mail/mail-config.ui.h:99
-msgid "S_tandard Font:"
-msgstr "S_tandard Font:"
+#: ../mail/evolution-mail.schemas.in.h:236
+msgid ""
+"Define the email export format when doing drag'n'drop. Possible values are "
+"mbox or pdf"
+msgstr ""
+"Define the email export format when doing drag'n'drop. Possible values are "
+"mbox or pdf"
 
-#: ../mail/mail-config.ui.h:100
-msgid "Secure MIME (S/MIME)"
-msgstr "Secure MIME (S/MIME)"
+#: ../mail/evolution-mail.schemas.in.h:237
+msgid "Format of the drag'n'drop export filename"
+msgstr "Format of the drag'n'drop export filename"
 
-#: ../mail/mail-config.ui.h:102
-msgid "Select HTML fixed width font"
-msgstr "Select HTML fixed width font"
+#: ../mail/evolution-mail.schemas.in.h:238
+msgid ""
+"Exported filename will be YYYYmmDDHHMMSS_email_title Possible values: 1 (: "
+"email sent date), 2 (: drag'n'drop date)"
+msgstr ""
+"Exported filename will be YYYYmmDDHHMMSS_email_title Possible values: 1 (: "
+"email sent date), 2 (: drag'n'drop date)"
 
-#: ../mail/mail-config.ui.h:103
-msgid "Select HTML variable width font"
-msgstr "Select HTML variable width font"
+#: ../mail/importers/elm-importer.c:181
+msgid "Importing Elm data"
+msgstr "Importing Elm data"
 
-#: ../mail/mail-config.ui.h:104
-msgid "Sender Photograph"
-msgstr "Sender Photograph"
+#: ../mail/importers/elm-importer.c:353 ../mail/importers/pine-importer.c:460
+#: ../modules/mail/e-mail-shell-view.c:1042
+#: ../widgets/misc/e-send-options.c:538
+msgid "Mail"
+msgstr "Mail"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:106
-msgid "Sending a _private reply to a mailing list message"
-msgstr "Sending a _private reply to a mailing list message"
+#: ../mail/importers/elm-importer.c:400
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm importer"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:108
-msgid "Sending a message with _recipients not entered as mail addresses"
-msgstr "Sending a message with _recipients not entered as mail addresses"
+#: ../mail/importers/elm-importer.c:401
+msgid "Import mail from Elm."
+msgstr "Import mail from Elm."
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:110
-msgid "Sending a message with an _empty subject line"
-msgstr "Sending a message with an _empty subject line"
+#: ../mail/importers/evolution-mbox-importer.c:142
+#: ../plugins/dbx-import/dbx-importer.c:260
+msgid "_Destination folder:"
+msgstr "_Destination folder:"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:112
-msgid "Sending a message with only _Bcc recipients defined"
-msgstr "Sending a message with only _Bcc recipients defined"
+#: ../mail/importers/evolution-mbox-importer.c:148
+#: ../plugins/dbx-import/dbx-importer.c:266
+#: ../plugins/pst-import/pst-importer.c:557
+msgid "Select folder"
+msgstr "Select folder"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:114
-msgid "Sending a reply to a large _number of recipients"
-msgstr "Sending a reply to a large _number of recipients"
+#: ../mail/importers/evolution-mbox-importer.c:149
+#: ../plugins/dbx-import/dbx-importer.c:267
+#: ../plugins/pst-import/pst-importer.c:558
+msgid "Select folder to import into"
+msgstr "Select folder to import into"
 
-#: ../mail/mail-config.ui.h:115
-msgid "Sent _Messages Folder:"
-msgstr "Sent _Messages Folder:"
+#: ../mail/importers/evolution-mbox-importer.c:438
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Subject"
 
-#: ../mail/mail-config.ui.h:116
-msgid "Ser_ver requires authentication"
-msgstr "Ser_ver requires authentication"
+#: ../mail/importers/evolution-mbox-importer.c:443
+msgctxt "mboxImp"
+msgid "From"
+msgstr "From"
 
-#: ../mail/mail-config.ui.h:117
-msgid "Server Configuration"
-msgstr "Server Configuration"
+#: ../mail/importers/evolution-mbox-importer.c:487
+#: ../shell/e-shell-utils.c:195
+msgid "Berkeley Mailbox (mbox)"
+msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/mail-config.ui.h:118
-msgid "Server _Type:"
-msgstr "Server _Type:"
+#: ../mail/importers/evolution-mbox-importer.c:488
+msgid "Importer Berkeley Mailbox format folders"
+msgstr "Importer Berkeley Mailbox format folders"
 
-#: ../mail/mail-config.ui.h:119
-msgid "Set custom junk header"
-msgstr "Set custom junk header"
+#: ../mail/importers/mail-importer.c:63
+msgid "Importing mailbox"
+msgstr "Importing mailbox"
 
-#: ../mail/mail-config.ui.h:120
-msgid "Si_gning algorithm:"
-msgstr "Si_gning algorithm:"
+#. Destination folder, was set in our widget
+#: ../mail/importers/mail-importer.c:153
+#: ../plugins/dbx-import/dbx-importer.c:621
+#: ../plugins/pst-import/pst-importer.c:770
+#, c-format
+msgid "Importing '%s'"
+msgstr "Importing '%s'"
 
-#: ../mail/mail-config.ui.h:121
-msgid "Sig_natures"
-msgstr "Sig_natures"
+#: ../mail/importers/mail-importer.c:316
+#, c-format
+msgid "Scanning %s"
+msgstr "Scanning %s"
 
-#: ../mail/mail-config.ui.h:122
-msgid "Sig_ning certificate:"
-msgstr "Sig_ning certificate:"
+#: ../mail/importers/pine-importer.c:262
+msgid "Importing Pine data"
+msgstr "Importing Pine data"
 
-#: ../mail/mail-config.ui.h:123
-msgid "Signat_ure:"
-msgstr "Signat_ure:"
+#: ../mail/importers/pine-importer.c:467
+#: ../modules/addressbook/addressbook-config.c:1115
+msgid "Address Book"
+msgstr "Address Book"
 
-#: ../mail/mail-config.ui.h:124
-msgid "Signatures"
-msgstr "Signatures"
+#: ../mail/importers/pine-importer.c:515
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine importer"
 
-#: ../mail/mail-config.ui.h:125
-msgid "Signing _algorithm:"
-msgstr "Signing _algorithm:"
+#: ../mail/importers/pine-importer.c:516
+msgid "Import mail from Pine."
+msgstr "Import mail from Pine."
 
-#: ../mail/mail-config.ui.h:126
-msgid "Special Folders"
-msgstr "Special Folders"
+#: ../mail/mail-autofilter.c:73
+#, c-format
+msgid "Mail to %s"
+msgstr "Mail to %s"
 
-#: ../mail/mail-config.ui.h:127
-msgid "Spell Checking"
-msgstr "Spell Checking"
+#: ../mail/mail-autofilter.c:229 ../mail/mail-autofilter.c:272
+#, c-format
+msgid "Mail from %s"
+msgstr "Mail from %s"
 
-#: ../mail/mail-config.ui.h:128
-msgid "Start _typing at the bottom on replying"
-msgstr "Start _typing at the bottom on replying"
+#: ../mail/mail-autofilter.c:255
+#, c-format
+msgid "Subject is %s"
+msgstr "Subject is %s"
 
-#: ../mail/mail-config.ui.h:129
-msgid "Start up"
-msgstr "Start up"
+#: ../mail/mail-autofilter.c:296
+#, c-format
+msgid "%s mailing list"
+msgstr "%s mailing list"
 
-#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
-msgid "TLS encryption"
-msgstr "TLS encryption"
+#: ../mail/mail-autofilter.c:406
+msgid "Add Filter Rule"
+msgstr "Add Filter Rule"
 
-#: ../mail/mail-config.ui.h:131
-msgid "T_ype:"
-msgstr "T_ype:"
+#. Translators: The first %s is name of the affected
+#. * filter rule(s), the second %s is URI of the removed
+#. * 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:513
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[1] ""
+"The following filter rules\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:1
+msgid "Set custom junk header"
+msgstr "Set custom junk header"
+
+#: ../mail/mail-config.ui.h:2
 msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+"All new emails with header that matches given content will be automatically "
+"filtered as junk"
 msgstr ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+"All new e-mails with header that matches given content will be automatically "
+"filtered as junk"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:3
+msgid "Header name"
+msgstr "Header name"
+
+#: ../mail/mail-config.ui.h:4
+msgid "Header content"
+msgstr "Header content"
+
+#: ../mail/mail-config.ui.h:5
+msgid "_Add Signature"
+msgstr "_Add Signature"
+
+#: ../mail/mail-config.ui.h:6
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11843,930 +13248,816 @@ msgstr ""
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 
-#: ../mail/mail-config.ui.h:136
-msgid ""
-"To help avoid email accidents and embarrassments, ask for confirmation "
-"before taking the following checkmarked actions:"
-msgstr ""
-"To help avoid e-mail accidents and embarrassments, ask for confirmation "
-"before taking the following checkmarked actions:"
-
-#: ../mail/mail-config.ui.h:137
-msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"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\""
+#: ../mail/mail-config.ui.h:10
+msgid "_Script:"
+msgstr "_Script:"
 
-#: ../mail/mail-config.ui.h:139
-msgid "Us_ername:"
-msgstr "Us_ername:"
+#: ../mail/mail-config.ui.h:11
+msgid "Default Behavior"
+msgstr "Default Behaviour"
 
-#: ../mail/mail-config.ui.h:140
-msgid "Use Authe_ntication"
-msgstr "Use Authe_ntication"
+#: ../mail/mail-config.ui.h:12
+msgid "For_mat messages in HTML"
+msgstr "For_mat messages in HTML"
 
-#: ../mail/mail-config.ui.h:141
-msgid "User _Name:"
-msgstr "User_name:"
+#: ../mail/mail-config.ui.h:13
+msgid "Automatically insert _emoticon images"
+msgstr "Automatically insert _emoticon images"
 
-#: ../mail/mail-config.ui.h:142
-msgid "_Add Signature"
-msgstr "_Add Signature"
+#: ../mail/mail-config.ui.h:14
+msgid "Always request rea_d receipt"
+msgstr "Always request rea_d receipt"
 
-#: ../mail/mail-config.ui.h:143
-msgid "_Always load images from the Internet"
-msgstr "_Always load images from the Internet"
+#: ../mail/mail-config.ui.h:15
+msgid "Encode filenames in an _Outlook/GMail way"
+msgstr "Encode filenames in an _Outlook/GMail way"
 
-#: ../mail/mail-config.ui.h:144
-msgid "_Authentication Type"
-msgstr "_Authentication Type"
+#: ../mail/mail-config.ui.h:16
+msgid "Ch_aracter encoding:"
+msgstr "Ch_aracter encoding:"
 
-#: ../mail/mail-config.ui.h:145
-msgid "_Direct connection to the Internet"
-msgstr "_Direct connection to the Internet"
+#: ../mail/mail-config.ui.h:17
+msgid "Replies and Forwards"
+msgstr "Replies and Forwards"
 
-#: ../mail/mail-config.ui.h:146
-msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "_Do not sign meeting requests (for Outlook compatibility)"
+#: ../mail/mail-config.ui.h:18
+msgid "_Reply style:"
+msgstr "_Reply style:"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:19
 msgid "_Forward style:"
 msgstr "_Forward style:"
 
-#: ../mail/mail-config.ui.h:148
-msgid "_Junk Folder:"
-msgstr "_Junk Folder:"
+#: ../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:149
+#: ../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:150
-msgid "_Languages"
-msgstr "_Languages"
-
-#: ../mail/mail-config.ui.h:151
-msgid "_Load images only in messages from contacts"
-msgstr "_Load images only in messages from contacts"
-
-#: ../mail/mail-config.ui.h:152
-msgid "_Lookup in local address book only"
-msgstr "_Look up in local address book only"
-
-#: ../mail/mail-config.ui.h:153
-msgid "_Make this my default account"
-msgstr "_Make this my default account"
-
-#: ../mail/mail-config.ui.h:154
-msgid "_Manual proxy configuration:"
-msgstr "_Manual proxy configuration:"
+#: ../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:156
-msgid "_Never load images from the Internet"
-msgstr "_Never load images from the Internet"
+#: ../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:158 ../modules/addressbook/ldap-config.ui.h:27
-msgid "_Port:"
-msgstr "_Port:"
+#: ../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:159
-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:26
+msgid "Sig_natures"
+msgstr "Sig_natures"
 
-#: ../mail/mail-config.ui.h:160
-msgid "_Reply style:"
-msgstr "_Reply style:"
+#: ../mail/mail-config.ui.h:28
+msgid "Signatures"
+msgstr "Signatures"
 
-#: ../mail/mail-config.ui.h:161
-msgid "_Script:"
-msgstr "_Script:"
+#: ../mail/mail-config.ui.h:29
+msgid "_Languages"
+msgstr "_Languages"
 
-#: ../mail/mail-config.ui.h:162
-msgid "_Secure HTTP Proxy:"
-msgstr "_Secure HTTP Proxy:"
+#: ../mail/mail-config.ui.h:30
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 
-#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
-#: ../plugins/publish-calendar/publish-calendar.ui.h:28
-msgid "_Server:"
-msgstr "_Server:"
+#: ../mail/mail-config.ui.h:31
+msgid "Languages Table"
+msgstr "Languages Table"
 
-#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:166
-msgid "_Show animated images"
-msgstr "_Show animated images"
+#: ../mail/mail-config.ui.h:33
+msgid "Check spelling while I _type"
+msgstr "Check spelling while I _type"
 
-#: ../mail/mail-config.ui.h:167
-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:34
+msgid "Color for _misspelled words:"
+msgstr "Colour for _misspelt words:"
 
-#: ../mail/mail-config.ui.h:168
-msgid "_Trash Folder:"
-msgstr "Wastebaske_t Folder:"
+#: ../mail/mail-config.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
+msgid "Pick a color"
+msgstr "Pick a colour"
 
-#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "_Use secure connection:"
+#: ../mail/mail-config.ui.h:36
+msgid "Spell Checking"
+msgstr "Spell Checking"
 
-#: ../mail/mail-config.ui.h:170
-msgid "_Use system defaults"
-msgstr "_Use system defaults"
+#: ../mail/mail-config.ui.h:37
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
+msgstr ""
+"To help avoid e-mail accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
 
-#: ../mail/mail-config.ui.h:171
-msgid "_Use the same fonts as other applications"
-msgstr "_Use the same fonts as other applications"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:39
+msgid "Sending a message with an _empty subject line"
+msgstr "Sending a message with an _empty subject line"
 
-#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
-msgid "a"
-msgstr "a"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:41
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "Sending a message with only _Bcc recipients defined"
 
-#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
-msgid "b"
-msgstr "b"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:43
+msgid "Sending a _private reply to a mailing list message"
+msgstr "Sending a _private reply to a mailing list message"
 
-#: ../mail/mail-config.ui.h:174
-msgid "color"
-msgstr "colour"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:45
+msgid "Sending a reply to a large _number of recipients"
+msgstr "Sending a reply to a large _number of recipients"
 
-#: ../mail/mail-config.ui.h:175
-msgid "description"
-msgstr "description"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:47
+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"
 
-#: ../mail/mail-dialogs.ui.h:1
-msgid "All active remote folders"
-msgstr "All active remote folders"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:49
+msgid "Sending a message with _recipients not entered as mail addresses"
+msgstr "Sending a message with _recipients not entered as mail addresses"
 
-#: ../mail/mail-dialogs.ui.h:2
-msgid "All local and active remote folders"
-msgstr "All local and active remote folders"
+#: ../mail/mail-config.ui.h:50
+msgid "Confirmations"
+msgstr "Confirmations"
 
-#: ../mail/mail-dialogs.ui.h:3
-msgid "All local folders"
-msgstr "All local folders"
+#: ../mail/mail-config.ui.h:52
+msgid "SHA1"
+msgstr "SHA1"
 
-#: ../mail/mail-dialogs.ui.h:4
-msgid "Call"
-msgstr "Call"
+#: ../mail/mail-config.ui.h:53
+msgid "SHA256"
+msgstr "SHA256"
 
-#. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:6
-msgid "Co_mpleted"
-msgstr "Co_mpleted"
+#: ../mail/mail-config.ui.h:54
+msgid "SHA384"
+msgstr "SHA384"
 
-#: ../mail/mail-dialogs.ui.h:7
-msgid "Digital Signature"
-msgstr "Digital Signature"
+#: ../mail/mail-config.ui.h:55
+msgid "SHA512"
+msgstr "SHA512"
 
-#: ../mail/mail-dialogs.ui.h:8
-msgid "Do Not Forward"
-msgstr "Do Not Forward"
+#: ../mail/mail-config.ui.h:56 ../smime/gui/smime-ui.ui.h:1
+msgid "a"
+msgstr "a"
 
-#: ../mail/mail-dialogs.ui.h:9
-msgid "Encryption"
-msgstr "Encryption"
+#: ../mail/mail-config.ui.h:57 ../smime/gui/smime-ui.ui.h:2
+msgid "b"
+msgstr "b"
 
-#: ../mail/mail-dialogs.ui.h:10
-msgid "Follow-Up"
-msgstr "Follow-Up"
+#: ../mail/mail-config.ui.h:58
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "Attachment"
 
-#: ../mail/mail-dialogs.ui.h:11
-msgid "For Your Information"
-msgstr "For Your Information"
+#: ../mail/mail-config.ui.h:59
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "Inline (Outlook style)"
 
-#: ../mail/mail-dialogs.ui.h:12
-msgid "Forward"
-msgstr "Forward"
+#: ../mail/mail-config.ui.h:60
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "Quoted"
 
-#: ../mail/mail-dialogs.ui.h:13
-msgid "License Agreement"
-msgstr "Licence Agreement"
+#: ../mail/mail-config.ui.h:61
+msgctxt "ReplyForward"
+msgid "Do not quote"
+msgstr "Do not quote"
 
-#: ../mail/mail-dialogs.ui.h:14
-msgid "No Response Necessary"
-msgstr "No Response Necessary"
+#: ../mail/mail-config.ui.h:62
+msgctxt "ReplyForward"
+msgid "Inline"
+msgstr "Inline"
 
-#: ../mail/mail-dialogs.ui.h:18
-msgid "Reply to All"
-msgstr "Reply to All"
+#: ../mail/mail-config.ui.h:63
+msgid "Proxy Settings"
+msgstr "Proxy Settings"
 
-#: ../mail/mail-dialogs.ui.h:19
-msgid "Review"
-msgstr "Review"
+#: ../mail/mail-config.ui.h:64
+msgid "_Use system defaults"
+msgstr "_Use system defaults"
 
-#: ../mail/mail-dialogs.ui.h:20
-msgid "Search Folder Sources"
-msgstr "Search Folder Sources"
+#: ../mail/mail-config.ui.h:65
+msgid "_Direct connection to the Internet"
+msgstr "_Direct connection to the Internet"
 
-#: ../mail/mail-dialogs.ui.h:21
-msgid "Security Information"
-msgstr "Security Information"
+#: ../mail/mail-config.ui.h:66
+msgid "_Manual proxy configuration:"
+msgstr "_Manual proxy configuration:"
 
-#: ../mail/mail-dialogs.ui.h:22
-msgid "Specific folders"
-msgstr "Specific folders"
+#: ../mail/mail-config.ui.h:67
+msgid "H_TTP Proxy:"
+msgstr "H_TTP Proxy:"
 
-#: ../mail/mail-dialogs.ui.h:23
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
+#: ../mail/mail-config.ui.h:68
+msgid "_Secure HTTP Proxy:"
+msgstr "_Secure HTTP Proxy:"
 
-#: ../mail/mail-dialogs.ui.h:25
-msgid "_Accept License"
-msgstr "_Accept Licence"
+#: ../mail/mail-config.ui.h:69
+msgid "SOC_KS Proxy:"
+msgstr "SOC_KS Proxy:"
 
-#: ../mail/mail-dialogs.ui.h:26
-msgid "_Due By:"
-msgstr "_Due By:"
+#: ../mail/mail-config.ui.h:70
+msgid "No _Proxy for:"
+msgstr "No _Proxy for:"
 
-#: ../mail/mail-dialogs.ui.h:27
-msgid "_Flag:"
-msgstr "_Flag:"
+#: ../mail/mail-config.ui.h:71
+msgid "Port:"
+msgstr "Port:"
 
-#: ../mail/mail-dialogs.ui.h:28
-msgid "_Tick this to accept the license agreement"
-msgstr "_Tick this to accept the licence agreement"
+#: ../mail/mail-config.ui.h:72
+msgid "Use Authe_ntication"
+msgstr "Use Authe_ntication"
 
-#: ../mail/mail-folder-cache.c:779
-#, c-format
-msgid "Pinging %s"
-msgstr "Pinging %s"
+#: ../mail/mail-config.ui.h:73
+msgid "Us_ername:"
+msgstr "Us_ername:"
 
-#: ../mail/mail-ops.c:85
-msgid "Filtering Selected Messages"
-msgstr "Filtering Selected Messages"
+#: ../mail/mail-config.ui.h:74
+msgid "Pass_word:"
+msgstr "Pass_word:"
 
-#: ../mail/mail-ops.c:205
-msgid "Fetching Mail"
-msgstr "Fetching Mail"
+#: ../mail/mail-config.ui.h:75
+msgid "Start up"
+msgstr "Start up"
 
-#: ../mail/mail-ops.c:821
-#, c-format
-msgid "Sending message %d of %d"
-msgstr "Sending message %d of %d"
+#: ../mail/mail-config.ui.h:76
+msgid "Check for new _messages on start"
+msgstr "Check for new _messages on start"
 
-#: ../mail/mail-ops.c:869
-#, c-format
-msgid "Failed to send %d of %d messages"
-msgstr "Failed to send %d of %d messages"
+#: ../mail/mail-config.ui.h:77
+msgid "Check for new messa_ges in all active accounts"
+msgstr "Check for new messa_ges in all active accounts"
 
-#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:837
-msgid "Canceled."
-msgstr "Cancelled."
+#: ../mail/mail-config.ui.h:78
+msgid "Message Display"
+msgstr "Message Display"
 
-#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:839
-msgid "Complete."
-msgstr "Complete."
+#: ../mail/mail-config.ui.h:79
+msgid "_Use the same fonts as other applications"
+msgstr "_Use the same fonts as other applications"
 
-#: ../mail/mail-ops.c:985
-#, c-format
-msgid "Moving messages to '%s'"
-msgstr "Moving messages to '%s'"
+#: ../mail/mail-config.ui.h:80
+msgid "S_tandard Font:"
+msgstr "S_tandard Font:"
 
-#: ../mail/mail-ops.c:986
-#, c-format
-msgid "Copying messages to '%s'"
-msgstr "Copying messages to '%s'"
+#: ../mail/mail-config.ui.h:81
+msgid "Select HTML fixed width font"
+msgstr "Select HTML fixed width font"
 
-#: ../mail/mail-ops.c:1104
-#, c-format
-msgid "Storing folder '%s'"
-msgstr "Storing folder '%s'"
+#: ../mail/mail-config.ui.h:82
+msgid "Select HTML variable width font"
+msgstr "Select HTML variable width font"
 
-#: ../mail/mail-ops.c:1179
-#, c-format
-msgid "Expunging and storing account '%s'"
-msgstr "Expunging and storing account '%s'"
+#: ../mail/mail-config.ui.h:83
+msgid "Fix_ed Width Font:"
+msgstr "Fix_ed Width Font:"
 
-#: ../mail/mail-ops.c:1180
-#, c-format
-msgid "Storing account '%s'"
-msgstr "Storing account '%s'"
+#: ../mail/mail-config.ui.h:84
+msgid "Highlight _quotations with"
+msgstr "Highlight _quotations with"
 
-#: ../mail/mail-ops.c:1242
-#, c-format
-msgid "Refreshing folder '%s'"
-msgstr "Refreshing folder '%s'"
+#: ../mail/mail-config.ui.h:85
+msgid "color"
+msgstr "colour"
 
-#: ../mail/mail-ops.c:1432
-#, c-format
-msgid "Expunging folder '%s'"
-msgstr "Expunging folder '%s'"
+#: ../mail/mail-config.ui.h:86
+msgid "Default character e_ncoding:"
+msgstr "Default character e_ncoding:"
 
-#: ../mail/mail-ops.c:1517
-#, c-format
-msgid "Emptying trash in '%s'"
-msgstr "Emptying wastebasket in '%s'"
+#: ../mail/mail-config.ui.h:87
+msgid "Apply the same _view settings to all folders"
+msgstr "Apply the same _view settings to all folders"
 
-#: ../mail/mail-ops.c:1619
-#, c-format
-msgid "Disconnecting %s"
-msgstr "Disconnecting %s"
+#: ../mail/mail-config.ui.h:88
+msgid "F_all back to threading messages by subject"
+msgstr "F_all back to threading messages by subject"
 
-#: ../mail/mail-send-recv.c:198
-msgid "Canceling..."
-msgstr "Cancellingâ"
+#: ../mail/mail-config.ui.h:89
+msgid "Delete Mail"
+msgstr "Delete Mail"
 
-#: ../mail/mail-send-recv.c:454
-msgid "Send & Receive Mail"
-msgstr "Send & Receive Mail"
+#: ../mail/mail-config.ui.h:90
+msgid "Empty trash folders on e_xit"
+msgstr "Empty wastebasket folders on e_xit"
 
-#: ../mail/mail-send-recv.c:470
-msgid "Cancel _All"
-msgstr "Cancel _All"
+#: ../mail/mail-config.ui.h:91
+msgid "Confirm _when expunging a folder"
+msgstr "Confirm _when expunging a folder"
 
-#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:979
-msgid "Updating..."
-msgstr "Updatingâ"
+#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.ui.h:93
+msgid "_Show animated images"
+msgstr "_Show animated images"
 
-#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:691
-msgid "Waiting..."
-msgstr "Waitingâ"
+#: ../mail/mail-config.ui.h:94
+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-send-recv.c:959
-#, c-format
-msgid "Checking for new mail"
-msgstr "Checking for new mail"
+#: ../mail/mail-config.ui.h:95
+msgid "Loading Images"
+msgstr "Loading Images"
 
-#: ../mail/mail-tools.c:72
-#, c-format
-msgid "Could not create spool directory '%s': %s"
-msgstr "Could not create spool directory '%s': %s"
+#: ../mail/mail-config.ui.h:96
+msgid "_Never load images from the Internet"
+msgstr "_Never load images from the Internet"
 
-#: ../mail/mail-tools.c:106
-#, c-format
-msgid "Trying to movemail a non-mbox source '%s'"
-msgstr "Trying to movemail a non-mbox source '%s'"
+#: ../mail/mail-config.ui.h:97
+msgid "_Load images only in messages from contacts"
+msgstr "_Load images only in messages from contacts"
 
-#: ../mail/mail-tools.c:215
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Forwarded message â %s"
+#: ../mail/mail-config.ui.h:98
+msgid "_Always load images from the Internet"
+msgstr "_Always load images from the Internet"
 
-#: ../mail/mail-tools.c:217
-msgid "Forwarded message"
-msgstr "Forwarded message"
+#: ../mail/mail-config.ui.h:99
+msgid "HTML Messages"
+msgstr "HTML Messages"
 
-#: ../mail/mail-vfolder.c:92
-#, c-format
-msgid "Setting up Search Folder: %s"
-msgstr "Setting up Search Folder: %s"
+#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+msgid "Labels"
+msgstr "Labels"
 
-#: ../mail/mail-vfolder.c:232
-#, c-format
-msgid "Updating Search Folders for '%s' : %s"
-msgstr "Updating Search Folders for '%s' : %s"
+#: ../mail/mail-config.ui.h:101
+msgid "Sender Photograph"
+msgstr "Sender Photograph"
 
-#. Translators: The first %s is name of the affected
-#. * search folder(s), the second %s is the URI of the
-#. * removed folder. For more than one search folder is
-#. * each of them on a separate line, with four spaces
-#. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:678
-#, c-format
-msgid ""
-"The Search Folder \"%s\" has been modified to account for the deleted "
-"folder\n"
-"\"%s\"."
-msgid_plural ""
-"The following Search Folders\n"
-"%s have been modified to account for the deleted folder\n"
-"\"%s\"."
-msgstr[0] ""
-"The Search Folder \"%s\" has been modified to account for the deleted "
-"folder\n"
-"\"%s\"."
-msgstr[1] ""
-"The following Search Folders\n"
-"%s have been modified to account for the deleted folder\n"
-"\"%s\"."
+#: ../mail/mail-config.ui.h:102
+msgid "_Show the photograph of sender in the message preview"
+msgstr "_Show the photograph of sender in the message preview"
 
-#: ../mail/mail-vfolder.c:1314
-msgid "Edit Search Folder"
-msgstr "Edit Search Folder"
+#: ../mail/mail-config.ui.h:103
+msgid "S_earch for sender photograph only in local address books"
+msgstr "S_earch for sender photograph only in local address books"
 
-#: ../mail/mail-vfolder.c:1423
-msgid "New Search Folder"
-msgstr "New Search Folder"
+#: ../mail/mail-config.ui.h:104
+msgid "Displayed Message Headers"
+msgstr "Displayed Message Headers"
 
-#: ../mail/mail.error.xml.h:1
-msgid "\"Check Junk\" Failed"
-msgstr "\"Check Junk\" Failed"
+#: ../mail/mail-config.ui.h:105
+msgid "Mail Headers Table"
+msgstr "Mail Headers Table"
 
-#: ../mail/mail.error.xml.h:2
-msgid "\"Report Junk\" Failed"
-msgstr "\"Report Junk\" Failed"
+#: ../mail/mail-config.ui.h:106
+#: ../modules/addressbook/autocompletion-config.c:188
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Date/Time Format"
+msgstr "Date/Time Format"
 
-#: ../mail/mail.error.xml.h:3
-msgid "\"Report Not Junk\" Failed"
-msgstr "\"Report Not Junk\" Failed"
+#: ../mail/mail-config.ui.h:107
+msgid "Headers"
+msgstr "Headers"
 
-#: ../mail/mail.error.xml.h:4
-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-config.ui.h:108
+msgid "Check incoming _messages for junk"
+msgstr "Check incoming _messages for junk"
 
-#: ../mail/mail.error.xml.h:5
-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-config.ui.h:109
+msgid "Delete junk messages on e_xit"
+msgstr "Delete junk messages on e_xit"
 
-#: ../mail/mail.error.xml.h:6
-msgid ""
-"A non-empty folder at \"{1}\" already exists.\n"
-"\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
-msgstr ""
-"A non-empty folder at \"{1}\" already exists.\n"
-"\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+#: ../mail/mail-config.ui.h:110
+msgid "Check cu_stom headers for junk"
+msgstr "Check cu_stom headers for junk"
 
-#: ../mail/mail.error.xml.h:9
-msgid ""
-"A read receipt notification has been requested for \"{1}\". Send the receipt "
-"notification to {0}?"
-msgstr ""
-"A read receipt notification has been requested for \"{1}\". Send the receipt "
-"notification to {0}?"
+#: ../mail/mail-config.ui.h:111
+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.error.xml.h:10
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
-msgstr ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
+#: ../mail/mail-config.ui.h:112
+msgid "_Lookup in local address book only"
+msgstr "_Look up in local address book only"
 
-#: ../mail/mail.error.xml.h:11
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+#: ../mail/mail-config.ui.h:113
+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.error.xml.h:12
-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-config.ui.h:115 ../modules/addressbook/ldap-config.ui.h:3
+msgid "No encryption"
+msgstr "No encryption"
 
-#: ../mail/mail.error.xml.h:13
-msgid "Are you sure you want to delete this account?"
-msgstr "Are you sure you want to delete this account?"
+#: ../mail/mail-config.ui.h:116 ../modules/addressbook/ldap-config.ui.h:1
+msgid "TLS encryption"
+msgstr "TLS encryption"
 
-#: ../mail/mail.error.xml.h:14
-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-config.ui.h:117 ../modules/addressbook/ldap-config.ui.h:2
+msgid "SSL encryption"
+msgstr "SSL encryption"
 
-#: ../mail/mail.error.xml.h:15
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+#: ../mail/mail-config.ui.h:118
+msgid "Special Folders"
+msgstr "Special Folders"
 
-#: ../mail/mail.error.xml.h:16
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
-msgstr ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
+#: ../mail/mail-config.ui.h:119
+msgid "Drafts _Folder:"
+msgstr "Drafts _Folder:"
 
-#: ../mail/mail.error.xml.h:17
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr "Are you sure you want to send a message in HTML format?"
+#: ../mail/mail-config.ui.h:120
+msgid "Sent _Messages Folder:"
+msgstr "Sent _Messages Folder:"
 
-#: ../mail/mail.error.xml.h:18
-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-config.ui.h:121
+msgid "_Trash Folder:"
+msgstr "Wastebaske_t Folder:"
 
-#: ../mail/mail.error.xml.h:19
-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-config.ui.h:122
+msgid "_Junk Folder:"
+msgstr "_Junk Folder:"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Are you sure you want to send a message with only Bcc recipients?"
+#: ../mail/mail-config.ui.h:123
+msgid "Composing Messages"
+msgstr "Composing Messages"
 
-#: ../mail/mail.error.xml.h:21
-msgid "Are you sure you want to send a message without a subject?"
-msgstr "Are you sure you want to send a message without a subject?"
+#: ../mail/mail-config.ui.h:124
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Always _blind carbon-copy (bcc) to:"
 
-#: ../mail/mail.error.xml.h:22
-msgid "Blank Signature"
-msgstr "Blank Signature"
+#: ../mail/mail-config.ui.h:125
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Alway_s carbon-copy (cc) to:"
 
-#: ../mail/mail.error.xml.h:23
-msgid "Cannot add Search Folder \"{0}\"."
-msgstr "Cannot add Search Folder \"{0}\"."
+#: ../mail/mail-config.ui.h:126
+msgid "Message Receipts"
+msgstr "Message Receipts"
 
-#: ../mail/mail.error.xml.h:24
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
+#: ../mail/mail-config.ui.h:127
+msgid "S_end message receipts:"
+msgstr "S_end message receipts:"
 
-#: ../mail/mail.error.xml.h:25
-msgid "Cannot create folder \"{0}\"."
-msgstr "Cannot create folder \"{0}\"."
+#: ../mail/mail-config.ui.h:128
+msgid "Account Information"
+msgstr "Account Information"
 
-#: ../mail/mail.error.xml.h:26
-msgid "Cannot create temporary save directory."
-msgstr "Cannot create temporary save directory."
+#: ../mail/mail-config.ui.h:129
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"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\""
 
-#: ../mail/mail.error.xml.h:27
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Cannot create the save directory, because \"{1}\""
+#: ../mail/mail-config.ui.h:131
+msgid "Required Information"
+msgstr "Required Information"
 
-#: ../mail/mail.error.xml.h:28
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Cannot delete folder \"{0}\"."
+#: ../mail/mail-config.ui.h:132
+msgid "Email _Address:"
+msgstr "E-mail _Address:"
 
-#: ../mail/mail.error.xml.h:29
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Cannot delete system folder \"{0}\"."
+#: ../mail/mail-config.ui.h:133
+msgid "Full Nam_e:"
+msgstr "Full Nam_e:"
 
-#: ../mail/mail.error.xml.h:30
-msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr "Cannot edit Search Folder \"{0}\" as it does not exist."
+#: ../mail/mail-config.ui.h:134
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+msgid "Optional Information"
+msgstr "Optional Information"
 
-#: ../mail/mail.error.xml.h:31
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Cannot move folder \"{0}\" to \"{1}\"."
+#: ../mail/mail-config.ui.h:135
+msgid "Signat_ure:"
+msgstr "Signat_ure:"
 
-#: ../mail/mail.error.xml.h:32
-msgid "Cannot open source \"{1}\"."
-msgstr "Cannot open source \"{1}\"."
+#: ../mail/mail-config.ui.h:136
+msgid "Add Ne_w Signature..."
+msgstr "Add Ne_w Signatureâ"
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{2}\"."
-msgstr "Cannot open source \"{2}\"."
+#: ../mail/mail-config.ui.h:137
+msgid "Or_ganization:"
+msgstr "Or_ganisation:"
 
-#: ../mail/mail.error.xml.h:34
-msgid "Cannot open target \"{2}\"."
-msgstr "Cannot open target \"{2}\"."
+#: ../mail/mail-config.ui.h:138
+msgid "Re_ply-To:"
+msgstr "Re_ply-To:"
 
-#: ../mail/mail.error.xml.h:35
-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."
-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-config.ui.h:139
+msgid "_Make this my default account"
+msgstr "_Make this my default account"
 
-#: ../mail/mail.error.xml.h:36
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Cannot rename \"{0}\" to \"{1}\"."
+#: ../mail/mail-config.ui.h:140
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr "_Do not sign meeting requests (for Outlook compatibility)"
 
-#: ../mail/mail.error.xml.h:37
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Cannot rename or move system folder \"{0}\"."
+#: ../mail/mail-config.ui.h:141
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail.error.xml.h:38
-msgid "Cannot save changes to account."
-msgstr "Cannot save changes to account."
+#: ../mail/mail-config.ui.h:142
+msgid "PGP/GPG _Key ID:"
+msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail.error.xml.h:39
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Cannot save to directory \"{0}\"."
+#: ../mail/mail-config.ui.h:143
+msgid "Si_gning algorithm:"
+msgstr "Si_gning algorithm:"
 
-#: ../mail/mail.error.xml.h:40
-msgid "Cannot save to file \"{0}\"."
-msgstr "Cannot save to file \"{0}\"."
+#: ../mail/mail-config.ui.h:144
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "Al_ways sign outgoing messages when using this account"
 
-#: ../mail/mail.error.xml.h:41
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Cannot set signature script \"{0}\"."
+#: ../mail/mail-config.ui.h:145
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr "Always encrypt to _myself when sending encrypted messages"
 
-#: ../mail/mail.error.xml.h:42
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Check to make sure your password is spelt correctly. Remember that many "
-"passwords are case-sensitive; your caps lock might be on."
+#: ../mail/mail-config.ui.h:146
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr "Always _trust keys in my keyring when encrypting"
 
-#: ../mail/mail.error.xml.h:43
-msgid "Close message window."
-msgstr "Close message window."
+#: ../mail/mail-config.ui.h:147
+msgid "Secure MIME (S/MIME)"
+msgstr "Secure MIME (S/MIME)"
 
-#: ../mail/mail.error.xml.h:44
-msgid "Could not save signature file."
-msgstr "Could not save signature file."
+#: ../mail/mail-config.ui.h:148
+msgid "Also encrypt to sel_f when sending encrypted messages"
+msgstr "Also encrypt to sel_f when sending encrypted messages"
 
-#: ../mail/mail.error.xml.h:46
-msgid "Do _Not Disable"
-msgstr "Do _Not Disable"
+#: ../mail/mail-config.ui.h:149
+msgid "Encrypt out_going messages (by default)"
+msgstr "Encrypt out_going messages (by default)"
 
-#: ../mail/mail.error.xml.h:47
-msgid "Do _Not Send"
-msgstr "Do _Not Send"
+#: ../mail/mail-config.ui.h:150
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr "Digitally sign o_utgoing messages (by default)"
 
-#: ../mail/mail.error.xml.h:48
-msgid "Do _Not Synchronize"
-msgstr "Do _Not Synchronise"
+#: ../mail/mail-config.ui.h:151
+msgid "Encry_ption certificate:"
+msgstr "Encry_ption certificate:"
 
-#: ../mail/mail.error.xml.h:49
-msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
-msgstr ""
-"Do you want to locally synchronise the folders that are marked for offline "
-"usage?"
+#: ../mail/mail-config.ui.h:152
+msgid "Sig_ning certificate:"
+msgstr "Sig_ning certificate:"
 
-#: ../mail/mail.error.xml.h:50
-msgid "Do you want to mark all messages as read?"
-msgstr "Do you want to mark all messages as read?"
+#: ../mail/mail-config.ui.h:153
+msgid "S_elect..."
+msgstr "S_electâ"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Do you wish to save your changes?"
-msgstr "Do you wish to save your changes?"
+#: ../mail/mail-config.ui.h:154
+msgid "Clea_r"
+msgstr "Clea_r"
 
-#: ../mail/mail.error.xml.h:52
-msgid "Enter password."
-msgstr "Enter password."
+#: ../mail/mail-config.ui.h:155
+msgid "Signing _algorithm:"
+msgstr "Signing _algorithm:"
 
-#: ../mail/mail.error.xml.h:53
-msgid "Error loading filter definitions."
-msgstr "Error loading filter definitions."
+#: ../mail/mail-config.ui.h:157
+msgid "Cle_ar"
+msgstr "Cle_ar"
 
-#: ../mail/mail.error.xml.h:54
-msgid "Error while performing operation."
-msgstr "Error while performing operation."
+#: ../mail/mail-config.ui.h:158
+msgid "Server _Type:"
+msgstr "Server _Type:"
 
-#. 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:58
-msgid "Error while {0}."
-msgstr "Error while {0}."
+#: ../mail/mail-config.ui.h:160
+msgid "description"
+msgstr "description"
 
-#: ../mail/mail.error.xml.h:59
-msgid ""
-"Evolution's local mail format has changed from mbox to Maildir. Your local "
-"mail must be migrated to the new format before Evolution can proceed. Do you "
-"want to migrate now?\n"
-"\n"
-"An mbox account will be created to preserve the old mbox folders. You can "
-"delete the account after ensuring the data is safely migrated. Please make "
-"sure there is enough disk space if you choose to migrate now."
-msgstr ""
-"Evolution's local mail format has changed from mbox to Maildir. Your local "
-"mail must be migrated to the new format before Evolution can proceed. Do you "
-"want to migrate now?\n"
-"\n"
-"An mbox account will be created to preserve the old mbox folders. You can "
-"delete the account after ensuring the data is safely migrated. Please make "
-"sure there is enough disk space if you choose to migrate now."
+#: ../mail/mail-config.ui.h:161
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+msgid "Configuration"
+msgstr "Configuration"
 
-#: ../mail/mail.error.xml.h:62
-msgid "Evolution's local mail format has changed."
-msgstr "Evolution's local mail format has changed."
+#: ../mail/mail-config.ui.h:162
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+msgid "_Server:"
+msgstr "_Server:"
 
-#: ../mail/mail.error.xml.h:63
-msgid "Failed to download messages for offline viewing."
-msgstr "Failed to download messages for offline viewing."
+#: ../mail/mail-config.ui.h:163 ../plugins/caldav/caldav-source.c:250
+#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../plugins/google-account-setup/google-source.c:655
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:273
+msgid "User_name:"
+msgstr "User_name:"
 
-#: ../mail/mail.error.xml.h:64
-msgid "Failed to find duplicate messages."
-msgstr "Failed to find duplicate messages."
+#: ../mail/mail-config.ui.h:165
+msgid "Mailbox location"
+msgstr "Mailbox location"
 
-#: ../mail/mail.error.xml.h:65
-msgid "Failed to open folder."
-msgstr "Failed to open folder."
+#: ../mail/mail-config.ui.h:167
+msgid "_Use secure connection:"
+msgstr "_Use secure connection:"
 
-#: ../mail/mail.error.xml.h:66
-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-config.ui.h:168
+msgid "SSL is not supported in this build of Evolution"
+msgstr "SSL is not supported in this build of Evolution"
 
-#: ../mail/mail.error.xml.h:67
-msgid "Failed to remove attachments from messages."
-msgstr "Failed to remove attachments from messages."
+#: ../mail/mail-config.ui.h:169
+msgid "_Authentication Type"
+msgstr "_Authentication Type"
 
-#: ../mail/mail.error.xml.h:68
-msgid "Failed to retrieve messages."
-msgstr "Failed to retrieve messages."
+#: ../mail/mail-config.ui.h:170
+msgid "Ch_eck for Supported Types"
+msgstr "Ch_eck for Supported Types"
 
-#: ../mail/mail.error.xml.h:69
-msgid "Failed to save messages to disk."
-msgstr "Failed to save messages to disk."
+#: ../mail/mail-config.ui.h:171
+msgid "Re_member password"
+msgstr "Re_member password"
 
-#: ../mail/mail.error.xml.h:70
-msgid "Failed to unsubscribe from folder."
-msgstr "Failed to unsubscribe from folder."
+#: ../mail/mail-config.ui.h:172
+msgid "Server Configuration"
+msgstr "Server Configuration"
 
-#: ../mail/mail.error.xml.h:71
-msgid "File exists but cannot overwrite it."
-msgstr "File exists but cannot overwrite it."
+#: ../mail/mail-config.ui.h:173 ../modules/addressbook/ldap-config.ui.h:13
+msgid "_Port:"
+msgstr "_Port:"
 
-#: ../mail/mail.error.xml.h:72
-msgid "File exists but is not a regular file."
-msgstr "File exists but is not a regular file."
+#: ../mail/mail-config.ui.h:174
+msgid "Ser_ver requires authentication"
+msgstr "Ser_ver requires authentication"
 
-#. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:74
-msgid "Folder '{0}' doesn't contain any duplicate message."
-msgstr "Folder '{0}' doesn't contain any duplicate messages."
+#: ../mail/mail-config.ui.h:175
+#: ../modules/addressbook/addressbook-config.c:1122
+msgid "Authentication"
+msgstr "Authentication"
 
-#: ../mail/mail.error.xml.h:75
-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-config.ui.h:176
+msgid "T_ype:"
+msgstr "T_ype:"
 
-#: ../mail/mail.error.xml.h:76
-msgid ""
-"If you delete the folder, all of its contents and its subfolders' contents "
-"will be deleted permanently."
-msgstr ""
-"If you delete the folder, all of its contents and its subfolders' contents "
-"will be deleted permanently."
+#: ../mail/mail-config.ui.h:177
+msgid "User _Name:"
+msgstr "User_name:"
 
-#: ../mail/mail.error.xml.h:77
-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-config.ui.h:178
+msgid "Remember _password"
+msgstr "Remember _password"
 
-#: ../mail/mail.error.xml.h:78
-msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "If you proceed, all proxy accounts will be deleted permanently."
+#: ../mail/mail-config.ui.h:179
+msgid "Personal Details:"
+msgstr "Personal Details:"
 
-#: ../mail/mail.error.xml.h:79
-msgid ""
-"If you proceed, the account information and\n"
-"all proxy information will be deleted permanently."
-msgstr ""
-"If you proceed, the account information and\n"
-"all proxy information will be deleted permanently."
+#: ../mail/mail-config.ui.h:188
+msgid "Encryption:"
+msgstr "Encryption:"
 
-#: ../mail/mail.error.xml.h:81
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr "If you proceed, the account information will be deleted permanently."
+#: ../mail/mail-config.ui.h:189
+msgid "none"
+msgstr "none"
 
-#: ../mail/mail.error.xml.h:82
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#: ../mail/mail-config.ui.h:190
+msgid "label"
+msgstr "label"
 
-#: ../mail/mail.error.xml.h:83
-msgid "Ignore"
-msgstr "Ignore"
+#: ../mail/mail-dialogs.ui.h:1
+msgid "Search Folder Sources"
+msgstr "Search Folder Sources"
 
-#: ../mail/mail.error.xml.h:84
-msgid "Invalid authentication"
-msgstr "Invalid authentication"
+#: ../mail/mail-dialogs.ui.h:2
+msgid "All local folders"
+msgstr "All local folders"
 
-#: ../mail/mail.error.xml.h:85
-msgid "Mail Deletion Failed"
-msgstr "Mail Deletion Failed"
+#: ../mail/mail-dialogs.ui.h:3
+msgid "All active remote folders"
+msgstr "All active remote folders"
 
-#: ../mail/mail.error.xml.h:86
-msgid "Mail filters automatically updated."
-msgstr "Mail filters automatically updated."
+#: ../mail/mail-dialogs.ui.h:4
+msgid "All local and active remote folders"
+msgstr "All local and active remote folders"
 
-#: ../mail/mail.error.xml.h:87
-msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
-"Many e-mail systems add an Apparently-To header to messages that only have "
-"Bcc recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or Cc: "
-"recipient."
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Specific folders"
+msgstr "Specific folders"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail-dialogs.ui.h:6
 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 "
-"they physically reside. Do you really want to delete these messages?"
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
 msgstr ""
-"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 "
-"they physically reside. Do you really want to delete these messages?"
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
 
-#: ../mail/mail.error.xml.h:89
-msgid "Missing folder."
-msgstr "Missing folder."
+#: ../mail/mail-dialogs.ui.h:8
+msgid "_Flag:"
+msgstr "_Flag:"
 
-#: ../mail/mail.error.xml.h:91
-msgid "N_ever"
-msgstr "N_ever"
+#: ../mail/mail-dialogs.ui.h:9
+msgid "_Due By:"
+msgstr "_Due By:"
 
-#: ../mail/mail.error.xml.h:92
-msgid "No duplicate messages found."
-msgstr "No duplicate messages found."
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:11
+msgid "Co_mpleted"
+msgstr "Co_mpleted"
 
-#: ../mail/mail.error.xml.h:93
-msgid "No sources selected."
-msgstr "No sources selected."
+#: ../mail/mail-dialogs.ui.h:12
+msgid "Call"
+msgstr "Call"
 
-#: ../mail/mail.error.xml.h:94
-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-dialogs.ui.h:13
+msgid "Do Not Forward"
+msgstr "Do Not Forward"
 
-#  mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:95
-msgid "Please check your account settings and try again."
-msgstr "Please check your account settings and try again."
+#: ../mail/mail-dialogs.ui.h:14
+msgid "Follow-Up"
+msgstr "Follow-Up"
 
-#  mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:96
-msgid "Please enable the account or send using another account."
-msgstr "Please enable the account or send using another account."
+#: ../mail/mail-dialogs.ui.h:15
+msgid "For Your Information"
+msgstr "For Your Information"
 
-#: ../mail/mail.error.xml.h:97
-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."
-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-dialogs.ui.h:16
+msgid "Forward"
+msgstr "Forward"
 
-#: ../mail/mail.error.xml.h:98
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
-"{0}"
-msgstr ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML e-mail:\n"
-"{0}"
+#: ../mail/mail-dialogs.ui.h:17
+msgid "No Response Necessary"
+msgstr "No Response Necessary"
 
-#: ../mail/mail.error.xml.h:100
-msgid "Please provide an unique name to identify this signature."
-msgstr "Please provide an unique name to identify this signature."
+#: ../mail/mail-dialogs.ui.h:21
+msgid "Reply to All"
+msgstr "Reply to All"
 
-#: ../mail/mail.error.xml.h:101
-msgid "Please wait."
-msgstr "Please wait."
+#: ../mail/mail-dialogs.ui.h:22
+msgid "Review"
+msgstr "Review"
 
-#: ../mail/mail.error.xml.h:102
-msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "Problem migrating old mail folder \"{0}\"."
+#: ../mail/mail-dialogs.ui.h:23
+msgid "License Agreement"
+msgstr "Licence Agreement"
 
-#: ../mail/mail.error.xml.h:103
-msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "Querying server for a list of supported authentication mechanisms."
+#: ../mail/mail-dialogs.ui.h:24
+msgid "_Tick this to accept the license agreement"
+msgstr "_Tick this to accept the licence agreement"
 
-#: ../mail/mail.error.xml.h:104
-msgid "Read receipt requested."
-msgstr "Read receipt requested."
+#: ../mail/mail-dialogs.ui.h:25
+msgid "_Accept License"
+msgstr "_Accept Licence"
 
-#: ../mail/mail.error.xml.h:105
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Really delete folder \"{0}\" and all of its subfolders?"
+#: ../mail/mail-dialogs.ui.h:26
+msgid "Security Information"
+msgstr "Security Information"
 
-#: ../mail/mail.error.xml.h:106
-msgid "Really delete folder \"{0}\"?"
-msgstr "Really delete folder \"{0}\"?"
+#: ../mail/mail-dialogs.ui.h:27
+msgid "Digital Signature"
+msgstr "Digital Signature"
 
-#: ../mail/mail.error.xml.h:107
-msgid "Remove duplicate messages?"
-msgstr "Remove duplicate messages?"
+#: ../mail/mail-dialogs.ui.h:28
+msgid "Encryption"
+msgstr "Encryption"
 
-#: ../mail/mail.error.xml.h:108
-msgid "Reply _Privately"
-msgstr "Reply _Privately"
+#: ../mail/mail.error.xml.h:1
+msgid "Invalid authentication"
+msgstr "Invalid authentication"
 
-#: ../mail/mail.error.xml.h:111
-msgid "Search Folders automatically updated."
-msgstr "Search Folders automatically updated."
+#: ../mail/mail.error.xml.h:2
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 
-#: ../mail/mail.error.xml.h:112
-msgid "Send private reply?"
-msgstr "Send private reply?"
+#: ../mail/mail.error.xml.h:3
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
 
-#: ../mail/mail.error.xml.h:113
-msgid "Send reply to all recipients?"
-msgstr "Send reply to all recipients?"
+#: ../mail/mail.error.xml.h:4
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"Check to make sure your password is spelt correctly. Remember that many "
+"passwords are case-sensitive; your caps lock might be on."
 
-#: ../mail/mail.error.xml.h:114
-msgid "Signature Already Exists"
-msgstr "Signature Already Exists"
+#: ../mail/mail.error.xml.h:5
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Are you sure you want to send a message in HTML format?"
 
-#: ../mail/mail.error.xml.h:115
-msgid "Synchronize folders locally for offline usage?"
-msgstr "Synchronise folders locally for offline usage?"
+#: ../mail/mail.error.xml.h:6
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}"
+msgstr ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML e-mail:\n"
+"{0}"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:9
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "Are you sure you want to send a message without a subject?"
+
+#: ../mail/mail.error.xml.h:10
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
 msgstr ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:11
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "Are you sure you want to send a message with only Bcc recipients?"
+
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12782,7 +14073,23 @@ msgstr ""
 "your message. To avoid this, you should add at least one To: or Cc: "
 "recipient. "
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:15
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+"Many e-mail systems add an Apparently-To header to messages that only have "
+"Bcc recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or Cc: "
+"recipient."
+
+#: ../mail/mail.error.xml.h:16
+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
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -12790,7 +14097,11 @@ msgstr ""
 "The following recipient was not recognised as a valid mail address:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:19
+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
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -12798,66 +14109,65 @@ msgstr ""
 "The following recipients were not recognised as valid mail addresses:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:125
-msgid "The script file must exist and be executable."
-msgstr "The script file must exist and be executable."
-
-#: ../mail/mail.error.xml.h:126
-msgid "These messages are not copies."
-msgstr "These messages are not copies."
+#: ../mail/mail.error.xml.h:22
+msgid "Send private reply?"
+msgstr "Send private reply?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:23
 msgid ""
-"This folder may have been added implicitly,\n"
-"go to the Search Folder editor to add it explicitly, if required."
+"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 "
+"you sure you want to proceed?"
 msgstr ""
-"This folder may have been added implicitly,\n"
-"go to the Search Folder editor to add it explicitly, if required."
+"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 "
+"you sure you want to proceed?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:24
+msgid "Reply _Privately"
+msgstr "Reply _Privately"
+
+#: ../mail/mail.error.xml.h:26
 msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
+"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 "
+"proceed?"
 msgstr ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
+"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 "
+"proceed?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:28
+msgid "Send reply to all recipients?"
+msgstr "Send reply to all recipients?"
+
+#: ../mail/mail.error.xml.h:29
 msgid ""
-"This message cannot be sent because you have not specified any recipients"
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
 msgstr ""
-"This message cannot be sent because you have not specified any recipients"
+"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:131
+#: ../mail/mail.error.xml.h:30
 msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+"This message cannot be sent because you have not specified any recipients"
 msgstr ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-
-#: ../mail/mail.error.xml.h:132
-msgid "This signature has been changed, but has not been saved."
-msgstr "This signature has been changed, but has not been saved."
+"This message cannot be sent because you have not specified any recipients"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:31
 msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
+"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."
 msgstr ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
-
-#: ../mail/mail.error.xml.h:134
-msgid "This will mark all messages as read in the selected folder."
-msgstr "This will mark all messages as read in the selected folder."
+"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:gw-accountsetup-error primary
-#: ../mail/mail.error.xml.h:135
-msgid "Unable to connect to the GroupWise server."
-msgstr "Unable to connect to the GroupWise server."
+#: ../mail/mail.error.xml.h:32
+msgid "Use default drafts folder?"
+msgstr "Use default drafts folder?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:33
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -12865,827 +14175,919 @@ msgstr ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 
-#: ../mail/mail.error.xml.h:137
-msgid "Unable to read license file."
-msgstr "Unable to read licence file."
-
-#: ../mail/mail.error.xml.h:138
-msgid "Unable to retrieve message."
-msgstr "Unable to retrieve message."
-
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:34
 msgid "Use _Default"
 msgstr "Use _Default"
 
-#: ../mail/mail.error.xml.h:140
-msgid "Use default drafts folder?"
-msgstr "Use default drafts folder?"
+#: ../mail/mail.error.xml.h:35
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
+msgstr ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:141
-msgid "Would you like to close the message window?"
-msgstr "Would you like to close the message window?"
+#: ../mail/mail.error.xml.h:36
+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:142
+#: ../mail/mail.error.xml.h:37
+msgid "_Expunge"
+msgstr "_Expunge"
+
+#: ../mail/mail.error.xml.h:38
 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 "
-"you sure you want to proceed?"
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
 msgstr ""
-"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 "
-"you sure you want to proceed?"
+"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:1187
+msgid "_Empty Trash"
+msgstr "_Empty Wastebasket"
+
+#: ../mail/mail.error.xml.h:40
+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
+msgid "_Open Messages"
+msgstr "_Open Messages"
+
+#: ../mail/mail.error.xml.h:42
+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
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+
+#. 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
+msgid "Error while {0}."
+msgstr "Error while {0}."
+
+#: ../mail/mail.error.xml.h:48
+msgid "Error while performing operation."
+msgstr "Error while performing operation."
+
+#: ../mail/mail.error.xml.h:49
+msgid "Enter password."
+msgstr "Enter password."
+
+#: ../mail/mail.error.xml.h:50
+msgid "Error loading filter definitions."
+msgstr "Error loading filter definitions."
+
+#: ../mail/mail.error.xml.h:51
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Cannot save to directory \"{0}\"."
+
+#: ../mail/mail.error.xml.h:52
+msgid "Cannot save to file \"{0}\"."
+msgstr "Cannot save to file \"{0}\"."
+
+#: ../mail/mail.error.xml.h:53
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Cannot create the save directory, because \"{1}\""
+
+#: ../mail/mail.error.xml.h:54
+msgid "Cannot create temporary save directory."
+msgstr "Cannot create temporary save directory."
+
+#: ../mail/mail.error.xml.h:55
+msgid "File exists but cannot overwrite it."
+msgstr "File exists but cannot overwrite it."
+
+#: ../mail/mail.error.xml.h:56
+msgid "File exists but is not a regular file."
+msgstr "File exists but is not a regular file."
+
+#: ../mail/mail.error.xml.h:57
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Cannot delete folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:143
-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 "
-"proceed?"
-msgstr ""
-"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 "
-"proceed?"
+#: ../mail/mail.error.xml.h:58
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Cannot delete system folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:59
 msgid ""
-"You are replying to a message which was sent to many recipients. Are you "
-"sure you want to reply to ALL of them?"
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
 msgstr ""
-"You are replying to a message which was sent to many recipients. Are you "
-"sure you want to reply to ALL of them?"
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
 
-#: ../mail/mail.error.xml.h:145
-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:60
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Cannot rename or move system folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:146
-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:61
+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:147
-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:62
+msgid ""
+"If you delete the folder, all of its contents and its subfolders' contents "
+"will be deleted permanently."
+msgstr ""
+"If you delete the folder, all of its contents and its subfolders' contents "
+"will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:148
-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:64
+msgid "Really delete folder \"{0}\"?"
+msgstr "Really delete folder \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:149
-msgid "You must name this Search Folder."
-msgstr "You must name this Search Folder."
+#: ../mail/mail.error.xml.h:65
+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:150
-msgid "You must specify a folder."
-msgstr "You must specify a folder."
+#: ../mail/mail.error.xml.h:66
+msgid "These messages are not copies."
+msgstr "These messages are not copies."
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:67
 msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local "
-"folders, all remote folders, or both."
+"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 "
+"they physically reside. Do you really want to delete these messages?"
 msgstr ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local "
-"folders, all remote folders, or both."
+"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 "
+"they physically reside. Do you really want to delete these messages?"
 
-#: ../mail/mail.error.xml.h:153
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
+#: ../mail/mail.error.xml.h:68
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Cannot rename \"{0}\" to \"{1}\"."
 
-#: ../mail/mail.error.xml.h:154
-msgid "_Always"
-msgstr "_Always"
+#: ../mail/mail.error.xml.h:69
+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:155
-msgid "_Append"
-msgstr "_Append"
+#: ../mail/mail.error.xml.h:70
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Cannot move folder \"{0}\" to \"{1}\"."
 
-#: ../mail/mail.error.xml.h:156
-#: ../plugins/publish-calendar/publish-calendar.c:619
-msgid "_Disable"
-msgstr "_Disable"
+#: ../mail/mail.error.xml.h:71
+msgid "Cannot open source \"{2}\"."
+msgstr "Cannot open source \"{2}\"."
 
-#: ../mail/mail.error.xml.h:157
-msgid "_Discard changes"
-msgstr "_Discard changes"
+#: ../mail/mail.error.xml.h:72
+msgid "Cannot open target \"{2}\"."
+msgstr "Cannot open target \"{2}\"."
 
-#: ../mail/mail.error.xml.h:158
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
-msgid "_Empty Trash"
-msgstr "_Empty Wastebasket"
+#: ../mail/mail.error.xml.h:73
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
 
-#: ../mail/mail.error.xml.h:159
-msgid "_Exit Evolution"
-msgstr "_Exit Evolution"
+#: ../mail/mail.error.xml.h:74
+msgid "Cannot create folder \"{0}\"."
+msgstr "Cannot create folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:160
-msgid "_Expunge"
-msgstr "_Expunge"
+#: ../mail/mail.error.xml.h:75
+msgid "Cannot open source \"{1}\"."
+msgstr "Cannot open source \"{1}\"."
 
-#: ../mail/mail.error.xml.h:161
-msgid "_Migrate Now"
-msgstr "_Migrate Now"
+#: ../mail/mail.error.xml.h:76
+msgid "Cannot save changes to account."
+msgstr "Cannot save changes to account."
 
-#: ../mail/mail.error.xml.h:162
-msgid "_No"
-msgstr "_No"
+#: ../mail/mail.error.xml.h:77
+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:163
-msgid "_Open Messages"
-msgstr "_Open Messages"
+#: ../mail/mail.error.xml.h:78
+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:166
-msgid "_Send Receipt"
-msgstr "_Send Receipt"
+#: ../mail/mail.error.xml.h:79
+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:167
-msgid "_Synchronize"
-msgstr "_Synchronise"
+#: ../mail/mail.error.xml.h:80
+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:168
-msgid "_Yes"
-msgstr "_Yes"
+#: ../mail/mail.error.xml.h:81
+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:169
-msgid "{0}"
-msgstr "{0}"
+#: ../mail/mail.error.xml.h:82
+msgid ""
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
+msgstr ""
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
 
-#: ../mail/message-list.c:1261
-msgid "Unseen"
-msgstr "Unseen"
+#: ../mail/mail.error.xml.h:84
+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/message-list.c:1262
-msgid "Seen"
-msgstr "Seen"
+#: ../mail/mail.error.xml.h:85
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr "If you proceed, all proxy accounts will be deleted permanently."
 
-#: ../mail/message-list.c:1263
-msgid "Answered"
-msgstr "Answered"
+#: ../mail/mail.error.xml.h:86
+msgid "Do _Not Disable"
+msgstr "Do _Not Disable"
 
-#: ../mail/message-list.c:1264
-msgid "Forwarded"
-msgstr "Forwarded"
+#: ../mail/mail.error.xml.h:87
+#: ../plugins/publish-calendar/publish-calendar.c:617
+msgid "_Disable"
+msgstr "_Disable"
 
-#: ../mail/message-list.c:1265
-msgid "Multiple Unseen Messages"
-msgstr "Multiple Unseen Messages"
+#: ../mail/mail.error.xml.h:88
+msgid "Could not save signature file."
+msgstr "Could not save signature file."
 
-#: ../mail/message-list.c:1266
-msgid "Multiple Messages"
-msgstr "Multiple Messages"
+#: ../mail/mail.error.xml.h:89
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Cannot set signature script \"{0}\"."
 
-#: ../mail/message-list.c:1270
-msgid "Lowest"
-msgstr "Lowest"
+#: ../mail/mail.error.xml.h:90
+msgid "The script file must exist and be executable."
+msgstr "The script file must exist and be executable."
 
-#: ../mail/message-list.c:1271
-msgid "Lower"
-msgstr "Lower"
+#: ../mail/mail.error.xml.h:91
+msgid "Do you wish to save your changes?"
+msgstr "Do you wish to save your changes?"
 
-#: ../mail/message-list.c:1275
-msgid "Higher"
-msgstr "Higher"
+#: ../mail/mail.error.xml.h:92
+msgid "This signature has been changed, but has not been saved."
+msgstr "This signature has been changed, but has not been saved."
 
-#: ../mail/message-list.c:1276
-msgid "Highest"
-msgstr "Highest"
+#: ../mail/mail.error.xml.h:93
+msgid "_Discard changes"
+msgstr "_Discard changes"
 
-#: ../mail/message-list.c:1909 ../widgets/table/e-cell-date.c:51
-msgid "?"
-msgstr "?"
+#: ../mail/mail.error.xml.h:94
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "Cannot edit Search Folder \"{0}\" as it does not exist."
 
-#. strftime format of a time,
-#. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:205
-msgid "Today %l:%M %p"
-msgstr "Today %l:%M %p"
+#: ../mail/mail.error.xml.h:95
+msgid ""
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
+msgstr ""
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
 
-#: ../mail/message-list.c:1925
-msgid "Yesterday %l:%M %p"
-msgstr "Yesterday %l:%M %p"
+#: ../mail/mail.error.xml.h:97
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "Cannot add Search Folder \"{0}\"."
 
-#: ../mail/message-list.c:1937
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#: ../mail/mail.error.xml.h:98
+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/message-list.c:1945
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %l:%M %p"
+#: ../mail/mail.error.xml.h:99
+msgid "Search Folders automatically updated."
+msgstr "Search Folders automatically updated."
+
+#: ../mail/mail.error.xml.h:100
+msgid "Mail filters automatically updated."
+msgstr "Mail filters automatically updated."
+
+#: ../mail/mail.error.xml.h:101
+msgid "Missing folder."
+msgstr "Missing folder."
 
-#: ../mail/message-list.c:1947
-msgid "%b %d %Y"
-msgstr "%d %b %Y"
+#: ../mail/mail.error.xml.h:102
+msgid "You must specify a folder."
+msgstr "You must specify a folder."
 
-#: ../mail/message-list.c:2752
-msgid "Select all visible messages"
-msgstr "Select all visible messages"
+#: ../mail/mail.error.xml.h:104
+msgid "You must name this Search Folder."
+msgstr "You must name this Search Folder."
 
-#: ../mail/message-list.c:2912 ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "Messages"
+#: ../mail/mail.error.xml.h:105
+msgid "No sources selected."
+msgstr "No sources selected."
 
-#. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4160
-msgid "Follow-up"
-msgstr "Follow-up"
+#: ../mail/mail.error.xml.h:106
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
+msgstr ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
 
-#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4675 ../mail/message-list.c:5098
-msgid "Generating message list"
-msgstr "Generating message list"
+#: ../mail/mail.error.xml.h:108
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "Problem migrating old mail folder \"{0}\"."
 
-#: ../mail/message-list.c:4912
+#: ../mail/mail.error.xml.h:109
 msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
 msgstr ""
-"No message satisfies your search criteria. Either clear search with Search â "
-"Clear menu item or change it."
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
 
-#: ../mail/message-list.c:4914
-msgid "There are no messages in this folder."
-msgstr "There are no messages in this folder."
+#: ../mail/mail.error.xml.h:112
+msgid "Ignore"
+msgstr "Ignore"
 
-#: ../mail/message-list.etspec.h:3
-msgid "Due By"
-msgstr "Due By"
+#: ../mail/mail.error.xml.h:113
+msgid "_Overwrite"
+msgstr "_Overwrite"
 
-#: ../mail/message-list.etspec.h:4
-msgid "Flag Status"
-msgstr "Flag Status"
+#: ../mail/mail.error.xml.h:114
+msgid "_Append"
+msgstr "_Append"
 
-#: ../mail/message-list.etspec.h:5
-msgid "Flagged"
-msgstr "Flagged"
+#: ../mail/mail.error.xml.h:115
+msgid "Evolution's local mail format has changed."
+msgstr "Evolution's local mail format has changed."
 
-#: ../mail/message-list.etspec.h:6
-msgid "Follow Up Flag"
-msgstr "Follow Up Flag"
+#: ../mail/mail.error.xml.h:116
+msgid ""
+"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
+"\n"
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
+msgstr ""
+"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
+"\n"
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
 
-#: ../mail/message-list.etspec.h:11
-msgid "Received"
-msgstr "Received"
+#: ../mail/mail.error.xml.h:119
+msgid "_Exit Evolution"
+msgstr "_Exit Evolution"
 
-#: ../mail/message-list.etspec.h:15
-msgid "Sent Messages"
-msgstr "Sent Messages"
+#: ../mail/mail.error.xml.h:120
+msgid "_Migrate Now"
+msgstr "_Migrate Now"
 
-#: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:572
-msgid "Size"
-msgstr "Size"
+#: ../mail/mail.error.xml.h:121
+msgid "Unable to read license file."
+msgstr "Unable to read licence file."
 
-#: ../mail/message-list.etspec.h:19
-msgid "Subject - Trimmed"
-msgstr "Subject â Trimmed"
+#: ../mail/mail.error.xml.h:122
+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."
+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/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1562
-msgid "Body contains"
-msgstr "Body contains"
+#: ../mail/mail.error.xml.h:123
+msgid "Please wait."
+msgstr "Please wait."
 
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1569
-msgid "Message contains"
-msgstr "Message contains"
+#: ../mail/mail.error.xml.h:124
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr "Querying server for a list of supported authentication mechanisms."
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1576
-msgid "Recipients contain"
-msgstr "Recipients contain"
+#: ../mail/mail.error.xml.h:125
+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/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1583
-msgid "Sender contains"
-msgstr "Sender contains"
+#  mail:gw-accountsetup-error primary
+#: ../mail/mail.error.xml.h:126
+msgid "Unable to connect to the GroupWise server."
+msgstr "Unable to connect to the GroupWise server."
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1590
-msgid "Subject contains"
-msgstr "Subject contains"
+#  mail:gw-accountsetup-error secondary
+#: ../mail/mail.error.xml.h:127
+msgid "Please check your account settings and try again."
+msgstr "Please check your account settings and try again."
 
-#: ../mail/searchtypes.xml.h:6
-msgid "Subject or Addresses contains"
-msgstr "Subject or Addresses contains"
+#: ../mail/mail.error.xml.h:128
+msgid "Synchronize folders locally for offline usage?"
+msgstr "Synchronise folders locally for offline usage?"
 
-#: ../modules/addressbook/addressbook-config.c:207
+#: ../mail/mail.error.xml.h:129
 msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
 msgstr ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
+"Do you want to locally synchronise the folders that are marked for offline "
+"usage?"
 
-#: ../modules/addressbook/addressbook-config.c:209
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
+#: ../mail/mail.error.xml.h:130
+msgid "Do _Not Synchronize"
+msgstr "Do _Not Synchronise"
 
-#: ../modules/addressbook/addressbook-config.c:211
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
+#: ../mail/mail.error.xml.h:131
+msgid "_Synchronize"
+msgstr "_Synchronise"
 
-#: ../modules/addressbook/addressbook-config.c:641
-msgid "U_se in Birthday & Anniversaries calendar"
-msgstr "U_se in Birthday & Anniversaries calendar"
+#: ../mail/mail.error.xml.h:132
+msgid "Do you want to mark all messages as read?"
+msgstr "Do you want to mark all messages as read?"
 
-#: ../modules/addressbook/addressbook-config.c:683
-msgid "Copy _book content locally for offline operation"
-msgstr "Copy _book content locally for offline operation"
+#: ../mail/mail.error.xml.h:133
+msgid "This will mark all messages as read in the selected folder."
+msgstr "This will mark all messages as read in the selected folder."
 
-#: ../modules/addressbook/addressbook-config.c:798
+#: ../mail/mail.error.xml.h:134
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
 msgstr ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
 
-#: ../modules/addressbook/addressbook-config.c:879
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"E-mail Address\" requires anonymous access to your LDAP "
-"server."
+#: ../mail/mail.error.xml.h:135
+msgid "Close message window."
+msgstr "Close message window."
 
-#: ../modules/addressbook/addressbook-config.c:962
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
+#: ../mail/mail.error.xml.h:136
+msgid "Would you like to close the message window?"
+msgstr "Would you like to close the message window?"
 
-#: ../modules/addressbook/addressbook-config.c:1086
-msgid "Server Information"
-msgstr "Server Information"
+#: ../mail/mail.error.xml.h:137
+msgid "_Yes"
+msgstr "_Yes"
 
-#: ../modules/addressbook/addressbook-config.c:1091
-#: ../smime/gui/smime-ui.ui.h:13
-msgid "Details"
-msgstr "Details"
+#: ../mail/mail.error.xml.h:138
+msgid "_No"
+msgstr "_No"
 
-#: ../modules/addressbook/addressbook-config.c:1092
-#: ../modules/mail/e-mail-shell-view.c:58
-msgid "Searching"
-msgstr "Searching"
+#: ../mail/mail.error.xml.h:139
+msgid "_Always"
+msgstr "_Always"
 
-#: ../modules/addressbook/addressbook-config.c:1094
-msgid "Downloading"
-msgstr "Downloading"
+#: ../mail/mail.error.xml.h:140
+msgid "N_ever"
+msgstr "N_ever"
 
-#: ../modules/addressbook/addressbook-config.c:1309
-msgid "Address Book Properties"
-msgstr "Address Book Properties"
+#: ../mail/mail.error.xml.h:141
+msgid "Signature Already Exists"
+msgstr "Signature Already Exists"
+
+#: ../mail/mail.error.xml.h:142
+msgid ""
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr ""
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
 
-#: ../modules/addressbook/addressbook-config.c:1311
-msgid "New Address Book"
-msgstr "New Address Book"
+#: ../mail/mail.error.xml.h:143
+msgid "Blank Signature"
+msgstr "Blank Signature"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "Autocomplete length"
+#: ../mail/mail.error.xml.h:144
+msgid "Please provide an unique name to identify this signature."
+msgstr "Please provide an unique name to identify this signature."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
-msgid "Contact layout style"
-msgstr "Contact layout style"
+#: ../mail/mail.error.xml.h:145
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
-msgid "Contact preview pane position (horizontal)"
-msgstr "Contact preview pane position (horizontal)"
+#  mail:gw-accountsetup-error secondary
+#: ../mail/mail.error.xml.h:146
+msgid "Please enable the account or send using another account."
+msgstr "Please enable the account or send using another account."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
-msgid "Contact preview pane position (vertical)"
-msgstr "Contact preview pane position (vertical)"
+#: ../mail/mail.error.xml.h:147
+msgid "Mail Deletion Failed"
+msgstr "Mail Deletion Failed"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "EFolderList XML for the list of completion URIs"
+#: ../mail/mail.error.xml.h:148
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "You do not have sufficient permissions to delete this mail."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "EFolderList XML for the list of completion URIs."
+#: ../mail/mail.error.xml.h:149
+msgid "\"Check Junk\" Failed"
+msgstr "\"Check Junk\" Failed"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
-msgid "Position of the contact preview pane when oriented horizontally."
-msgstr "Position of the contact preview pane when oriented horizontally."
+#: ../mail/mail.error.xml.h:150
+msgid "\"Report Junk\" Failed"
+msgstr "\"Report Junk\" Failed"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
-msgid "Position of the contact preview pane when oriented vertically."
-msgstr "Position of the contact preview pane when oriented vertically."
+#: ../mail/mail.error.xml.h:151
+msgid "\"Report Not Junk\" Failed"
+msgstr "\"Report Not Junk\" Failed"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
-msgid "Primary address book"
-msgstr "Primary address book"
+#: ../mail/mail.error.xml.h:152
+msgid "Remove duplicate messages?"
+msgstr "Remove duplicate messages?"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
-msgid "Show autocompleted name with an address"
-msgstr "Show autocompleted name with an address"
+#: ../mail/mail.error.xml.h:153
+msgid "No duplicate messages found."
+msgstr "No duplicate messages found."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
-msgid "Show maps"
-msgstr "Show maps"
+#. Translators: {0} is replaced with a folder name
+#: ../mail/mail.error.xml.h:155
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr "Folder '{0}' doesn't contain any duplicate messages."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid "Show preview pane"
-msgstr "Show preview pane"
+#: ../mail/mail.error.xml.h:156
+msgid "Failed to unsubscribe from folder."
+msgstr "Failed to unsubscribe from folder."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
-msgid ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view."
-msgstr ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view."
+#: ../mail/mail.error.xml.h:158
+msgid "Unable to retrieve message."
+msgstr "Unable to retrieve message."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the contact list. \"0\" (Classic View) places the preview pane below the "
-"contact list. \"1\" (Vertical View) places the preview pane next to the "
-"contact list."
-msgstr ""
-"The layout style determines where to place the preview pane in relation to "
-"the contact list. \"0\" (Classic View) places the preview pane below the "
-"contact list. \"1\" (Vertical View) places the preview pane next to the "
-"contact list."
+#: ../mail/mail.error.xml.h:159
+msgid "{0}"
+msgstr "{0}"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
+#: ../mail/mail.error.xml.h:160
+msgid "Failed to open folder."
+msgstr "Failed to open folder."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
-msgid "URI for the folder last used in the select names dialog"
-msgstr "URI for the folder last used in the select names dialogue"
+#: ../mail/mail.error.xml.h:161
+msgid "Failed to find duplicate messages."
+msgstr "Failed to find duplicate messages."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
-msgid "URI for the folder last used in the select names dialog."
-msgstr "URI for the folder last used in the select names dialogue."
+#: ../mail/mail.error.xml.h:162
+msgid "Failed to retrieve messages."
+msgstr "Failed to retrieve messages."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr ""
-"Whether to force showing the e-mail address with the name of the "
-"autocompleted contact in the entry."
+#: ../mail/mail.error.xml.h:163
+msgid "Failed to remove attachments from messages."
+msgstr "Failed to remove attachments from messages."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
-msgid "Whether to show maps in preview pane."
-msgstr "Whether to show maps in preview pane."
+#: ../mail/mail.error.xml.h:164
+msgid "Failed to download messages for offline viewing."
+msgstr "Failed to download messages for offline viewing."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
-msgid "Whether to show the preview pane."
-msgstr "Whether to show the preview pane."
+#: ../mail/mail.error.xml.h:165
+msgid "Failed to save messages to disk."
+msgstr "Failed to save messages to disk."
 
-#. 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:194
-#: ../modules/mail/em-mailer-prefs.c:1049
-msgid "_Table column:"
-msgstr "_Table column:"
+#: ../mail/mail.error.xml.h:166
+msgid "Hidden file is attached."
+msgstr "Hidden file is attached."
 
-#: ../modules/addressbook/autocompletion-config.c:197
-msgid "Autocompletion"
-msgstr "Autocompletion"
+#: ../mail/mail.error.xml.h:167
+msgid ""
+"The attachment named {0} is a hidden file and may contain sensitive data. "
+"Please review it before sending."
+msgstr ""
+"The attachment named {0} is a hidden file and may contain sensitive data. "
+"Please review it before sending."
 
-#: ../modules/addressbook/autocompletion-config.c:200
-msgid "Always _show address of the autocompleted contact"
-msgstr "Always _show address of the autocompleted contact"
+#: ../mail/mail-send-recv.c:207
+msgid "Canceling..."
+msgstr "Cancellingâ"
 
-#. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:102
-#: ../modules/addressbook/e-book-shell-migrate.c:154
-msgid "On LDAP Servers"
-msgstr "On LDAP Servers"
+#: ../mail/mail-send-recv.c:534
+msgid "Send & Receive Mail"
+msgstr "Send & Receive Mail"
 
-#: ../modules/addressbook/e-book-shell-backend.c:302
-msgctxt "New"
-msgid "_Contact"
-msgstr "_Contact"
+#: ../mail/mail-send-recv.c:550
+msgid "Cancel _All"
+msgstr "Cancel _All"
 
-#: ../modules/addressbook/e-book-shell-backend.c:304
-#: ../modules/addressbook/e-book-shell-view-actions.c:905
-msgid "Create a new contact"
-msgstr "Create a new contact"
+#: ../mail/mail-send-recv.c:650 ../mail/mail-send-recv.c:1029
+msgid "Updating..."
+msgstr "Updatingâ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:309
-msgctxt "New"
-msgid "Contact _List"
-msgstr "Contact _List"
+#: ../mail/mail-send-recv.c:650 ../mail/mail-send-recv.c:736
+msgid "Waiting..."
+msgstr "Waitingâ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:311
-#: ../modules/addressbook/e-book-shell-view-actions.c:912
-msgid "Create a new contact list"
-msgstr "Create a new contact list"
+#: ../mail/mail-send-recv.c:1009
+#, c-format
+msgid "Checking for new mail"
+msgstr "Checking for new mail"
 
-#: ../modules/addressbook/e-book-shell-backend.c:319
-msgctxt "New"
-msgid "Address _Book"
-msgstr "Address _Book"
+#: ../mail/mail-vfolder-ui.c:159
+msgid "Edit Search Folder"
+msgstr "Edit Search Folder"
 
-#: ../modules/addressbook/e-book-shell-backend.c:321
-#: ../modules/addressbook/e-book-shell-view-actions.c:835
-msgid "Create a new address book"
-msgstr "Create a new address book"
+#: ../mail/mail-vfolder-ui.c:270
+msgid "New Search Folder"
+msgstr "New Search Folder"
 
-#. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:338
-#: ../modules/addressbook/e-book-shell-view.c:405
-#: ../modules/calendar/e-cal-shell-backend.c:115
-#: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:366
-msgid "Contacts"
-msgstr "Contacts"
+#: ../mail/message-list.c:1272
+msgid "Unseen"
+msgstr "Unseen"
 
-#: ../modules/addressbook/e-book-shell-backend.c:348
-msgid "Certificates"
-msgstr "Certificates"
+#: ../mail/message-list.c:1273
+msgid "Seen"
+msgstr "Seen"
 
-#. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:387
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
-msgid "Save as vCard"
-msgstr "Save as vCardâ"
+#: ../mail/message-list.c:1274
+msgid "Answered"
+msgstr "Answered"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:812
-msgid "Co_py All Contacts To..."
-msgstr "Co_py All Contacts Toâ"
+#: ../mail/message-list.c:1275
+msgid "Forwarded"
+msgstr "Forwarded"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:814
-msgid "Copy the contacts of the selected address book to another"
-msgstr "Copy the contacts of the selected address book to another"
+#: ../mail/message-list.c:1276
+msgid "Multiple Unseen Messages"
+msgstr "Multiple Unseen Messages"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:819
-msgid "D_elete Address Book"
-msgstr "D_elete Address Book"
+#: ../mail/message-list.c:1277
+msgid "Multiple Messages"
+msgstr "Multiple Messages"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
-msgid "Delete the selected address book"
-msgstr "Delete the selected address book"
+#: ../mail/message-list.c:1281
+msgid "Lowest"
+msgstr "Lowest"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:826
-msgid "Mo_ve All Contacts To..."
-msgstr "Mo_ve All Contacts Toâ"
+#: ../mail/message-list.c:1282
+msgid "Lower"
+msgstr "Lower"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:828
-msgid "Move the contacts of the selected address book to another"
-msgstr "Move the contacts of the selected address book to another"
+#: ../mail/message-list.c:1286
+msgid "Higher"
+msgstr "Higher"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:833
-msgid "_New Address Book"
-msgstr "_New Address Book"
+#: ../mail/message-list.c:1287
+msgid "Highest"
+msgstr "Highest"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:840
-msgid "Address _Book Properties"
-msgstr "Address _Book Properties"
+#: ../mail/message-list.c:1909 ../widgets/table/e-cell-date.c:51
+msgid "?"
+msgstr "?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:842
-msgid "Show properties of the selected address book"
-msgstr "Show properties of the selected address book"
+#. strftime format of a time,
+#. * in 12-hour format, without seconds.
+#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:208
+msgid "Today %l:%M %p"
+msgstr "Today %l:%M %p"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:847
-msgid "Address Book _Map"
-msgstr "Address Book _Map"
+#: ../mail/message-list.c:1925
+msgid "Yesterday %l:%M %p"
+msgstr "Yesterday %l:%M %p"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:849
-msgid "Show map with all contacts from selected address book"
-msgstr "Show map with all contacts from selected address book"
+#: ../mail/message-list.c:1937
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M %p"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:854
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/calendar/e-memo-shell-view-actions.c:641
-#: ../modules/calendar/e-task-shell-view-actions.c:765
-#: ../modules/mail/e-mail-shell-view-actions.c:1199
-msgid "_Rename..."
-msgstr "_Renameâ"
+#: ../mail/message-list.c:1945
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %l:%M %p"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:856
-msgid "Rename the selected address book"
-msgstr "Rename the selected address book"
+#: ../mail/message-list.c:1947
+msgid "%b %d %Y"
+msgstr "%d %b %Y"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:863
-msgid "Stop loading"
-msgstr "Stop loading"
+#: ../mail/message-list.c:2752
+msgid "Select all visible messages"
+msgstr "Select all visible messages"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:868
-msgid "_Copy Contact To..."
-msgstr "_Copy Contact Toâ"
+#: ../mail/message-list.c:2888 ../mail/message-list.etspec.h:17
+msgid "Messages"
+msgstr "Messages"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:870
-msgid "Copy selected contacts to another address book"
-msgstr "Copy selected contacts to another address book"
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:4101
+msgid "Follow-up"
+msgstr "Follow-up"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:875
-msgid "_Delete Contact"
-msgstr "_Delete Contact"
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:4638 ../mail/message-list.c:5058
+msgid "Generating message list"
+msgstr "Generating message list"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:882
-msgid "_Find in Contact..."
-msgstr "_Find in Contactâ"
+#: ../mail/message-list.c:4875
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"No message satisfies your search criteria. Either clear search with Search â "
+"Clear menu item or change it."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-msgid "Search for text in the displayed contact"
-msgstr "Search for text in the displayed contact"
+#: ../mail/message-list.c:4877
+msgid "There are no messages in this folder."
+msgstr "There are no messages in this folder."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:889
-msgid "_Forward Contact..."
-msgstr "_Forward Contactâ"
+#: ../mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr "Flagged"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:891
-msgid "Send selected contacts to another person"
-msgstr "Send selected contacts to another person"
+#: ../mail/message-list.etspec.h:8
+msgid "Received"
+msgstr "Received"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:896
-msgid "_Move Contact To..."
-msgstr "_Move Contact Toâ"
+#: ../mail/message-list.etspec.h:10
+#: ../widgets/misc/e-attachment-tree-view.c:574
+msgid "Size"
+msgstr "Size"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:898
-msgid "Move selected contacts to another address book"
-msgstr "Move selected contacts to another address book"
+#: ../mail/message-list.etspec.h:11
+msgid "Flag Status"
+msgstr "Flag Status"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:903
-msgid "_New Contact..."
-msgstr "_New Contactâ"
+#: ../mail/message-list.etspec.h:12
+msgid "Follow Up Flag"
+msgstr "Follow Up Flag"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:910
-msgid "New Contact _List..."
-msgstr "New Contact _Listâ"
+#: ../mail/message-list.etspec.h:13
+msgid "Due By"
+msgstr "Due By"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:917
-msgid "_Open Contact"
-msgstr "_Open Contact"
+#: ../mail/message-list.etspec.h:18
+msgid "Sent Messages"
+msgstr "Sent Messages"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:919
-msgid "View the current contact"
-msgstr "View the current contact"
+#: ../mail/message-list.etspec.h:20
+msgid "Subject - Trimmed"
+msgstr "Subject â Trimmed"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:924
-msgid "_Send Message to Contact..."
-msgstr "_Send Message to Contactâ"
+#: ../mail/searchtypes.xml.h:1
+msgid "Subject or Addresses contains"
+msgstr "Subject or Addresses contains"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:926
-msgid "Send a message to the selected contacts"
-msgstr "Send a message to the selected contacts"
+#: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1652
+msgid "Recipients contain"
+msgstr "Recipients contain"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:933
-#: ../modules/calendar/e-cal-shell-view-actions.c:1540
-#: ../modules/calendar/e-task-shell-view-actions.c:823
-msgid "_Actions"
-msgstr "_Actions"
+#: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
+msgid "Message contains"
+msgstr "Message contains"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:940
-#: ../modules/calendar/e-memo-shell-view-actions.c:678
-#: ../modules/calendar/e-task-shell-view-actions.c:830
-#: ../modules/mail/e-mail-shell-view-actions.c:1357
-msgid "_Preview"
-msgstr "_Preview"
+#: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
+msgid "Subject contains"
+msgstr "Subject contains"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:949
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
-#: ../modules/calendar/e-memo-shell-view-actions.c:691
-#: ../modules/calendar/e-task-shell-view-actions.c:843
-msgid "_Delete"
-msgstr "_Delete"
+#: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1659
+msgid "Sender contains"
+msgstr "Sender contains"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
-msgid "_Properties"
-msgstr "_Properties"
+#: ../mail/searchtypes.xml.h:6
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
+msgid "Body contains"
+msgstr "Body contains"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
-msgid "Address Book Map"
-msgstr "Address Book Map"
+#: ../modules/addressbook/addressbook-config.c:204
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:989
-msgid "Contact _Preview"
-msgstr "Contact _Preview"
+#: ../modules/addressbook/addressbook-config.c:206
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:991
-msgid "Show contact preview window"
-msgstr "Show contact preview window"
+#: ../modules/addressbook/addressbook-config.c:208
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
-msgid "Show _Maps"
-msgstr "Show _Maps"
+#: ../modules/addressbook/addressbook-config.c:649
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "U_se in Birthday & Anniversaries calendar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:999
-msgid "Show maps in contact preview window"
-msgstr "Show maps in contact preview window"
+#: ../modules/addressbook/addressbook-config.c:693
+msgid "Copy _book content locally for offline operation"
+msgstr "Copy _book content locally for offline operation"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1018
-#: ../modules/calendar/e-memo-shell-view-actions.c:748
-#: ../modules/calendar/e-task-shell-view-actions.c:912
-#: ../modules/mail/e-mail-shell-view-actions.c:1472
-msgid "_Classic View"
-msgstr "_Classic View"
+#: ../modules/addressbook/addressbook-config.c:812
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1020
-msgid "Show contact preview below the contact list"
-msgstr "Show contact preview below the contact list"
+#: ../modules/addressbook/addressbook-config.c:898
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"E-mail Address\" requires anonymous access to your LDAP "
+"server."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1025
-#: ../modules/calendar/e-memo-shell-view-actions.c:755
-#: ../modules/calendar/e-task-shell-view-actions.c:919
-#: ../modules/mail/e-mail-shell-view-actions.c:1479
-msgid "_Vertical View"
-msgstr "_Vertical View"
+#: ../modules/addressbook/addressbook-config.c:987
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1027
-msgid "Show contact preview alongside the contact list"
-msgstr "Show contact preview alongside the contact list"
+#: ../modules/addressbook/addressbook-config.c:1120
+msgid "Server Information"
+msgstr "Server Information"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1035
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:936
-msgid "Any Category"
-msgstr "Any Category"
+#: ../modules/addressbook/addressbook-config.c:1125
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Details"
+msgstr "Details"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1042
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
-msgid "Unmatched"
-msgstr "Unmatched"
+#: ../modules/addressbook/addressbook-config.c:1126
+#: ../modules/mail/e-mail-shell-view.c:58
+msgid "Searching"
+msgstr "Searching"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1052
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
-#: ../modules/calendar/e-memo-shell-view-actions.c:782
-#: ../modules/calendar/e-task-shell-view-actions.c:981
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
-#: ../shell/e-shell-content.c:666
-msgid "Advanced Search"
-msgstr "Advanced Search"
+#: ../modules/addressbook/addressbook-config.c:1128
+msgid "Downloading"
+msgstr "Downloading"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1085
-msgid "Print all shown contacts"
-msgstr "Print all shown contacts"
+#: ../modules/addressbook/addressbook-config.c:1346
+msgid "Address Book Properties"
+msgstr "Address Book Properties"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1092
-msgid "Preview the contacts to be printed"
-msgstr "Preview the contacts to be printed"
+#: ../modules/addressbook/addressbook-config.c:1348
+msgid "New Address Book"
+msgstr "New Address Book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1099
-msgid "Print selected contacts"
-msgstr "Print selected contacts"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "EFolderList XML for the list of completion URIs"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1114
-msgid "S_ave Address Book as vCard"
-msgstr "S_ave Address Book as vCard"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "EFolderList XML for the list of completion URIs."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1116
-msgid "Save the contacts of the selected address book as a vCard"
-msgstr "Save the contacts of the selected address book as a vCard"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view."
+msgstr ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view."
 
-#. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1122
-#: ../modules/addressbook/e-book-shell-view-actions.c:1132
-msgid "_Save as vCard..."
-msgstr "_Save as vCardâ"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
+msgid "Whether to show maps in preview pane."
+msgstr "Whether to show maps in preview pane."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1124
-msgid "Save selected contacts as a vCard"
-msgstr "Save selected contacts as a vCard"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
+msgid ""
+"Whether addresses should be formatted according to standard in their "
+"destination country."
+msgstr ""
+"Whether addresses should be formatted according to standard in their "
+"destination country."
 
-#: ../modules/addressbook/e-book-shell-view.c:349
-msgid "_Forward Contacts"
-msgstr "_Forward Contacts"
+#. 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:194
+#: ../modules/mail/em-mailer-prefs.c:1067
+msgid "_Table column:"
+msgstr "_Table column:"
 
-#: ../modules/addressbook/e-book-shell-view.c:351
-msgid "_Forward Contact"
-msgstr "_Forward Contact"
+#: ../modules/addressbook/autocompletion-config.c:197
+msgid "Address formatting"
+msgstr "Address formatting"
 
-#: ../modules/addressbook/e-book-shell-view.c:382
-msgid "_Send Message to Contacts"
-msgstr "_Send Message to Contacts"
+#: ../modules/addressbook/autocompletion-config.c:200
+msgid "_Format address according to standard of its destination country"
+msgstr "_Format address according to standard of its destination country"
 
-#: ../modules/addressbook/e-book-shell-view.c:384
-msgid "_Send Message to List"
-msgstr "_Send Message to List"
+#: ../modules/addressbook/autocompletion-config.c:209
+msgid "Autocompletion"
+msgstr "Autocompletion"
 
-#: ../modules/addressbook/e-book-shell-view.c:386
-msgid "_Send Message to Contact"
-msgstr "_Send Message to Contact"
+#: ../modules/addressbook/autocompletion-config.c:212
+msgid "Always _show address of the autocompleted contact"
+msgstr "Always _show address of the autocompleted contact"
 
 #: ../modules/addressbook/eab-composer-util.c:149
 msgid "Multiple vCards"
@@ -13707,478 +15109,480 @@ msgstr "Contact information"
 msgid "Contact information for %s"
 msgstr "Contact information for %s"
 
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "1"
-msgstr "1"
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:4
-msgid "5"
-msgstr "5"
-
-#: ../modules/addressbook/ldap-config.ui.h:5
-msgid "Anonymously"
-msgstr "Anonymously"
-
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:7
-msgid "B_rowse this book until limit reached"
-msgstr "B_rowse this book until limit reached"
-
-#: ../modules/addressbook/ldap-config.ui.h:8
-msgid "Lo_gin:"
-msgstr "Lo_gin:"
-
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:11
-msgid "One"
-msgstr "One"
-
-#: ../modules/addressbook/ldap-config.ui.h:13
-msgid "Search Filter"
-msgstr "Search Filter"
-
-#: ../modules/addressbook/ldap-config.ui.h:14
-msgid "Search _base:"
-msgstr "Search _base:"
-
-#: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Search _filter:"
-msgstr "Search _filter:"
-
-#: ../modules/addressbook/ldap-config.ui.h:16
-msgid ""
-"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\"."
-msgstr ""
-"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\"."
-
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:18
-msgid "Sub"
-msgstr "Sub"
+#. Create the LDAP source group
+#: ../modules/addressbook/e-book-shell-backend.c:108
+#: ../modules/addressbook/e-book-shell-migrate.c:154
+msgid "On LDAP Servers"
+msgstr "On LDAP Servers"
 
-#: ../modules/addressbook/ldap-config.ui.h:19
-msgid "Supported Search Bases"
-msgstr "Supported Search Bases"
+#: ../modules/addressbook/e-book-shell-backend.c:309
+msgctxt "New"
+msgid "_Contact"
+msgstr "_Contact"
 
-#: ../modules/addressbook/ldap-config.ui.h:21
-msgid "Using distinguished name (DN)"
-msgstr "Using distinguished name (DN)"
+#: ../modules/addressbook/e-book-shell-backend.c:311
+#: ../modules/addressbook/e-book-shell-view-actions.c:909
+msgid "Create a new contact"
+msgstr "Create a new contact"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
-msgid "Using email address"
-msgstr "Using e-mail address"
+#: ../modules/addressbook/e-book-shell-backend.c:316
+msgctxt "New"
+msgid "Contact _List"
+msgstr "Contact _List"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
-msgid "_Download limit:"
-msgstr "_Download limit:"
+#: ../modules/addressbook/e-book-shell-backend.c:318
+#: ../modules/addressbook/e-book-shell-view-actions.c:916
+msgid "Create a new contact list"
+msgstr "Create a new contact list"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
-msgid "_Find Possible Search Bases"
-msgstr "_Find Possible Search Bases"
+#: ../modules/addressbook/e-book-shell-backend.c:326
+msgctxt "New"
+msgid "Address _Book"
+msgstr "Address _Book"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
-msgid "_Login method:"
-msgstr "_Login method:"
+#: ../modules/addressbook/e-book-shell-backend.c:328
+#: ../modules/addressbook/e-book-shell-view-actions.c:839
+msgid "Create a new address book"
+msgstr "Create a new address book"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
-msgid "_Search scope:"
-msgstr "_Search scope:"
+#. Create the contacts group
+#: ../modules/addressbook/e-book-shell-backend.c:345
+#: ../modules/addressbook/e-book-shell-view.c:402
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:63
+#: ../modules/online-accounts/e-online-accounts-google.c:376
+msgid "Contacts"
+msgstr "Contacts"
 
-#: ../modules/addressbook/ldap-config.ui.h:30
-msgid "_Timeout:"
-msgstr "_Timeout:"
+#: ../modules/addressbook/e-book-shell-backend.c:356
+msgid "Certificates"
+msgstr "Certificates"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
-msgid "cards"
-msgstr "cards"
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:391
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
+msgid "Save as vCard"
+msgstr "Save as vCardâ"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:146
-#, c-format
-msgid "Failed to spawn Bogofilter (%s): "
-msgstr "Failed to spawn Bogofilter (%s): "
+#: ../modules/addressbook/e-book-shell-view-actions.c:816
+msgid "Co_py All Contacts To..."
+msgstr "Co_py All Contacts Toâ"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:164
-msgid "Failed to stream mail message content to Bogofilter: "
-msgstr "Failed to stream mail message content to Bogofilter: "
+#: ../modules/addressbook/e-book-shell-view-actions.c:818
+msgid "Copy the contacts of the selected address book to another"
+msgstr "Copy the contacts of the selected address book to another"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:213
-msgid "Bogofilter either crashed or failed to process a mail message"
-msgstr "Bogofilter either crashed or failed to process a mail message"
+#: ../modules/addressbook/e-book-shell-view-actions.c:823
+msgid "D_elete Address Book"
+msgstr "D_elete Address Book"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:312
-msgid "Bogofilter Options"
-msgstr "Bogofilter Options"
+#: ../modules/addressbook/e-book-shell-view-actions.c:825
+msgid "Delete the selected address book"
+msgstr "Delete the selected address book"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:321
-msgid "Convert message text to _Unicode"
-msgstr "Convert message text to _Unicode"
+#: ../modules/addressbook/e-book-shell-view-actions.c:830
+msgid "Mo_ve All Contacts To..."
+msgstr "Mo_ve All Contacts Toâ"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:477
-msgid "Bogofilter"
-msgstr "Bogofilter"
+#: ../modules/addressbook/e-book-shell-view-actions.c:832
+msgid "Move the contacts of the selected address book to another"
+msgstr "Move the contacts of the selected address book to another"
 
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "Convert mail messages to Unicode"
+#: ../modules/addressbook/e-book-shell-view-actions.c:837
+msgid "_New Address Book"
+msgstr "_New Address Book"
 
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
+msgid "Address _Book Properties"
+msgstr "Address _Book Properties"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
-#, 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/addressbook/e-book-shell-view-actions.c:846
+msgid "Show properties of the selected address book"
+msgstr "Show properties of the selected address book"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
-msgid "(Shown in a Day View)"
-msgstr "(Shown in a Day View)"
+#: ../modules/addressbook/e-book-shell-view-actions.c:851
+msgid "Address Book _Map"
+msgstr "Address Book _Map"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
-msgid "05 minutes"
-msgstr "05 minutes"
+#: ../modules/addressbook/e-book-shell-view-actions.c:853
+msgid "Show map with all contacts from selected address book"
+msgstr "Show map with all contacts from selected address book"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
-msgid "10 minutes"
-msgstr "10 minutes"
+#: ../modules/addressbook/e-book-shell-view-actions.c:858
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-memo-shell-view-actions.c:640
+#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
+msgid "_Rename..."
+msgstr "_Renameâ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
-msgid "15 minutes"
-msgstr "15 minutes"
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
+msgid "Rename the selected address book"
+msgstr "Rename the selected address book"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
-msgid "30 minutes"
-msgstr "30 minutes"
+#: ../modules/addressbook/e-book-shell-view-actions.c:867
+msgid "Stop loading"
+msgstr "Stop loading"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:8
-msgid "60 minutes"
-msgstr "60 minutes"
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
+msgid "_Copy Contact To..."
+msgstr "_Copy Contact Toâ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alerts"
-msgstr "Alerts"
+#: ../modules/addressbook/e-book-shell-view-actions.c:874
+msgid "Copy selected contacts to another address book"
+msgstr "Copy selected contacts to another address book"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
-msgid "Day _ends:"
-msgstr "Day _ends:"
+#: ../modules/addressbook/e-book-shell-view-actions.c:879
+msgid "_Delete Contact"
+msgstr "_Delete Contact"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
-msgid "Days"
-msgstr "Days"
+#: ../modules/addressbook/e-book-shell-view-actions.c:886
+msgid "_Find in Contact..."
+msgstr "_Find in Contactâ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
-msgid "Default Free/Busy Server"
-msgstr "Default Free/Busy Server"
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
+msgid "Search for text in the displayed contact"
+msgstr "Search for text in the displayed contact"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
-msgid "Display"
-msgstr "Display"
+#: ../modules/addressbook/e-book-shell-view-actions.c:893
+msgid "_Forward Contact..."
+msgstr "_Forward Contactâ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
-msgid "Display reminders in _notification area only"
-msgstr "Display reminders in _notification area only"
+#: ../modules/addressbook/e-book-shell-view-actions.c:895
+msgid "Send selected contacts to another person"
+msgstr "Send selected contacts to another person"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
-msgid "Hours"
-msgstr "Hours"
+#: ../modules/addressbook/e-book-shell-view-actions.c:900
+msgid "_Move Contact To..."
+msgstr "_Move Contact Toâ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
-msgid "Minutes"
-msgstr "Minutes"
+#: ../modules/addressbook/e-book-shell-view-actions.c:902
+msgid "Move selected contacts to another address book"
+msgstr "Move selected contacts to another address book"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
-msgid "Publishing Information"
-msgstr "Publishing Information"
+#: ../modules/addressbook/e-book-shell-view-actions.c:907
+msgid "_New Contact..."
+msgstr "_New Contactâ"
 
-#. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-msgid "S_un"
-msgstr "S_un"
+#: ../modules/addressbook/e-book-shell-view-actions.c:914
+msgid "New Contact _List..."
+msgstr "New Contact _Listâ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
-msgid "Sc_roll Month View by a week"
-msgstr "Sc_roll Month View by a week"
+#: ../modules/addressbook/e-book-shell-view-actions.c:921
+msgid "_Open Contact"
+msgstr "_Open Contact"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
-msgid "Se_cond zone:"
-msgstr "Se_cond zone:"
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
+msgid "View the current contact"
+msgstr "View the current contact"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Select the calendars for reminder notification"
-msgstr "Select the calendars for reminder notification"
+#: ../modules/addressbook/e-book-shell-view-actions.c:928
+msgid "_Send Message to Contact..."
+msgstr "_Send Message to Contactâ"
 
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
-msgid "Sh_ow a reminder"
-msgstr "Sh_ow a reminder"
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
+msgid "Send a message to the selected contacts"
+msgstr "Send a message to the selected contacts"
 
-#. 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:33
-msgid "Show a _reminder"
-msgstr "Show a _reminder"
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-task-shell-view-actions.c:822
+msgid "_Actions"
+msgstr "_Actions"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
-msgid "Show r_ecurring events in italic in bottom left calendar"
-msgstr "Show r_ecurring events in italic in bottom left calendar"
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#: ../modules/calendar/e-memo-shell-view-actions.c:677
+#: ../modules/calendar/e-task-shell-view-actions.c:829
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
+msgid "_Preview"
+msgstr "_Preview"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
-msgid "Show week _numbers"
-msgstr "Show week _numbers"
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-memo-shell-view-actions.c:690
+#: ../modules/calendar/e-task-shell-view-actions.c:842
+msgid "_Delete"
+msgstr "_Delete"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
-msgid "T_asks due today:"
-msgstr "T_asks due today:"
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
+msgid "_Properties"
+msgstr "_Properties"
 
-#. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
-msgid "T_hu"
-msgstr "T_hu"
+#: ../modules/addressbook/e-book-shell-view-actions.c:961
+msgid "Address Book Map"
+msgstr "Address Book Map"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
-msgid "Template:"
-msgstr "Template:"
+#: ../modules/addressbook/e-book-shell-view-actions.c:993
+msgid "Contact _Preview"
+msgstr "Contact _Preview"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
-#: ../widgets/misc/e-dateedit.c:592
-msgid "Time"
-msgstr "Time"
+#: ../modules/addressbook/e-book-shell-view-actions.c:995
+msgid "Show contact preview window"
+msgstr "Show contact preview window"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "Time format:"
-msgstr "Time format:"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1001
+msgid "Show _Maps"
+msgstr "Show _Maps"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
-msgid "Use s_ystem time zone"
-msgstr "Use s_ystem time zone"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1003
+msgid "Show maps in contact preview window"
+msgstr "Show maps in contact preview window"
 
-#. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
-msgid "Wee_k starts on:"
-msgstr "Wee_k starts on:"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1022
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:1548
+msgid "_Classic View"
+msgstr "_Classic View"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
-msgid "Work Week"
-msgstr "Work Week"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1024
+msgid "Show contact preview below the contact list"
+msgstr "Show contact preview below the contact list"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
-msgid "Work days:"
-msgstr "Work days:"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1029
+#: ../modules/calendar/e-memo-shell-view-actions.c:754
+#: ../modules/calendar/e-task-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
+msgid "_Vertical View"
+msgstr "_Vertical View"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
-msgid "_12 hour (AM/PM)"
-msgstr "_12 hour (AM/PM)"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1031
+msgid "Show contact preview alongside the contact list"
+msgstr "Show contact preview alongside the contact list"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
-msgid "_24 hour"
-msgstr "_24 hour"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1039
+#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:935
+msgid "Any Category"
+msgstr "Any Category"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
-msgid "_Ask for confirmation when deleting items"
-msgstr "_Ask for confirmation when deleting items"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1046
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:970
+msgid "Unmatched"
+msgstr "Unmatched"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
-msgid "_Compress weekends in month view"
-msgstr "_Compress weekends in month view"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1056
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../shell/e-shell-content.c:664
+msgid "Advanced Search"
+msgstr "Advanced Search"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "_Day begins:"
-msgstr "_Day begins:"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1089
+msgid "Print all shown contacts"
+msgstr "Print all shown contacts"
 
-#. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
-msgid "_Fri"
-msgstr "_Fri"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1096
+msgid "Preview the contacts to be printed"
+msgstr "Preview the contacts to be printed"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
-msgid "_Hide completed tasks after"
-msgstr "_Hide completed tasks after"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1103
+msgid "Print selected contacts"
+msgstr "Print selected contacts"
 
-#. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
-msgid "_Mon"
-msgstr "_Mon"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1118
+msgid "S_ave Address Book as vCard"
+msgstr "S_ave Address Book as vCard"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:64
-msgid "_Overdue tasks:"
-msgstr "_Overdue tasks:"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1120
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "Save the contacts of the selected address book as a vCard"
 
-#. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
-msgid "_Sat"
-msgstr "_Sat"
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:1126
+#: ../modules/addressbook/e-book-shell-view-actions.c:1136
+msgid "_Save as vCard..."
+msgstr "_Save as vCardâ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
-msgid "_Show appointment end times in week and month view"
-msgstr "_Show appointment end times in week and month view"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1128
+msgid "Save selected contacts as a vCard"
+msgstr "Save selected contacts as a vCard"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:68
-msgid "_Time divisions:"
-msgstr "_Time divisions:"
+#: ../modules/addressbook/e-book-shell-view.c:346
+msgid "_Forward Contacts"
+msgstr "_Forward Contacts"
 
-#. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:70
-msgid "_Tue"
-msgstr "_Tue"
+#: ../modules/addressbook/e-book-shell-view.c:348
+msgid "_Forward Contact"
+msgstr "_Forward Contact"
 
-#. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
-msgid "_Wed"
-msgstr "_Wed"
+#: ../modules/addressbook/e-book-shell-view.c:379
+msgid "_Send Message to Contacts"
+msgstr "_Send Message to Contacts"
 
-#. 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:74
-msgid "before every anniversary/birthday"
-msgstr "before every anniversary/birthday"
+#: ../modules/addressbook/e-book-shell-view.c:381
+msgid "_Send Message to List"
+msgstr "_Send Message to List"
 
-#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
-msgid "before every appointment"
-msgstr "before every appointment"
+#: ../modules/addressbook/e-book-shell-view.c:383
+msgid "_Send Message to Contact"
+msgstr "_Send Message to Contact"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
-msgid "Ask for confirmation when deleting items"
-msgstr "Ask for confirmation when deleting items"
+#: ../modules/addressbook/ldap-config.ui.h:4
+msgid "Anonymously"
+msgstr "Anonymously"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "Background colour of tasks that are due today, in \"#rrggbb\" format."
+#: ../modules/addressbook/ldap-config.ui.h:5
+msgid "Using email address"
+msgstr "Using e-mail address"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "Background colour of tasks that are overdue, in \"#rrggbb\" format."
+#: ../modules/addressbook/ldap-config.ui.h:6
+msgid "Using distinguished name (DN)"
+msgstr "Using distinguished name (DN)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
-msgid "Birthday and anniversary reminder"
-msgstr "Birthday and anniversary reminder"
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:8
+msgid "One"
+msgstr "One"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
-msgid "Birthday and anniversary reminder units"
-msgstr "Birthday and anniversary reminder units"
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:10
+msgid "Sub"
+msgstr "Sub"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
-msgid "Birthday and anniversary reminder value"
-msgstr "Birthday and anniversary reminder value"
+#: ../modules/addressbook/ldap-config.ui.h:11
+msgid "Supported Search Bases"
+msgstr "Supported Search Bases"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-msgid "Calendars to run reminders for"
-msgstr "Calendars to run reminders for"
+#: ../modules/addressbook/ldap-config.ui.h:14
+msgid "Ser_ver:"
+msgstr "Ser_ver:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-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)."
+#: ../modules/addressbook/ldap-config.ui.h:15
+msgid "Use secure _connection:"
+msgstr "Use secure _connection:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "Colour to draw the Marcus Bains line in the Day View."
+#: ../modules/addressbook/ldap-config.ui.h:16
+msgid "_Login method:"
+msgstr "_Login method:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
-msgid "Compress weekends in month view"
-msgstr "Compress weekends in month view"
+#: ../modules/addressbook/ldap-config.ui.h:17
+msgid "Lo_gin:"
+msgstr "Lo_gin:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
-msgid "Confirm expunge"
-msgstr "Confirm expunge"
+#: ../modules/addressbook/ldap-config.ui.h:18
+msgid "Search _base:"
+msgstr "Search _base:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
-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."
+#: ../modules/addressbook/ldap-config.ui.h:19
+msgid "_Search scope:"
+msgstr "_Search scope:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
-msgid "Default appointment reminder"
-msgstr "Default appointment reminder"
+#: ../modules/addressbook/ldap-config.ui.h:20
+msgid "_Find Possible Search Bases"
+msgstr "_Find Possible Search Bases"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
-msgid "Default reminder units"
-msgstr "Default reminder units"
+#: ../modules/addressbook/ldap-config.ui.h:21
+msgid "S_earch filter:"
+msgstr "S_earch filter:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
-msgid "Default reminder value"
-msgstr "Default reminder value"
+#: ../modules/addressbook/ldap-config.ui.h:22
+msgid "Search Filter"
+msgstr "Search Filter"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
-msgid "Directory for saving reminder audio files"
-msgstr "Directory for saving reminder audio files"
+#: ../modules/addressbook/ldap-config.ui.h:23
+msgid ""
+"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\"."
+msgstr ""
+"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\"."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Free/busy server URLs"
-msgstr "Free/busy server URLs"
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:25
+msgid "1"
+msgstr "1"
+
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:27
+msgid "5"
+msgstr "5"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
-msgid "Free/busy template URL"
-msgstr "Free/busy template URL"
+#: ../modules/addressbook/ldap-config.ui.h:30
+msgid "contacts"
+msgstr "contacts"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
-msgid "Hide completed tasks"
-msgstr "Hide completed tasks"
+#: ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Timeout:"
+msgstr "_Timeout:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
-msgid "Hide task units"
-msgstr "Hide task units"
+#: ../modules/addressbook/ldap-config.ui.h:32
+msgid "_Download limit:"
+msgstr "_Download limit:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
-msgid "Hide task value"
-msgstr "Hide task value"
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.ui.h:34
+msgid "B_rowse this book until limit reached"
+msgstr "B_rowse this book until limit reached"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
-msgid "Horizontal pane position"
-msgstr "Horizontal pane position"
+#: ../modules/bogofilter/evolution-bogofilter.c:145
+#, c-format
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "Failed to spawn Bogofilter (%s): "
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr "Hour the workday ends on, in twenty four hour format, 0 to 23."
+#: ../modules/bogofilter/evolution-bogofilter.c:163
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr "Failed to stream mail message content to Bogofilter: "
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
-msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr "Hour the workday starts on, in twenty four hour format, 0 to 23."
+#: ../modules/bogofilter/evolution-bogofilter.c:212
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr "Bogofilter either crashed or failed to process a mail message"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
-msgid "If \"true\", show the memo preview pane in the main window."
-msgstr "If \"true\", show the memo preview pane in the main window."
+#: ../modules/bogofilter/evolution-bogofilter.c:311
+msgid "Bogofilter Options"
+msgstr "Bogofilter Options"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
-msgid "If \"true\", show the task preview pane in the main window."
-msgstr "If \"true\", show the task preview pane in the main window."
+#: ../modules/bogofilter/evolution-bogofilter.c:320
+msgid "Convert message text to _Unicode"
+msgstr "Convert message text to _Unicode"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
-msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "Intervals shown in Day and Work Week views, in minutes."
+#: ../modules/bogofilter/evolution-bogofilter.c:476
+msgid "Bogofilter"
+msgstr "Bogofilter"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
-msgid "Last reminder time"
-msgstr "Last reminder time"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
+msgstr ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
-msgid "List of recently used second time zones in a Day View."
-msgstr "List of recently used second time zones in a Day View."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
-msgid "List of server URLs for free/busy publishing."
-msgstr "List of server URLs for free/busy publishing."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "Use the system timezone instead of the timezone selected in Evolution."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
-msgid "Marcus Bains Line"
-msgstr "Marcus Bains Line"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
-msgid "Marcus Bains Line Color - Day View"
-msgstr "Marcus Bains Line Colour â Day View"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+msgid "List of recently used second time zones in a Day View."
+msgstr "List of recently used second time zones in a Day View."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
-msgid "Marcus Bains Line Color - Time bar"
-msgstr "Marcus Bains Line Colour â Time bar"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+msgid "Maximum number of recently used timezones to remember."
+msgstr "Maximum number of recently used timezones to remember."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -14186,55 +15590,25 @@ msgstr ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
-msgid "Maximum number of recently used timezones to remember."
-msgstr "Maximum number of recently used timezones to remember."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
-msgid "Memo layout style"
-msgstr "Memo layout style"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
-msgid "Memo preview pane position (horizontal)"
-msgstr "Memo preview pane position (horizontal)"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
-msgid "Memo preview pane position (vertical)"
-msgstr "Memo preview pane position (vertical)"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
-msgid "Minute the workday ends on, 0 to 59."
-msgstr "Minute the workday ends on, 0 to 59."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
-msgid "Minute the workday starts on, 0 to 59."
-msgstr "Minute the workday starts on, 0 to 59."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
-msgid "Month view horizontal pane position"
-msgstr "Month view horizontal pane position"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
-msgid "Month view vertical pane position"
-msgstr "Month view vertical pane position"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
-msgid "Number of units for determining a birthday or anniversary reminder."
-msgstr "Number of units for determining a birthday or anniversary reminder."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+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."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
-msgid "Number of units for determining a default reminder."
-msgstr "Number of units for determining a default reminder."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
-msgid "Number of units for determining when to hide tasks."
-msgstr "Number of units for determining when to hide tasks."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr "Hour the workday ends on, in twenty four hour format, 0 to 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
-msgid "Overdue tasks color"
-msgstr "Overdue tasks colour"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr "Intervals shown in Day and Work Week views, in minutes."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -14242,7 +15616,19 @@ msgstr ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+msgid "Vertical pane position"
+msgstr "Vertical pane position"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14250,27 +15636,7 @@ msgstr ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
-msgid "Position of the memo preview pane when oriented vertically."
-msgstr "Position of the memo preview pane when oriented vertically."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
-msgid "Position of the task preview pane when oriented horizontally."
-msgstr "Position of the task preview pane when oriented horizontally."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
-msgid "Position of the task preview pane when oriented vertically."
-msgstr "Position of the task preview pane when oriented vertically."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14278,132 +15644,92 @@ msgstr ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
 msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
 msgstr ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
-msgid "Primary calendar"
-msgstr "Primary calendar"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
-msgid "Primary memo list"
-msgstr "Primary memo list"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr "If \"true\", show the memo preview pane in the main window."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
-msgid "Primary task list"
-msgstr "Primary task list"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr "Position of the task preview pane when oriented horizontally."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
-msgid "Programs that are allowed to be run by reminders."
-msgstr "Programs that are allowed to be run by reminders."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr "Position of the memo preview pane when oriented vertically."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Recently used second time zones in a Day View"
-msgstr "Recently used second time zones in a Day View"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
-msgid "Recurrent Events in Italic"
-msgstr "Recurrent Events in Italic"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr "If \"true\", show the task preview pane in the main window."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
-msgid "Reminder programs"
-msgstr "Reminder programs"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+msgid "Position of the task preview pane when oriented vertically."
+msgstr "Position of the task preview pane when oriented vertically."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for reminder audio"
-msgstr "Save directory for reminder audio"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
-msgid "Scroll Month View by a week"
-msgstr "Scroll Month View by a week"
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Show RSVP field in the event/task/meeting editor"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
-msgid "Show Role field in the event/task/meeting editor"
-msgstr "Show Role field in the event/task/meeting editor"
+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."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
-msgid "Show appointment end times in week and month views"
-msgstr "Show appointment end times in week and month views"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
-msgid "Show categories field in the event/meeting/task editor"
-msgstr "Show categories field in the event/meeting/task editor"
+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."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
-msgid "Show days with recurrent events in italic font in bottom left calendar."
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
-"Show days with recurrent events in italic font in bottom left calendar."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display reminders in notification tray"
-msgstr "Show display reminders in notification tray"
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
-msgid "Show status field in the event/task/meeting editor"
-msgstr "Show status field in the event/task/meeting editor"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
-msgid "Show the memo preview pane"
-msgstr "Show the memo preview pane"
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr "Colour to draw the Marcus Bains line in the Day View."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
-msgid "Show the task preview pane"
-msgstr "Show the task preview pane"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
-msgid "Show timezone field in the event/meeting editor"
-msgstr "Show timezone field in the event/meeting editor"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
-msgid "Show type field in the event/task/meeting editor"
-msgstr "Show type field in the event/task/meeting editor"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
-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"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
 msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
-msgid "Task layout style"
-msgstr "Task layout style"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
-msgid "Task preview pane position (horizontal)"
-msgstr "Task preview pane position (horizontal)"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
-msgid "Task preview pane position (vertical)"
-msgstr "Task preview pane position (vertical)"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
-msgid "Tasks due today color"
-msgstr "Tasks due today colour"
+"Colour to draw the Marcus Bains Line in the Time bar (empty for default)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
+msgid "Show days with recurrent events in italic font in bottom left calendar."
 msgstr ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view."
+"Show days with recurrent events in italic font in bottom left calendar."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view."
@@ -14411,7 +15737,7 @@ msgstr ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view."
@@ -14419,318 +15745,437 @@ msgstr ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
-#, no-c-format
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr "Whether to hide completed tasks in the tasks view."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
 msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 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."
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:86
+msgid "Number of units for determining when to hide tasks."
+msgstr "Number of units for determining when to hide tasks."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr "Background colour of tasks that are due today, in \"#rrggbb\" format."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr "Background colour of tasks that are overdue, in \"#rrggbb\" format."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr "Whether to ask for confirmation when deleting an appointment or task."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr "Whether to ask for confirmation when expunging appointments and tasks."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
+msgid "Whether to set a default reminder for appointments."
+msgstr "Whether to set a default reminder for appointments."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
+msgid "Number of units for determining a default reminder."
+msgstr "Number of units for determining a default reminder."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
+msgid "Whether to set a reminder for birthdays and anniversaries."
+msgstr "Whether to set a reminder for birthdays and anniversaries."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
+msgid "Number of units for determining a birthday or anniversary reminder."
+msgstr "Number of units for determining a birthday or anniversary reminder."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
 msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
 msgstr ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+"Units for a birthday or anniversary reminder: \"minutes\", \"hours\" or "
+"\"days\"."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "Whether to show week numbers in various places in the Calendar."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
+msgid "Scroll Month View by a week"
+msgstr "Scroll Month View by a week"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
+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."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
+msgid "Time the last reminder ran, in time_t."
+msgstr "Time the last reminder ran, in time_t."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
+msgid "Calendars to run reminders for"
+msgstr "Calendars to run reminders for"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
+msgid "Programs that are allowed to be run by reminders."
+msgstr "Programs that are allowed to be run by reminders."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
+msgid "Whether or not to use the notification tray for display reminders."
+msgstr "Whether or not to use the notification tray for display reminders."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
+msgid "Free/busy server URLs"
+msgstr "Free/busy server URLs"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
+msgid "List of server URLs for free/busy publishing."
+msgstr "List of server URLs for free/busy publishing."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
+#, no-c-format
 msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
 msgstr ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+"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."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
 msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
 msgstr ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
+"This can have three possible values: 0 for errors, 1 for warnings, 2 for "
+"debug messages."
+
+#: ../modules/calendar/e-cal-attachment-handler.c:316
+#: ../smime/gui/smime-ui.ui.h:32
+msgid "I_mport"
+msgstr "I_mport"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:397
+msgid "Select a Calendar"
+msgstr "Select a Calendar"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:424
+msgid "Select a Task List"
+msgstr "Select a Task List"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:434
+msgid "I_mport to Calendar"
+msgstr "I_mport to Calendar"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:441
+msgid "I_mport to Tasks"
+msgstr "I_mport to Tasks"
+
+#: ../modules/calendar/e-calendar-preferences.c:467
+msgid "Selected Calendars for Reminders"
+msgstr "Selected Calendars for Reminders"
+
+#: ../modules/calendar/e-calendar-preferences.c:891
+msgid "Ti_me and date:"
+msgstr "Ti_me and date:"
+
+#: ../modules/calendar/e-calendar-preferences.c:892
+msgid "_Date only:"
+msgstr "_Date only:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
+msgid "Minutes"
+msgstr "Minutes"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Hours"
+msgstr "Hours"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
-msgid "The second timezone for a Day View"
-msgstr "The second timezone for a Day View"
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Days"
+msgstr "Days"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr ""
-"This can have three possible values: 0 for errors, 1 for warnings, 2 for "
-"debug messages."
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
+msgid "60 minutes"
+msgstr "60 minutes"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
-msgid "Time divisions"
-msgstr "Time divisions"
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
+msgid "30 minutes"
+msgstr "30 minutes"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last reminder ran, in time_t."
-msgstr "Time the last reminder ran, in time_t."
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "15 minutes"
+msgstr "15 minutes"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
-msgid "Timezone"
-msgstr "Timezone"
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
+msgid "10 minutes"
+msgstr "10 minutes"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
-msgid "Twenty four hour time format"
-msgstr "Twenty four hour time format"
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+msgid "05 minutes"
+msgstr "05 minutes"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\"."
-msgstr ""
-"Units for a birthday or anniversary reminder: \"minutes\", \"hours\" or "
-"\"days\"."
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../widgets/misc/e-dateedit.c:595
+msgid "Time"
+msgstr "Time"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
+msgid "Se_cond zone:"
+msgstr "Se_cond zone:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
+msgid "(Shown in a Day View)"
+msgstr "(Shown in a Day View)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
-msgid "Use system timezone"
-msgstr "Use system timezone"
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
+msgid "Use s_ystem time zone"
+msgstr "Use s_ystem time zone"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
-msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr "Use the system timezone instead of the timezone selected in Evolution."
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "Time format:"
+msgstr "Time format:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
-msgid "Vertical pane position"
-msgstr "Vertical pane position"
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "_12 hour (AM/PM)"
+msgstr "_12 hour (AM/PM)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
-msgid "Week start"
-msgstr "Week start"
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
+msgid "_24 hour"
+msgstr "_24 hour"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+msgid "Work Week"
+msgstr "Work Week"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display reminders."
-msgstr "Whether or not to use the notification tray for display reminders."
+#. A weekday like "Monday" follows
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
+msgid "Wee_k starts on:"
+msgstr "Wee_k starts on:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
-msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "Whether to ask for confirmation when deleting an appointment or task."
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Work days:"
+msgstr "Work days:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "Whether to ask for confirmation when expunging appointments and tasks."
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+msgid "_Day begins:"
+msgstr "_Day begins:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-msgstr ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
+#. Monday
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "_Mon"
+msgstr "_Mon"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
-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."
+#. Tuesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
+msgid "_Tue"
+msgstr "_Tue"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-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."
+#. Wednesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
+msgid "_Wed"
+msgstr "_Wed"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
-msgid "Whether to hide completed tasks in the tasks view."
-msgstr "Whether to hide completed tasks in the tasks view."
+#. Thursday
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "T_hu"
+msgstr "T_hu"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
-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."
+#. Friday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "_Fri"
+msgstr "_Fri"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
-msgid "Whether to set a default reminder for appointments."
-msgstr "Whether to set a default reminder for appointments."
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
+msgid "_Sat"
+msgstr "_Sat"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
-msgid "Whether to set a reminder for birthdays and anniversaries."
-msgstr "Whether to set a reminder for birthdays and anniversaries."
+#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+msgid "S_un"
+msgstr "S_un"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
-msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "Whether to show RSVP field in the event/task/meeting editor"
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+msgid "Day _ends:"
+msgstr "Day _ends:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr "Whether to show categories field in the event/meeting editor"
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
+msgid "Alerts"
+msgstr "Alerts"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
-msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "Whether to show role field in the event/task/meeting editor"
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+msgid "_Ask for confirmation when deleting items"
+msgstr "_Ask for confirmation when deleting items"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "Whether to show status field in the event/task/meeting editor"
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "_Time divisions:"
+msgstr "_Time divisions:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-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."
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
+msgid "_Show appointment end times in week and month view"
+msgstr "_Show appointment end times in week and month view"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "Whether to show timezone field in the event/meeting editor"
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
+msgid "_Compress weekends in month view"
+msgstr "_Compress weekends in month view"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
-msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "Whether to show type field in the event/task/meeting editor"
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
+msgid "Show week _numbers"
+msgstr "Show week _numbers"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week numbers in various places in the Calendar."
-msgstr "Whether to show week numbers in various places in the Calendar."
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+msgid "Show r_ecurring events in italic in bottom left calendar"
+msgstr "Show r_ecurring events in italic in bottom left calendar"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
-msgid "Work days"
-msgstr "Work days"
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
+msgid "Sc_roll Month View by a week"
+msgstr "Sc_roll Month View by a week"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
-msgid "Workday end hour"
-msgstr "Workday end hour"
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "Display"
+msgstr "Display"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
-msgid "Workday end minute"
-msgstr "Workday end minute"
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
+msgid "Highlight t_asks due today"
+msgstr "Highlight t_asks due today"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
-msgid "Workday start hour"
-msgstr "Workday start hour"
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "Highlight _overdue tasks"
+msgstr "Highlight _overdue tasks"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
-msgid "Workday start minute"
-msgstr "Workday start minute"
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
+msgid "_Hide completed tasks after"
+msgstr "_Hide completed tasks after"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:312
-#: ../smime/gui/smime-ui.ui.h:22
-msgid "I_mport"
-msgstr "I_mport"
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+msgid "Display reminders in _notification area only"
+msgstr "Display reminders in _notification area only"
+
+#. 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
+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
+msgid "before every appointment"
+msgstr "before every appointment"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:393
-msgid "Select a Calendar"
-msgstr "Select a Calendar"
+#. 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
+msgid "Show a _reminder"
+msgstr "Show a _reminder"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:420
-msgid "Select a Task List"
-msgstr "Select a Task List"
+#. 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
+msgid "before every anniversary/birthday"
+msgstr "before every anniversary/birthday"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:430
-msgid "I_mport to Calendar"
-msgstr "I_mport to Calendar"
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
+msgid "Select the calendars for reminder notification"
+msgstr "Select the calendars for reminder notification"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:437
-msgid "I_mport to Tasks"
-msgstr "I_mport to Tasks"
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
+msgid "Default Free/Busy Server"
+msgstr "Default Free/Busy Server"
 
-#: ../modules/calendar/e-calendar-preferences.c:461
-msgid "Selected Calendars for Reminders"
-msgstr "Selected Calendars for Reminders"
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
+msgid "Template:"
+msgstr "Template:"
 
-#: ../modules/calendar/e-calendar-preferences.c:863
-msgid "Ti_me and date:"
-msgstr "Ti_me and date:"
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#, 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.c:864
-msgid "_Date only:"
-msgstr "_Date only:"
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+msgid "Publishing Information"
+msgstr "Publishing Information"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:117
+#: ../modules/calendar/e-cal-shell-backend.c:123
 #: ../modules/calendar/e-cal-shell-migrate.c:198
-#: ../modules/calendar/e-memo-shell-backend.c:104
-#: ../modules/calendar/e-memo-shell-migrate.c:152
-#: ../modules/calendar/e-task-shell-backend.c:104
+#: ../modules/calendar/e-memo-shell-backend.c:114
+#: ../modules/calendar/e-memo-shell-migrate.c:155
+#: ../modules/calendar/e-task-shell-backend.c:110
 #: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "On The Web"
 
-#: ../modules/calendar/e-cal-shell-backend.c:119
+#: ../modules/calendar/e-cal-shell-backend.c:125
 #: ../plugins/calendar-weather/calendar-weather.c:127
 msgid "Weather"
 msgstr "Weather"
 
-#: ../modules/calendar/e-cal-shell-backend.c:206
+#: ../modules/calendar/e-cal-shell-backend.c:212
 #: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "Birthdays & Anniversaries"
 
-#: ../modules/calendar/e-cal-shell-backend.c:439
+#: ../modules/calendar/e-cal-shell-backend.c:451
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-backend.c:453
 #: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:458
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "All Day A_ppointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-backend.c:460
 msgid "Create a new all-day appointment"
 msgstr "Create a new all-day appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:465
 msgctxt "New"
 msgid "M_eeting"
 msgstr "M_eeting"
 
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:467
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: ../modules/calendar/e-cal-shell-backend.c:463
+#: ../modules/calendar/e-cal-shell-backend.c:475
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-backend.c:477
 #: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:788
+#: ../modules/calendar/e-cal-shell-backend.c:800
 msgid "Calendar and Tasks"
 msgstr "Calendar and Tasks"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:184
+#: ../modules/calendar/e-cal-shell-sidebar.c:190
 msgid "Loading calendars"
 msgstr "Loading calendars"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:755
+#: ../modules/calendar/e-cal-shell-sidebar.c:761
 msgid "_New Calendar..."
 msgstr "_New Calendarâ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:772
+#: ../modules/calendar/e-cal-shell-sidebar.c:778
 msgid "Calendar Selector"
 msgstr "Calendar Selector"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1123
+#: ../modules/calendar/e-cal-shell-sidebar.c:1114
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Opening calendar at %s"
@@ -14771,15 +16216,15 @@ msgid "event"
 msgstr "event"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1177
-#: ../modules/calendar/e-cal-shell-view-memopad.c:220
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:525
-#: ../modules/calendar/e-task-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-memopad.c:219
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:524
+#: ../modules/calendar/e-task-shell-view-actions.c:641
 msgid "Save as iCalendar"
 msgstr "Save as iCalendar"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1335
-#: ../modules/calendar/e-memo-shell-view-actions.c:606
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "_Copy..."
 msgstr "_Copyâ"
 
@@ -14816,7 +16261,7 @@ msgid "_New Calendar"
 msgstr "_New Calendar"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1391
-#: ../modules/calendar/e-task-shell-view-actions.c:814
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "Purg_e"
 msgstr "Purg_e"
 
@@ -14825,8 +16270,8 @@ msgid "Purge old appointments and meetings"
 msgstr "Purge old appointments and meetings"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1398
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "Re_fresh"
 msgstr "Re_fresh"
 
@@ -14883,10 +16328,10 @@ msgid "Create a new all day event"
 msgstr "Create a new all-day event"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1461
-#: ../modules/calendar/e-cal-shell-view-memopad.c:254
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:327
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
+#: ../modules/calendar/e-task-shell-view-actions.c:722
 msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendarâ"
 
@@ -14986,75 +16431,79 @@ msgstr "Active Appointments"
 msgid "Next 7 Days' Appointments"
 msgstr "Next 7 Days' Appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1734
-#: ../modules/calendar/e-memo-shell-view-actions.c:796
-#: ../modules/calendar/e-task-shell-view-actions.c:995
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+msgid "Occurs Less Than 5 Times"
+msgstr "Occurs Less Than 5 Times"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:994
 msgid "Description contains"
 msgstr "Description contains"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
-#: ../modules/calendar/e-memo-shell-view-actions.c:803
-#: ../modules/calendar/e-task-shell-view-actions.c:1002
+#: ../modules/calendar/e-cal-shell-view-actions.c:1748
+#: ../modules/calendar/e-memo-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:1001
 msgid "Summary contains"
 msgstr "Summary contains"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
 msgid "Print this calendar"
 msgstr "Print this calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#: ../modules/calendar/e-cal-shell-view-actions.c:1767
 msgid "Preview the calendar to be printed"
 msgstr "Preview the calendar to be printed"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1782
-#: ../modules/calendar/e-cal-shell-view-memopad.c:295
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
-#: ../modules/calendar/e-memo-shell-view-actions.c:844
-#: ../modules/calendar/e-task-shell-view-actions.c:1043
+#: ../modules/calendar/e-cal-shell-view-actions.c:1789
+#: ../modules/calendar/e-cal-shell-view-memopad.c:294
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:381
+#: ../modules/calendar/e-memo-shell-view-actions.c:843
+#: ../modules/calendar/e-task-shell-view-actions.c:1042
 msgid "_Save as iCalendar..."
 msgstr "_Save as iCalendarâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1859
+#: ../modules/calendar/e-cal-shell-view-actions.c:1866
 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:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:523
+#: ../modules/calendar/e-cal-shell-view-memopad.c:217
+#: ../modules/calendar/e-memo-shell-view-actions.c:522
 msgid "memo"
 msgstr "memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:261
-#: ../modules/calendar/e-memo-shell-view-actions.c:655
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
 msgid "New _Memo"
 msgstr "New _Memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:263
-#: ../modules/calendar/e-memo-shell-backend.c:300
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-cal-shell-view-memopad.c:262
+#: ../modules/calendar/e-memo-shell-backend.c:310
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
 msgid "Create a new memo"
 msgstr "Create a new memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:268
-#: ../modules/calendar/e-memo-shell-view-actions.c:662
+#: ../modules/calendar/e-cal-shell-view-memopad.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:661
 msgid "_Open Memo"
 msgstr "_Open Memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:270
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
+#: ../modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
 msgid "View the selected memo"
 msgstr "View the selected memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:275
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
-#: ../modules/calendar/e-memo-shell-view-actions.c:669
-#: ../modules/calendar/e-task-shell-view-actions.c:807
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-memo-shell-view-actions.c:668
+#: ../modules/calendar/e-task-shell-view-actions.c:806
 msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:829
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
 msgid "Print the selected memo"
 msgstr "Print the selected memo"
 
@@ -15062,95 +16511,95 @@ msgstr "Print the selected memo"
 #. * 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:285
-#: ../modules/calendar/e-task-shell-view-actions.c:640
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:284
+#: ../modules/calendar/e-task-shell-view-actions.c:639
 msgid "task"
 msgstr "task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:320
-#: ../modules/calendar/e-task-shell-view-actions.c:702
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
+#: ../modules/calendar/e-task-shell-view-actions.c:701
 msgid "_Assign Task"
 msgstr "_Assign Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:334
-#: ../modules/calendar/e-task-shell-view-actions.c:779
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:778
 msgid "_Mark as Complete"
 msgstr "_Mark as Complete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:336
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:335
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "Mark selected tasks as complete"
 msgstr "Mark selected tasks as complete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:341
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 msgid "_Mark as Incomplete"
 msgstr "_Mark as Incomplete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:343
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 msgid "Mark selected tasks as incomplete"
 msgstr "Mark selected tasks as incomplete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:348
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "New _Task"
 msgstr "New _Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:350
-#: ../modules/calendar/e-task-shell-backend.c:299
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
+#: ../modules/calendar/e-task-shell-backend.c:305
+#: ../modules/calendar/e-task-shell-view-actions.c:794
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:355
-#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:799
 msgid "_Open Task"
 msgstr "_Open Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:357
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "View the selected task"
 msgstr "View the selected task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:374
-#: ../modules/calendar/e-task-shell-view-actions.c:1028
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
 msgid "Print the selected task"
 msgstr "Print the selected task"
 
-#: ../modules/calendar/e-memo-shell-backend.c:298
+#: ../modules/calendar/e-memo-shell-backend.c:308
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Mem_o"
 
-#: ../modules/calendar/e-memo-shell-backend.c:305
+#: ../modules/calendar/e-memo-shell-backend.c:315
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Shared Memo"
 
-#: ../modules/calendar/e-memo-shell-backend.c:307
+#: ../modules/calendar/e-memo-shell-backend.c:317
 msgid "Create a new shared memo"
 msgstr "Create a new shared memo"
 
-#: ../modules/calendar/e-memo-shell-backend.c:315
+#: ../modules/calendar/e-memo-shell-backend.c:325
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Memo Li_st"
 
-#: ../modules/calendar/e-memo-shell-backend.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-backend.c:327
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Create a new memo list"
 msgstr "Create a new memo list"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:179
+#: ../modules/calendar/e-memo-shell-sidebar.c:186
 msgid "Loading memos"
 msgstr "Loading memos"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:696
+#: ../modules/calendar/e-memo-shell-sidebar.c:703
 msgid "Memo List Selector"
 msgstr "Memo List Selector"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:1009
+#: ../modules/calendar/e-memo-shell-sidebar.c:1001
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Opening memos at %s"
@@ -15160,63 +16609,63 @@ msgstr "Opening memos at %s"
 msgid "Print Memos"
 msgstr "Print Memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
 msgid "_Delete Memo"
 msgstr "_Delete Memo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "_Find in Memo..."
 msgstr "_Find in Memoâ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:594
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
 msgid "Search for text in the displayed memo"
 msgstr "Search for text in the displayed memo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
 msgid "D_elete Memo List"
 msgstr "D_elete Memo List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Delete the selected memo list"
 msgstr "Delete the selected memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
 msgid "_New Memo List"
 msgstr "_New Memo List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
 msgid "Refresh the selected memo list"
 msgstr "Refresh the selected memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Rename the selected memo list"
 msgstr "Rename the selected memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
 msgid "Show _Only This Memo List"
 msgstr "Show _Only This Memo List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:727
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
 msgid "Memo _Preview"
 msgstr "Memo _Preview"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:729
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
 msgid "Show memo preview pane"
 msgstr "Show memo preview pane"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-memo-shell-view-actions.c:749
 msgid "Show memo preview below the memo list"
 msgstr "Show memo preview below the memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-memo-shell-view-actions.c:756
 msgid "Show memo preview alongside the memo list"
 msgstr "Show memo preview alongside the memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:815
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
 msgid "Print the list of memos"
 msgstr "Print the list of memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:822
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
 msgid "Preview the list of memos to be printed"
 msgstr "Preview the list of memos to be printed"
 
@@ -15236,45 +16685,45 @@ msgstr[0] "%d memo"
 msgstr[1] "%d memos"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:428
-#: ../modules/calendar/e-task-shell-view-private.c:585
+#: ../modules/calendar/e-task-shell-view-private.c:609
 #, c-format
 msgid "%d selected"
 msgstr "%d selected"
 
-#: ../modules/calendar/e-task-shell-backend.c:297
+#: ../modules/calendar/e-task-shell-backend.c:303
 msgctxt "New"
 msgid "_Task"
 msgstr "_Task"
 
-#: ../modules/calendar/e-task-shell-backend.c:304
+#: ../modules/calendar/e-task-shell-backend.c:310
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Assigne_d Task"
 
-#: ../modules/calendar/e-task-shell-backend.c:306
+#: ../modules/calendar/e-task-shell-backend.c:312
 msgid "Create a new assigned task"
 msgstr "Create a new assigned task"
 
-#: ../modules/calendar/e-task-shell-backend.c:314
+#: ../modules/calendar/e-task-shell-backend.c:320
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Tas_k List"
 
-#: ../modules/calendar/e-task-shell-backend.c:316
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "Create a new task list"
 msgstr "Create a new task list"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:179
+#: ../modules/calendar/e-task-shell-sidebar.c:186
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:696
+#: ../modules/calendar/e-task-shell-sidebar.c:703
 msgid "Task List Selector"
 msgstr "Task List Selector"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:1010
+#: ../modules/calendar/e-task-shell-sidebar.c:1002
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
@@ -15284,7 +16733,7 @@ msgstr "Opening tasks at %s"
 msgid "Print Tasks"
 msgstr "Print Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:584
+#: ../modules/calendar/e-task-shell-view-actions.c:583
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15296,99 +16745,99 @@ msgstr ""
 "\n"
 "Really erase these tasks?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:591
+#: ../modules/calendar/e-task-shell-view-actions.c:590
 msgid "Do not ask me again"
 msgstr "Do not ask me again"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 msgid "_Delete Task"
 msgstr "_Delete Task"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:715
 msgid "_Find in Task..."
 msgstr "_Find in Taskâ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:718
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "Search for text in the displayed task"
 msgstr "Search for text in the displayed task"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:730
+#: ../modules/calendar/e-task-shell-view-actions.c:729
 msgid "Copy..."
 msgstr "Copyâ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:737
+#: ../modules/calendar/e-task-shell-view-actions.c:736
 msgid "D_elete Task List"
 msgstr "D_elete Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "Delete the selected task list"
 msgstr "Delete the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-view-actions.c:743
 msgid "_New Task List"
 msgstr "_New Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Refresh the selected task list"
 msgstr "Refresh the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:766
 msgid "Rename the selected task list"
 msgstr "Rename the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "Show _Only This Task List"
 msgstr "Show _Only This Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "Mar_k as Incomplete"
 msgstr "Mar_k as Incomplete"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/calendar/e-task-shell-view-actions.c:815
 msgid "Delete completed tasks"
 msgstr "Delete completed tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/calendar/e-task-shell-view-actions.c:890
 msgid "Task _Preview"
 msgstr "Task _Preview"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:893
+#: ../modules/calendar/e-task-shell-view-actions.c:892
 msgid "Show task preview pane"
 msgstr "Show task preview pane"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 msgid "Show task preview below the task list"
 msgstr "Show task preview below the task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/calendar/e-task-shell-view-actions.c:920
 msgid "Show task preview alongside the task list"
 msgstr "Show task preview alongside the task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:929
+#: ../modules/calendar/e-task-shell-view-actions.c:928
 msgid "Active Tasks"
 msgstr "Active Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:942
 msgid "Completed Tasks"
 msgstr "Completed Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:949
 msgid "Next 7 Days' Tasks"
 msgstr "Next 7 Days' Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:956
 msgid "Overdue Tasks"
 msgstr "Overdue Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-task-shell-view-actions.c:963
 msgid "Tasks with Attachments"
 msgstr "Tasks with Attachments"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1014
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "Print the list of tasks"
 msgstr "Print the list of tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1021
+#: ../modules/calendar/e-task-shell-view-actions.c:1020
 msgid "Preview the list of tasks to be printed"
 msgstr "Preview the list of tasks to be printed"
 
@@ -15400,458 +16849,465 @@ msgstr "Delete Tasks"
 msgid "Delete Task"
 msgstr "Delete Task"
 
-#: ../modules/calendar/e-task-shell-view-private.c:472
+#: ../modules/calendar/e-task-shell-view-private.c:498
 msgid "Expunging"
 msgstr "Expunging"
 
-#: ../modules/calendar/e-task-shell-view-private.c:581
+#: ../modules/calendar/e-task-shell-view-private.c:605
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d task"
 msgstr[1] "%d tasks"
 
-#: ../modules/mail/em-account-prefs.c:219
-msgid "Evolution Account Assistant"
-msgstr "Evolution Account Assistant"
-
-#: ../modules/mail/em-account-prefs.c:268
-msgid "Account Editor"
-msgstr "Account Editor"
-
-#. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:384
+#: ../modules/mail/e-mail-attachment-handler.c:389
 #, c-format
-msgid "%d attached messages"
-msgstr "%d attached messages"
+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:195
+#: ../modules/mail/e-mail-shell-backend.c:230
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: ../modules/mail/e-mail-shell-backend.c:197
+#: ../modules/mail/e-mail-shell-backend.c:232
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: ../modules/mail/e-mail-shell-backend.c:205
+#: ../modules/mail/e-mail-shell-backend.c:240
+msgctxt "New"
+msgid "Mail Acco_unt"
+msgstr "Mail Acco_unt"
+
+#: ../modules/mail/e-mail-shell-backend.c:242
+msgid "Create a new mail account"
+msgstr "Create a new mail account"
+
+#: ../modules/mail/e-mail-shell-backend.c:247
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:249
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: ../modules/mail/e-mail-shell-backend.c:412
+#: ../modules/mail/e-mail-shell-backend.c:464
 msgid "Mail Accounts"
 msgstr "Mail Accounts"
 
-#: ../modules/mail/e-mail-shell-backend.c:420
+#: ../modules/mail/e-mail-shell-backend.c:473
 msgid "Mail Preferences"
 msgstr "Mail Preferences"
 
-#: ../modules/mail/e-mail-shell-backend.c:428
+#: ../modules/mail/e-mail-shell-backend.c:482
 msgid "Composer Preferences"
 msgstr "Composer Preferences"
 
-#: ../modules/mail/e-mail-shell-backend.c:436
+#: ../modules/mail/e-mail-shell-backend.c:491
 msgid "Network Preferences"
 msgstr "Network Preferences"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1115
-#: ../modules/mail/e-mail-shell-view.c:960
+#: ../modules/mail/e-mail-shell-backend.c:725
+msgid "Evolution Account Assistant"
+msgstr "Evolution Account Assistant"
+
+#: ../modules/mail/e-mail-shell-backend.c:771
+msgid "Account Editor"
+msgstr "Account Editor"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view.c:947
 msgid "_Disable Account"
 msgstr "_Disable Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1117
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
 msgid "Disable this account"
 msgstr "Disable this account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1124
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 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:1129
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
+msgid "Edit properties of this account"
+msgstr "Edit properties of this account"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "_Download Messages for Offline Usage"
 msgstr "_Download Messages for Offline Usage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1131
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
 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:1136
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "Fl_ush Outbox"
 msgstr "Fl_ush Outbox"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "_Copy Folder To..."
 msgstr "_Copy Folder Toâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
 msgid "Copy the selected folder into another folder"
 msgstr "Copy the selected folder into another folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1152
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
 msgid "Permanently remove this folder"
 msgstr "Permanently remove this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1157
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "E_xpunge"
 msgstr "E_xpunge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
 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:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1236
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_k All Messages as Read"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1238
 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:1171
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 msgid "_Move Folder To..."
 msgstr "_Move Folder Toâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
 msgid "Move the selected folder into another folder"
 msgstr "Move the selected folder into another folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1178
+#: ../modules/mail/e-mail-shell-view-actions.c:1250
 msgid "_New..."
 msgstr "_Newâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Create a new folder for storing mail"
 msgstr "Create a new folder for storing mail"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "Change the properties of this folder"
 msgstr "Change the properties of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "Refresh the folder"
 msgstr "Refresh the folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Change the name of this folder"
 msgstr "Change the name of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1206
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Select Message _Thread"
 msgstr "Select Message _Thread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1208
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 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:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Select Message S_ubthread"
 msgstr "Select Message S_ubthread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 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:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 msgid "Empty _Trash"
 msgstr "Empty Was_tebasket"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
 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:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "_New Label"
 msgstr "_New Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1243
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "N_one"
 msgstr "N_one"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1257
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "_Manage Subscriptions"
 msgstr "_Manage Subscriptions"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1408
 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:1264
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "Send / _Receive"
 msgstr "Send / _Receive"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "Send queued items and retrieve new items"
 msgstr "Send queued items and retrieve new items"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "R_eceive All"
 msgstr "R_eceive All"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "Receive new items from all accounts"
 msgstr "Receive new items from all accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
 msgid "_Send All"
 msgstr "_Send All"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "Send queued items in all accounts"
 msgstr "Send queued items in all accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
-#: ../widgets/misc/e-activity-proxy.c:310
+#: ../modules/mail/e-mail-shell-view-actions.c:1378
+#: ../widgets/misc/e-activity-proxy.c:313
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1308
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
 msgid "Cancel the current mail operation"
 msgstr "Cancel the current mail operation"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1385
 msgid "Collapse All _Threads"
 msgstr "Collapse All _Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1387
 msgid "Collapse all message threads"
 msgstr "Collapse all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1392
 msgid "E_xpand All Threads"
 msgstr "E_xpand All Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../modules/mail/e-mail-shell-view-actions.c:1394
 msgid "Expand all message threads"
 msgstr "Expand all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1399
 msgid "_Message Filters"
 msgstr "_Message Filters"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
 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:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1406
 msgid "_Subscriptions..."
 msgstr "_Subscriptionsâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1343
+#: ../modules/mail/e-mail-shell-view-actions.c:1415
 msgid "F_older"
 msgstr "F_older"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
+#: ../modules/mail/e-mail-shell-view-actions.c:1422
 msgid "_Label"
 msgstr "_Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1367
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "C_reate Search Folder From Search..."
 msgstr "C_reate Search Folder From Searchâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1374
+#: ../modules/mail/e-mail-shell-view-actions.c:1446
 msgid "Search F_olders"
 msgstr "Search F_olders"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#: ../modules/mail/e-mail-shell-view-actions.c:1448
 msgid "Create or edit search folder definitions"
 msgstr "Create or edit search folder definitions"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1407
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
 msgid "_New Folder..."
 msgstr "_New Folderâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1511
 msgid "Show Message _Preview"
 msgstr "Show Message _Preview"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
+#: ../modules/mail/e-mail-shell-view-actions.c:1513
 msgid "Show message preview pane"
 msgstr "Show message preview pane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1443
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Show _Deleted Messages"
 msgstr "Show _Deleted Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 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:1451
+#: ../modules/mail/e-mail-shell-view-actions.c:1527
 msgid "_Group By Threads"
 msgstr "_Group By Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
 msgid "Threaded message list"
 msgstr "Threaded message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1474
+#: ../modules/mail/e-mail-shell-view-actions.c:1550
 msgid "Show message preview below the message list"
 msgstr "Show message preview below the message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1481
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
 msgid "Show message preview alongside the message list"
 msgstr "Show message preview alongside the message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1489
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 msgid "All Messages"
 msgstr "All Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1496
+#: ../modules/mail/e-mail-shell-view-actions.c:1572
 msgid "Important Messages"
 msgstr "Important Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1503
+#: ../modules/mail/e-mail-shell-view-actions.c:1579
 msgid "Last 5 Days' Messages"
 msgstr "Last 5 Days' Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-shell-view-actions.c:1586
 msgid "Messages Not Junk"
 msgstr "Messages Not Junk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1517
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
 msgid "Messages with Attachments"
 msgstr "Messages with Attachments"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1524
+#: ../modules/mail/e-mail-shell-view-actions.c:1600
 msgid "No Label"
 msgstr "No Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1531
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "Read Messages"
 msgstr "Read Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1538
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Recent Messages"
 msgstr "Recent Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Unread Messages"
 msgstr "Unread Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1597
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Subject or Addresses contain"
 msgstr "Subject or Addresses contain"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:1683
 msgid "All Accounts"
 msgstr "All Accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../modules/mail/e-mail-shell-view-actions.c:1690
 msgid "Current Account"
 msgstr "Current Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1697
 msgid "Current Folder"
 msgstr "Current Folder"
 
-#: ../modules/mail/e-mail-shell-view.c:563
+#: ../modules/mail/e-mail-shell-view.c:560
 msgid "All Account Search"
 msgstr "All Account Search"
 
-#: ../modules/mail/e-mail-shell-view.c:736
+#: ../modules/mail/e-mail-shell-view.c:721
 msgid "Account Search"
 msgstr "Account Search"
 
-#: ../modules/mail/e-mail-shell-view.c:958
+#: ../modules/mail/e-mail-shell-view.c:945
 msgid "Proxy _Logout"
 msgstr "Proxy _Logout"
 
-#: ../modules/mail/e-mail-shell-view-private.c:997
+#: ../modules/mail/e-mail-shell-view-private.c:1023
 #, 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:1008
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, 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:1014
-#: ../modules/mail/e-mail-shell-view-private.c:1021
+#: ../modules/mail/e-mail-shell-view-private.c:1040
+#: ../modules/mail/e-mail-shell-view-private.c:1047
 #, 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:1027
+#: ../modules/mail/e-mail-shell-view-private.c:1053
 #, 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:1033
+#: ../modules/mail/e-mail-shell-view-private.c:1059
 #, 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:1039
+#: ../modules/mail/e-mail-shell-view-private.c:1065
 #, 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:1051
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 #, 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:1054
+#: ../modules/mail/e-mail-shell-view-private.c:1080
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1074
+#: ../modules/mail/e-mail-shell-view-private.c:1103
 msgid "Trash"
 msgstr "Wastebasket"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1542
+#: ../modules/mail/e-mail-shell-view-private.c:1579
 msgid "Send / Receive"
 msgstr "Send / Receive"
 
-#: ../modules/mail/em-composer-prefs.c:495
-#: ../modules/plugin-manager/evolution-plugin-manager.c:361
-#: ../plugins/publish-calendar/publish-calendar.c:857
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Enabled"
-msgstr "Enabled"
-
-#: ../modules/mail/em-composer-prefs.c:499
+#: ../modules/mail/em-composer-prefs.c:513
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:89
 msgid "Every time"
 msgstr "Every time"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:90
 msgid "Once per day"
 msgstr "Once per day"
 
-#: ../modules/mail/em-mailer-prefs.c:93
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Once per week"
 msgstr "Once per week"
 
-#: ../modules/mail/em-mailer-prefs.c:94
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per month"
 msgstr "Once per month"
 
@@ -15864,39 +17320,61 @@ 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:1051
+#: ../modules/mail/em-mailer-prefs.c:1069
 msgid "_Date header:"
 msgstr "_Date header:"
 
-#: ../modules/mail/em-mailer-prefs.c:1052
+#: ../modules/mail/em-mailer-prefs.c:1070
 msgid "Show _original header value"
 msgstr "Show _original header value"
 
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "Check whether Evolution is the default mailer"
-
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "Every time Evolution starts, check whether it is the default mailer."
-
 #: ../modules/mailto-handler/evolution-mailto-handler.c:146
 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:258
+#, 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:324
+#, c-format
+msgid "Delivery Notification for \"%s\""
+msgstr "Delivery Notification for \"%s\""
+
+#: ../modules/mdn/evolution-mdn.c:449
+#, 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:454
+msgid "_Notify Sender"
+msgstr "_Notify Sender"
+
+#: ../modules/mdn/evolution-mdn.error.xml.h:1
+msgid "Sender wants to be notified when you have read this message."
+msgstr "Sender wants to be notified when you have read this message."
+
+#: ../modules/mdn/evolution-mdn.error.xml.h:2
+msgid "Sender has been notified that you have read this message."
+msgstr "Sender has been notified that you have read this message."
+
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Evolution is currently offline."
+msgstr "Evolution is currently offline."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
 msgid "Click 'Work Online' to return to online mode."
 msgstr "Click 'Work Online' to return to online mode."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
 msgid "Evolution is currently offline due to a network outage."
 msgstr "Evolution is currently offline due to a network outage."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
-msgid "Evolution is currently offline."
-msgstr "Evolution is currently offline."
-
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
 msgid ""
 "Evolution will return to online mode once a network connection is "
@@ -15905,7 +17383,7 @@ msgstr ""
 "Evolution will return to online mode once a network connection is "
 "established."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+#: ../modules/online-accounts/camel-sasl-xoauth.c:388
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an authentication token."
@@ -15913,11 +17391,11 @@ 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:461
+#: ../modules/online-accounts/camel-sasl-xoauth.c:475
 msgid "OAuth"
 msgstr "OAuth"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+#: ../modules/online-accounts/camel-sasl-xoauth.c:477
 msgid ""
 "This option will connect to the server by way of the GNOME Online Accounts "
 "service"
@@ -15925,32 +17403,32 @@ msgstr ""
 "This option will connect to the server by way of the GNOME Online Accounts "
 "service"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:70
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
 msgid "Author(s)"
 msgstr "Author(s)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:256
+#: ../modules/plugin-manager/evolution-plugin-manager.c:255
 msgid "Plugin Manager"
 msgstr "Plugin Manager"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:271
+#: ../modules/plugin-manager/evolution-plugin-manager.c:270
 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:300
+#: ../modules/plugin-manager/evolution-plugin-manager.c:299
 msgid "Overview"
 msgstr "Overview"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:369
-#: ../modules/plugin-manager/evolution-plugin-manager.c:452
+#: ../modules/plugin-manager/evolution-plugin-manager.c:368
+#: ../modules/plugin-manager/evolution-plugin-manager.c:451
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:490
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
 msgid "_Plugins"
 msgstr "_Plugins"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:491
+#: ../modules/plugin-manager/evolution-plugin-manager.c:490
 msgid "Enable and disable plugins"
 msgstr "Enable and disable plugins"
 
@@ -15963,141 +17441,117 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Test Plugin for Python EPlugin loader."
 
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "Hello Python"
-
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
 msgid "Python Plugin Loader tests"
 msgstr "Python Plugin Loader tests"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:191
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:190
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "Failed to spawn SpamAssassin (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:214
+#: ../modules/spamassassin/evolution-spamassassin.c:213
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "Failed to stream mail message content to SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:233
+#: ../modules/spamassassin/evolution-spamassassin.c:232
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "Failed to write '%s' to SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:261
+#: ../modules/spamassassin/evolution-spamassassin.c:260
 msgid "Failed to read output from SpamAssassin: "
 msgstr "Failed to read output from SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:316
+#: ../modules/spamassassin/evolution-spamassassin.c:315
 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:835
+#: ../modules/spamassassin/evolution-spamassassin.c:834
 msgid "SpamAssassin Options"
 msgstr "SpamAssassin Options"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:850
+#: ../modules/spamassassin/evolution-spamassassin.c:849
 msgid "I_nclude remote tests"
 msgstr "I_nclude remote tests"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:864
+#: ../modules/spamassassin/evolution-spamassassin.c:863
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "This will make SpamAssassin more reliable, but slower."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1073
+#: ../modules/spamassassin/evolution-spamassassin.c:1072
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
-msgid "Use SpamAssassin daemon and client"
-msgstr "Use SpamAssassin daemon and client"
-
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
-
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
-msgid "Use only local spam tests."
-msgstr "Use only local spam tests."
-
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
-msgid "Use only the local spam tests (no DNS)."
-msgstr "Use only the local spam tests (no DNS)."
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:280
-#: ../widgets/misc/e-import-assistant.c:396
+#: ../modules/startup-wizard/evolution-startup-wizard.c:283
+#: ../widgets/misc/e-import-assistant.c:403
 msgid "Please select the information that you would like to import:"
 msgstr "Please select the information that you would like to import:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:312
-#: ../widgets/misc/e-import-assistant.c:552
+#: ../modules/startup-wizard/evolution-startup-wizard.c:315
+#: ../widgets/misc/e-import-assistant.c:559
 #, c-format
 msgid "From %s:"
 msgstr "From %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:323
-#: ../modules/startup-wizard/evolution-startup-wizard.c:421
+#: ../modules/startup-wizard/evolution-startup-wizard.c:326
+#: ../modules/startup-wizard/evolution-startup-wizard.c:424
 msgid "Importing Files"
 msgstr "Importing Files"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:399
-msgid "Import cancelled. Click \"Forward\" to continue."
-msgstr "Import cancelled. Click \"Forward\" to continue."
+#: ../modules/startup-wizard/evolution-startup-wizard.c:402
+msgid "Import cancelled."
+msgstr "Import cancelled."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:417
-msgid "Import complete. Click \"Forward\" to continue."
-msgstr "Import complete. Click \"Forward\" to continue."
+#: ../modules/startup-wizard/evolution-startup-wizard.c:420
+msgid "Import complete."
+msgstr "Import complete."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:497
+#: ../modules/startup-wizard/evolution-startup-wizard.c:494
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Setup Assistant"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:503
+#: ../modules/startup-wizard/evolution-startup-wizard.c:500
 msgid "Welcome"
 msgstr "Welcome"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:508
+#: ../modules/startup-wizard/evolution-startup-wizard.c:505
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
+"to your email accounts, and to import files from other applications."
 msgstr ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your e-mail accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
+"to your e-mail accounts, and to import files from other applications."
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:613
 msgid "Loading accounts..."
 msgstr "Loading accountsâ"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Add local address books to Evolution."
-msgstr "Add local address books to Evolution."
-
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
 msgid "Local Address Books"
 msgstr "Local Address Books"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
-msgstr ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Add local address books to Evolution."
+msgstr "Add local address books to Evolution."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../plugins/attachment-reminder/attachment-reminder.c:136
 msgid "_Do not show this message again."
 msgstr "_Do not show this message again."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:464
+#: ../plugins/attachment-reminder/attachment-reminder.c:484
 #: ../plugins/templates/templates.c:462
 msgid "Keywords"
 msgstr "Keywords"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Message has no attachments"
+msgstr "Message has no attachments"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
@@ -16105,10 +17559,6 @@ msgstr ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
-msgid "Message has no attachments"
-msgstr "Message has no attachments"
-
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add Attachment..."
 msgstr "_Add Attachmentâ"
@@ -16118,78 +17568,20 @@ msgid "_Edit Message"
 msgstr "_Edit Message"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
-msgid "Attachment Reminder"
-msgstr "Attachment Reminder"
-
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-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/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid "Inline Audio"
-msgstr "Inline Audio"
-
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Play audio attachments directly in mail messages."
-msgstr "Play audio attachments directly in mail messages."
-
-#: ../plugins/backup-restore/backup-restore.c:192
-msgid "Select name of the Evolution backup file"
-msgstr "Select name of the Evolution backup file"
-
-#: ../plugins/backup-restore/backup-restore.c:225
-msgid "_Restart Evolution after backup"
-msgstr "_Restart Evolution after backup"
-
-#: ../plugins/backup-restore/backup-restore.c:251
-msgid "Select name of the Evolution backup file to restore"
-msgstr "Select name of the Evolution backup file to restore"
-
-#: ../plugins/backup-restore/backup-restore.c:264
-msgid "_Restart Evolution after restore"
-msgstr "_Restart Evolution after restore"
-
-#: ../plugins/backup-restore/backup-restore.c:337
-msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-"settings, mail filters etc."
-msgstr ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-"settings, mail filters etc."
-
-#: ../plugins/backup-restore/backup-restore.c:344
-msgid "_Restore Evolution from the backup file"
-msgstr "_Restore Evolution from the backup file"
-
-#: ../plugins/backup-restore/backup-restore.c:351
-msgid "Please select an Evolution Archive to restore:"
-msgstr "Please select an Evolution Archive to restore:"
-
-#: ../plugins/backup-restore/backup-restore.c:354
-msgid "Choose a file to restore"
-msgstr "Choose a file to restore"
-
-#: ../plugins/backup-restore/backup-restore.c:362
-msgid "Restore from backup"
-msgstr "Restore from backup"
-
-#: ../plugins/backup-restore/backup-restore.c:402
-msgid "_Back up Evolution Data..."
-msgstr "_Back up Evolution Dataâ"
+msgid "Attachment Reminder"
+msgstr "Attachment Reminder"
 
-#: ../plugins/backup-restore/backup-restore.c:404
-msgid "Back up Evolution data and settings to an archive file"
-msgstr "Back up Evolution data and settings to an archive file"
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "Reminds you when you forgot to add an attachment to a mail message."
 
-#: ../plugins/backup-restore/backup-restore.c:409
-msgid "R_estore Evolution Data..."
-msgstr "R_estore Evolution Dataâ"
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+msgid "Inline Audio"
+msgstr "Inline Audio"
 
-#: ../plugins/backup-restore/backup-restore.c:411
-msgid "Restore Evolution data and settings from an archive file"
-msgstr "Restore Evolution data and settings from an archive file"
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+msgid "Play audio attachments directly in mail messages."
+msgstr "Play audio attachments directly in mail messages."
 
 #: ../plugins/backup-restore/backup.c:77
 msgid "Back up Evolution directory"
@@ -16212,87 +17604,144 @@ msgid "With Graphical User Interface"
 msgstr "With Graphical User Interface"
 
 #. FIXME Will the versioned setting always work?
-#: ../plugins/backup-restore/backup.c:299
-#: ../plugins/backup-restore/backup.c:418
+#: ../plugins/backup-restore/backup.c:308
+#: ../plugins/backup-restore/backup.c:432
 msgid "Shutting down Evolution"
 msgstr "Shutting down Evolution"
 
-#: ../plugins/backup-restore/backup.c:308
+#: ../plugins/backup-restore/backup.c:317
 msgid "Backing Evolution accounts and settings"
 msgstr "Backing up Evolution accounts and settings"
 
-#: ../plugins/backup-restore/backup.c:318
+#: ../plugins/backup-restore/backup.c:329
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Backing up Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 
-#: ../plugins/backup-restore/backup.c:331
+#: ../plugins/backup-restore/backup.c:345
 msgid "Back up complete"
 msgstr "Backup complete"
 
-#: ../plugins/backup-restore/backup.c:338
-#: ../plugins/backup-restore/backup.c:527
+#: ../plugins/backup-restore/backup.c:352
+#: ../plugins/backup-restore/backup.c:570
 msgid "Restarting Evolution"
 msgstr "Restarting Evolution"
 
-#: ../plugins/backup-restore/backup.c:424
+#: ../plugins/backup-restore/backup.c:438
 msgid "Back up current Evolution data"
 msgstr "Back up current Evolution data"
 
-#: ../plugins/backup-restore/backup.c:432
+#: ../plugins/backup-restore/backup.c:446
 msgid "Extracting files from back up"
 msgstr "Extracting files from backup"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:515
 msgid "Loading Evolution settings"
 msgstr "Loading Evolution settings"
 
-#: ../plugins/backup-restore/backup.c:508
+#: ../plugins/backup-restore/backup.c:551
 msgid "Removing temporary back up files"
 msgstr "Removing temporary backup files"
 
-#: ../plugins/backup-restore/backup.c:520
+#: ../plugins/backup-restore/backup.c:563
 msgid "Ensuring local sources"
 msgstr "Ensuring local sources"
 
-#: ../plugins/backup-restore/backup.c:707
+#: ../plugins/backup-restore/backup.c:767
+msgid "Evolution Back Up"
+msgstr "Evolution Back Up"
+
+#: ../plugins/backup-restore/backup.c:768
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Backing up to the folder %s"
 
-#: ../plugins/backup-restore/backup.c:712
+#: ../plugins/backup-restore/backup.c:772
+msgid "Evolution Restore"
+msgstr "Evolution Restore"
+
+#: ../plugins/backup-restore/backup.c:773
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restoring from the folder %s"
 
-#. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:736
-msgid "Evolution Back up"
-msgstr "Evolution Backup"
-
-#: ../plugins/backup-restore/backup.c:736
-msgid "Evolution Restore"
-msgstr "Evolution Restore"
-
-#: ../plugins/backup-restore/backup.c:774
+#: ../plugins/backup-restore/backup.c:841
 msgid "Backing up Evolution Data"
 msgstr "Backing up Evolution Data"
 
-#: ../plugins/backup-restore/backup.c:775
+#: ../plugins/backup-restore/backup.c:842
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Please wait while Evolution backs up your data."
 
-#: ../plugins/backup-restore/backup.c:777
+#: ../plugins/backup-restore/backup.c:844
 msgid "Restoring Evolution Data"
 msgstr "Restoring Evolution Data"
 
-#: ../plugins/backup-restore/backup.c:778
+#: ../plugins/backup-restore/backup.c:845
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Please wait while Evolution restores your data."
 
-#: ../plugins/backup-restore/backup.c:796
+#: ../plugins/backup-restore/backup.c:863
 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."
 
+#: ../plugins/backup-restore/backup-restore.c:225
+msgid "Select name of the Evolution backup file"
+msgstr "Select name of the Evolution backup file"
+
+#: ../plugins/backup-restore/backup-restore.c:258
+msgid "_Restart Evolution after backup"
+msgstr "_Restart Evolution after backup"
+
+#: ../plugins/backup-restore/backup-restore.c:285
+msgid "Select name of the Evolution backup file to restore"
+msgstr "Select name of the Evolution backup file to restore"
+
+#: ../plugins/backup-restore/backup-restore.c:298
+msgid "_Restart Evolution after restore"
+msgstr "_Restart Evolution after restore"
+
+#: ../plugins/backup-restore/backup-restore.c:385
+msgid ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
+msgstr ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
+
+#: ../plugins/backup-restore/backup-restore.c:395
+msgid "_Restore Evolution from the backup file"
+msgstr "_Restore Evolution from the backup file"
+
+#: ../plugins/backup-restore/backup-restore.c:405
+msgid "Please select an Evolution Archive to restore:"
+msgstr "Please select an Evolution Archive to restore:"
+
+#: ../plugins/backup-restore/backup-restore.c:409
+msgid "Choose a file to restore"
+msgstr "Choose a file to restore"
+
+#: ../plugins/backup-restore/backup-restore.c:423
+msgid "Restore from backup"
+msgstr "Restore from backup"
+
+#: ../plugins/backup-restore/backup-restore.c:470
+msgid "_Back up Evolution Data..."
+msgstr "_Back up Evolution Dataâ"
+
+#: ../plugins/backup-restore/backup-restore.c:472
+msgid "Back up Evolution data and settings to an archive file"
+msgstr "Back up Evolution data and settings to an archive file"
+
+#: ../plugins/backup-restore/backup-restore.c:477
+msgid "R_estore Evolution Data..."
+msgstr "R_estore Evolution Dataâ"
+
+#: ../plugins/backup-restore/backup-restore.c:479
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "Restore Evolution data and settings from an archive file"
+
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
 msgid "Back up and Restore"
@@ -16303,40 +17752,18 @@ msgid "Back up and restore your Evolution data and settings."
 msgstr "Back up and restore your Evolution data and settings."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
-msgid "Are you sure you want to close Evolution?"
-msgstr "Are you sure you want to close Evolution?"
+msgid "Invalid Evolution backup file"
+msgstr "Invalid Evolution backup file"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid ""
-"Are you sure you want to restore Evolution from the selected back up file?"
-msgstr ""
-"Are you sure you want to restore Evolution from the selected backup file?"
+msgid "Please select a valid backup file to restore."
+msgstr "Please select a valid backup file to restore."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Close and Back up Evolution"
-msgstr "Close and Back Up Evolution"
+msgid "Are you sure you want to close Evolution?"
+msgstr "Are you sure you want to close Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-msgid "Close and Restore Evolution"
-msgstr "Close and Restore Evolution"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Insufficient Permissions"
-msgstr "Insufficient Permissions"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid "Invalid Evolution back up file"
-msgstr "Invalid Evolution backup file"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "Please select a valid back up file to restore."
-msgstr "Please select a valid backup file to restore."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "The selected folder is not writable."
-msgstr "The selected folder is not writable."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid ""
 "To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
@@ -16344,47 +17771,69 @@ msgstr ""
 "To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Close and Back up Evolution"
+msgstr "Close and Back Up Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your back "
-"up."
+"all your current Evolution data and settings and restore them from your "
+"backup."
 msgstr ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
 "all your current Evolution data and settings and restore them from your "
 "backup."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "Close and Restore Evolution"
+msgstr "Close and Restore Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid "Insufficient Permissions"
+msgstr "Insufficient Permissions"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+msgid "The selected folder is not writable."
+msgstr "The selected folder is not writable."
+
+#: ../plugins/bbdb/bbdb.c:668 ../plugins/bbdb/bbdb.c:677
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatic Contacts"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Create _address book entries when sending mails"
 msgstr "Create _address book entries when sending mails"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:700
 msgid "Select Address book for Automatic Contacts"
 msgstr "Select Address book for Automatic Contacts"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:717
 msgid "Instant Messaging Contacts"
 msgstr "Instant Messaging Contacts"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
+#: ../plugins/bbdb/bbdb.c:732
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Synchronise contact info and images from Pidgin buddy list"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:740
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Select Address book for Pidgin buddy list"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:753
 msgid "Synchronize with _buddy list now"
 msgstr "Synchronise with _buddy list now"
 
@@ -16406,15 +17855,15 @@ msgstr ""
 "reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 
-#: ../plugins/caldav/caldav-browse-server.c:214
+#: ../plugins/caldav/caldav-browse-server.c:215
 msgid "Authentication failed. Server requires correct login."
 msgstr "Authentication failed. Server requires correct login."
 
-#: ../plugins/caldav/caldav-browse-server.c:216
+#: ../plugins/caldav/caldav-browse-server.c:217
 msgid "Given URL cannot be found."
 msgstr "Given URL cannot be found."
 
-#: ../plugins/caldav/caldav-browse-server.c:220
+#: ../plugins/caldav/caldav-browse-server.c:221
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16423,178 +17872,177 @@ msgstr ""
 "Server returned unexpected data.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:360
-#: ../plugins/caldav/caldav-browse-server.c:694
+#: ../plugins/caldav/caldav-browse-server.c:361
+#: ../plugins/caldav/caldav-browse-server.c:695
 msgid "Failed to parse server response."
 msgstr "Failed to parse server response."
 
-#: ../plugins/caldav/caldav-browse-server.c:454
+#: ../plugins/caldav/caldav-browse-server.c:455
 msgid "Events"
 msgstr "Events"
 
-#: ../plugins/caldav/caldav-browse-server.c:476
+#: ../plugins/caldav/caldav-browse-server.c:477
 msgid "User's calendars"
 msgstr "User's calendars"
 
-#: ../plugins/caldav/caldav-browse-server.c:588
-#: ../plugins/caldav/caldav-browse-server.c:763
+#: ../plugins/caldav/caldav-browse-server.c:589
+#: ../plugins/caldav/caldav-browse-server.c:764
 msgid "Failed to get server URL."
 msgstr "Failed to get server URL."
 
-#: ../plugins/caldav/caldav-browse-server.c:761
-#: ../plugins/caldav/caldav-browse-server.c:802
-#: ../plugins/caldav/caldav-browse-server.c:1493
+#: ../plugins/caldav/caldav-browse-server.c:762
+#: ../plugins/caldav/caldav-browse-server.c:803
+#: ../plugins/caldav/caldav-browse-server.c:1502
 msgid "Searching for user's calendars..."
 msgstr "Searching for user's calendarsâ"
 
-#: ../plugins/caldav/caldav-browse-server.c:800
+#: ../plugins/caldav/caldav-browse-server.c:801
 msgid "Could not find any user calendar."
 msgstr "Could not find any user calendar."
 
-#: ../plugins/caldav/caldav-browse-server.c:938
+#: ../plugins/caldav/caldav-browse-server.c:939
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "Previous attempt failed: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:940
+#: ../plugins/caldav/caldav-browse-server.c:941
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "Previous attempt failed with code %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:945
+#: ../plugins/caldav/caldav-browse-server.c:946
 #, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "Enter password for user %s on server %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1008
+#: ../plugins/caldav/caldav-browse-server.c:1009
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "Cannot create soup message for URL '%s'"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1266
+#: ../plugins/caldav/caldav-browse-server.c:1267
 msgid "Searching folder content..."
 msgstr "Searching folder contentsâ"
 
-#: ../plugins/caldav/caldav-browse-server.c:1325
-#: ../plugins/caldav/caldav-source.c:261
+#: ../plugins/caldav/caldav-browse-server.c:1326
+#: ../plugins/caldav/caldav-source.c:262
 msgid "Server _handles meeting invitations"
 msgstr "Server _handles meeting invitations"
 
-#: ../plugins/caldav/caldav-browse-server.c:1332
+#: ../plugins/caldav/caldav-browse-server.c:1333
 msgid "List of available calendars:"
 msgstr "List of available calendars:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1370
+#: ../plugins/caldav/caldav-browse-server.c:1371
 msgid "Supports"
 msgstr "Supports"
 
-#: ../plugins/caldav/caldav-browse-server.c:1397
-#: ../plugins/caldav/caldav-source.c:259
+#: ../plugins/caldav/caldav-browse-server.c:1402
+#: ../plugins/caldav/caldav-source.c:260
 msgid "User e_mail:"
 msgstr "User e-_mail:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1469
+#: ../plugins/caldav/caldav-browse-server.c:1478
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "Failed to create thread: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1585
+#: ../plugins/caldav/caldav-browse-server.c:1599
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "Server URL '%s' is not a valid URL"
 
-#: ../plugins/caldav/caldav-browse-server.c:1591
+#: ../plugins/caldav/caldav-browse-server.c:1609
 msgid "Browse for a CalDAV calendar"
 msgstr "Browse for a CalDAV calendar"
 
-#: ../plugins/caldav/caldav-source.c:240
-#: ../plugins/calendar-http/calendar-http.c:107
+#: ../plugins/caldav/caldav-source.c:241
+#: ../plugins/calendar-http/calendar-http.c:109
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:261
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:145
+#: ../plugins/caldav/caldav-source.c:248
+#: ../plugins/calendar-http/calendar-http.c:149
 #: ../plugins/google-account-setup/google-contacts-source.c:359
 msgid "Use _secure connection"
 msgstr "Use _secure connection"
 
-#: ../plugins/caldav/caldav-source.c:249
-#: ../plugins/google-account-setup/google-contacts-source.c:337
-#: ../plugins/google-account-setup/google-source.c:669
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
-msgid "User_name:"
-msgstr "User_name:"
-
-#: ../plugins/caldav/caldav-source.c:264
+#: ../plugins/caldav/caldav-source.c:265
 msgid "Brows_e server for a calendar"
 msgstr "Brows_e server for a calendar"
 
-#: ../plugins/caldav/caldav-source.c:282
-#: ../plugins/calendar-file/calendar-file.c:204
-#: ../plugins/calendar-http/calendar-http.c:129
+#: ../plugins/caldav/caldav-source.c:283
+#: ../plugins/calendar-file/calendar-file.c:207
+#: ../plugins/calendar-http/calendar-http.c:132
 #: ../plugins/calendar-weather/calendar-weather.c:421
 #: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/google-account-setup/google-source.c:675
+#: ../plugins/google-account-setup/google-source.c:661
 msgid "Re_fresh:"
 msgstr "Re_fresh:"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "Add CalDAV support to Evolution."
-msgstr "Add CalDAV support to Evolution."
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
 msgid "CalDAV Support"
 msgstr "CalDAV Support"
 
-#: ../plugins/calendar-file/calendar-file.c:134
-msgid "_Customize options"
-msgstr "_Customise options"
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "Add CalDAV support to Evolution."
+msgstr "Add CalDAV support to Evolution."
+
+#: ../plugins/calendar-file/calendar-file.c:136
+msgid "C_ustomize options"
+msgstr "C_ustomise options"
 
-#: ../plugins/calendar-file/calendar-file.c:153
-msgid "File _name:"
-msgstr "File _name:"
+#: ../plugins/calendar-file/calendar-file.c:155
+#: ../widgets/misc/e-attachment-dialog.c:333
+#: ../widgets/misc/e-import-assistant.c:273
+msgid "F_ilename:"
+msgstr "F_ilename:"
 
-#: ../plugins/calendar-file/calendar-file.c:157
+#: ../plugins/calendar-file/calendar-file.c:160
 msgid "Choose calendar file"
 msgstr "Choose calendar file"
 
-#: ../plugins/calendar-file/calendar-file.c:209
+#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "On open"
 msgstr "On open"
 
-#: ../plugins/calendar-file/calendar-file.c:210
+#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
+#: ../plugins/calendar-file/calendar-file.c:215
 msgid "On file change"
 msgstr "On file change"
 
-#: ../plugins/calendar-file/calendar-file.c:211
+#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
+#: ../plugins/calendar-file/calendar-file.c:217
 msgid "Periodically"
 msgstr "Periodically"
 
-#: ../plugins/calendar-file/calendar-file.c:228
+#: ../plugins/calendar-file/calendar-file.c:238
 msgid "Force read _only"
 msgstr "Force read _only"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Add local calendars to Evolution."
-msgstr "Add local calendars to Evolution."
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Local Calendars"
 msgstr "Local Calendars"
 
-#: ../plugins/calendar-http/calendar-http.c:207
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Add local calendars to Evolution."
+msgstr "Add local calendars to Evolution."
+
+#: ../plugins/calendar-http/calendar-http.c:214
 msgid "Userna_me:"
 msgstr "Userna_me:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "Add web calendars to Evolution."
-msgstr "Add web calendars to Evolution."
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Web Calendars"
 msgstr "Web Calendars"
 
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+msgid "Add web calendars to Evolution."
+msgstr "Add web calendars to Evolution."
+
 #: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Fog"
 msgstr "Weather: Fog"
@@ -16655,46 +18103,46 @@ msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheit, inches, etc)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Add weather calendars to Evolution."
-msgstr "Add weather calendars to Evolution."
-
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "Weather Calendars"
 
-#: ../plugins/dbx-import/dbx-importer.c:284
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+msgid "Add weather calendars to Evolution."
+msgstr "Add weather calendars to Evolution."
+
+#: ../plugins/dbx-import/dbx-importer.c:292
 msgid "Importing Outlook Express data"
 msgstr "Importing Outlook Express data"
 
 #: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
-msgid "Import Outlook Express messages from DBX file"
-msgstr "Import Outlook Express messages from DBX file"
-
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
 msgid "Outlook DBX import"
 msgstr "Outlook DBX import"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Outlook Express 5/6 personal folders (.dbx)"
 
-#: ../plugins/default-source/default-source.c:168
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Import Outlook Express messages from DBX file"
+msgstr "Import Outlook Express messages from DBX file"
+
+#: ../plugins/default-source/default-source.c:169
 msgid "Mark as _default address book"
 msgstr "Mark as _default address book"
 
-#: ../plugins/default-source/default-source.c:182
+#: ../plugins/default-source/default-source.c:183
 msgid "A_utocomplete with this address book"
 msgstr "A_utocomplete with this address book"
 
-#: ../plugins/default-source/default-source.c:191
+#: ../plugins/default-source/default-source.c:192
 msgid "Mark as _default calendar"
 msgstr "Mark as _default calendar"
 
-#: ../plugins/default-source/default-source.c:192
+#: ../plugins/default-source/default-source.c:193
 msgid "Mark as _default task list"
 msgstr "Mark as _default task list"
 
-#: ../plugins/default-source/default-source.c:193
+#: ../plugins/default-source/default-source.c:194
 msgid "Mark as _default memo list"
 msgstr "Mark as _default memo list"
 
@@ -16706,66 +18154,52 @@ msgstr "Default Sources"
 msgid "Mark your preferred address book and calendar as default."
 msgstr "Mark your preferred address book and calendar as default."
 
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Headers"
-msgstr "List of Custom Headers"
-
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:301
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Security:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:326
+#: ../plugins/email-custom-header/email-custom-header.c:305
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Personal"
 
-#: ../plugins/email-custom-header/email-custom-header.c:327
+#: ../plugins/email-custom-header/email-custom-header.c:306
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Unclassified"
 
-#: ../plugins/email-custom-header/email-custom-header.c:328
+#: ../plugins/email-custom-header/email-custom-header.c:307
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Protected"
 
-#: ../plugins/email-custom-header/email-custom-header.c:329
+#: ../plugins/email-custom-header/email-custom-header.c:308
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Confidential"
 
-#: ../plugins/email-custom-header/email-custom-header.c:330
+#: ../plugins/email-custom-header/email-custom-header.c:309
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Secret"
 
-#: ../plugins/email-custom-header/email-custom-header.c:331
+#: ../plugins/email-custom-header/email-custom-header.c:310
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Top secret"
 
-#: ../plugins/email-custom-header/email-custom-header.c:388
+#: ../plugins/email-custom-header/email-custom-header.c:367
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "None"
 
-#: ../plugins/email-custom-header/email-custom-header.c:584
+#: ../plugins/email-custom-header/email-custom-header.c:540
 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:847
+#: ../plugins/email-custom-header/email-custom-header.c:803
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16773,59 +18207,46 @@ 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:901
+#: ../plugins/email-custom-header/email-custom-header.c:857
 msgid "Key"
 msgstr "Key"
 
-#: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:468
+#: ../plugins/email-custom-header/email-custom-header.c:873
+#: ../plugins/templates/templates.c:470
 msgid "Values"
 msgstr "Values"
 
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
+msgid "Custom Header"
+msgstr "Custom Header"
+
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Add custom headers to outgoing mail messages."
 msgstr "Add custom headers to outgoing mail messages."
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
-msgid "Custom Header"
-msgstr "Custom Header"
-
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
 msgid "Email Custom Header"
 msgstr "E-mail Custom Header"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "Automatically launch editor when key is pressed in the mail composer"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:132
-msgid "Automatically launch when a new mail is edited"
-msgstr "Automatically launch when a new mail is edited"
-
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
-msgid "Default External Editor"
-msgstr "Default External Editor"
-
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
-msgid "The default command that must be used as the editor."
-msgstr "The default command that must be used as the editor."
-
-#: ../plugins/external-editor/external-editor.c:121
+#: ../plugins/external-editor/external-editor.c:114
 msgid "Command to be executed to launch the editor: "
 msgstr "Command to be executed to launch the editor: "
 
-#: ../plugins/external-editor/external-editor.c:122
+#: ../plugins/external-editor/external-editor.c:115
 msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim -f\""
+"For XEmacs use \"xemacs\"\n"
+"For Vim use \"gvim -f\""
 msgstr ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim -f\""
+"For XEmacs use \"xemacs\"\n"
+"For Vim use \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:402
-#: ../plugins/external-editor/external-editor.c:404
+#: ../plugins/external-editor/external-editor.c:396
+#: ../plugins/external-editor/external-editor.c:398
 msgid "Compose in External Editor"
 msgstr "Compose in External Editor"
 
@@ -16838,14 +18259,22 @@ msgid "Use an external editor to compose plain-text mail messages."
 msgstr "Use an external editor to compose plain-text mail messages."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
-msgid "Cannot create Temporary File"
-msgstr "Cannot create Temporary File"
-
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "Editor not launchable"
 
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
+msgid "Cannot create Temporary File"
+msgstr "Cannot create Temporary File"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
@@ -16853,37 +18282,17 @@ msgstr ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
-msgid "External editor still running"
-msgstr "External editor still running"
-
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
-msgid ""
-"The external editor is still running. The mail composer window cannot be "
-"closed as long as the editor is active."
-msgstr ""
-"The external editor is still running. The mail composer window cannot be "
-"closed as long as the editor is active."
-
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid ""
-"The external editor set in your plugin preferences cannot be launched. Try "
-"setting a different editor."
-msgstr ""
-"The external editor set in your plugin preferences cannot be launched. Try "
-"setting a different editor."
-
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
-msgid "Insert Face picture by default"
-msgstr "Insert Face picture by default"
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid "External editor still running"
+msgstr "External editor still running"
 
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
-"Whether insert Face picture to outgoing messages by default. The picture "
-"should be set before checking this, otherwise nothing happens."
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
 msgstr ""
-"Whether insert Face picture to outgoing messages by default. The picture "
-"should be set before checking this, otherwise nothing happens."
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
 
 #: ../plugins/face/face.c:292
 msgid "Select a Face Picture"
@@ -16893,19 +18302,19 @@ msgstr "Select a Face Picture"
 msgid "Image files"
 msgstr "Image files"
 
-#: ../plugins/face/face.c:359
+#: ../plugins/face/face.c:361
 msgid "_Insert Face picture by default"
 msgstr "_Insert Face picture by default"
 
-#: ../plugins/face/face.c:370
+#: ../plugins/face/face.c:374
 msgid "Load new _Face picture"
 msgstr "Load new _Face picture"
 
-#: ../plugins/face/face.c:429
+#: ../plugins/face/face.c:435
 msgid "Include _Face"
 msgstr "Include _Face"
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Attach a small picture of your face to outgoing messages."
 msgstr "Attach a small picture of your face to outgoing messages."
 
@@ -16914,36 +18323,36 @@ msgid "Failed Read"
 msgstr "Failed Read"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:2
-msgid "Invalid Image Size"
-msgstr "Invalid Image Size"
+msgid "The file cannot be read"
+msgstr "The file cannot be read"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:3
-msgid "Not an image"
-msgstr "Not an image"
+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"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
-msgid "The file cannot be read"
-msgstr "The file cannot be read"
+msgid "Not an image"
+msgstr "Not an image"
 
 #: ../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}"
 
 #: ../plugins/google-account-setup/google-contacts-source.c:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:249
 msgid "Server"
 msgstr "Server"
 
-#: ../plugins/google-account-setup/google-source.c:459
+#: ../plugins/google-account-setup/google-source.c:452
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "Enter password for user %s to access list of subscribed calendars."
 
-#: ../plugins/google-account-setup/google-source.c:576
+#: ../plugins/google-account-setup/google-source.c:564
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16952,28 +18361,28 @@ msgstr ""
 "Cannot read data from Google server.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:576
-#: ../plugins/mail-to-task/mail-to-task.c:813
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/google-account-setup/google-source.c:564
+#: ../plugins/mail-to-task/mail-to-task.c:840
+#: ../plugins/mail-to-task/mail-to-task.c:1103
 msgid "Unknown error."
 msgstr "Unknown error."
 
-#: ../plugins/google-account-setup/google-source.c:679
+#: ../plugins/google-account-setup/google-source.c:665
 msgid "Cal_endar:"
 msgstr "Cal_endar:"
 
-#: ../plugins/google-account-setup/google-source.c:714
+#: ../plugins/google-account-setup/google-source.c:702
 msgid "Retrieve _List"
 msgstr "Retrieve _List"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "Add Google Calendars to Evolution."
-msgstr "Add Google Calendars to Evolution."
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google Calendars"
 msgstr "Google Calendars"
 
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Add Google Calendars to Evolution."
+msgstr "Add Google Calendars to Evolution."
+
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "Inline Image"
@@ -16982,31 +18391,17 @@ msgstr "Inline Image"
 msgid "View image attachments directly in mail messages."
 msgstr "View image attachments directly in mail messages."
 
-#: ../plugins/imap-features/imap-headers.c:337
-#: ../plugins/imap-features/imap-headers.ui.h:2
+#: ../plugins/imap-features/imap-headers.c:334
+#: ../plugins/imap-features/imap-headers.ui.h:10
 msgid "Custom Headers"
 msgstr "Custom Headers"
 
-#: ../plugins/imap-features/imap-headers.c:349
-#: ../plugins/imap-features/imap-headers.ui.h:5
+#: ../plugins/imap-features/imap-headers.c:356
+#: ../plugins/imap-features/imap-headers.ui.h:7
 msgid "IMAP Headers"
 msgstr "IMAP Headers"
 
 #: ../plugins/imap-features/imap-headers.ui.h:1
-msgid "Basic and _Mailing List Headers (Default)"
-msgstr "Basic and _Mailing List Headers (Default)"
-
-#: ../plugins/imap-features/imap-headers.ui.h:3
-msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
-"You can ignore this if you choose \"All Headers\"."
-msgstr ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
-"You can ignore this if you choose \"All Headers\"."
-
-#: ../plugins/imap-features/imap-headers.ui.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -17014,7 +18409,11 @@ msgstr ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
 
-#: ../plugins/imap-features/imap-headers.ui.h:8
+#: ../plugins/imap-features/imap-headers.ui.h:3
+msgid "_Fetch All Headers"
+msgstr "_Fetch All Headers"
+
+#: ../plugins/imap-features/imap-headers.ui.h:4
 msgid ""
 "_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -17022,158 +18421,179 @@ msgstr ""
 "_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 
-#: ../plugins/imap-features/imap-headers.ui.h:10
-msgid "_Fetch All Headers"
-msgstr "_Fetch All Headers"
+#: ../plugins/imap-features/imap-headers.ui.h:6
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr "Basic and _Mailing List Headers (Default)"
 
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "Fine-tune your IMAP accounts."
-msgstr "Fine-tune your IMAP accounts."
+#: ../plugins/imap-features/imap-headers.ui.h:8
+msgid ""
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
+"You can ignore this if you choose \"All Headers\"."
+msgstr ""
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
+"You can ignore this if you choose \"All Headers\"."
 
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
 msgid "IMAP Features"
 msgstr "IMAP Features"
 
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "Fine-tune your IMAP accounts."
+msgstr "Fine-tune your IMAP accounts."
+
 #. Translators: The first '%s' is replaced with a calendar name,
 #. * the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:499
+#: ../plugins/itip-formatter/itip-formatter.c:505
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Failed to load the calendar '%s' (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:659
+#: ../plugins/itip-formatter/itip-formatter.c:665
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "An appointment in the calendar '%s' conflicts with this meeting"
 
-#: ../plugins/itip-formatter/itip-formatter.c:683
+#: ../plugins/itip-formatter/itip-formatter.c:689
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Found the appointment in the calendar '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:789
+#: ../plugins/itip-formatter/itip-formatter.c:802
 msgid "Unable to find any calendars"
 msgstr "Unable to find any calendars"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:809
 msgid "Unable to find this meeting in any calendar"
 msgstr "Unable to find this meeting in any calendar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:813
 msgid "Unable to find this task in any task list"
 msgstr "Unable to find this task in any task list"
 
-#: ../plugins/itip-formatter/itip-formatter.c:804
+#: ../plugins/itip-formatter/itip-formatter.c:817
 msgid "Unable to find this memo in any memo list"
 msgstr "Unable to find this memo in any memo list"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1082
+#: ../plugins/itip-formatter/itip-formatter.c:1119
 msgid "Opening the calendar. Please wait..."
 msgstr "Opening the calendar. Please waitâ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1085
+#: ../plugins/itip-formatter/itip-formatter.c:1122
 msgid "Searching for an existing version of this appointment"
 msgstr "Searching for an existing version of this appointment"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1362
-msgid "Unable to parse item"
-msgstr "Unable to parse item"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1484
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Unable to send item to calendar '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1463
+#: ../plugins/itip-formatter/itip-formatter.c:1498
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sent to calendar '%s' as accepted"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1467
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sent to calendar '%s' as tentative"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1472
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sent to calendar '%s' as declined"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1477
+#: ../plugins/itip-formatter/itip-formatter.c:1512
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sent to calendar '%s' as cancelled"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1579
+#: ../plugins/itip-formatter/itip-formatter.c:1581
+#: ../plugins/itip-formatter/itip-formatter.c:1974
+#: ../plugins/itip-formatter/itip-formatter.c:2065
+msgid "Saving changes to the calendar. Please wait..."
+msgstr "Saving changes to the calendar. Please waitâ"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1620
+msgid "Unable to parse item"
+msgstr "Unable to parse item"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1800
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organiser has removed the delegate %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1807
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Sent a cancellation notice to the delegate"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1809
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Could not send the cancellation notice to the delegate"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1700
-msgid "Attendee status could not be updated because the status is invalid"
-msgstr "Attendee status could not be updated because the status is invalid"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1729
+#: ../plugins/itip-formatter/itip-formatter.c:1855
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Unable to update attendee. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1733
+#: ../plugins/itip-formatter/itip-formatter.c:1861
 msgid "Attendee status updated"
 msgstr "Attendee status updated"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1737
+#: ../plugins/itip-formatter/itip-formatter.c:1881
+msgid "The meeting is invalid and cannot be updated"
+msgstr "The meeting is invalid and cannot be updated"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1947
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr "Attendee status could not be updated because the status is invalid"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2042
 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"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1759
+#: ../plugins/itip-formatter/itip-formatter.c:2086
 msgid "Meeting information sent"
 msgstr "Meeting information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1762
+#: ../plugins/itip-formatter/itip-formatter.c:2089
 msgid "Task information sent"
 msgstr "Task information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1765
+#: ../plugins/itip-formatter/itip-formatter.c:2092
 msgid "Memo information sent"
 msgstr "Memo information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:2101
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Unable to send meeting information, the meeting does not exist"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1777
+#: ../plugins/itip-formatter/itip-formatter.c:2104
 msgid "Unable to send task information, the task does not exist"
 msgstr "Unable to send task information, the task does not exist"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1780
+#: ../plugins/itip-formatter/itip-formatter.c:2107
 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.
-#: ../plugins/itip-formatter/itip-formatter.c:1846
+#: ../plugins/itip-formatter/itip-formatter.c:2173
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1851
+#: ../plugins/itip-formatter/itip-formatter.c:2178
 msgid "Save Calendar"
 msgstr "Save Calendar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1914
-#: ../plugins/itip-formatter/itip-formatter.c:1925
+#: ../plugins/itip-formatter/itip-formatter.c:2241
+#: ../plugins/itip-formatter/itip-formatter.c:2252
 msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1915
-#: ../plugins/itip-formatter/itip-formatter.c:1926
+#: ../plugins/itip-formatter/itip-formatter.c:2242
+#: ../plugins/itip-formatter/itip-formatter.c:2253
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17181,15 +18601,15 @@ msgstr ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1966
-#: ../plugins/itip-formatter/itip-formatter.c:1994
-#: ../plugins/itip-formatter/itip-formatter.c:2103
+#: ../plugins/itip-formatter/itip-formatter.c:2293
+#: ../plugins/itip-formatter/itip-formatter.c:2321
+#: ../plugins/itip-formatter/itip-formatter.c:2432
 msgid "The item in the calendar is not valid"
 msgstr "The item in the calendar is not valid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1967
-#: ../plugins/itip-formatter/itip-formatter.c:1995
-#: ../plugins/itip-formatter/itip-formatter.c:2104
+#: ../plugins/itip-formatter/itip-formatter.c:2294
+#: ../plugins/itip-formatter/itip-formatter.c:2322
+#: ../plugins/itip-formatter/itip-formatter.c:2433
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17197,11 +18617,11 @@ msgstr ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2008
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2009
+#: ../plugins/itip-formatter/itip-formatter.c:2336
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17209,237 +18629,235 @@ msgstr ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2672
+#: ../plugins/itip-formatter/itip-formatter.c:2860
 msgctxt "cal-itip"
 msgid "None"
 msgstr "None"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2688
+#: ../plugins/itip-formatter/itip-formatter.c:2876
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2806
+#: ../plugins/itip-formatter/itip-formatter.c:2994
 msgid "This meeting recurs"
 msgstr "This meeting recurs"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2809
+#: ../plugins/itip-formatter/itip-formatter.c:2997
 msgid "This task recurs"
 msgstr "This task recurs"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2812
+#: ../plugins/itip-formatter/itip-formatter.c:3000
 msgid "This memo recurs"
 msgstr "This memo recurs"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3036
+#: ../plugins/itip-formatter/itip-formatter.c:3231
 msgid "Meeting Invitations"
 msgstr "Meeting Invitations"
 
-#. Delete message after acting
-#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:3061
+#: ../plugins/itip-formatter/itip-formatter.c:3257
 msgid "_Delete message after acting"
 msgstr "_Delete message after acting"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3071
-#: ../plugins/itip-formatter/itip-formatter.c:3104
+#: ../plugins/itip-formatter/itip-formatter.c:3271
+#: ../plugins/itip-formatter/itip-formatter.c:3304
 msgid "Conflict Search"
 msgstr "Conflict Search"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3086
+#: ../plugins/itip-formatter/itip-formatter.c:3286
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Select the calendars to search for meeting conflicts"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:196
+#: ../plugins/itip-formatter/itip-view.c:199
 msgid "Today %H:%M"
 msgstr "Today %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:203
 msgid "Today %H:%M:%S"
 msgstr "Today %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:209
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Today %l:%M:%S %p"
 msgstr "Today %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:224
+#: ../plugins/itip-formatter/itip-view.c:227
 msgid "Tomorrow %H:%M"
 msgstr "Tomorrow %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %H:%M:%S"
 msgstr "Tomorrow %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:233
+#: ../plugins/itip-formatter/itip-view.c:236
 msgid "Tomorrow %l:%M %p"
 msgstr "Tomorrow %l:%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:240
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Tomorrow %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:259
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:261
+#: ../plugins/itip-formatter/itip-view.c:264
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:270
+#: ../plugins/itip-formatter/itip-view.c:273
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:277
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../plugins/itip-formatter/itip-view.c:283
+#: ../plugins/itip-formatter/itip-view.c:286
 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.
-#: ../plugins/itip-formatter/itip-view.c:289
+#: ../plugins/itip-formatter/itip-view.c:292
 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.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:296
 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.
-#: ../plugins/itip-formatter/itip-view.c:298
+#: ../plugins/itip-formatter/itip-view.c:301
 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.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:305
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:311
 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.
-#: ../plugins/itip-formatter/itip-view.c:313
+#: ../plugins/itip-formatter/itip-view.c:316
 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.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:320
 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.
-#: ../plugins/itip-formatter/itip-view.c:322
+#: ../plugins/itip-formatter/itip-view.c:325
 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.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:329
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:364
-#: ../plugins/itip-formatter/itip-view.c:365
-#: ../plugins/itip-formatter/itip-view.c:452
-#: ../plugins/itip-formatter/itip-view.c:453
-#: ../plugins/itip-formatter/itip-view.c:540
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:543
 msgid "An unknown person"
 msgstr "An unknown person"
 
-#: ../plugins/itip-formatter/itip-view.c:369
-#: ../plugins/itip-formatter/itip-view.c:457
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Please respond on behalf of %s"
 
-#: ../plugins/itip-formatter/itip-view.c:371
-#: ../plugins/itip-formatter/itip-view.c:459
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Received on behalf of %s"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s through %s has published the following meeting information:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s has published the following meeting information:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s has delegated the following meeting to you:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:389
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s through %s requests your presence at the following meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:391
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s requests your presence at the following meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:397
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s through %s wishes to add to an existing meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:396
+#: ../plugins/itip-formatter/itip-view.c:399
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s wishes to add to an existing meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:403
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -17448,87 +18866,87 @@ msgstr ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:402
+#: ../plugins/itip-formatter/itip-view.c:405
 #, 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:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:409
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s through %s has sent back the following meeting response:"
 
-#: ../plugins/itip-formatter/itip-view.c:408
+#: ../plugins/itip-formatter/itip-view.c:411
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s has sent back the following meeting response:"
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:415
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s through %s has cancelled the following meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:417
 #, c-format
-msgid "%s has canceled the following meeting."
-msgstr "%s has cancelled the following meeting."
+msgid "%s has canceled the following meeting:"
+msgstr "%s has cancelled the following meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:421
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s through %s has proposed the following meeting changes."
 
-#: ../plugins/itip-formatter/itip-view.c:420
+#: ../plugins/itip-formatter/itip-view.c:423
 #, c-format
-msgid "%s has proposed the following meeting changes."
-msgstr "%s has proposed the following meeting changes."
+msgid "%s has proposed the following meeting changes:"
+msgstr "%s has proposed the following meeting changes:"
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:427
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s through %s has declined the following meeting changes:"
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:429
 #, c-format
-msgid "%s has declined the following meeting changes."
-msgstr "%s has declined the following meeting changes."
+msgid "%s has declined the following meeting changes:"
+msgstr "%s has declined the following meeting changes:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:467
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s through %s has published the following task:"
 
-#: ../plugins/itip-formatter/itip-view.c:466
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s has published the following task:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s requests the assignment of %s to the following task:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:477
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s through %s has assigned you a task:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:479
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s has assigned you a task:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:485
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s through %s wishes to add to an existing task:"
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:487
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s wishes to add to an existing task:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:491
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -17537,276 +18955,364 @@ msgstr ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:490
+#: ../plugins/itip-formatter/itip-view.c:493
 #, 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:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:497
 #, 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:"
 
-#: ../plugins/itip-formatter/itip-view.c:496
+#: ../plugins/itip-formatter/itip-view.c:499
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s has sent back the following assigned task response:"
 
-#: ../plugins/itip-formatter/itip-view.c:500
+#: ../plugins/itip-formatter/itip-view.c:503
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s through %s has cancelled the following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:502
+#: ../plugins/itip-formatter/itip-view.c:505
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s has cancelled the following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:506
+#: ../plugins/itip-formatter/itip-view.c:509
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s through %s has proposed the following task assignment changes:"
 
-#: ../plugins/itip-formatter/itip-view.c:508
+#: ../plugins/itip-formatter/itip-view.c:511
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s has proposed the following task assignment changes:"
 
-#: ../plugins/itip-formatter/itip-view.c:512
+#: ../plugins/itip-formatter/itip-view.c:515
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s through %s has declined the following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:514
+#: ../plugins/itip-formatter/itip-view.c:517
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s has declined the following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:551
+#: ../plugins/itip-formatter/itip-view.c:554
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s through %s has published the following memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:553
+#: ../plugins/itip-formatter/itip-view.c:556
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s has published the following memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:558
+#: ../plugins/itip-formatter/itip-view.c:561
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s through %s wishes to add to an existing memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:560
+#: ../plugins/itip-formatter/itip-view.c:563
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s wishes to add to an existing memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:564
+#: ../plugins/itip-formatter/itip-view.c:567
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s through %s has cancelled the following shared memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:566
+#: ../plugins/itip-formatter/itip-view.c:569
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s has cancelled the following shared memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:690
+#: ../plugins/itip-formatter/itip-view.c:693
 msgid "All day:"
 msgstr "All day:"
 
-#: ../plugins/itip-formatter/itip-view.c:700
+#: ../plugins/itip-formatter/itip-view.c:703
 msgid "Start day:"
 msgstr "Start day:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:700
-#: ../plugins/itip-formatter/itip-view.c:1062
+#: ../plugins/itip-formatter/itip-view.c:703
+#: ../plugins/itip-formatter/itip-view.c:1061
 msgid "Start time:"
 msgstr "Start time:"
 
-#: ../plugins/itip-formatter/itip-view.c:712
+#: ../plugins/itip-formatter/itip-view.c:715
 msgid "End day:"
 msgstr "End day:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:712
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:1072
 msgid "End time:"
 msgstr "End time:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:851
 msgid "_Open Calendar"
 msgstr "_Open Calendar"
 
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:881
-#: ../plugins/itip-formatter/itip-view.c:886
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:867
+#: ../plugins/itip-formatter/itip-view.c:884
+#: ../plugins/itip-formatter/itip-view.c:889
 msgid "_Decline"
 msgstr "_Decline"
 
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
-#: ../plugins/itip-formatter/itip-view.c:867
-#: ../plugins/itip-formatter/itip-view.c:883
-#: ../plugins/itip-formatter/itip-view.c:888
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
+#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:886
+#: ../plugins/itip-formatter/itip-view.c:891
 msgid "A_ccept"
 msgstr "A_ccept"
 
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Decline all"
 msgstr "_Decline all"
 
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative all"
 msgstr "_Tentative all"
 
-#: ../plugins/itip-formatter/itip-view.c:859
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:882
-#: ../plugins/itip-formatter/itip-view.c:887
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:868
+#: ../plugins/itip-formatter/itip-view.c:885
+#: ../plugins/itip-formatter/itip-view.c:890
 msgid "_Tentative"
 msgstr "_Tentative"
 
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "A_ccept all"
 msgstr "A_ccept all"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:871
+#: ../plugins/itip-formatter/itip-view.c:874
 msgid "_Send Information"
 msgstr "_Send Information"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:875
+#: ../plugins/itip-formatter/itip-view.c:878
 msgid "_Update Attendee Status"
 msgstr "_Update Attendee Status"
 
-#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Update"
 msgstr "_Update"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1093
-#: ../plugins/itip-formatter/itip-view.c:1147
+#: ../plugins/itip-formatter/itip-view.c:1092
+#: ../plugins/itip-formatter/itip-view.c:1148
 msgid "Comment:"
 msgstr "Comment:"
 
-#: ../plugins/itip-formatter/itip-view.c:1132
+#: ../plugins/itip-formatter/itip-view.c:1131
 msgid "Send _reply to sender"
 msgstr "Send _reply to sender"
 
-#: ../plugins/itip-formatter/itip-view.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Send _updates to attendees"
 msgstr "Send _updates to attendees"
 
-#: ../plugins/itip-formatter/itip-view.c:1171
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Apply to all instances"
 msgstr "_Apply to all instances"
 
-#: ../plugins/itip-formatter/itip-view.c:1180
+#: ../plugins/itip-formatter/itip-view.c:1191
 msgid "Show time as _free"
 msgstr "Show time as _free"
 
-#: ../plugins/itip-formatter/itip-view.c:1183
+#: ../plugins/itip-formatter/itip-view.c:1194
 msgid "_Preserve my reminder"
 msgstr "_Preserve my reminder"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1200
 msgid "_Inherit reminder"
 msgstr "_Inherit reminder"
 
-#: ../plugins/itip-formatter/itip-view.c:1965
+#: ../plugins/itip-formatter/itip-view.c:1982
 msgid "_Tasks:"
 msgstr "_Tasks:"
 
-#: ../plugins/itip-formatter/itip-view.c:1967
+#: ../plugins/itip-formatter/itip-view.c:1984
 msgid "_Memos:"
 msgstr "_Memos:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "Display \"text/calendar\" MIME parts in mail messages."
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
 msgstr "Itip Formatter"
 
+#: ../plugins/itip-formatter/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."
+
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
-"'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+"This response is not from a current attendee. Add the sender as an attendee?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "This meeting has been delegated"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+"'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
-msgid "Beep or play sound file."
-msgstr "Beep or play sound file."
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:350
+msgid "Get List _Archive"
+msgstr "Get List _Archive"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable icon in notification area."
-msgstr "Enable icon in notification area."
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:352
+msgid "Get an archive of the list this message belongs to"
+msgstr "Get an archive of the list this message belongs to"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:357
+msgid "Get List _Usage Information"
+msgstr "Get List _Usage Information"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:359
+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:364
+msgid "Contact List _Owner"
+msgstr "Contact List _Owner"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+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:371
+msgid "_Post Message to List"
+msgstr "_Post Message to List"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+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:378
+msgid "_Subscribe to List"
+msgstr "_Subscribe to List"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+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:385
+msgid "_Unsubscribe from List"
+msgstr "_Unsubscribe from List"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+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:394
+msgid "Mailing _List"
+msgstr "Mailing _List"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "Mailing List Actions"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+msgid "Action not available"
+msgstr "Action not available"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
+"This message does not contain the header information required for this "
+"action."
 msgstr ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
+"This message does not contain the header information required for this "
+"action."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "Notify new messages for Inbox only."
-msgstr "Notify new messages for Inbox only."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
+msgid "Posting not allowed"
+msgstr "Posting not allowed"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
-msgid "Play sound when new messages arrive."
-msgstr "Play sound when new messages arrive."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr "Play themed sound when new messages arrive, if not in beep mode."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+msgid "Send e-mail message to mailing list?"
+msgstr "Send e-mail message to mailing list?"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
-msgid "Show new mail icon in notification area when new messages arrive."
-msgstr "Show new mail icon in notification area when new messages arrive."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+msgid ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
+msgstr ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-msgid "Sound file name to be played."
-msgstr "Sound file name to be played."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+msgid "_Send message"
+msgstr "_Send message"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Sound file to be played when new messages arrive, if not in beep mode."
-msgstr "Sound file to be played when new messages arrive, if not in beep mode."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+msgid "_Edit message"
+msgstr "_Edit message"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
-msgid "Use sound theme"
-msgstr "Use sound theme"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:11
+msgid "Malformed header"
+msgstr "Malformed header"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:12
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
-msgid "Whether play sound or beep when new messages arrive."
-msgstr "Whether play sound or beep when new messages arrive."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
+msgid "No e-mail action"
+msgstr "No e-mail action"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
-msgid "Whether to notify new messages in Inbox folder only."
-msgstr "Whether to notify new messages in Inbox folder only."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+msgid ""
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
+"\n"
+"Header: {0}"
+msgstr ""
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
+"\n"
+"Header: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:391
+#: ../plugins/mail-notification/mail-notification.c:384
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17823,56 +19329,56 @@ msgstr[1] ""
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:416
+#: ../plugins/mail-notification/mail-notification.c:409
 #, c-format
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:427
+#: ../plugins/mail-notification/mail-notification.c:420
 #, 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."
 
-#: ../plugins/mail-notification/mail-notification.c:436
-#: ../plugins/mail-notification/mail-notification.c:444
-#: ../plugins/mail-notification/mail-notification.c:447
+#: ../plugins/mail-notification/mail-notification.c:429
+#: ../plugins/mail-notification/mail-notification.c:437
+#: ../plugins/mail-notification/mail-notification.c:440
 msgid "New email"
 msgstr "New e-mail"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:468
+#: ../plugins/mail-notification/mail-notification.c:461
 #, c-format
 msgid "Show %s"
 msgstr "Show %s"
 
-#: ../plugins/mail-notification/mail-notification.c:673
+#: ../plugins/mail-notification/mail-notification.c:661
 msgid "_Play sound when a new message arrives"
 msgstr "_Play sound when a new message arrives"
 
-#: ../plugins/mail-notification/mail-notification.c:703
+#: ../plugins/mail-notification/mail-notification.c:693
 msgid "_Beep"
 msgstr "_Beep"
 
-#: ../plugins/mail-notification/mail-notification.c:716
+#: ../plugins/mail-notification/mail-notification.c:706
 msgid "Use sound _theme"
 msgstr "Use sound _theme"
 
-#: ../plugins/mail-notification/mail-notification.c:735
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Play _file:"
 msgstr "Play _file:"
 
-#: ../plugins/mail-notification/mail-notification.c:744
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Select sound file"
 msgstr "Select sound file"
 
-#: ../plugins/mail-notification/mail-notification.c:801
+#: ../plugins/mail-notification/mail-notification.c:790
 msgid "Notify new messages for _Inbox only"
 msgstr "Notify new messages for _Inbox only"
 
-#: ../plugins/mail-notification/mail-notification.c:811
+#: ../plugins/mail-notification/mail-notification.c:800
 msgid "Show _notification when a new message arrives"
 msgstr "Show _notification when a new message arrives"
 
@@ -17885,12 +19391,12 @@ 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:238
+#: ../plugins/mail-to-task/mail-to-task.c:243
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Created from a mail by %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:603
+#: ../plugins/mail-to-task/mail-to-task.c:618
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -17899,7 +19405,7 @@ msgstr ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:606
+#: ../plugins/mail-to-task/mail-to-task.c:621
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -17908,7 +19414,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:609
+#: ../plugins/mail-to-task/mail-to-task.c:624
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -17917,56 +19423,77 @@ msgstr ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:626
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:643
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
 "add them all?"
-msgstr ""
+msgid_plural ""
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
+msgstr[0] ""
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
+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:629
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:649
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
 "add them all?"
-msgstr ""
+msgid_plural ""
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
+msgstr[0] ""
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
+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:632
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:655
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
-msgstr ""
+msgid_plural ""
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
+msgstr[0] ""
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
+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:651
+#: ../plugins/mail-to-task/mail-to-task.c:676
 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:726
+#: ../plugins/mail-to-task/mail-to-task.c:751
 msgid "[No Summary]"
 msgstr "[No Summary]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:763
 msgid "Invalid object returned from a server"
 msgstr "Invalid object returned from a server"
 
-#: ../plugins/mail-to-task/mail-to-task.c:788
+#: ../plugins/mail-to-task/mail-to-task.c:815
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "An error occurred during processing: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:813
+#: ../plugins/mail-to-task/mail-to-task.c:840
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Cannot open calendar. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:820
+#: ../plugins/mail-to-task/mail-to-task.c:847
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -17974,7 +19501,7 @@ msgstr ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:823
+#: ../plugins/mail-to-task/mail-to-task.c:850
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -17982,7 +19509,7 @@ msgstr ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:826
+#: ../plugins/mail-to-task/mail-to-task.c:853
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -17990,44 +19517,44 @@ msgstr ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/mail-to-task/mail-to-task.c:1103
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Cannot get source list. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1138
+#: ../plugins/mail-to-task/mail-to-task.c:1164
 msgid "No writable calendar is available."
 msgstr "No writeable calendar is available."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1230
+#: ../plugins/mail-to-task/mail-to-task.c:1258
 msgid "Create an _Event"
 msgstr "Create an _Event"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1232
+#: ../plugins/mail-to-task/mail-to-task.c:1260
 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:1237
+#: ../plugins/mail-to-task/mail-to-task.c:1265
 msgid "Create a Mem_o"
 msgstr "Create a Mem_o"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1239
+#: ../plugins/mail-to-task/mail-to-task.c:1267
 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:1244
+#: ../plugins/mail-to-task/mail-to-task.c:1272
 msgid "Create a _Task"
 msgstr "Create a _Task"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1246
+#: ../plugins/mail-to-task/mail-to-task.c:1274
 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:1254
+#: ../plugins/mail-to-task/mail-to-task.c:1282
 msgid "Create a _Meeting"
 msgstr "Create a _Meeting"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1256
+#: ../plugins/mail-to-task/mail-to-task.c:1284
 msgid "Create a new meeting from the selected message"
 msgstr "Create a new meeting from the selected message"
 
@@ -18035,151 +19562,11 @@ 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/mailing-list-actions/mailing-list-actions.c:346
-msgid "Get List _Archive"
-msgstr "Get List _Archive"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:348
-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:353
-msgid "Get List _Usage Information"
-msgstr "Get List _Usage Information"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:355
-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:360
-msgid "Contact List _Owner"
-msgstr "Contact List _Owner"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:362
-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:367
-msgid "_Post Message to List"
-msgstr "_Post Message to List"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
-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:374
-msgid "_Subscribe to List"
-msgstr "_Subscribe to List"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
-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:381
-msgid "_Unsubscribe from List"
-msgstr "_Unsubscribe from List"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
-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:390
-msgid "Mailing _List"
-msgstr "Mailing _List"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-msgid "Mailing List Actions"
-msgstr "Mailing List Actions"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
-msgstr "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
-msgid "Action not available"
-msgstr "Action not available"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
-msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
-"\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
-msgstr ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
-"\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
-msgid "Malformed header"
-msgstr "Malformed header"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
-msgid "No e-mail action"
-msgstr "No e-mail action"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
-msgid "Posting not allowed"
-msgstr "Posting not allowed"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
-msgstr ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
-msgid "Send e-mail message to mailing list?"
-msgstr "Send e-mail message to mailing list?"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
-msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
-"\n"
-"Header: {0}"
-msgstr ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
-"\n"
-"Header: {0}"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
-msgid ""
-"The {0} header of this message is malformed and could not be processed.\n"
-"\n"
-"Header: {1}"
-msgstr ""
-"The {0} header of this message is malformed and could not be processed.\n"
-"\n"
-"Header: {1}"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid ""
-"This message does not contain the header information required for this "
-"action."
-msgstr ""
-"This message does not contain the header information required for this "
-"action."
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
-msgid "_Edit message"
-msgstr "_Edit message"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
-msgid "_Send message"
-msgstr "_Send message"
-
-#: ../plugins/mark-all-read/mark-all-read.c:42
+#: ../plugins/mark-all-read/mark-all-read.c:43
 msgid "Also mark messages in subfolders?"
 msgstr "Also mark messages in subfolders?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:44
+#: ../plugins/mark-all-read/mark-all-read.c:45
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18187,15 +19574,15 @@ 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:215
+#: ../plugins/mark-all-read/mark-all-read.c:216
 msgid "In Current Folder and _Subfolders"
 msgstr "In Current Folder and _Subfolders"
 
-#: ../plugins/mark-all-read/mark-all-read.c:229
+#: ../plugins/mark-all-read/mark-all-read.c:230
 msgid "In Current _Folder Only"
 msgstr "In Current _Folder Only"
 
-#: ../plugins/mark-all-read/mark-all-read.c:575
+#: ../plugins/mark-all-read/mark-all-read.c:576
 msgid "Mark Me_ssages as Read"
 msgstr "Mark Me_ssages as Read"
 
@@ -18207,32 +19594,32 @@ msgstr "Mark All Read"
 msgid "Mark all messages in a folder as read."
 msgstr "Mark all messages in a folder as read."
 
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+msgid "Prefer Plain Text"
+msgstr "Prefer Plain Text"
+
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
 msgid "Plain Text Mode"
 msgstr "Plain Text Mode"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
-msgid "Prefer Plain Text"
-msgstr "Prefer Plain Text"
-
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "View mail messages as plain text, even if they contain HTML content."
 
-#: ../plugins/prefer-plain/prefer-plain.c:251
+#: ../plugins/prefer-plain/prefer-plain.c:250
 msgid "Show HTML if present"
 msgstr "Show HTML if present"
 
-#: ../plugins/prefer-plain/prefer-plain.c:252
+#: ../plugins/prefer-plain/prefer-plain.c:251
 msgid "Let Evolution choose the best part to show."
 msgstr "Let Evolution choose the best part to show."
 
-#: ../plugins/prefer-plain/prefer-plain.c:255
+#: ../plugins/prefer-plain/prefer-plain.c:254
 msgid "Show plain text if present"
 msgstr "Show plain text if present"
 
-#: ../plugins/prefer-plain/prefer-plain.c:256
+#: ../plugins/prefer-plain/prefer-plain.c:255
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -18240,11 +19627,11 @@ msgstr ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 
-#: ../plugins/prefer-plain/prefer-plain.c:260
+#: ../plugins/prefer-plain/prefer-plain.c:259
 msgid "Only ever show plain text"
 msgstr "Only ever show plain text"
 
-#: ../plugins/prefer-plain/prefer-plain.c:261
+#: ../plugins/prefer-plain/prefer-plain.c:260
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -18252,7 +19639,7 @@ msgstr ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 
-#: ../plugins/prefer-plain/prefer-plain.c:313
+#: ../plugins/prefer-plain/prefer-plain.c:311
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Show s_uppressed HTML parts as attachments"
 
@@ -18261,42 +19648,42 @@ msgid "HTML _Mode"
 msgstr "HTML _Mode"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
-msgid "Import Outlook messages from PST file"
-msgstr "Import Outlook messages from PST file"
-
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
 msgid "Outlook PST import"
 msgstr "Outlook PST import"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+#: ../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:450
+#: ../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:543
 msgid "_Mail"
 msgstr "_Mail"
 
-#: ../plugins/pst-import/pst-importer.c:469
+#: ../plugins/pst-import/pst-importer.c:571
 msgid "Destination folder:"
 msgstr "Destination folder:"
 
-#: ../plugins/pst-import/pst-importer.c:475
+#: ../plugins/pst-import/pst-importer.c:581
 msgid "_Address Book"
 msgstr "_Address Book"
 
-#: ../plugins/pst-import/pst-importer.c:476
+#: ../plugins/pst-import/pst-importer.c:586
 msgid "A_ppointments"
 msgstr "A_ppointments"
 
-#: ../plugins/pst-import/pst-importer.c:477 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:591 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "_Tasks"
 
-#: ../plugins/pst-import/pst-importer.c:478
+#: ../plugins/pst-import/pst-importer.c:596
 msgid "_Journal entries"
 msgstr "_Journal entries"
 
-#: ../plugins/pst-import/pst-importer.c:585
+#: ../plugins/pst-import/pst-importer.c:707
 msgid "Importing Outlook data"
 msgstr "Importing Outlook data"
 
@@ -18315,38 +19702,38 @@ msgstr "Locations"
 msgid "Publish calendars to the web."
 msgstr "Publish calendars to the web."
 
-#: ../plugins/publish-calendar/publish-calendar.c:216
-#: ../plugins/publish-calendar/publish-calendar.c:471
+#: ../plugins/publish-calendar/publish-calendar.c:218
+#: ../plugins/publish-calendar/publish-calendar.c:469
 #, c-format
 msgid "Could not open %s:"
 msgstr "Could not open %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:218
+#: ../plugins/publish-calendar/publish-calendar.c:220
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "Could not open %s: Unknown error"
 
-#: ../plugins/publish-calendar/publish-calendar.c:238
+#: ../plugins/publish-calendar/publish-calendar.c:240
 #, 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:240
+#: ../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:288
+#: ../plugins/publish-calendar/publish-calendar.c:286
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Mount of %s failed:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:619
-#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+#: ../plugins/publish-calendar/publish-calendar.c:617
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "E_nable"
 
-#: ../plugins/publish-calendar/publish-calendar.c:767
+#: ../plugins/publish-calendar/publish-calendar.c:765
 msgid "Are you sure you want to remove this location?"
 msgstr "Are you sure you want to remove this location?"
 
@@ -18361,105 +19748,105 @@ msgstr "Could not create publish thread."
 msgid "_Publish Calendar Information"
 msgstr "_Publish Calendar Information"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Custom Location"
-msgstr "Custom Location"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+msgid "iCal"
+msgstr "iCal"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:3
 msgid "Daily"
 msgstr "Daily"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:5
-msgid "FTP (with login)"
-msgstr "FTP (with login)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "Weekly"
+msgstr "Weekly"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
 msgid "Manual (via Actions menu)"
 msgstr "Manual (via Actions menu)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:11
-msgid "P_ort:"
-msgstr "P_ort:"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Secure FTP (SFTP)"
+msgstr "Secure FTP (SFTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Public FTP"
 msgstr "Public FTP"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:13
-msgid "Publishing Location"
-msgstr "Publishing Location"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
+msgid "FTP (with login)"
+msgstr "FTP (with login)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:14
-msgid "Publishing _Frequency:"
-msgstr "Publishing _Frequency:"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Windows share"
+msgstr "Windows share"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:15
-msgid "Secure FTP (SSH)"
-msgstr "Secure FTP (SSH)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Secure WebDAV (HTTPS)"
 msgstr "Secure WebDAV (HTTPS)"
 
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Custom Location"
+msgstr "Custom Location"
+
 #: ../plugins/publish-calendar/publish-calendar.ui.h:17
-msgid "Service _type:"
-msgstr "Service _type:"
+msgid "_Publish as:"
+msgstr "_Publish as:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:18
-msgid "Sources"
-msgstr "Sources"
+msgid "Publishing _Frequency:"
+msgstr "Publishing _Frequency:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr "Time _duration:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:20
-msgid "WebDAV (HTTP)"
-msgstr "WebDAV (HTTP)"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Weekly"
-msgstr "Weekly"
+msgid "Sources"
+msgstr "Sources"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:22
-msgid "Windows share"
-msgstr "Windows share"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+msgid "Service _type:"
+msgstr "Service _type:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_File:"
 msgstr "_File:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+msgid "P_ort:"
+msgstr "P_ort:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+msgid "_Username:"
+msgstr "_Username:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
-msgid "_Publish as:"
-msgstr "_Publish as:"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "_Remember password"
 msgstr "_Remember password"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:29
-msgid "_Username:"
-msgstr "_Username:"
-
 #: ../plugins/publish-calendar/publish-calendar.ui.h:31
-msgid "iCal"
-msgstr "iCal"
+msgid "Publishing Location"
+msgstr "Publishing Location"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:95
-#: ../plugins/publish-calendar/publish-format-ical.c:92
+#: ../plugins/publish-calendar/publish-format-fb.c:94
+#: ../plugins/publish-calendar/publish-format-ical.c:91
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "Could not publish calendar: Calendar backend no longer exists"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:518
+#: ../plugins/publish-calendar/url-editor-dialog.c:521
 msgid "New Location"
 msgstr "New Location"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:520
+#: ../plugins/publish-calendar/url-editor-dialog.c:523
 msgid "Edit Location"
 msgstr "Edit Location"
 
@@ -18542,7 +19929,7 @@ msgstr "_Encapsulate values with:"
 msgid "Comma separated values (.csv)"
 msgstr "Comma separated values (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:225
+#: ../plugins/save-calendar/ical-format.c:175 ../shell/e-shell-utils.c:199
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -18559,11 +19946,11 @@ msgstr "Save a calendar or task list to disk."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:156
+#: ../plugins/save-calendar/rdf-format.c:152
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:389
+#: ../plugins/save-calendar/rdf-format.c:387
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
@@ -18587,15 +19974,7 @@ msgstr "Save the selected memo list to disk"
 msgid "Save the selected task list to disk"
 msgstr "Save the selected task list to disk"
 
-#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
-msgstr ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
-
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
@@ -18605,26 +19984,26 @@ 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:1094
+#: ../plugins/templates/templates.c:1105
 msgid "No Title"
 msgstr "No Title"
 
-#: ../plugins/templates/templates.c:1195
+#: ../plugins/templates/templates.c:1217
 msgid "Save as _Template"
 msgstr "Save as _Template"
 
-#: ../plugins/templates/templates.c:1197
+#: ../plugins/templates/templates.c:1219
 msgid "Save as Template"
 msgstr "Save as Template"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-msgstr "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Decoder"
 msgstr "TNEF Decoder"
 
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
 msgid "Inline vCards"
 msgstr "Inline vCards"
@@ -18633,191 +20012,97 @@ msgstr "Inline vCards"
 msgid "Show vCards directly in mail messages."
 msgstr "Show vCards directly in mail messages."
 
-#: ../plugins/vcard-inline/vcard-inline.c:207
-#: ../plugins/vcard-inline/vcard-inline.c:292
+#: ../plugins/vcard-inline/vcard-inline.c:208
+#: ../plugins/vcard-inline/vcard-inline.c:293
 msgid "Show Full vCard"
 msgstr "Show Full vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:210
+#: ../plugins/vcard-inline/vcard-inline.c:211
 msgid "Show Compact vCard"
 msgstr "Show Compact vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:271
+#: ../plugins/vcard-inline/vcard-inline.c:272
 msgid "There is one other contact."
 msgstr "There is one other contact."
 
-#: ../plugins/vcard-inline/vcard-inline.c:280
+#: ../plugins/vcard-inline/vcard-inline.c:281
 #, 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."
 
-#: ../plugins/vcard-inline/vcard-inline.c:301
+#: ../plugins/vcard-inline/vcard-inline.c:302
 msgid "Save in Address Book"
 msgstr "Save in Address Book"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "Add WebDAV contacts to Evolution."
-msgstr "Add WebDAV contacts to Evolution."
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "WebDAV contacts"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "Add WebDAV contacts to Evolution."
+msgstr "Add WebDAV contacts to Evolution."
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:70
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:287
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Avoid IfMatch (needed on Apache < 2.2.8)"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "Authenticate proxy server connections"
-msgstr "Authenticate proxy server connections"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
-msgid "Automatic proxy configuration URL"
-msgstr "Automatic proxy configuration URL"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Configuration version"
-msgstr "Configuration version"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Default sidebar width"
-msgstr "Default sidebar width"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
-msgid "Default window X coordinate"
-msgstr "Default window X coordinate"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:6
-msgid "Default window Y coordinate"
-msgstr "Default window Y coordinate"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:7
-msgid "Default window height"
-msgstr "Default window height"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid "Default window state"
-msgstr "Default window state"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:9
-msgid "Default window width"
-msgstr "Default window width"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:10
-msgid "Enable express mode"
-msgstr "Enable express mode"
-
 #: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+"List of paths for the folders to be synchronised to disk for offline usage"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
-msgid "Flag that enables a much simplified user interface."
-msgstr "Flag that enables a much simplified user interface."
+msgid "Default window Y coordinate"
+msgstr "Default window Y coordinate"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "HTTP proxy host name"
-msgstr "HTTP proxy host name"
+msgid "The default Y coordinate for the main window."
+msgstr "The default Y coordinate for the main window."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:14
-msgid "HTTP proxy password"
-msgstr "HTTP proxy password"
+msgid "Default window X coordinate"
+msgstr "Default window X coordinate"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
-msgid "HTTP proxy port"
-msgstr "HTTP proxy port"
+msgid "The default X coordinate for the main window."
+msgstr "The default X coordinate for the main window."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid "HTTP proxy username"
-msgstr "HTTP proxy username"
+msgid "Default window width"
+msgstr "Default window width"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:17
-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."
+msgid "The default width for the main window, in pixels."
+msgstr "The default width for the main window, in pixels."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgid "Default window height"
+msgstr "Default window height"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
-msgid "Initial attachment view"
-msgstr "Initial attachment view"
+msgid "The default height for the main window, in pixels."
+msgstr "The default height for the main window, in pixels."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid "Initial file chooser folder"
-msgstr "Initial file chooser folder"
+msgid "Default window state"
+msgstr "Default window state"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:21
-msgid "Initial folder for GtkFileChooser dialogs."
-msgstr "Initial folder for GtkFileChooser dialogues."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:22
-msgid ""
-"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
-"View."
-msgstr ""
-"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
-"View."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:23
-msgid "Last upgraded configuration version"
-msgstr "Last upgraded configuration version"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
-"List of paths for the folders to be synchronised to disk for offline usage"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:25
-msgid "Non-proxy hosts"
-msgstr "Non-proxy hosts"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:26
-msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr "Password to pass as authentication when doing HTTP proxying."
+msgid "Whether or not the window should be maximized."
+msgstr "Whether the window should be maximised."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "Proxy configuration mode"
 msgstr "Proxy configuration mode"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "SOCKS proxy host name"
-msgstr "SOCKS proxy host name"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid "SOCKS proxy port"
-msgstr "SOCKS proxy port"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:30
-msgid "Secure HTTP proxy host name"
-msgstr "Secure HTTP proxy host name"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:31
-msgid "Secure HTTP proxy port"
-msgstr "Secure HTTP proxy port"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -18827,73 +20112,13 @@ msgstr ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
 "configuration\" and \"use proxy configuration provided in the autoconfig URL"
-"\" respectively."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:33
-msgid "Sidebar is visible"
-msgstr "Sidebar is visible"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:34
-msgid "Skip development warning dialog"
-msgstr "Skip development warning dialogue"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
-msgid "Start in offline mode"
-msgstr "Start in offline mode"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:36
-msgid "Statusbar is visible"
-msgstr "Statusbar is visible"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
-msgstr ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:38
-msgid "The default X coordinate for the main window."
-msgstr "The default X coordinate for the main window."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:39
-msgid "The default Y coordinate for the main window."
-msgstr "The default Y coordinate for the main window."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:40
-msgid "The default height for the main window, in pixels."
-msgstr "The default height for the main window, in pixels."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:41
-msgid "The default width for the main window, in pixels."
-msgstr "The default width for the main window, in pixels."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:42
-msgid "The default width for the sidebar, in pixels."
-msgstr "The default width for the sidebar, in pixels."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
-msgstr ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:44
-msgid "The machine name to proxy HTTP through."
-msgstr "The machine name to proxy HTTP through."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:45
-msgid "The machine name to proxy secure HTTP through."
-msgstr "The machine name to proxy secure HTTP through."
+"\" respectively."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
-msgid "The machine name to proxy socks through."
-msgstr "The machine name to proxy socks through."
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "HTTP proxy port"
+msgstr "HTTP proxy port"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -18901,7 +20126,19 @@ msgstr ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid "HTTP proxy host name"
+msgstr "HTTP proxy host name"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid "The machine name to proxy HTTP through."
+msgstr "The machine name to proxy HTTP through."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid "Secure HTTP proxy port"
+msgstr "Secure HTTP proxy port"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -18909,7 +20146,19 @@ msgstr ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid "Secure HTTP proxy host name"
+msgstr "Secure HTTP proxy host name"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "The machine name to proxy secure HTTP through."
+msgstr "The machine name to proxy secure HTTP through."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "SOCKS proxy port"
+msgstr "SOCKS proxy port"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -18917,88 +20166,97 @@ msgstr ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "SOCKS proxy host name"
+msgstr "SOCKS proxy host name"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
+msgid "The machine name to proxy socks through."
+msgstr "The machine name to proxy socks through."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:49
+msgid "Use HTTP proxy"
+msgstr "Use HTTP proxy"
+
 #: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid ""
-"This key contains a list of hosts which are connected to directly, rather "
-"than via the proxy (if it is active). The values can be hostnames, domains "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-msgstr ""
-"This key contains a list of hosts which are connected to directly, rather "
-"than via the proxy (if it is active). The values can be hostnames, domains "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgid "Authenticate proxy server connections"
+msgstr "Authenticate proxy server connections"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
-msgid "Toolbar is visible"
-msgstr "Toolbar is visible"
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:53
-msgid "URL that provides proxy configuration values."
-msgstr "URL that provides proxy configuration values."
+msgid "HTTP proxy username"
+msgstr "HTTP proxy username"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid "Use HTTP proxy"
-msgstr "Use HTTP proxy"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Username to pass as authentication when doing HTTP proxying."
 msgstr "Username to pass as authentication when doing HTTP proxying."
 
+#: ../shell/apps_evolution_shell.schemas.in.h:55
+msgid "HTTP proxy password"
+msgstr "HTTP proxy password"
+
 #: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"Whether Evolution will start up in offline mode instead of online mode."
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr "Password to pass as authentication when doing HTTP proxying."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:57
-msgid "Whether or not the window should be maximized."
-msgstr "Whether the window should be maximised."
+msgid "Non-proxy hosts"
+msgstr "Non-proxy hosts"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:58
-msgid "Whether the sidebar should be visible."
-msgstr "Whether the sidebar should be visible."
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:59
-msgid "Whether the status bar should be visible."
-msgstr "Whether the status bar should be visible."
+msgid "Automatic proxy configuration URL"
+msgstr "Automatic proxy configuration URL"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:60
-msgid "Whether the toolbar should be visible."
-msgstr "Whether the toolbar should be visible."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:61
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
-"Whether the warning dialogue in development versions of Evolution is skipped."
+msgid "URL that provides proxy configuration values."
+msgstr "URL that provides proxy configuration values."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:62
-msgid "Whether the window buttons should be visible."
-msgstr "Whether the window buttons should be visible."
+#: ../shell/e-shell.c:312
+msgid "Preparing to go offline..."
+msgstr "Preparing to go offlineâ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:63
-msgid "Window button style"
-msgstr "Window button style"
+#: ../shell/e-shell.c:365
+msgid "Preparing to go online..."
+msgstr "Preparing to go onlineâ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:64
-msgid "Window buttons are visible"
-msgstr "Window buttons are visible"
+#: ../shell/e-shell.c:436
+msgid "Preparing to quit..."
+msgstr "Preparing to quitâ"
 
-#: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
+#: ../shell/e-shell-content.c:727 ../shell/e-shell-content.c:728
 msgid "Searches"
 msgstr "Searches"
 
-#: ../shell/e-shell-content.c:773
+#: ../shell/e-shell-content.c:771
 msgid "Save Search"
 msgstr "Save Search"
 
@@ -19006,31 +20264,31 @@ 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:938
+#: ../shell/e-shell-searchbar.c:940
 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:971
+#: ../shell/e-shell-searchbar.c:973
 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:1034
+#: ../shell/e-shell-searchbar.c:1036
 msgid "i_n"
 msgstr "i_n"
 
-#: ../shell/e-shell-utils.c:223
+#: ../shell/e-shell-utils.c:197
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:246
+#: ../shell/e-shell-utils.c:220
 msgid "All Files (*)"
 msgstr "All Files (*)"
 
-#: ../shell/e-shell-view.c:296
+#: ../shell/e-shell-view.c:303
 msgid "Saving user interface state"
 msgstr "Saving user interface state"
 
@@ -19049,293 +20307,286 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Evolution Website"
 
-#: ../shell/e-shell-window-actions.c:902
+#: ../shell/e-shell-window-actions.c:914
 msgid "Categories Editor"
 msgstr "Categories Editor"
 
-#: ../shell/e-shell-window-actions.c:1237
+#: ../shell/e-shell-window-actions.c:1249
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy is not installed."
 
-#: ../shell/e-shell-window-actions.c:1239
+#: ../shell/e-shell-window-actions.c:1251
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy could not be run."
 
-#: ../shell/e-shell-window-actions.c:1420
+#: ../shell/e-shell-window-actions.c:1432
 msgid "Show information about Evolution"
 msgstr "Show information about Evolution"
 
-#: ../shell/e-shell-window-actions.c:1425
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1437
+#: ../shell/e-shell-window-actions.c:1451
 msgid "_Close Window"
 msgstr "_Close Window"
 
-#: ../shell/e-shell-window-actions.c:1446
+#: ../shell/e-shell-window-actions.c:1458
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../shell/e-shell-window-actions.c:1448
+#: ../shell/e-shell-window-actions.c:1460
 msgid "Open the Evolution User Guide"
 msgstr "Open the Evolution User Guide"
 
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1486
 msgid "_Forget Passwords"
 msgstr "_Forget Passwords"
 
-#: ../shell/e-shell-window-actions.c:1476
+#: ../shell/e-shell-window-actions.c:1488
 msgid "Forget all remembered passwords"
 msgstr "Forget all remembered passwords"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1493
 msgid "I_mport..."
 msgstr "I_mportâ"
 
-#: ../shell/e-shell-window-actions.c:1483
+#: ../shell/e-shell-window-actions.c:1495
 msgid "Import data from other programs"
 msgstr "Import data from other programs"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1500
 msgid "New _Window"
 msgstr "New _Window"
 
-#: ../shell/e-shell-window-actions.c:1490
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Create a new window displaying this view"
 msgstr "Create a new window displaying this view"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1514
 msgid "Available Cate_gories"
 msgstr "Available Cate_gories"
 
-#: ../shell/e-shell-window-actions.c:1504
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Manage available categories"
 msgstr "Manage available categories"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1528
 msgid "_Quick Reference"
 msgstr "_Quick Reference"
 
-#: ../shell/e-shell-window-actions.c:1518
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Show Evolution's shortcut keys"
 msgstr "Show Evolution's shortcut keys"
 
-#: ../shell/e-shell-window-actions.c:1525
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Exit the program"
 msgstr "Exit the program"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1542
 msgid "_Advanced Search..."
 msgstr "_Advanced Searchâ"
 
-#: ../shell/e-shell-window-actions.c:1532
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Construct a more advanced search"
 msgstr "Construct a more advanced search"
 
-#: ../shell/e-shell-window-actions.c:1539
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Clear the current search parameters"
 msgstr "Clear the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1556
 msgid "_Edit Saved Searches..."
 msgstr "_Edit Saved Searchesâ"
 
-#: ../shell/e-shell-window-actions.c:1546
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Manage your saved searches"
 msgstr "Manage your saved searches"
 
-#: ../shell/e-shell-window-actions.c:1553
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Click here to change the search type"
 msgstr "Click here to change the search type"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1570
 msgid "_Find Now"
 msgstr "_Find Now"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1560
+#: ../shell/e-shell-window-actions.c:1572
 msgid "Execute the current search parameters"
 msgstr "Execute the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1577
 msgid "_Save Search..."
 msgstr "_Save Searchâ"
 
-#: ../shell/e-shell-window-actions.c:1567
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Save the current search parameters"
 msgstr "Save the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1591
 msgid "Submit _Bug Report..."
 msgstr "Submit _Bug Reportâ"
 
-#: ../shell/e-shell-window-actions.c:1581
+#: ../shell/e-shell-window-actions.c:1593
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Submit a bug report using Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1598
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: ../shell/e-shell-window-actions.c:1588
+#: ../shell/e-shell-window-actions.c:1600
 msgid "Put Evolution into offline mode"
 msgstr "Put Evolution into offline mode"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1605
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: ../shell/e-shell-window-actions.c:1595
+#: ../shell/e-shell-window-actions.c:1607
 msgid "Put Evolution into online mode"
 msgstr "Put Evolution into online mode"
 
-#: ../shell/e-shell-window-actions.c:1623
+#: ../shell/e-shell-window-actions.c:1635
 msgid "Lay_out"
 msgstr "Lay_out"
 
-#: ../shell/e-shell-window-actions.c:1630
+#: ../shell/e-shell-window-actions.c:1642
 msgid "_New"
 msgstr "_New"
 
-#: ../shell/e-shell-window-actions.c:1637
+#: ../shell/e-shell-window-actions.c:1649
 msgid "_Search"
 msgstr "_Search"
 
-#: ../shell/e-shell-window-actions.c:1644
+#: ../shell/e-shell-window-actions.c:1656
 msgid "_Switcher Appearance"
 msgstr "_Switcher Appearance"
 
-#: ../shell/e-shell-window-actions.c:1658
+#: ../shell/e-shell-window-actions.c:1670
 msgid "_Window"
 msgstr "_Window"
 
-#: ../shell/e-shell-window-actions.c:1687
+#: ../shell/e-shell-window-actions.c:1699
 msgid "Show Side _Bar"
 msgstr "Show Side _Bar"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1701
 msgid "Show the side bar"
 msgstr "Show the side bar"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1707
 msgid "Show _Buttons"
 msgstr "Show _Buttons"
 
-#: ../shell/e-shell-window-actions.c:1697
+#: ../shell/e-shell-window-actions.c:1709
 msgid "Show the switcher buttons"
 msgstr "Show the switcher buttons"
 
-#: ../shell/e-shell-window-actions.c:1703
+#: ../shell/e-shell-window-actions.c:1715
 msgid "Show _Status Bar"
 msgstr "Show _Status Bar"
 
-#: ../shell/e-shell-window-actions.c:1705
+#: ../shell/e-shell-window-actions.c:1717
 msgid "Show the status bar"
 msgstr "Show the status bar"
 
-#: ../shell/e-shell-window-actions.c:1711
+#: ../shell/e-shell-window-actions.c:1723
 msgid "Show _Tool Bar"
 msgstr "Show _Tool Bar"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1725
 msgid "Show the tool bar"
 msgstr "Show the tool bar"
 
-#: ../shell/e-shell-window-actions.c:1735
+#: ../shell/e-shell-window-actions.c:1747
 msgid "_Icons Only"
 msgstr "_Icons Only"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Display window buttons with icons only"
 msgstr "Display window buttons with icons only"
 
-#: ../shell/e-shell-window-actions.c:1742
+#: ../shell/e-shell-window-actions.c:1754
 msgid "_Text Only"
 msgstr "_Text Only"
 
-#: ../shell/e-shell-window-actions.c:1744
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Display window buttons with text only"
 msgstr "Display window buttons with text only"
 
-#: ../shell/e-shell-window-actions.c:1749
+#: ../shell/e-shell-window-actions.c:1761
 msgid "Icons _and Text"
 msgstr "Icons _and Text"
 
-#: ../shell/e-shell-window-actions.c:1751
+#: ../shell/e-shell-window-actions.c:1763
 msgid "Display window buttons with icons and text"
 msgstr "Display window buttons with icons and text"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Tool_bar Style"
 msgstr "Tool_bar Style"
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1770
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Display window buttons using the desktop toolbar setting"
 
-#: ../shell/e-shell-window-actions.c:1766
+#: ../shell/e-shell-window-actions.c:1778
 msgid "Define Views..."
 msgstr "Define Viewsâ"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1780
 msgid "Create or edit views"
 msgstr "Create or edit views"
 
-#: ../shell/e-shell-window-actions.c:1773
+#: ../shell/e-shell-window-actions.c:1785
 msgid "Save Custom View..."
 msgstr "Save Custom Viewâ"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1787
 msgid "Save current custom view"
 msgstr "Save current custom view"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1794
 msgid "C_urrent View"
 msgstr "C_urrent View"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1804
 msgid "Custom View"
 msgstr "Custom View"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1806
 msgid "Current view is a customized view"
 msgstr "Current view is a customised view"
 
-#: ../shell/e-shell-window-actions.c:1804
+#: ../shell/e-shell-window-actions.c:1816
 msgid "Change the page settings for your current printer"
 msgstr "Change the page settings for your current printer"
 
-#: ../shell/e-shell-window-actions.c:2194
+#: ../shell/e-shell-window-actions.c:2206
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: ../shell/e-shell-window-actions.c:2414
+#: ../shell/e-shell-window-actions.c:2327
+#, c-format
+msgid "Select view: %s"
+msgstr "Select view: %s"
+
+#: ../shell/e-shell-window-actions.c:2428
 msgid "Execute these search parameters"
 msgstr "Execute these search parameters"
 
+#: ../shell/e-shell-window.c:494
+msgid "New"
+msgstr "New"
+
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:584
+#: ../shell/e-shell-window-private.c:577
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s â Evolution"
 
-#: ../shell/e-shell-window.c:442
-msgid "New"
-msgstr "New"
-
-#: ../shell/e-shell.c:361
-msgid "Preparing to go offline..."
-msgstr "Preparing to go offlineâ"
-
-#: ../shell/e-shell.c:414
-msgid "Preparing to go online..."
-msgstr "Preparing to go onlineâ"
-
-#: ../shell/e-shell.c:476
-msgid "Preparing to quit..."
-msgstr "Preparing to quitâ"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:195
+#: ../shell/main.c:188
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19370,7 +20621,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:212
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19378,13 +20629,13 @@ msgstr ""
 "Thanks\n"
 "The Evolution Team\n"
 
-#: ../shell/main.c:226
+#: ../shell/main.c:219
 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:308
+#: ../shell/main.c:310
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19392,30 +20643,26 @@ msgstr ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 
-#: ../shell/main.c:312
+#: ../shell/main.c:314
 msgid "Apply the given geometry to the main window"
 msgstr "Apply the given geometry to the main window"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:318
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:320
 msgid "Ignore network availability"
 msgstr "Ignore network availability"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:322
 msgid "Start in \"express\" mode"
 msgstr "Start in \"express\" mode"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:325
 msgid "Forcibly shut down Evolution"
 msgstr "Forcibly shut down Evolution"
 
-#: ../shell/main.c:326
-msgid "Send the debugging output of all components to a file."
-msgstr "Send the debugging output of all components to a file."
-
 #: ../shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "Disable loading of any plugins."
@@ -19425,14 +20672,14 @@ msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Disable preview pane of Mail, Contacts and Tasks."
 
 #: ../shell/main.c:334
-msgid "Import URIs or file names given as rest of arguments."
-msgstr "Import URIs or file names given as rest of arguments."
+msgid "Import URIs or filenames given as rest of arguments."
+msgstr "Import URIs or filenames given as rest of arguments."
 
 #: ../shell/main.c:336
 msgid "Request a running Evolution process to quit"
 msgstr "Request a running Evolution process to quit"
 
-#: ../shell/main.c:512 ../shell/main.c:520
+#: ../shell/main.c:510 ../shell/main.c:518
 msgid "- The Evolution PIM and Email Client"
 msgstr "- The Evolution PIM and E-mail Client"
 
@@ -19454,21 +20701,37 @@ msgstr ""
 "%s: --force-online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 
-#: ../shell/shell.error.xml.h:1
-msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "Are you sure you want to forget all remembered passwords?"
-
-#  shell:upgrade-remove-1-4 title
-#  shell:upgrade-remove-1-4 primary
 #: ../shell/shell.error.xml.h:2
-msgid "Cannot upgrade directly from version {0}"
-msgstr "Cannot upgrade directly from version {0}"
+msgid "Upgrade from previous version failed:"
+msgstr "Upgrade from previous version failed:"
 
 #: ../shell/shell.error.xml.h:3
+msgid ""
+"{0}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+"{0}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+
+#: ../shell/shell.error.xml.h:7
 msgid "Continue Anyway"
 msgstr "Continue Anyway"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:8
+msgid "Quit Now"
+msgstr "Quit Now"
+
+#  shell:upgrade-remove-1-4 title
+#  shell:upgrade-remove-1-4 primary
+#: ../shell/shell.error.xml.h:9
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Cannot upgrade directly from version {0}"
+
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "Evolution no longer supports upgrading directly from version {0}. However as "
 "a workaround you might try first upgrading to Evolution 2, and then "
@@ -19478,7 +20741,11 @@ msgstr ""
 "a workaround you might try first upgrading to Evolution 2, and then "
 "upgrading to Evolution 3."
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:11
+msgid "Are you sure you want to forget all remembered passwords?"
+msgstr "Are you sure you want to forget all remembered passwords?"
+
+#: ../shell/shell.error.xml.h:12
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -19486,45 +20753,25 @@ msgstr ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 
-#: ../shell/shell.error.xml.h:7
-msgid "Quit Now"
-msgstr "Quit Now"
-
-#: ../shell/shell.error.xml.h:8
-msgid "Upgrade from previous version failed:"
-msgstr "Upgrade from previous version failed:"
-
-#: ../shell/shell.error.xml.h:9
-msgid "_Forget"
-msgstr "_Forget"
-
-#: ../shell/shell.error.xml.h:10
-msgid ""
-"{0}\n"
-"\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
-msgstr ""
-"{0}\n"
-"\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
-
-#: ../shell/test/e-test-shell-backend.c:56
+#: ../shell/shell.error.xml.h:13
+msgid "_Forget"
+msgstr "_Forget"
+
+#: ../shell/test/e-test-shell-backend.c:52
 msgctxt "New"
 msgid "_Test Item"
 msgstr "_Test Item"
 
-#: ../shell/test/e-test-shell-backend.c:58
+#: ../shell/test/e-test-shell-backend.c:54
 msgid "Create a new test item"
 msgstr "Create a new test item"
 
-#: ../shell/test/e-test-shell-backend.c:66
+#: ../shell/test/e-test-shell-backend.c:62
 msgctxt "New"
 msgid "Test _Source"
 msgstr "Test _Source"
 
-#: ../shell/test/e-test-shell-backend.c:68
+#: ../shell/test/e-test-shell-backend.c:64
 msgid "Create a new test source"
 msgstr "Create a new test source"
 
@@ -19563,31 +20810,31 @@ msgstr "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgid "Not a launchable item"
 msgstr "Not a launchable item"
 
-#: ../smclient/eggsmclient.c:226
+#: ../smclient/eggsmclient.c:229
 msgid "Disable connection to session manager"
 msgstr "Disable connection to session manager"
 
-#: ../smclient/eggsmclient.c:229
+#: ../smclient/eggsmclient.c:232
 msgid "Specify file containing saved configuration"
 msgstr "Specify file containing saved configuration"
 
-#: ../smclient/eggsmclient.c:229
+#: ../smclient/eggsmclient.c:232
 msgid "FILE"
 msgstr "FILE"
 
-#: ../smclient/eggsmclient.c:232
+#: ../smclient/eggsmclient.c:235
 msgid "Specify session management ID"
 msgstr "Specify session management ID"
 
-#: ../smclient/eggsmclient.c:232
+#: ../smclient/eggsmclient.c:235
 msgid "ID"
 msgstr "ID"
 
-#: ../smclient/eggsmclient.c:253
+#: ../smclient/eggsmclient.c:256
 msgid "Session management options:"
 msgstr "Session management options:"
 
-#: ../smclient/eggsmclient.c:254
+#: ../smclient/eggsmclient.c:257
 msgid "Show session management options"
 msgstr "Show session management options"
 
@@ -19602,124 +20849,128 @@ msgstr ""
 "\n"
 "Edit trust settings:"
 
-#: ../smime/gui/cert-trust-dialog.c:146
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-
-#: ../smime/gui/cert-trust-dialog.c:150
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-
-#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
-#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:96
+#: ../smime/gui/certificate-manager.c:116
 msgid "Certificate Name"
 msgstr "Certificate Name"
 
-#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
 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:79 ../smime/gui/certificate-manager.c:99
 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/smime-ui.ui.h:32
-#: ../smime/lib/e-cert.c:569
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118 ../smime/gui/smime-ui.ui.h:12
+#: ../smime/lib/e-cert.c:543
 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:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
 msgid "Purposes"
 msgstr "Purposes"
 
-#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
-#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120 ../smime/gui/smime-ui.ui.h:15
 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:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121
 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:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122
 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:85
+#: ../smime/gui/certificate-manager.c:105
+#: ../smime/gui/certificate-manager.c:123
 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:86
+#: ../smime/gui/certificate-manager.c:106
+#: ../smime/gui/certificate-manager.c:124
 msgid "Expires"
 msgstr "Expires"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125 ../smime/gui/smime-ui.ui.h:17
 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/smime-ui.ui.h:26
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126 ../smime/gui/smime-ui.ui.h:18
 msgid "MD5 Fingerprint"
 msgstr "MD5 Fingerprint"
 
-#: ../smime/gui/certificate-manager.c:93
-#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:117
 msgid "Email Address"
 msgstr "E-mail Address"
 
-#: ../smime/gui/certificate-manager.c:575
+#: ../smime/gui/certificate-manager.c:584
 msgid "Select a certificate to import..."
 msgstr "Select a certificate to importâ"
 
-#: ../smime/gui/certificate-manager.c:588
+#: ../smime/gui/certificate-manager.c:597
 msgid "All files"
 msgstr "All files"
 
-#: ../smime/gui/certificate-manager.c:623
+#: ../smime/gui/certificate-manager.c:632
 msgid "Failed to import certificate"
 msgstr "Failed to import certificate"
 
-#: ../smime/gui/certificate-manager.c:991
+#: ../smime/gui/certificate-manager.c:1006
 msgid "All PKCS12 files"
 msgstr "All PKCS12 files"
 
-#: ../smime/gui/certificate-manager.c:1009
+#: ../smime/gui/certificate-manager.c:1023
 msgid "All email certificate files"
 msgstr "All e-mail certificate files"
 
-#: ../smime/gui/certificate-manager.c:1027
+#: ../smime/gui/certificate-manager.c:1040
 msgid "All CA certificate files"
 msgstr "All CA certificate files"
 
-#: ../smime/gui/certificate-viewer.c:345
+#: ../smime/gui/certificate-viewer.c:349
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Certificate Viewer: %s"
 
+#: ../smime/gui/cert-trust-dialog.c:148
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+
+#: ../smime/gui/cert-trust-dialog.c:152
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+
 #: ../smime/gui/component.c:50
 #, c-format
 msgid "Enter the password for '%s'"
@@ -19730,12 +20981,12 @@ msgstr "Enter the password for '%s'"
 msgid "Enter new password for certificate database"
 msgstr "Enter new password for certificate database"
 
-#: ../smime/gui/component.c:78
+#: ../smime/gui/component.c:79
 msgid "Enter new password"
 msgstr "Enter new password"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:118
+#: ../smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19744,7 +20995,7 @@ msgstr ""
 "Issued to:\n"
 "  Subject: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:123
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19753,316 +21004,312 @@ msgstr ""
 "Issued by:\n"
 "  Subject: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:172
+#: ../smime/gui/e-cert-selector.c:176
 msgid "Select certificate"
 msgstr "Select certificate"
 
-#: ../smime/gui/smime-ui.ui.h:1
-msgid "<Not Part of Certificate>"
-msgstr "<Not Part of Certificate>"
-
-#: ../smime/gui/smime-ui.ui.h:2
-msgid "Authorities"
-msgstr "Authorities"
-
-#: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup _All"
-msgstr "Back Up _All"
+#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:803
+msgid "SSL Client Certificate"
+msgstr "SSL Client Certificate"
 
-#: ../smime/gui/smime-ui.ui.h:4
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-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:4 ../smime/lib/e-cert.c:807
+msgid "SSL Server Certificate"
+msgstr "SSL Server Certificate"
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1097
-msgid "Certificate"
-msgstr "Certificate"
+#: ../smime/gui/smime-ui.ui.h:5
+msgid "Email Signer Certificate"
+msgstr "E-mail Signer Certificate"
 
 #: ../smime/gui/smime-ui.ui.h:6
-msgid "Certificate Authority Trust"
-msgstr "Certificate Authority Trust"
+msgid "Email Recipient Certificate"
+msgstr "E-mail Recipient Certificate"
 
 #: ../smime/gui/smime-ui.ui.h:7
-msgid "Certificate Fields"
-msgstr "Certificate Fields"
+msgid "This certificate has been verified for the following uses:"
+msgstr "This certificate has been verified for the following uses:"
 
 #: ../smime/gui/smime-ui.ui.h:8
-msgid "Certificate Hierarchy"
-msgstr "Certificate Hierarchy"
+msgid "Issued To"
+msgstr "Issued To"
 
 #: ../smime/gui/smime-ui.ui.h:9
-msgid "Certificate details"
-msgstr "Certificate details"
+msgid "Common Name (CN)"
+msgstr "Common Name (CN)"
 
 #: ../smime/gui/smime-ui.ui.h:10
-msgid "Certificates Table"
-msgstr "Certificates Table"
+msgid "Organization (O)"
+msgstr "Organisation (O)"
 
 #: ../smime/gui/smime-ui.ui.h:11
-msgid "Common Name (CN)"
-msgstr "Common Name (CN)"
+msgid "Organizational Unit (OU)"
+msgstr "Organisational Unit (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:12
-msgid "Contact Certificates"
-msgstr "Contact Certificates"
+#: ../smime/gui/smime-ui.ui.h:13
+msgid "Issued On"
+msgstr "Issued On"
 
 #: ../smime/gui/smime-ui.ui.h:14
-msgid "Do not trust the authenticity of this certificate"
-msgstr "Do not trust the authenticity of this certificate"
-
-#: ../smime/gui/smime-ui.ui.h:15
-msgid "Email Certificate Trust Settings"
-msgstr "E-mail Certificate Trust Settings"
-
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Email Recipient Certificate"
-msgstr "E-mail Recipient Certificate"
-
-#: ../smime/gui/smime-ui.ui.h:17
-msgid "Email Signer Certificate"
-msgstr "E-mail Signer Certificate"
-
-#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "Expires On"
 
+#: ../smime/gui/smime-ui.ui.h:16
+msgid "Fingerprints"
+msgstr "Fingerprints"
+
 #: ../smime/gui/smime-ui.ui.h:19
-msgid "Field Value"
-msgstr "Field Value"
+msgid "<Not Part of Certificate>"
+msgstr "<Not Part of Certificate>"
 
 #: ../smime/gui/smime-ui.ui.h:20
-msgid "Fingerprints"
-msgstr "Fingerprints"
+msgid "Validity"
+msgstr "Validity"
+
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "Certificate Hierarchy"
+msgstr "Certificate Hierarchy"
+
+#: ../smime/gui/smime-ui.ui.h:23
+msgid "Certificate Fields"
+msgstr "Certificate Fields"
 
 #: ../smime/gui/smime-ui.ui.h:24
-msgid "Issued On"
-msgstr "Issued On"
+msgid "Field Value"
+msgstr "Field Value"
 
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Issued To"
-msgstr "Issued To"
+#: ../smime/gui/smime-ui.ui.h:26
+msgid "You have certificates from these organizations that identify you:"
+msgstr "You have certificates from these organisations that identify you:"
 
 #: ../smime/gui/smime-ui.ui.h:27
-msgid "Organization (O)"
-msgstr "Organisation (O)"
-
-#: ../smime/gui/smime-ui.ui.h:28
-msgid "Organizational Unit (OU)"
-msgstr "Organisational Unit (OU)"
+msgid "Certificates Table"
+msgstr "Certificates Table"
 
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:829
-msgid "SSL Client Certificate"
-msgstr "SSL Client Certificate"
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:30
+msgid "_Backup"
+msgstr "_Backup"
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:833
-msgid "SSL Server Certificate"
-msgstr "SSL Server Certificate"
+#: ../smime/gui/smime-ui.ui.h:31
+msgid "Backup _All"
+msgstr "Back Up _All"
 
 #: ../smime/gui/smime-ui.ui.h:33
-msgid "This certificate has been verified for the following uses:"
-msgstr "This certificate has been verified for the following uses:"
+msgid "Your Certificates"
+msgstr "Your Certificates"
 
 #: ../smime/gui/smime-ui.ui.h:34
-msgid "Trust the authenticity of this certificate"
-msgstr "Trust the authenticity of this certificate"
+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:35
-msgid "Trust this CA to identify email users."
-msgstr "Trust this CA to identify e-mail users."
+msgid "Contact Certificates"
+msgstr "Contact Certificates"
 
 #: ../smime/gui/smime-ui.ui.h:36
-msgid "Trust this CA to identify software developers."
-msgstr "Trust this CA to identify software developers."
+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:37
-msgid "Trust this CA to identify websites."
-msgstr "Trust this CA to identify websites."
+msgid "Authorities"
+msgstr "Authorities"
 
 #: ../smime/gui/smime-ui.ui.h:38
-msgid "Validity"
-msgstr "Validity"
+msgid "Certificate Authority Trust"
+msgstr "Certificate Authority Trust"
 
 #: ../smime/gui/smime-ui.ui.h:39
-msgid "You have certificates from these organizations that identify you:"
-msgstr "You have certificates from these organisations that identify you:"
+msgid "Trust this CA to identify _websites."
+msgstr "Trust this CA to identify _websites."
 
 #: ../smime/gui/smime-ui.ui.h:40
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "Trust this CA to identify _email users."
+msgstr "Trust this CA to identify _e-mail users."
 
 #: ../smime/gui/smime-ui.ui.h:41
-msgid "You have certificates on file that identify these people:"
-msgstr "You have certificates on file that identify these people:"
+msgid "Trust this CA to identify _software developers."
+msgstr "Trust this CA to identify _software developers."
 
 #: ../smime/gui/smime-ui.ui.h:42
-msgid "Your Certificates"
-msgstr "Your Certificates"
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
 
-#. This is a verb, as in "make a backup".
-#: ../smime/gui/smime-ui.ui.h:44
-msgid "_Backup"
-msgstr "_Backup"
+#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1072
+msgid "Certificate"
+msgstr "Certificate"
 
 #: ../smime/gui/smime-ui.ui.h:45
+msgid "Certificate details"
+msgstr "Certificate details"
+
+#: ../smime/gui/smime-ui.ui.h:46
+msgid "Email Certificate Trust Settings"
+msgstr "E-mail Certificate Trust Settings"
+
+#: ../smime/gui/smime-ui.ui.h:47
+msgid "Trust the authenticity of this certificate"
+msgstr "Trust the authenticity of this certificate"
+
+#: ../smime/gui/smime-ui.ui.h:48
+msgid "Do not trust the authenticity of this certificate"
+msgstr "Do not trust the authenticity of this certificate"
+
+#: ../smime/gui/smime-ui.ui.h:49
 msgid "_Edit CA Trust"
 msgstr "_Edit CA Trust"
 
-#: ../smime/lib/e-cert-db.c:912
-msgid "Certificate already exists"
-msgstr "Certificate already exists"
-
-#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
+#: ../smime/lib/e-cert.c:202 ../smime/lib/e-cert.c:214
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:417
+#: ../smime/lib/e-cert.c:391
 msgid "Sign"
 msgstr "Sign"
 
-#: ../smime/lib/e-cert.c:418
+#: ../smime/lib/e-cert.c:392
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: ../smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:504
 msgid "Version"
 msgstr "Version"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:519
 msgid "Version 1"
 msgstr "Version 1"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:522
 msgid "Version 2"
 msgstr "Version 2"
 
-#: ../smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:525
 msgid "Version 3"
 msgstr "Version 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:608
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:611
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:614
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:643
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PKCS #1 SHA-256 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:646
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PKCS #1 SHA-384 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-512 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA Encryption"
 
-#: ../smime/lib/e-cert.c:679
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
 msgstr "Certificate Key Usage"
 
-#: ../smime/lib/e-cert.c:682
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
 msgstr "Netscape Certificate Type"
 
-#: ../smime/lib/e-cert.c:685
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
 msgstr "Certificate Authority Key Identifier"
 
-#: ../smime/lib/e-cert.c:697
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Object Identifier (%s)"
 
-#: ../smime/lib/e-cert.c:749
+#: ../smime/lib/e-cert.c:723
 msgid "Algorithm Identifier"
 msgstr "Algorithm Identifier"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:731
 msgid "Algorithm Parameters"
 msgstr "Algorithm Parameters"
 
-#: ../smime/lib/e-cert.c:779
+#: ../smime/lib/e-cert.c:753
 msgid "Subject Public Key Info"
 msgstr "Subject Public Key Info"
 
-#: ../smime/lib/e-cert.c:784
+#: ../smime/lib/e-cert.c:758
 msgid "Subject Public Key Algorithm"
 msgstr "Subject Public Key Algorithm"
 
-#: ../smime/lib/e-cert.c:799
+#: ../smime/lib/e-cert.c:773
 msgid "Subject's Public Key"
 msgstr "Subject's Public Key"
 
-#: ../smime/lib/e-cert.c:820 ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:794 ../smime/lib/e-cert.c:844
 msgid "Error: Unable to process extension"
 msgstr "Error: Unable to process extension"
 
-#: ../smime/lib/e-cert.c:841 ../smime/lib/e-cert.c:853
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:827
 msgid "Object Signer"
 msgstr "Object Signer"
 
-#: ../smime/lib/e-cert.c:845
+#: ../smime/lib/e-cert.c:819
 msgid "SSL Certificate Authority"
 msgstr "SSL Certificate Authority"
 
-#: ../smime/lib/e-cert.c:849
+#: ../smime/lib/e-cert.c:823
 msgid "Email Certificate Authority"
 msgstr "E-mail Certificate Authority"
 
-#: ../smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:852
 msgid "Signing"
 msgstr "Signing"
 
-#: ../smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:856
 msgid "Non-repudiation"
 msgstr "Non-repudiation"
 
-#: ../smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:860
 msgid "Key Encipherment"
 msgstr "Key Encipherment"
 
-#: ../smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:864
 msgid "Data Encipherment"
 msgstr "Data Encipherment"
 
-#: ../smime/lib/e-cert.c:894
+#: ../smime/lib/e-cert.c:868
 msgid "Key Agreement"
 msgstr "Key Agreement"
 
-#: ../smime/lib/e-cert.c:898
+#: ../smime/lib/e-cert.c:872
 msgid "Certificate Signer"
 msgstr "Certificate Signer"
 
-#: ../smime/lib/e-cert.c:902
+#: ../smime/lib/e-cert.c:876
 msgid "CRL Signer"
 msgstr "CRL Signer"
 
-#: ../smime/lib/e-cert.c:951
+#: ../smime/lib/e-cert.c:925
 msgid "Critical"
 msgstr "Critical"
 
-#: ../smime/lib/e-cert.c:953 ../smime/lib/e-cert.c:956
+#: ../smime/lib/e-cert.c:927 ../smime/lib/e-cert.c:930
 msgid "Not Critical"
 msgstr "Not Critical"
 
-#: ../smime/lib/e-cert.c:977
+#: ../smime/lib/e-cert.c:951
 msgid "Extensions"
 msgstr "Extensions"
 
@@ -20074,90 +21321,94 @@ msgstr "Extensions"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1055
+#: ../smime/lib/e-cert.c:1030
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1111 ../smime/lib/e-cert.c:1234
+#: ../smime/lib/e-cert.c:1086 ../smime/lib/e-cert.c:1209
 msgid "Certificate Signature Algorithm"
 msgstr "Certificate Signature Algorithm"
 
-#: ../smime/lib/e-cert.c:1120
+#: ../smime/lib/e-cert.c:1095
 msgid "Issuer"
 msgstr "Issuer"
 
-#: ../smime/lib/e-cert.c:1175
+#: ../smime/lib/e-cert.c:1150
 msgid "Issuer Unique ID"
 msgstr "Issuer Unique ID"
 
-#: ../smime/lib/e-cert.c:1194
+#: ../smime/lib/e-cert.c:1169
 msgid "Subject Unique ID"
 msgstr "Subject Unique ID"
 
-#: ../smime/lib/e-cert.c:1240
+#: ../smime/lib/e-cert.c:1215
 msgid "Certificate Signature Value"
 msgstr "Certificate Signature Value"
 
-#: ../smime/lib/e-pkcs12.c:256
+#: ../smime/lib/e-cert-db.c:859
+msgid "Certificate already exists"
+msgstr "Certificate already exists"
+
+#: ../smime/lib/e-pkcs12.c:199
 msgid "PKCS12 File Password"
 msgstr "PKCS12 File Password"
 
-#: ../smime/lib/e-pkcs12.c:257
+#: ../smime/lib/e-pkcs12.c:200
 msgid "Enter password for PKCS12 file:"
 msgstr "Enter password for PKCS12 file:"
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:306
 msgid "Imported Certificate"
 msgstr "Imported Certificate"
 
 #: ../views/addressbook/galview.xml.h:1
-msgid "By _Company"
-msgstr "By _Company"
-
-#: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
 msgstr "_Address Cards"
 
-#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:2 ../views/calendar/galview.xml.h:5
 msgid "_List View"
 msgstr "_List View"
 
-#: ../views/calendar/galview.xml.h:1
+#: ../views/addressbook/galview.xml.h:3
+msgid "By _Company"
+msgstr "By _Company"
+
+#: ../views/calendar/galview.xml.h:1
+msgid "_Day View"
+msgstr "_Day View"
+
+#: ../views/calendar/galview.xml.h:2
+msgid "_Work Week View"
+msgstr "_Work Week View"
+
+#: ../views/calendar/galview.xml.h:3
 msgid "W_eek View"
 msgstr "W_eek View"
 
-#: ../views/calendar/galview.xml.h:2
-msgid "_Day View"
-msgstr "_Day View"
-
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Month View"
 
-#: ../views/calendar/galview.xml.h:5
-msgid "_Work Week View"
-msgstr "_Work Week View"
-
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "As Sent Folder for Wi_de View"
+msgid "_Messages"
+msgstr "_Messages"
 
 #: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "As _Sent Folder"
 
 #: ../views/mail/galview.xml.h:3
-msgid "By S_tatus"
-msgstr "By S_tatus"
+msgid "By Su_bject"
+msgstr "By Su_bject"
 
 #: ../views/mail/galview.xml.h:4
 msgid "By Se_nder"
 msgstr "By Se_nder"
 
 #: ../views/mail/galview.xml.h:5
-msgid "By Su_bject"
-msgstr "By Su_bject"
+msgid "By S_tatus"
+msgstr "By S_tatus"
 
 #: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
@@ -20168,43 +21419,35 @@ msgid "For _Wide View"
 msgstr "For _Wide View"
 
 #: ../views/mail/galview.xml.h:8
-msgid "_Messages"
-msgstr "_Messages"
+msgid "As Sent Folder for Wi_de View"
+msgstr "As Sent Folder for Wi_de View"
 
 #: ../views/memos/galview.xml.h:1
 msgid "_Memos"
 msgstr "_Memos"
 
-#: ../views/tasks/galview.xml.h:1
+#: ../views/tasks/galview.xml.h:2
 msgid "With _Due Date"
 msgstr "With _Due Date"
 
-#: ../views/tasks/galview.xml.h:2
+#: ../views/tasks/galview.xml.h:3
 msgid "With _Status"
 msgstr "With _Status"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:789
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:416
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:420
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:424
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:770
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "Select a Time Zone"
 msgstr "Select a Time Zone"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
-msgid "Time Zones"
-msgstr "Time Zones"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
-msgid "Timezone drop-down combination box"
-msgstr "Timezone drop-down combination box"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
+#: ../widgets/e-timezone-dialog/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"
@@ -20214,18 +21457,26 @@ msgstr ""
 "zone.\n"
 "Use the right mouse button to zoom out."
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+msgid "Time Zones"
+msgstr "Time Zones"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid "_Selection"
 msgstr "_Selection"
 
-#: ../widgets/menus/gal-define-views-dialog.c:359
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
+msgid "Timezone drop-down combination box"
+msgstr "Timezone drop-down combination box"
+
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Define Views for %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:367
-#: ../widgets/menus/gal-define-views-dialog.c:369
+#: ../widgets/menus/gal-define-views-dialog.c:372
+#: ../widgets/menus/gal-define-views-dialog.c:374
 msgid "Define Views"
 msgstr "Define Views"
 
@@ -20234,11 +21485,11 @@ msgstr "Define Views"
 msgid "Define Views for \"%s\""
 msgstr "Define Views for \"%s\""
 
-#: ../widgets/menus/gal-view-factory-etable.c:111
+#: ../widgets/menus/gal-view-factory-etable.c:115
 msgid "Table"
 msgstr "Table"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:289
 msgid "Save Current View"
 msgstr "Save Current View"
 
@@ -20250,7 +21501,7 @@ msgstr "_Create new view"
 msgid "_Replace existing view"
 msgstr "_Replace existing view"
 
-#: ../widgets/menus/gal-view-new-dialog.c:108
+#: ../widgets/menus/gal-view-new-dialog.c:172
 msgid "Define New View"
 msgstr "Define New View"
 
@@ -20259,47 +21510,105 @@ msgid "Name of new view:"
 msgstr "Name of new view:"
 
 #: ../widgets/menus/gal-view-new-dialog.ui.h:2
+msgid "Type of view:"
+msgstr "Type of view:"
+
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of View"
 msgstr "Type of View"
 
-#: ../widgets/menus/gal-view-new-dialog.ui.h:3
-msgid "Type of view:"
-msgstr "Type of view:"
+#: ../widgets/misc/ea-calendar-item.c:306
+#: ../widgets/misc/ea-calendar-item.c:315
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
 
-#: ../widgets/misc/e-account-manager.c:353
-msgid "De_fault"
-msgstr "De_fault"
+#: ../widgets/misc/ea-calendar-item.c:318
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Calendar: from %s to %s"
 
-#: ../widgets/misc/e-account-tree-view.c:243
-msgid "Account Name"
-msgstr "Account Name"
+#: ../widgets/misc/ea-calendar-item.c:354
+msgid "evolution calendar item"
+msgstr "evolution calendar item"
+
+#: ../widgets/misc/e-alert-bar.c:120
+msgid "Close this message"
+msgstr "Close this message"
+
+#. 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.
+#: ../widgets/misc/e-attachment.c:1000
+msgid "Attached message"
+msgstr "Attached message"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1811 ../widgets/misc/e-attachment.c:2349
+#: ../widgets/misc/e-attachment-store.c:525
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../widgets/misc/e-attachment.c:1854 ../widgets/misc/e-attachment.c:2651
+msgid "A load operation is already in progress"
+msgstr "A load operation is already in progress"
+
+#: ../widgets/misc/e-attachment.c:1862 ../widgets/misc/e-attachment.c:2659
+msgid "A save operation is already in progress"
+msgstr "A save operation is already in progress"
+
+#: ../widgets/misc/e-attachment.c:1954
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Could not load '%s'"
+
+#: ../widgets/misc/e-attachment.c:1957
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Could not load the attachment"
+
+#: ../widgets/misc/e-attachment.c:2230
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Could not open '%s'"
+
+#: ../widgets/misc/e-attachment.c:2233
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Could not open the attachment"
+
+#: ../widgets/misc/e-attachment.c:2667
+msgid "Attachment contents not loaded"
+msgstr "Attachment contents not loaded"
+
+#: ../widgets/misc/e-attachment.c:2743
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Could not save '%s'"
 
-#: ../widgets/misc/e-account-tree-view.c:274
-msgid "Protocol"
-msgstr "Protocol"
+#: ../widgets/misc/e-attachment.c:2746
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Could not save the attachment"
 
-#: ../widgets/misc/e-attachment-dialog.c:308
+#: ../widgets/misc/e-attachment-dialog.c:311
 msgid "Attachment Properties"
 msgstr "Attachment Properties"
 
-#: ../widgets/misc/e-attachment-dialog.c:330
-msgid "_Filename:"
-msgstr "_Filename:"
-
-#: ../widgets/misc/e-attachment-dialog.c:365
+#: ../widgets/misc/e-attachment-dialog.c:368
 msgid "MIME Type:"
 msgstr "MIME Type:"
 
-#: ../widgets/misc/e-attachment-dialog.c:373
-#: ../widgets/misc/e-attachment-store.c:559
+#: ../widgets/misc/e-attachment-dialog.c:376
+#: ../widgets/misc/e-attachment-store.c:442
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggest automatic display of attachment"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:99
 msgid "Could not set as background"
 msgstr "Could not set as background"
 
-#: ../widgets/misc/e-attachment-handler-image.c:145
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "Set as _Background"
 
@@ -20317,156 +21626,100 @@ msgstr "_Send Toâ"
 msgid "Send the selected attachments somewhere"
 msgstr "Send the selected attachments somewhere"
 
-#: ../widgets/misc/e-attachment-icon-view.c:162
-#: ../widgets/misc/e-attachment-tree-view.c:547
+#: ../widgets/misc/e-attachment-icon-view.c:166
+#: ../widgets/misc/e-attachment-tree-view.c:549
 msgid "Loading"
 msgstr "Loading"
 
-#: ../widgets/misc/e-attachment-icon-view.c:174
-#: ../widgets/misc/e-attachment-tree-view.c:559
+#: ../widgets/misc/e-attachment-icon-view.c:178
+#: ../widgets/misc/e-attachment-tree-view.c:561
 msgid "Saving"
 msgstr "Saving"
 
-#: ../widgets/misc/e-attachment-paned.c:97
+#: ../widgets/misc/e-attachment-paned.c:104
 msgid "Hide Attachment _Bar"
 msgstr "Hide Attachment _Bar"
 
-#: ../widgets/misc/e-attachment-paned.c:99
-#: ../widgets/misc/e-attachment-paned.c:639
+#: ../widgets/misc/e-attachment-paned.c:106
+#: ../widgets/misc/e-attachment-paned.c:719
 msgid "Show Attachment _Bar"
 msgstr "Show Attachment _Bar"
 
-#: ../widgets/misc/e-attachment-store.c:547
+#: ../widgets/misc/e-attachment-store.c:430
 msgid "Add Attachment"
 msgstr "Add Attachment"
 
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-store.c:433
 msgid "A_ttach"
 msgstr "A_ttach"
 
-#: ../widgets/misc/e-attachment-store.c:613
+#: ../widgets/misc/e-attachment-store.c:496
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Save Attachment"
 msgstr[1] "Save Attachments"
 
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:642
-#: ../widgets/misc/e-attachment.c:1810 ../widgets/misc/e-attachment.c:2352
-msgid "attachment.dat"
-msgstr "attachment.dat"
-
-#: ../widgets/misc/e-attachment-view.c:404
+#: ../widgets/misc/e-attachment-view.c:379
 msgid "Open With Other Application..."
 msgstr "Open With Other Applicationâ"
 
-#: ../widgets/misc/e-attachment-view.c:411
+#: ../widgets/misc/e-attachment-view.c:386
 msgid "S_ave All"
 msgstr "S_ave All"
 
-#: ../widgets/misc/e-attachment-view.c:437
+#: ../widgets/misc/e-attachment-view.c:412
 msgid "A_dd Attachment..."
 msgstr "A_dd Attachmentâ"
 
-#: ../widgets/misc/e-attachment-view.c:461
+#: ../widgets/misc/e-attachment-view.c:436
 msgid "_Hide"
 msgstr "_Hide"
 
-#: ../widgets/misc/e-attachment-view.c:468
+#: ../widgets/misc/e-attachment-view.c:443
 msgid "Hid_e All"
 msgstr "Hid_e All"
 
-#: ../widgets/misc/e-attachment-view.c:475
+#: ../widgets/misc/e-attachment-view.c:450
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: ../widgets/misc/e-attachment-view.c:482
+#: ../widgets/misc/e-attachment-view.c:457
 msgid "Vie_w All Inline"
 msgstr "Vie_w All Inline"
 
-#: ../widgets/misc/e-attachment-view.c:803
+#: ../widgets/misc/e-attachment-view.c:778
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Open With \"%s\""
 
-#: ../widgets/misc/e-attachment-view.c:806
+#: ../widgets/misc/e-attachment-view.c:781
 #, 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.
-#: ../widgets/misc/e-attachment.c:998
-msgid "Attached message"
-msgstr "Attached message"
-
-#: ../widgets/misc/e-attachment.c:1853 ../widgets/misc/e-attachment.c:2654
-msgid "A load operation is already in progress"
-msgstr "A load operation is already in progress"
-
-#: ../widgets/misc/e-attachment.c:1861 ../widgets/misc/e-attachment.c:2662
-msgid "A save operation is already in progress"
-msgstr "A save operation is already in progress"
-
-#: ../widgets/misc/e-attachment.c:1953
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Could not load '%s'"
-
-#: ../widgets/misc/e-attachment.c:1956
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Could not load the attachment"
-
-#: ../widgets/misc/e-attachment.c:2232
-#, c-format
-msgid "Could not open '%s'"
-msgstr "Could not open '%s'"
-
-#: ../widgets/misc/e-attachment.c:2235
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Could not open the attachment"
-
-#: ../widgets/misc/e-attachment.c:2670
-msgid "Attachment contents not loaded"
-msgstr "Attachment contents not loaded"
-
-#: ../widgets/misc/e-attachment.c:2746
-#, c-format
-msgid "Could not save '%s'"
-msgstr "Could not save '%s'"
-
-#: ../widgets/misc/e-attachment.c:2749
-#, c-format
-msgid "Could not save the attachment"
-msgstr "Could not save the attachment"
-
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
 #: ../widgets/misc/e-buffer-tagger.c:387
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-click to open a link"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
-msgid "%B %Y"
-msgstr "%B %Y"
-
 #: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "Month Calendar"
 
-#: ../widgets/misc/e-charset-combo-box.c:96
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1269
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../widgets/misc/e-charset-combo-box.c:100
 msgid "Character Encoding"
 msgstr "Character Encoding"
 
-#: ../widgets/misc/e-charset-combo-box.c:119
+#: ../widgets/misc/e-charset-combo-box.c:123
 msgid "Enter the character set to use"
 msgstr "Enter the character set to use"
 
-#: ../widgets/misc/e-charset-combo-box.c:339
+#: ../widgets/misc/e-charset-combo-box.c:342
 msgid "Other..."
 msgstr "Otherâ"
 
@@ -20474,52 +21727,52 @@ msgstr "Otherâ"
 msgid "Contacts Map"
 msgstr "Contacts Map"
 
-#: ../widgets/misc/e-dateedit.c:501
+#: ../widgets/misc/e-dateedit.c:504
 msgid "Date and Time"
 msgstr "Date and Time"
 
-#: ../widgets/misc/e-dateedit.c:522
+#: ../widgets/misc/e-dateedit.c:525
 msgid "Text entry to input date"
 msgstr "Text entry to input date"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:547
 msgid "Click this button to show a calendar"
 msgstr "Click this button to show a calendar"
 
-#: ../widgets/misc/e-dateedit.c:591
+#: ../widgets/misc/e-dateedit.c:594
 msgid "Drop-down combination box to select time"
 msgstr "Drop-down combination box to select time"
 
-#: ../widgets/misc/e-dateedit.c:663
+#: ../widgets/misc/e-dateedit.c:666
 msgid "No_w"
 msgstr "No_w"
 
-#: ../widgets/misc/e-dateedit.c:669
+#: ../widgets/misc/e-dateedit.c:673
 msgid "_Today"
 msgstr "_Today"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../widgets/misc/e-dateedit.c:677
+#: ../widgets/misc/e-dateedit.c:682
 msgid "_None"
 msgstr "_None"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1921
+#: ../widgets/misc/e-dateedit.c:1694 ../widgets/misc/e-dateedit.c:1927
 msgctxt "date"
 msgid "None"
 msgstr "None"
 
-#: ../widgets/misc/e-dateedit.c:1815
+#: ../widgets/misc/e-dateedit.c:1821
 msgid "Invalid Date Value"
 msgstr "Invalid Date Value"
 
-#: ../widgets/misc/e-dateedit.c:1859
+#: ../widgets/misc/e-dateedit.c:1865
 msgid "Invalid Time Value"
 msgstr "Invalid Time Value"
 
-#: ../widgets/misc/e-import-assistant.c:249
+#: ../widgets/misc/e-import-assistant.c:256
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -20527,37 +21780,33 @@ msgstr ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 
-#: ../widgets/misc/e-import-assistant.c:266
-msgid "F_ilename:"
-msgstr "F_ilename:"
-
-#: ../widgets/misc/e-import-assistant.c:276
+#: ../widgets/misc/e-import-assistant.c:283
 msgid "Select a file"
 msgstr "Select a file"
 
-#: ../widgets/misc/e-import-assistant.c:290
-#: ../widgets/misc/e-import-assistant.c:465
+#: ../widgets/misc/e-import-assistant.c:297
+#: ../widgets/misc/e-import-assistant.c:472
 msgid "File _type:"
 msgstr "File _type:"
 
-#: ../widgets/misc/e-import-assistant.c:333
-#: ../widgets/misc/e-import-assistant.c:913
+#: ../widgets/misc/e-import-assistant.c:340
+#: ../widgets/misc/e-import-assistant.c:920
 msgid "Choose the destination for this import"
 msgstr "Choose the destination for this import"
 
-#: ../widgets/misc/e-import-assistant.c:358
+#: ../widgets/misc/e-import-assistant.c:365
 msgid "Choose the type of importer to run:"
 msgstr "Choose the type of importer to run:"
 
-#: ../widgets/misc/e-import-assistant.c:366
+#: ../widgets/misc/e-import-assistant.c:373
 msgid "Import data and settings from _older programs"
 msgstr "Import data and settings from _older programs"
 
-#: ../widgets/misc/e-import-assistant.c:374
+#: ../widgets/misc/e-import-assistant.c:381
 msgid "Import a _single file"
 msgstr "Import a _single file"
 
-#: ../widgets/misc/e-import-assistant.c:526
+#: ../widgets/misc/e-import-assistant.c:533
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -20568,37 +21817,37 @@ msgstr ""
 "like to try again, please click the \"Back\" button."
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:768
+#: ../widgets/misc/e-import-assistant.c:775
 msgid "_Cancel Import"
 msgstr "_Cancel Import"
 
-#: ../widgets/misc/e-import-assistant.c:912
+#: ../widgets/misc/e-import-assistant.c:919
 msgid "Preview data to be imported"
 msgstr "Preview data to be imported"
 
-#: ../widgets/misc/e-import-assistant.c:918
-#: ../widgets/misc/e-import-assistant.c:931
-#: ../widgets/misc/e-import-assistant.c:1276
-#: ../widgets/misc/e-import-assistant.c:1352
-#: ../widgets/misc/e-import-assistant.c:1361
+#: ../widgets/misc/e-import-assistant.c:925
+#: ../widgets/misc/e-import-assistant.c:938
+#: ../widgets/misc/e-import-assistant.c:1291
+#: ../widgets/misc/e-import-assistant.c:1367
+#: ../widgets/misc/e-import-assistant.c:1376
 msgid "Import Data"
 msgstr "Import Data"
 
-#: ../widgets/misc/e-import-assistant.c:926
+#: ../widgets/misc/e-import-assistant.c:933
 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."
 
-#: ../widgets/misc/e-import-assistant.c:1266
-#: ../widgets/misc/e-import-assistant.c:1301
+#: ../widgets/misc/e-import-assistant.c:1281
+#: ../widgets/misc/e-import-assistant.c:1316
 msgid "Evolution Import Assistant"
 msgstr "Evolution Import Assistant"
 
-#: ../widgets/misc/e-import-assistant.c:1283
-#: ../widgets/misc/e-import-assistant.c:1339
+#: ../widgets/misc/e-import-assistant.c:1298
+#: ../widgets/misc/e-import-assistant.c:1354
 msgid "Import Location"
 msgstr "Import Location"
 
-#: ../widgets/misc/e-import-assistant.c:1294
+#: ../widgets/misc/e-import-assistant.c:1309
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -20608,27 +21857,27 @@ msgstr ""
 "With this assistant you will be guided through the process of importing "
 "external files into Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1311
+#: ../widgets/misc/e-import-assistant.c:1326
 msgid "Importer Type"
 msgstr "Importer Type"
 
-#: ../widgets/misc/e-import-assistant.c:1321
+#: ../widgets/misc/e-import-assistant.c:1336
 msgid "Select Information to Import"
 msgstr "Select Information to Import"
 
-#: ../widgets/misc/e-import-assistant.c:1330
+#: ../widgets/misc/e-import-assistant.c:1345
 msgid "Select a File"
 msgstr "Select a File"
 
-#: ../widgets/misc/e-import-assistant.c:1347
+#: ../widgets/misc/e-import-assistant.c:1362
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Click \"Apply\" to begin importing the file into Evolution."
 
-#: ../widgets/misc/e-map.c:883
+#: ../widgets/misc/e-map.c:886
 msgid "World Map"
 msgstr "World Map"
 
-#: ../widgets/misc/e-map.c:886
+#: ../widgets/misc/e-map.c:889
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -20636,234 +21885,234 @@ msgstr ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
 
-#: ../widgets/misc/e-online-button.c:27
+#: ../widgets/misc/e-online-button.c:31
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr "Evolution is currently online.  Click this button to work offline."
 
-#: ../widgets/misc/e-online-button.c:30
+#: ../widgets/misc/e-online-button.c:34
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr "Evolution is currently offline.  Click this button to work online."
 
-#: ../widgets/misc/e-online-button.c:33
+#: ../widgets/misc/e-online-button.c:37
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution is currently offline because the network is unavailable."
 
-#: ../widgets/misc/e-preferences-window.c:279
+#: ../widgets/misc/e-preferences-window.c:317
 msgid "Evolution Preferences"
 msgstr "Evolution Preferences"
 
-#: ../widgets/misc/e-search-bar.c:81
+#: ../widgets/misc/e-search-bar.c:85
 #, c-format
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: ../widgets/misc/e-search-bar.c:563
+#: ../widgets/misc/e-search-bar.c:566
 msgid "Close the find bar"
 msgstr "Close the find bar"
 
-#: ../widgets/misc/e-search-bar.c:571
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Fin_d:"
 msgstr "Fin_d:"
 
-#: ../widgets/misc/e-search-bar.c:583
+#: ../widgets/misc/e-search-bar.c:586
 msgid "Clear the search"
 msgstr "Clear the search"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Previous"
 msgstr "_Previous"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:616
 msgid "Find the previous occurrence of the phrase"
 msgstr "Find the previous occurrence of the phrase"
 
-#: ../widgets/misc/e-search-bar.c:626
+#: ../widgets/misc/e-search-bar.c:629
 msgid "_Next"
 msgstr "_Next"
 
-#: ../widgets/misc/e-search-bar.c:632
+#: ../widgets/misc/e-search-bar.c:635
 msgid "Find the next occurrence of the phrase"
 msgstr "Find the next occurrence of the phrase"
 
-#: ../widgets/misc/e-search-bar.c:645
+#: ../widgets/misc/e-search-bar.c:648
 msgid "Mat_ch case"
 msgstr "Mat_ch case"
 
-#: ../widgets/misc/e-search-bar.c:673
+#: ../widgets/misc/e-search-bar.c:676
 msgid "Reached bottom of page, continued from top"
 msgstr "Reached bottom of page, continued from top"
 
-#: ../widgets/misc/e-search-bar.c:695
+#: ../widgets/misc/e-search-bar.c:698
 msgid "Reached top of page, continued from bottom"
 msgstr "Reached top of page, continued from bottom"
 
-#: ../widgets/misc/e-send-options.c:552
+#: ../widgets/misc/e-send-options.c:570
 msgid "When de_leted:"
 msgstr "When de_leted:"
 
-#: ../widgets/misc/e-send-options.ui.h:1
-msgid "A_uto-delete sent item"
-msgstr "A_uto-delete sent item"
-
 #: ../widgets/misc/e-send-options.ui.h:3
-msgid "Creat_e a sent item to track information"
-msgstr "Creat_e a sent item to track information"
-
-#: ../widgets/misc/e-send-options.ui.h:4
-msgid "Deli_vered and opened"
-msgstr "Deli_vered and opened"
-
-#: ../widgets/misc/e-send-options.ui.h:5
-msgid "Delivery Options"
-msgstr "Delivery Options"
+msgid "Standard"
+msgstr "Standard"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_Until"
-
-#: ../widgets/misc/e-send-options.ui.h:7
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_After"
+msgid "Proprietary"
+msgstr "Proprietary"
 
 #: ../widgets/misc/e-send-options.ui.h:8
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "days"
+msgid "Secret"
+msgstr "Secret"
 
 #: ../widgets/misc/e-send-options.ui.h:9
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "Wi_thin"
+msgid "Top Secret"
+msgstr "Top Secret"
 
 #: ../widgets/misc/e-send-options.ui.h:10
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "days"
-
-#: ../widgets/misc/e-send-options.ui.h:11
 msgid "For Your Eyes Only"
 msgstr "For Your Eyes Only"
 
+#. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:12
-msgid "Gene_ral Options"
-msgstr "Gene_ral Options"
+msgctxt "send-options"
+msgid "None"
+msgstr "None"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:13
 msgid "Mail Receipt"
 msgstr "Mail Receipt"
 
+#: ../widgets/misc/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "R_eply requested"
+
+#: ../widgets/misc/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "Wi_thin"
+
 #: ../widgets/misc/e-send-options.ui.h:17
-msgid "Proprietary"
-msgstr "Proprietary"
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "days"
 
 #: ../widgets/misc/e-send-options.ui.h:18
-msgid "R_eply requested"
-msgstr "R_eply requested"
+msgid "_When convenient"
+msgstr "_When convenient"
 
 #: ../widgets/misc/e-send-options.ui.h:20
-msgid "Return Notification"
-msgstr "Return Notification"
+msgid "_Delay message delivery"
+msgstr "_Delay message delivery"
 
 #: ../widgets/misc/e-send-options.ui.h:21
-msgid "Secret"
-msgstr "Secret"
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_After"
+
+#: ../widgets/misc/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "days"
 
 #: ../widgets/misc/e-send-options.ui.h:23
-msgid "Sta_tus Tracking"
-msgstr "Sta_tus Tracking"
+msgid "_Set expiration date"
+msgstr "_Set expiration date"
 
 #: ../widgets/misc/e-send-options.ui.h:24
-msgid "Standard"
-msgstr "Standard"
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Until"
 
 #: ../widgets/misc/e-send-options.ui.h:25
-msgid "Status Tracking"
-msgstr "Status Tracking"
+msgid "Delivery Options"
+msgstr "Delivery Options"
 
-#: ../widgets/misc/e-send-options.ui.h:26
-msgid "Top Secret"
-msgstr "Top Secret"
+#: ../widgets/misc/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "_Classification:"
 
 #: ../widgets/misc/e-send-options.ui.h:28
-msgid "When acce_pted:"
-msgstr "When acce_pted:"
+msgid "Gene_ral Options"
+msgstr "Gene_ral Options"
 
 #: ../widgets/misc/e-send-options.ui.h:29
-msgid "When co_mpleted:"
-msgstr "When co_mpleted:"
+msgid "Creat_e a sent item to track information"
+msgstr "Creat_e a sent item to track information"
 
 #: ../widgets/misc/e-send-options.ui.h:30
-msgid "When decli_ned:"
-msgstr "When decli_ned:"
+msgid "_Delivered"
+msgstr "_Delivered"
 
 #: ../widgets/misc/e-send-options.ui.h:31
-msgid "_All information"
-msgstr "_All information"
+msgid "Deli_vered and opened"
+msgstr "Deli_vered and opened"
 
 #: ../widgets/misc/e-send-options.ui.h:32
-msgid "_Classification:"
-msgstr "_Classification:"
+msgid "_All information"
+msgstr "_All information"
 
 #: ../widgets/misc/e-send-options.ui.h:33
-msgid "_Delay message delivery"
-msgstr "_Delay message delivery"
+msgid "A_uto-delete sent item"
+msgstr "A_uto-delete sent item"
 
 #: ../widgets/misc/e-send-options.ui.h:34
-msgid "_Delivered"
-msgstr "_Delivered"
+msgid "Status Tracking"
+msgstr "Status Tracking"
+
+#: ../widgets/misc/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "_When opened:"
 
 #: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Set expiration date"
-msgstr "_Set expiration date"
+msgid "When decli_ned:"
+msgstr "When decli_ned:"
 
 #: ../widgets/misc/e-send-options.ui.h:37
-msgid "_When convenient"
-msgstr "_When convenient"
+msgid "When co_mpleted:"
+msgstr "When co_mpleted:"
 
 #: ../widgets/misc/e-send-options.ui.h:38
-msgid "_When opened:"
-msgstr "_When opened:"
+msgid "When acce_pted:"
+msgstr "When acce_pted:"
+
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "Return Notification"
 
-#. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:40
-msgctxt "send-options"
-msgid "None"
-msgstr "None"
+msgid "Sta_tus Tracking"
+msgstr "Sta_tus Tracking"
 
-#: ../widgets/misc/e-signature-editor.c:138
-#: ../widgets/misc/e-signature-editor.c:564
-#: ../widgets/misc/e-signature-manager.c:372
-#: ../widgets/misc/e-signature-script-dialog.c:219
+#: ../widgets/misc/e-signature-editor.c:142
+#: ../widgets/misc/e-signature-editor.c:567
+#: ../widgets/misc/e-signature-manager.c:376
+#: ../widgets/misc/e-signature-script-dialog.c:223
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: ../widgets/misc/e-signature-editor.c:214
+#: ../widgets/misc/e-signature-editor.c:218
 msgid "_Save and Close"
 msgstr "_Save and Close"
 
-#: ../widgets/misc/e-signature-editor.c:431
+#: ../widgets/misc/e-signature-editor.c:434
 msgid "Edit Signature"
 msgstr "Edit Signature"
 
-#: ../widgets/misc/e-signature-editor.c:446
+#: ../widgets/misc/e-signature-editor.c:449
 msgid "_Signature Name:"
 msgstr "_Signature Name:"
 
-#: ../widgets/misc/e-signature-manager.c:317
+#: ../widgets/misc/e-signature-manager.c:321
 msgid "Add Signature Script"
 msgstr "Add Signature Script"
 
-#: ../widgets/misc/e-signature-manager.c:382
+#: ../widgets/misc/e-signature-manager.c:386
 msgid "Edit Signature Script"
 msgstr "Edit Signature Script"
 
-#: ../widgets/misc/e-signature-manager.c:602
+#: ../widgets/misc/e-signature-manager.c:605
 msgid "Add _Script"
 msgstr "Add _Script"
 
-#: ../widgets/misc/e-signature-script-dialog.c:268
+#: ../widgets/misc/e-signature-script-dialog.c:270
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -20873,11 +22122,11 @@ msgstr ""
 "signature. The name you specify will be used\n"
 "for display purposes only."
 
-#: ../widgets/misc/e-signature-script-dialog.c:313
+#: ../widgets/misc/e-signature-script-dialog.c:315
 msgid "S_cript:"
 msgstr "S_cript:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:344
+#: ../widgets/misc/e-signature-script-dialog.c:346
 msgid "Script file must be executable."
 msgstr "Script file must be executable."
 
@@ -20932,20 +22181,6 @@ msgstr "Click to hide/unhide addresses"
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
-#: ../widgets/misc/ea-calendar-item.c:306
-#: ../widgets/misc/ea-calendar-item.c:315
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
-
-#: ../widgets/misc/ea-calendar-item.c:318
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Calendar: from %s to %s"
-
-#: ../widgets/misc/ea-calendar-item.c:354
-msgid "evolution calendar item"
-msgstr "evolution calendar item"
-
 #: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr "popup list"
@@ -20954,17 +22189,18 @@ msgstr "popup list"
 msgid "Now"
 msgstr "Now"
 
-#. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:316
+#. Translators: "None" as a label of a button to unset date in a
+#. * date table cell.
+#: ../widgets/table/e-cell-date-edit.c:317
 msgctxt "table-date"
 msgid "None"
 msgstr "None"
 
-#: ../widgets/table/e-cell-date-edit.c:324
+#: ../widgets/table/e-cell-date-edit.c:325
 msgid "OK"
 msgstr "OK"
 
-#: ../widgets/table/e-cell-date-edit.c:868
+#: ../widgets/table/e-cell-date-edit.c:873
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "The time must be in the format: %s"
@@ -20973,7 +22209,7 @@ msgstr "The time must be in the format: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "The percent value must be between 0 and 100, inclusive"
 
-#: ../widgets/table/e-table-click-to-add.c:607
+#: ../widgets/table/e-table-click-to-add.c:610
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
 msgid "click to add"
@@ -20996,7 +22232,7 @@ msgid "No grouping"
 msgstr "No grouping"
 
 #: ../widgets/table/e-table-config.c:666
-#: ../widgets/table/e-table-config.ui.h:11
+#: ../widgets/table/e-table-config.ui.h:1
 msgid "Show Fields"
 msgstr "Show Fields"
 
@@ -21004,91 +22240,87 @@ msgstr "Show Fields"
 msgid "Available Fields"
 msgstr "Available Fields"
 
-#: ../widgets/table/e-table-config.ui.h:1
+#: ../widgets/table/e-table-config.ui.h:2
 msgid "A_vailable Fields:"
 msgstr "A_vailable Fields:"
 
-#: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1717
-msgid "Ascending"
-msgstr "Ascending"
-
 #: ../widgets/table/e-table-config.ui.h:3
-msgid "Clear All"
-msgstr "Clear All"
+msgid "_Show these fields in order:"
+msgstr "_Show these fields in order:"
 
 #: ../widgets/table/e-table-config.ui.h:4
-msgid "Clear _All"
-msgstr "Clear _All"
+msgid "Move _Up"
+msgstr "Move _Up"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1717
-msgid "Descending"
-msgstr "Descending"
+msgid "Move _Down"
+msgstr "Move _Down"
 
-#: ../widgets/table/e-table-config.ui.h:8
-msgid "Group Items By"
-msgstr "Group Items By"
+#: ../widgets/table/e-table-config.ui.h:7
+msgid "_Remove"
+msgstr "_Remove"
 
 #: ../widgets/table/e-table-config.ui.h:9
-msgid "Move _Down"
-msgstr "Move _Down"
+msgid "_Show field in View"
+msgstr "_Show field in View"
 
 #: ../widgets/table/e-table-config.ui.h:10
-msgid "Move _Up"
-msgstr "Move _Up"
+#: ../widgets/table/e-table-header-item.c:1736
+msgid "Ascending"
+msgstr "Ascending"
+
+#: ../widgets/table/e-table-config.ui.h:11
+#: ../widgets/table/e-table-header-item.c:1736
+msgid "Descending"
+msgstr "Descending"
 
 #: ../widgets/table/e-table-config.ui.h:12
+msgid "Group Items By"
+msgstr "Group Items By"
+
+#: ../widgets/table/e-table-config.ui.h:13
 msgid "Show _field in View"
 msgstr "Show _field in View"
 
-#: ../widgets/table/e-table-config.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:14
+msgid "Then By"
+msgstr "Then By"
+
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Show field i_n View"
 msgstr "Show field i_n View"
 
-#: ../widgets/table/e-table-config.ui.h:14
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Show field in _View"
 msgstr "Show field in _View"
 
-#: ../widgets/table/e-table-config.ui.h:15
+#: ../widgets/table/e-table-config.ui.h:17
+msgid "Clear _All"
+msgstr "Clear _All"
+
+#: ../widgets/table/e-table-config.ui.h:18
 msgid "Sort"
 msgstr "Sort"
 
-#: ../widgets/table/e-table-config.ui.h:16
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "Sort Items By"
 msgstr "Sort Items By"
 
-#: ../widgets/table/e-table-config.ui.h:17
-msgid "Then By"
-msgstr "Then By"
-
-#: ../widgets/table/e-table-config.ui.h:19
-msgid "_Fields Shown..."
-msgstr "_Fields Shownâ"
-
 #: ../widgets/table/e-table-config.ui.h:20
-msgid "_Group By..."
-msgstr "_Group Byâ"
+msgid "Clear All"
+msgstr "Clear All"
 
 #: ../widgets/table/e-table-config.ui.h:21
-msgid "_Remove"
-msgstr "_Remove"
+msgid "_Sort..."
+msgstr "_Sortâ"
 
 #: ../widgets/table/e-table-config.ui.h:22
-msgid "_Show field in View"
-msgstr "_Show field in View"
+msgid "_Group By..."
+msgstr "_Group Byâ"
 
 #: ../widgets/table/e-table-config.ui.h:23
-msgid "_Show these fields in order:"
-msgstr "_Show these fields in order:"
-
-#: ../widgets/table/e-table-config.ui.h:24
-msgid "_Sort..."
-msgstr "_Sortâ"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:119
-msgid "Add a Column"
-msgstr "Add a Column"
+msgid "_Fields Shown..."
+msgstr "_Fields Shownâ"
 
 #: ../widgets/table/e-table-field-chooser.c:153
 msgid ""
@@ -21098,6 +22330,10 @@ msgstr ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
 
+#: ../widgets/table/e-table-field-chooser-dialog.c:224
+msgid "Add a Column"
+msgstr "Add a Column"
+
 #. Translators: This text is used as a special row when an ETable
 #. * has turned on grouping on a column, which has set a title.
 #. * The first %s is replaced with a column title.
@@ -21125,63 +22361,67 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d item)"
 msgstr[1] "%s (%d items)"
 
-#: ../widgets/table/e-table-header-item.c:1557
+#: ../widgets/table/e-table-header-item.c:1574
 msgid "Customize Current View"
 msgstr "Customise Current View"
 
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1596
 msgid "Sort _Ascending"
 msgstr "Sort _Ascending"
 
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1599
 msgid "Sort _Descending"
 msgstr "Sort _Descending"
 
-#: ../widgets/table/e-table-header-item.c:1585
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "_Unsort"
 msgstr "_Unsort"
 
-#: ../widgets/table/e-table-header-item.c:1588
+#: ../widgets/table/e-table-header-item.c:1605
 msgid "Group By This _Field"
 msgstr "Group By This _Field"
 
-#: ../widgets/table/e-table-header-item.c:1591
+#: ../widgets/table/e-table-header-item.c:1608
 msgid "Group By _Box"
 msgstr "Group By _Box"
 
-#: ../widgets/table/e-table-header-item.c:1595
+#: ../widgets/table/e-table-header-item.c:1612
 msgid "Remove This _Column"
 msgstr "Remove This _Column"
 
-#: ../widgets/table/e-table-header-item.c:1598
+#: ../widgets/table/e-table-header-item.c:1615
 msgid "Add a C_olumn..."
 msgstr "Add a C_olumnâ"
 
-#: ../widgets/table/e-table-header-item.c:1602
+#: ../widgets/table/e-table-header-item.c:1619
 msgid "A_lignment"
 msgstr "A_lignment"
 
-#: ../widgets/table/e-table-header-item.c:1605
+#: ../widgets/table/e-table-header-item.c:1622
 msgid "B_est Fit"
 msgstr "B_est Fit"
 
-#: ../widgets/table/e-table-header-item.c:1608
+#: ../widgets/table/e-table-header-item.c:1625
 msgid "Format Column_s..."
 msgstr "Format Column_sâ"
 
-#: ../widgets/table/e-table-header-item.c:1612
+#: ../widgets/table/e-table-header-item.c:1629
 msgid "Custo_mize Current View..."
 msgstr "Custo_mise Current Viewâ"
 
-#: ../widgets/table/e-table-header-item.c:1674
+#: ../widgets/table/e-table-header-item.c:1691
 msgid "_Sort By"
 msgstr "_Sort By"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1692
+#: ../widgets/table/e-table-header-item.c:1709
 msgid "_Custom"
 msgstr "_Custom"
 
+#: ../widgets/table/gal-a11y-e-cell.c:123
+msgid "Table Cell"
+msgstr "Table Cell"
+
 #. Translators: description of a "popup" action
 #: ../widgets/table/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
@@ -21202,26 +22442,126 @@ 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"
 
-#: ../widgets/table/gal-a11y-e-cell.c:123
-msgid "Table Cell"
-msgstr "Table Cell"
-
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
 msgid "click"
 msgstr "click"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:158
+#: ../widgets/table/gal-a11y-e-table-column-header.c:161
 msgid "sort"
 msgstr "sort"
 
-#: ../widgets/text/e-text.c:2327
+#: ../widgets/text/e-text.c:2338
 msgid "Select All"
 msgstr "Select All"
 
-#: ../widgets/text/e-text.c:2339
+#: ../widgets/text/e-text.c:2351
 msgid "Input Methods"
 msgstr "Input Methods"
 
+#~ msgid "Recent _Documents"
+#~ msgstr "Recent _Documents"
+
+#~ msgid "Categor_ies..."
+#~ msgstr "Categor_iesâ"
+
+#~ msgid "%A, %B %d, %Y"
+#~ msgstr "%A, %d %B, %Y"
+
+#~ msgid "%a %m/%d/%Y"
+#~ msgstr "%a %d/%m/%Y"
+
+#~ msgid "%m/%d/%Y"
+#~ msgstr "%d/%m/%Y"
+
+#~ msgid "never"
+#~ msgstr "never"
+
+#~ msgid "Do you wish to overwrite it?"
+#~ msgstr "Do you wish to overwrite it?"
+
+#~ msgid "File exists \"{0}\"."
+#~ msgstr "File exists \"{0}\"."
+
+#~ msgid "GConf error: %s"
+#~ msgstr "GConf error: %s"
+
+#~ msgid "All further errors shown only on terminal."
+#~ msgstr "All further errors shown only on terminal."
+
+#~ msgctxt "mail-receiving"
+#~ msgid "None"
+#~ msgstr "None"
+
+#~ msgid ""
+#~ "Please enter a descriptive name for this account below.\n"
+#~ "This name will be used for display purposes only."
+#~ msgstr ""
+#~ "Please enter a descriptive name for this account below.\n"
+#~ "This name will be used for display purposes only."
+
+#~ msgid "Migrating..."
+#~ msgstr "Migratingâ"
+
+#~ msgid "Migration"
+#~ msgstr "Migration"
+
+#~ msgid "Migrating '%s':"
+#~ msgstr "Migrating '%s':"
+
+#~ msgid "Migrating Folders"
+#~ msgstr "Migrating Folders"
+
+#~ msgid ""
+#~ "The summary format of the Evolution mailbox folders has been moved to "
+#~ "SQLite since Evolution 2.24.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "The summary format of the Evolution mailbox folders has been moved to "
+#~ "SQLite since Evolution 2.24.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your foldersâ"
+
+#~ msgid "C_haracter set:"
+#~ msgstr "C_haracter set:"
+
+#~ msgid ""
+#~ "A read receipt notification has been requested for \"{1}\". Send the "
+#~ "receipt notification to {0}?"
+#~ msgstr ""
+#~ "A read receipt notification has been requested for \"{1}\". Send the "
+#~ "receipt notification to {0}?"
+
+#~ msgid "Read receipt requested."
+#~ msgstr "Read receipt requested."
+
+#~ msgid "_Send Receipt"
+#~ msgstr "_Send Receipt"
+
+#~ msgid "cards"
+#~ msgstr "cards"
+
+#~ msgid "Import cancelled. Click \"Forward\" to continue."
+#~ msgstr "Import cancelled. Click \"Forward\" to continue."
+
+#~ msgid "Import complete. Click \"Forward\" to continue."
+#~ msgstr "Import complete. Click \"Forward\" to continue."
+
+#~ msgid "File _name:"
+#~ msgstr "File _name:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "Send the debugging output of all components to a file."
+#~ msgstr "Send the debugging output of all components to a file."
+
+#~ msgid "Protocol"
+#~ msgstr "Protocol"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Filename:"
+
 #~ msgid "Invalid object"
 #~ msgstr "Invalid object"
 
@@ -21284,9 +22624,6 @@ msgstr "Input Methods"
 #~ msgid "Anjal email client"
 #~ msgstr "Anjal e-mail client"
 
-#~ msgid "Opening folder '%s'"
-#~ msgstr "Opening folder '%s'"
-
 #~ msgid "Please select a folder from the current account."
 #~ msgstr "Please select a folder from the current account."
 
@@ -21386,9 +22723,6 @@ msgstr "Input Methods"
 #~ msgid "Add a map showing the location of contacts when possible."
 #~ msgstr "Add a map showing the location of contacts when possible."
 
-#~ msgid "Map for contacts"
-#~ msgstr "Map for contacts"
-
 #~ msgid "Checklist"
 #~ msgstr "Checklist"
 
@@ -21698,18 +23032,6 @@ msgstr "Input Methods"
 #~ msgid "Undelivered: "
 #~ msgstr "Undelivered: "
 
-#~ msgid "Enable D-Bus messages."
-#~ msgstr "Enable D-Bus messages."
-
-#~ msgid "Generates a D-Bus message when new mail messages arrive."
-#~ msgstr "Generates a D-Bus message when new mail messages arrive."
-
-#~ msgid "Popup message together with the icon."
-#~ msgstr "Popup message together with the icon."
-
-#~ msgid "Whether show message over the icon when new messages arrive."
-#~ msgstr "Whether show message over the icon when new messages arrive."
-
 #~ msgid "Show icon in _notification area"
 #~ msgstr "Show icon in _notification area"
 
@@ -22101,12 +23423,6 @@ msgstr "Input Methods"
 #~ msgid "The attachment has no viewable calendar items"
 #~ msgstr "The attachment has no viewable calendar items"
 
-#~ msgid "Update complete\n"
-#~ msgstr "Update complete\n"
-
-#~ msgid "Object is invalid and cannot be updated\n"
-#~ msgstr "Object is invalid and cannot be updated\n"
-
 #~ msgid "This response is not from a current attendee.  Add as an attendee?"
 #~ msgstr "This response is not from a current attendee.  Add as an attendee?"
 
@@ -22468,9 +23784,6 @@ msgstr "Input Methods"
 #~ msgid "Could not cancel"
 #~ msgstr "Could not cancel"
 
-#~ msgid "Authentication Failed"
-#~ msgstr "Authentication Failed"
-
 #~ msgid "Authentication Required"
 #~ msgstr "Authentication Required"
 
@@ -23055,9 +24368,6 @@ msgstr "Input Methods"
 #~ msgid "This widget displays groups of calendars"
 #~ msgstr "This widget displays groups of calendars"
 
-#~ msgid "The registry of memo lists"
-#~ msgstr "The registry of memo lists"
-
 #~ msgid "The memo table model"
 #~ msgstr "The memo table model"
 
@@ -23070,9 +24380,6 @@ msgstr "Input Methods"
 #~ msgid "This widget displays groups of memo lists"
 #~ msgstr "This widget displays groups of memo lists"
 
-#~ msgid "The registry of task lists"
-#~ msgstr "The registry of task lists"
-
 #~ msgid "The task table model"
 #~ msgstr "The task table model"
 
@@ -23128,13 +24435,6 @@ msgstr "Input Methods"
 #~ msgstr ""
 #~ "Hide deleted messages rather than displaying them with a line through them"
 
-#~ msgid ""
-#~ "List of clues for the attachment reminder plugin to look for in a message "
-#~ "body."
-#~ msgstr ""
-#~ "List of clues for the attachment reminder plugin to look for in a message "
-#~ "body."
-
 #~ msgid "Add Hula support to Evolution."
 #~ msgstr "Add Hula support to Evolution."
 
@@ -23198,9 +24498,6 @@ msgstr "Input Methods"
 #~ msgid "Shell Window"
 #~ msgstr "Shell Window"
 
-#~ msgid "The window to which the shell view belongs"
-#~ msgstr "The window to which the shell view belongs"
-
 #~ msgid "The key file holding widget state data"
 #~ msgstr "The key file holding widget state data"
 
@@ -23403,9 +24700,6 @@ msgstr "Input Methods"
 #~ msgid "Pane position when oriented horizontally"
 #~ msgstr "Pane position when orientated horizontally"
 
-#~ msgid "Vertical Position"
-#~ msgstr "Vertical Position"
-
 #~ msgid "Pane position when oriented vertically"
 #~ msgstr "Pane position when orientated vertically"
 
@@ -23442,9 +24736,6 @@ msgstr "Input Methods"
 #~ msgid "Focused Column"
 #~ msgstr "Focused Column"
 
-#~ msgid "Unselected Column"
-#~ msgstr "Unselected Column"
-
 #~ msgid "Strikeout Column"
 #~ msgstr "Strikeout Column"
 
@@ -23699,11 +24990,6 @@ msgstr "Input Methods"
 #~ msgid "Overwrite"
 #~ msgstr "Overwrite"
 
-#~ msgid "contact"
-#~ msgid_plural "contacts"
-#~ msgstr[0] "contact"
-#~ msgstr[1] "contacts"
-
 #~ msgid "Save Appointment"
 #~ msgstr "Save Appointment"
 
@@ -24482,9 +25768,6 @@ msgstr "Input Methods"
 #~ msgid "Unsubscribe Folder..."
 #~ msgstr "Unsubscribe Folderâ"
 
-#~ msgid "Unsubscribe from \"%s\""
-#~ msgstr "Unsubscribe from \"%s\""
-
 #~ msgid ""
 #~ "<b>Currently, your status is \"Out of the Office\". </b>\n"
 #~ "\n"
@@ -24590,9 +25873,6 @@ msgstr "Input Methods"
 #~ msgid "Exchange - Send Options"
 #~ msgstr "Exchange â Send Options"
 
-#~ msgid "I_mportance: "
-#~ msgstr "I_mportance: "
-
 #~ msgid ""
 #~ "Normal\n"
 #~ "High\n"
@@ -24890,9 +26170,6 @@ msgstr "Input Methods"
 #~ "Your current usage is: {0} KB. You will not be able to send mail until "
 #~ "you clear up some space by deleting some mail."
 
-#~ msgid "Your password has expired."
-#~ msgstr "Your password has expired."
-
 #~ msgid "{0} cannot be added to an access control list"
 #~ msgstr "{0} cannot be added to an access control list"
 
@@ -25552,9 +26829,6 @@ msgstr "Input Methods"
 #~ msgid "Copy Tool"
 #~ msgstr "Copy Tool"
 
-#~ msgid "Unsubscribe Folders"
-#~ msgstr "Unsubscribe Folders"
-
 #~ msgid ""
 #~ "Unsubscribe from an IMAP folder by right-clicking on it in the folder "
 #~ "tree."
@@ -25586,9 +26860,6 @@ msgstr "Input Methods"
 #~ msgid "_Post message to list"
 #~ msgstr "_Post message to list"
 
-#~ msgid "_Subscribe to list"
-#~ msgstr "_Subscribe to list"
-
 #~ msgid "_Un-subscribe to list"
 #~ msgstr "_Un-subscribe to list"
 
@@ -25873,9 +27144,6 @@ msgstr "Input Methods"
 #~ msgid "Find Possible Search Bases"
 #~ msgstr "Find Possible Search Bases"
 
-#~ msgid "Whenever Possible"
-#~ msgstr "Whenever Possible"
-
 #~ msgid "_Add Address Book"
 #~ msgstr "_Add Address Book"
 
@@ -28054,9 +29322,6 @@ msgstr "Input Methods"
 #~ msgid "_New Search _Folder (FIXME)"
 #~ msgstr "_New Search _Folder (FIXME)"
 
-#~ msgid "Addressbook"
-#~ msgstr "Addressbook"
-
 #~ msgid "*"
 #~ msgstr "*"
 
@@ -28089,9 +29354,6 @@ msgstr "Input Methods"
 #~ msgid "Select target addressbook."
 #~ msgstr "Select target addressbook."
 
-#~ msgid "(none)"
-#~ msgstr "(none)"
-
 #~ msgid "Select an Action"
 #~ msgstr "Select an Action"
 
@@ -28149,12 +29411,6 @@ msgstr "Input Methods"
 #~ msgid "Calendar and Tasks Settings"
 #~ msgstr "Calendar and Tasks Settings"
 
-#~ msgid "Color for overdue tasks"
-#~ msgstr "Colour for overdue tasks"
-
-#~ msgid "Color for tasks due today"
-#~ msgstr "Colour for tasks due today"
-
 #~ msgid "_Add URL"
 #~ msgstr "_Add URL"
 
@@ -28278,9 +29534,6 @@ msgstr "Input Methods"
 #~ msgid "T_erminal Font:"
 #~ msgstr "T_erminal Font:"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Subscribe"
-
 #~ msgid "Server: %s, Type: %s"
 #~ msgstr "Server: %s, Type: %s"
 
@@ -28313,9 +29566,6 @@ msgstr "Input Methods"
 #~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 #~ msgstr "<span weight=\"bold\">Instant Messaging Contacts</span>"
 
-#~ msgid "Automatic contacts"
-#~ msgstr "Automatic contacts"
-
 #~ msgid "Exchange Connector access error."
 #~ msgstr "Exchange Connector access error."