[evolution] Updated British English translatioN



commit 3b35f71fe24390c6c64cbf6446e9fd3250d38744
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Sat Mar 16 13:28:38 2013 +0000

    Updated British English translatioN

 po/en_GB.po |21526 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 10816 insertions(+), 10710 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 111fb31..a8a15cb 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,19 +2,18 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Robert Brady <rwb197 zepler org>, 2000.
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
-# Bruce Cowan <bruce bcowan me uk>, 2009, 2010, 2011, 2012.
+# Bruce Cowan <bruce bcowan me uk>, 2009, 2010, 2011, 2012, 2013.
 # Philip Withnall <philip tecnocode co uk>, 2010.
 # Chris Leonard <cjlhomeaddress gmail com>, 2012.
-#: ../shell/main.c:584
+#: ../shell/main.c:573
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2012-11-05 15:42+0000\n"
-"PO-Revision-Date: 2012-11-01 23:07-0400\n"
-"Last-Translator: Chris Leonard <cjlhomeaddress gmail com>\n"
-"Language-Team: Sugar Labs\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-16 13:21+0000\n"
+"PO-Revision-Date: 2013-03-16 13:28+0100\n"
+"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
+"Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -106,7 +105,7 @@ msgstr ""
 "server. Are you sure you want to proceed?"
 
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:61
 msgid "_Delete From Server"
 msgstr "_Delete From Server"
 
@@ -177,21 +176,10 @@ msgid "Error saving {0} to {1}: {2}"
 msgstr "Error saving {0} to {1}: {2}"
 
 #: ../addressbook/addressbook.error.xml.h:31
-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:33
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
-msgstr ""
-"Your contacts for {0} will not be available until Evolution is restarted."
-
-#: ../addressbook/addressbook.error.xml.h:34
 msgid "Address '{0}' already exists."
 msgstr "Address '{0}' already exists."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -199,16 +187,16 @@ 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:36
-#: ../mail/em-vfolder-editor-rule.c:391 ../widgets/table/e-table-config.ui.h:6
+#: ../addressbook/addressbook.error.xml.h:33 ../e-util/e-table-config.ui.h:6
+#: ../e-util/e-name-selector-dialog.c:977 ../mail/em-vfolder-editor-rule.c:397
 msgid "_Add"
 msgstr "_Add"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Some addresses already exist in this contact list."
 msgstr "Some addresses already exist in this contact list."
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
@@ -216,19 +204,19 @@ msgstr ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Skip duplicates"
 msgstr "Skip duplicates"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Add with duplicates"
 msgstr "Add with duplicates"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../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:42
+#: ../addressbook/addressbook.error.xml.h:39
 msgid ""
 "A contact list named '{0}' is already in this contact list. Would you like "
 "to add it anyway?"
@@ -236,21 +224,21 @@ msgstr ""
 "A contact list named '{0}' is already in this contact list. Would you like "
 "to add it anyway?"
 
-#: ../addressbook/addressbook.error.xml.h:43
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1264
+#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1237
 msgid "Failed to delete contact"
 msgstr "Failed to delete contact"
 
-#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:41
 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:45
+#: ../addressbook/addressbook.error.xml.h:42
 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:47
+#: ../addressbook/addressbook.error.xml.h:44
 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."
@@ -259,9 +247,9 @@ msgstr ""
 "different address book from the side bar in the Contacts view."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:625
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:647
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2935
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:635
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:657
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2949
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
@@ -299,10 +287,10 @@ msgstr "_Wants to receive HTML mail"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 #: ../addressbook/gui/merging/eab-contact-merging.c:396
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:611
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:973
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:971
+#: ../smime/lib/e-asn1-object.c:395
 msgid "Email"
 msgstr "E-mail"
 
@@ -315,7 +303,7 @@ msgid "Instant Messaging"
 msgstr "Instant Messaging"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:1002
+#: ../addressbook/importers/evolution-vcard-importer.c:1001
 msgid "Contact"
 msgstr "Contact"
 
@@ -324,9 +312,9 @@ msgid "_Home Page:"
 msgstr "_Home Page:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../calendar/gui/dialogs/event-page.c:722
+#: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1858
+#: ../modules/itip-formatter/itip-view.c:1877
 msgid "_Calendar:"
 msgstr "_Calendar:"
 
@@ -343,7 +331,7 @@ msgid "Home Page:"
 msgstr "Home Page:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:98
+#: ../modules/cal-config-google/evolution-cal-config-google.c:97
 msgid "Calendar:"
 msgstr "Calendar:"
 
@@ -377,7 +365,7 @@ msgid "_Profession:"
 msgstr "_Profession:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+msgctxt "Job"
 msgid "_Title:"
 msgstr "_Title:"
 
@@ -418,8 +406,8 @@ msgid "_Anniversary:"
 msgstr "_Anniversary:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:706
-#: ../calendar/gui/e-calendar-view.c:2150
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
+#: ../calendar/gui/e-calendar-view.c:2193
 msgid "Anniversary"
 msgstr "Anniversary"
 
@@ -429,8 +417,8 @@ msgstr "Anniversary"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:705
-#: ../calendar/gui/e-calendar-view.c:2149 ../shell/main.c:135
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
+#: ../calendar/gui/e-calendar-view.c:2192 ../shell/main.c:127
 msgid "Birthday"
 msgstr "Birthday"
 
@@ -468,27 +456,27 @@ msgid "_Address:"
 msgstr "_Address:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
-#: ../addressbook/gui/widgets/eab-contact-display.c:399
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:75
-#: ../widgets/misc/e-contact-map.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/e-contact-map.c:308
+#: ../addressbook/gui/widgets/eab-contact-display.c:389
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:69
 msgid "Home"
 msgstr "Home"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:396
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:74
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
-#: ../widgets/misc/e-contact-map.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/e-contact-map.c:316
+#: ../addressbook/gui/widgets/eab-contact-display.c:386
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:68
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
 msgid "Work"
 msgstr "Work"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:76
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:384
-#: ../calendar/gui/e-cal-model.c:3570
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:70
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:379
+#: ../calendar/gui/e-cal-model.c:3466
 msgid "Other"
 msgstr "Other"
 
@@ -500,79 +488,79 @@ msgstr "Mailing Address"
 msgid "Notes"
 msgstr "Notes"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:609
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:612
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:620
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:613
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:611
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:610
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:621
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:622
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:497
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:227
+#: ../addressbook/gui/widgets/eab-gui-util.c:493
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:242
 msgid "Error modifying contact"
 msgstr "Error modifying contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:641
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2929
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:651
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2943
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Contact Editor — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3450
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3476
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3451
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3477
 msgid "_No image"
 msgstr "_No image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3784
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3810
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -580,48 +568,48 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3790
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3816
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3797
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3824
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "'%s' cannot be a future date"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3805
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3832
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3818
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3832
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3845
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3859
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' is empty"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3847
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3874
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
 msgid "Contact Quick-Add"
 msgstr "Contact Quick-Add"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:457
 msgid "_Edit Full"
 msgstr "_Edit Full"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:491
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
 msgid "_Full name"
 msgstr "_Full name"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:502
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:523
 msgid "E_mail"
 msgstr "E_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:513
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:536
 msgid "_Select Address Book"
 msgstr "_Select Address Book"
 
@@ -678,6 +666,11 @@ msgstr "Full Name"
 msgid "_First:"
 msgstr "_First:"
 
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+msgctxt "FullName"
+msgid "_Title:"
+msgstr "_Title:"
+
 #: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "_Middle:"
@@ -691,7 +684,7 @@ 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:764
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:818
 msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
@@ -727,23 +720,23 @@ msgstr "Insert email addresses from Address Book"
 msgid "_Select..."
 msgstr "_Select…"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:887
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:941
 msgid "Contact List Members"
 msgstr "Contact List Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1412
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1475
 msgid "_Members"
 msgstr "_Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1531
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1594
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1546
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1609
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1561
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1624
 msgid "Error removing list"
 msgstr "Error removing list"
 
@@ -795,425 +788,171 @@ msgid "Merge Contact"
 msgstr "Merge Contact"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1072
+#: ../modules/addressbook/e-book-shell-view-actions.c:1104
 msgid "Name contains"
 msgstr "Name contains"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1065
+#: ../modules/addressbook/e-book-shell-view-actions.c:1097
 msgid "Email begins with"
 msgstr "E-mail begins with"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
-#: ../modules/calendar/e-cal-shell-view-actions.c:1798
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/addressbook/e-book-shell-view-actions.c:1090
+#: ../modules/calendar/e-cal-shell-view-actions.c:1795
+#: ../modules/calendar/e-memo-shell-view-actions.c:812
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
 msgid "Any field contains"
 msgstr "Any field contains"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:93
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:102
-#: ../addressbook/gui/widgets/ea-minicard-view.c:189
-msgid "evolution address book"
-msgstr "evolution address book"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+msgid "No contacts"
+msgstr "No contacts"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:162
-msgid "Copy _Email Address"
-msgstr "Copy _E-mail Address"
+#: ../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"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../widgets/misc/e-web-view.c:296 ../widgets/misc/e-web-view-gtkhtml.c:429
-msgid "Copy the email address to the clipboard"
-msgstr "Copy the e-mail address to the clipboard"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:367
+msgid "Error getting book view"
+msgstr "Error getting book view"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169
-#: ../widgets/misc/e-web-view.c:301 ../widgets/misc/e-web-view-gtkhtml.c:434
-msgid "_Send New Message To..."
-msgstr "_Send New Message To…"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:814
+msgid "Search Interrupted"
+msgstr "Search Interrupted"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171
-#: ../widgets/misc/e-web-view.c:303 ../widgets/misc/e-web-view-gtkhtml.c:436
-msgid "Send a mail message to this address"
-msgstr "Send a mail message to this address"
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:161
+msgid "Error modifying card"
+msgstr "Error modifying card"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:333
-#: ../widgets/misc/e-web-view.c:1097 ../widgets/misc/e-web-view-gtkhtml.c:973
-#, c-format
-msgid "Click to mail %s"
-msgstr "Click to mail %s"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+msgid "Cut selected contacts to the clipboard"
+msgstr "Cut selected contacts to the clipboard"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:154
-msgid "Open map"
-msgstr "Open map"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+msgid "Copy selected contacts to the clipboard"
+msgstr "Copy selected contacts to the clipboard"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:549
-msgid "List Members:"
-msgstr "List Members:"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:646
+msgid "Paste contacts from the clipboard"
+msgstr "Paste contacts from the clipboard"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:613
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Nickname"
-msgstr "Nickname"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:652
+#: ../modules/addressbook/e-book-shell-view-actions.c:908
+msgid "Delete selected contacts"
+msgstr "Delete selected contacts"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Company"
-msgstr "Company"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:658
+msgid "Select all visible contacts"
+msgstr "Select all visible contacts"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:667
-msgid "Department"
-msgstr "Department"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
+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-formatter.c:668
-msgid "Profession"
-msgstr "Profession"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1289
+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-formatter.c:669
-msgid "Position"
-msgstr "Position"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1293
+#, 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-formatter.c:670
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Manager"
-msgstr "Manager"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+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-formatter.c:671
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-msgid "Assistant"
-msgstr "Assistant"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+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-formatter.c:672
-msgid "Video Chat"
-msgstr "Video Chat"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
+#, 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-formatter.c:673
-#: ../modules/calendar/e-cal-shell-view-actions.c:217
-#: ../modules/calendar/e-cal-shell-view-actions.c:246
-#: ../modules/calendar/e-cal-shell-view.c:548
-#: ../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:1463
+#, 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-formatter.c:674
-#: ../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:1471
+msgid "_Don't Display"
+msgstr "_Don't Display"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:675
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
-msgid "Phone"
-msgstr "Phone"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
+msgid "Display _All Contacts"
+msgstr "Display _All Contacts"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:676
-msgid "Fax"
-msgstr "Fax"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "File As"
+msgstr "File As"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:677
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
-msgid "Address"
-msgstr "Address"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Given Name"
+msgstr "Given Name"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:700
-msgid "Home Page"
-msgstr "Home Page"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Family Name"
+msgstr "Family Name"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:701
-msgid "Web Log"
-msgstr "Web Log"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:608
+msgid "Nickname"
+msgstr "Nickname"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Email 2"
+msgstr "E-mail 2"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:707
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-msgid "Spouse"
-msgstr "Spouse"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Email 3"
+msgstr "E-mail 3"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:717
-msgid "Personal"
-msgstr "Personal"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Assistant Phone"
+msgstr "Assistant Phone"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:741
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-msgid "Note"
-msgstr "Note"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Business Phone"
+msgstr "Business Phone"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:937
-msgid "List Members"
-msgstr "List Members"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Business Phone 2"
+msgstr "Business Phone 2"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:958
-msgid "Job Title"
-msgstr "Job Title"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Business Fax"
+msgstr "Business Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:999
-msgid "Home page"
-msgstr "Home page"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Callback Phone"
+msgstr "Callback Phone"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1009
-msgid "Blog"
-msgstr "Blog"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "Car Phone"
+msgstr "Car Phone"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
-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:143
-#, 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:156
-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:165
-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:173
-msgid "Detailed error message:"
-msgstr "Detailed error message:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
-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:217
-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:225
-#, 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:230
-#, 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:236
-#: ../addressbook/gui/widgets/eab-gui-util.c:242
-#, 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:264
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:315
-msgid "Select Address Book"
-msgstr "Select Address Book"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:397
-msgid "list"
-msgstr "list"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:586
-msgid "Move contact to"
-msgstr "Move contact to"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:588
-msgid "Copy contact to"
-msgstr "Copy contact to"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:591
-msgid "Move contacts to"
-msgstr "Move contacts to"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:593
-msgid "Copy contacts to"
-msgstr "Copy contacts to"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:164
-msgid "No contacts"
-msgstr "No contacts"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:168
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "%d contact"
-msgstr[1] "%d contacts"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:371
-msgid "Error getting book view"
-msgstr "Error getting book view"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:805
-msgid "Search Interrupted"
-msgstr "Search Interrupted"
-
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:160
-msgid "Error modifying card"
-msgstr "Error modifying card"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:644
-msgid "Cut selected contacts to the clipboard"
-msgstr "Cut selected contacts to the clipboard"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:650
-msgid "Copy selected contacts to the clipboard"
-msgstr "Copy selected contacts to the clipboard"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:656
-msgid "Paste contacts from the clipboard"
-msgstr "Paste contacts from the clipboard"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:662
-#: ../modules/addressbook/e-book-shell-view-actions.c:876
-msgid "Delete selected contacts"
-msgstr "Delete selected contacts"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Select all visible contacts"
-msgstr "Select all visible contacts"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
-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:1316
-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:1320
-#, 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:1326
-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:1330
-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:1334
-#, 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:1490
-#, 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:1498
-msgid "_Don't Display"
-msgstr "_Don't Display"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1499
-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:15
+msgid "Company Phone"
+msgstr "Company Phone"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Home Phone"
@@ -1231,6 +970,11 @@ msgstr "Home Fax"
 msgid "ISDN Phone"
 msgstr "ISDN Phone"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:700
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Other Phone"
@@ -1265,6 +1009,11 @@ msgstr "Telex"
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:663
+msgid "Company"
+msgstr "Company"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "Unit"
@@ -1278,11 +1027,21 @@ msgid "Title"
 msgstr "Title"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:657
+#: ../calendar/gui/e-meeting-list-view.c:663
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Role"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:667
+msgid "Manager"
+msgstr "Manager"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:668
+msgid "Assistant"
+msgstr "Assistant"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Website"
@@ -1295,65 +1054,35 @@ msgstr "Journal"
 #: ../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
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:89
 msgid "Categories"
 msgstr "Categories"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:34
-msgid "Open"
-msgstr "Open"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
+msgid "Spouse"
+msgstr "Spouse"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:156
-msgid "Contact List: "
-msgstr "Contact List: "
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:738
+msgid "Note"
+msgstr "Note"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:157
-msgid "Contact: "
-msgstr "Contact: "
+#: ../addressbook/gui/widgets/e-contact-map-window.c:364
+msgid "Contacts Map"
+msgstr "Contacts Map"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:183
-msgid "evolution minicard"
-msgstr "evolution minicard"
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Searching for the Contacts…"
 
-#: ../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:93
-msgid "Work Email"
-msgstr "Work E-mail"
-
-#: ../addressbook/gui/widgets/e-minicard.c:94
-msgid "Home Email"
-msgstr "Home E-mail"
-
-#: ../addressbook/gui/widgets/e-minicard.c:95
-#: ../addressbook/gui/widgets/e-minicard.c:775
-msgid "Other Email"
-msgstr "Other E-mail"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
-msgid ""
-"\n"
-"\n"
-"Searching for the Contacts..."
-msgstr ""
-"\n"
-"\n"
-"Searching for the Contacts…"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1367,7 +1096,7 @@ msgstr ""
 "\n"
 "or double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:194
+#: ../addressbook/gui/widgets/e-minicard-view.c:197
 msgid ""
 "\n"
 "\n"
@@ -1381,7 +1110,7 @@ msgstr ""
 "\n"
 "Double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:198
+#: ../addressbook/gui/widgets/e-minicard-view.c:201
 msgid ""
 "\n"
 "\n"
@@ -1391,7 +1120,7 @@ msgstr ""
 "\n"
 "Search for the Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../addressbook/gui/widgets/e-minicard-view.c:203
 msgid ""
 "\n"
 "\n"
@@ -1401,142 +1130,385 @@ msgstr ""
 "\n"
 "There are no items to show in this view."
 
+#: ../addressbook/gui/widgets/e-minicard.c:93
+msgid "Work Email"
+msgstr "Work E-mail"
+
+#: ../addressbook/gui/widgets/e-minicard.c:94
+msgid "Home Email"
+msgstr "Home E-mail"
+
+#: ../addressbook/gui/widgets/e-minicard.c:95
+#: ../addressbook/gui/widgets/e-minicard.c:828
+msgid "Other Email"
+msgstr "Other E-mail"
+
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:194
+msgid "evolution address book"
+msgstr "evolution address book"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact"
+msgstr "New Contact"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
+msgid "New Contact List"
+msgstr "New Contact List"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:177
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "current address book folder %s has %d card"
+msgstr[1] "current address book folder %s has %d cards"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:34
+msgid "Open"
+msgstr "Open"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:160
+msgid "Contact List: "
+msgstr "Contact List: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:161
+msgid "Contact: "
+msgstr "Contact: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:188
+msgid "evolution minicard"
+msgstr "evolution minicard"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:152
+msgid "Copy _Email Address"
+msgstr "Copy _E-mail Address"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:154
+#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:295
+msgid "Copy the email address to the clipboard"
+msgstr "Copy the e-mail address to the clipboard"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:159
+#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:300
+msgid "_Send New Message To..."
+msgstr "_Send New Message To…"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:161
+#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:302
+msgid "Send a mail message to this address"
+msgstr "Send a mail message to this address"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:323
+#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:1084
+#, c-format
+msgid "Click to mail %s"
+msgstr "Click to mail %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:148
+msgid "Open map"
+msgstr "Open map"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:544
+msgid "List Members:"
+msgstr "List Members:"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:664
+msgid "Department"
+msgstr "Department"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:665
+msgid "Profession"
+msgstr "Profession"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
+msgid "Position"
+msgstr "Position"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:669
+msgid "Video Chat"
+msgstr "Video Chat"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
+#: ../e-util/e-send-options.c:546
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view.c:548
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "Calendar"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
+#: ../calendar/gui/dialogs/event-editor.c:122
+#: ../calendar/gui/dialogs/event-editor.c:349
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "Free/Busy"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:699
+msgid "Phone"
+msgstr "Phone"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
+msgid "Fax"
+msgstr "Fax"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:701
+msgid "Address"
+msgstr "Address"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:697
+msgid "Home Page"
+msgstr "Home Page"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:698
+msgid "Web Log"
+msgstr "Web Log"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:714
+msgid "Personal"
+msgstr "Personal"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:935
+msgid "List Members"
+msgstr "List Members"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:956
+msgid "Job Title"
+msgstr "Job Title"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:997
+msgid "Home page"
+msgstr "Home page"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1007
+msgid "Blog"
+msgstr "Blog"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:118
+msgid ""
+"This address book cannot be opened. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"This address book cannot be opened. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the address book once in online mode to download its contents."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#, c-format
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:150
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr ""
+"This version of Evolution does not have LDAP support compiled into it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
+msgid "Detailed error message:"
+msgstr "Detailed error message:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:204
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"configured for this address book.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"configured for this address book.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:219
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "The backend for this address book was unable to parse this query. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "The backend for this address book refused to perform this query. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:230
+#: ../addressbook/gui/widgets/eab-gui-util.c:236
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "This query did not complete successfully. %s"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:258
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:309
+msgid "Select Address Book"
+msgstr "Select Address Book"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+msgid "list"
+msgstr "list"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Move contact to"
+msgstr "Move contact to"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:583
+msgid "Copy contact to"
+msgstr "Copy contact to"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
+msgid "Move contacts to"
+msgstr "Move contacts to"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:588
+msgid "Copy contacts to"
+msgstr "Copy contacts to"
+
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
 msgid "Card View"
 msgstr "Card View"
 
-#: ../addressbook/importers/evolution-csv-importer.c:746
-#: ../addressbook/importers/evolution-ldif-importer.c:544
+#: ../addressbook/importers/evolution-csv-importer.c:744
+#: ../addressbook/importers/evolution-ldif-importer.c:543
 #: ../addressbook/importers/evolution-vcard-importer.c:279
-#: ../calendar/importers/icalendar-importer.c:446
-#: ../calendar/importers/icalendar-importer.c:939
-#: ../calendar/importers/icalendar-importer.c:978 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:935
+#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Importing…"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1084
+#: ../addressbook/importers/evolution-csv-importer.c:1079
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlook Contacts CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1085
+#: ../addressbook/importers/evolution-csv-importer.c:1080
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlook Contacts CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1093
+#: ../addressbook/importers/evolution-csv-importer.c:1088
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozilla Contacts CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1094
+#: ../addressbook/importers/evolution-csv-importer.c:1089
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilla Contacts CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1102
+#: ../addressbook/importers/evolution-csv-importer.c:1097
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolution Contacts CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1103
+#: ../addressbook/importers/evolution-csv-importer.c:1098
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolution Contacts CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:805
+#: ../addressbook/importers/evolution-ldif-importer.c:801
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:806
+#: ../addressbook/importers/evolution-ldif-importer.c:802
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF importer"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:667
+#: ../addressbook/importers/evolution-vcard-importer.c:664
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:668
+#: ../addressbook/importers/evolution-vcard-importer.c:665
 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:717
+#: ../addressbook/printing/e-contact-print.c:764
 #, c-format
 msgid "Page %d"
 msgstr "Page %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Specify the output file instead of standard output"
 msgstr "Specify the output file instead of standard output"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "List local address book folders"
 msgstr "List local address book folders"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:68
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "Show cards as vcard or csv file"
 msgstr "Show cards as vcard or csv file"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:69
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:72
-msgid "Export in asynchronous mode"
-msgstr "Export in asynchronous mode"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:75
-msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
-msgstr ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:77
-msgid "NUMBER"
-msgstr "NUMBER"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:149
+#: ../addressbook/tools/evolution-addressbook-export.c:136
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Command line arguments error, please use --help option to see the usage."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:150
 msgid "Only support csv or vcard format."
 msgstr "Only support csv or vcard format."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:172
-msgid "In async mode, output must be file."
-msgstr "In async mode, output must be file."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:180
-msgid "In normal mode, there is no need for the size option."
-msgstr "In normal mode, there is no need for the size option."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:213
+#: ../addressbook/tools/evolution-addressbook-export.c:181
 msgid "Unhandled error"
 msgstr "Unhandled error"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:653
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:688
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:625
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:46
 msgid "Can not open file"
 msgstr "Can not open file"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:74
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:76
 #, c-format
 msgid "Failed to open client '%s': %s"
 msgstr "Failed to open client '%s': %s"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:108
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:106
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:121
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:119
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
@@ -1545,14 +1517,14 @@ 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:134
-#: ../calendar/gui/dialogs/recurrence-page.c:1199
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:132
+#: ../calendar/gui/dialogs/recurrence-page.c:1204
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:330
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:329
 msgid "Start time"
 msgstr "Start time"
 
@@ -1568,17 +1540,16 @@ msgstr "Dismiss _All"
 msgid "_Snooze"
 msgstr "_Snooze"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../libevolution-utils/e-alert-dialog.c:162
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:162
 msgid "_Dismiss"
 msgstr "_Dismiss"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/alarm-notify/alarm-queue.c:1757
-#: ../calendar/alarm-notify/alarm-queue.c:1767
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:191
-#: ../modules/itip-formatter/itip-view.c:1472
-#: ../modules/itip-formatter/itip-view.c:1583
+#: ../calendar/alarm-notify/alarm-queue.c:1766
+#: ../calendar/alarm-notify/alarm-queue.c:1776
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:190
+#: ../modules/itip-formatter/itip-view.c:1489
+#: ../modules/itip-formatter/itip-view.c:1600
 msgid "Location:"
 msgstr "Location:"
 
@@ -1593,57 +1564,61 @@ msgstr "Snooze _time:"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../filter/filter.ui.h:8
-#: ../modules/calendar/e-cal-shell-view-actions.c:353
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../e-util/filter.ui.h:8
+#: ../e-util/e-interval-chooser.c:143
+#: ../modules/calendar/e-cal-shell-view-actions.c:352
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
-#: ../widgets/misc/e-interval-chooser.c:143
 msgid "days"
 msgstr "days"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../filter/filter.ui.h:7
-#: ../widgets/misc/e-interval-chooser.c:141
+#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
+#: ../e-util/e-interval-chooser.c:141
 msgid "hours"
 msgstr "hours"
 
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../filter/filter.ui.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
+#: ../e-util/e-interval-chooser.c:139
 #: ../mail/e-mail-config-provider-page.c:527
-#: ../modules/addressbook/ldap-config.ui.h:29
-#: ../widgets/misc/e-interval-chooser.c:139
 msgid "minutes"
 msgstr "minutes"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1606
-#: ../calendar/alarm-notify/alarm-queue.c:1738
+#: ../calendar/alarm-notify/alarm-queue.c:1612
+#: ../calendar/alarm-notify/alarm-queue.c:1746
 msgid "No summary available."
 msgstr "No summary available."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1615
-#: ../calendar/alarm-notify/alarm-queue.c:1617
+#: ../calendar/alarm-notify/alarm-queue.c:1621
+#: ../calendar/alarm-notify/alarm-queue.c:1623
 msgid "No description available."
 msgstr "No description available."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1625
+#: ../calendar/alarm-notify/alarm-queue.c:1631
 msgid "No location information available."
 msgstr "No location information available."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1671
+#: ../calendar/alarm-notify/alarm-queue.c:1636
+#: ../calendar/alarm-notify/alarm-queue.c:1737
+#: ../calendar/alarm-notify/alarm-queue.c:2099
+msgid "Evolution Reminders"
+msgstr "Evolution Reminders"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1679
 #, 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:1867
-#: ../calendar/alarm-notify/alarm-queue.c:1902
+#: ../calendar/alarm-notify/alarm-queue.c:1884
+#: ../calendar/alarm-notify/alarm-queue.c:1919
 msgid "Warning"
 msgstr "Warning"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1871
+#: ../calendar/alarm-notify/alarm-queue.c:1888
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1655,7 +1630,7 @@ msgstr ""
 "configured to send an e-mail.  Evolution will display\n"
 "a normal reminder dialogue box instead."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1908
+#: ../calendar/alarm-notify/alarm-queue.c:1925
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1672,7 +1647,7 @@ msgstr ""
 "\n"
 "Are you sure you want to run this program?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1923
+#: ../calendar/alarm-notify/alarm-queue.c:1940
 msgid "Do not ask me about this program again."
 msgstr "Do not ask me about this program again."
 
@@ -1730,7 +1705,7 @@ msgid "_Send Notice"
 msgstr "_Send Notice"
 
 #: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Are you sure you want to delete this meeting?"
@@ -1750,7 +1725,7 @@ msgstr ""
 "know the task has been deleted."
 
 #: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:192
+#: ../calendar/gui/dialogs/delete-comp.c:196
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Are you sure you want to delete this task?"
@@ -1772,7 +1747,7 @@ msgstr ""
 "know the memo has been deleted."
 
 #: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:195
+#: ../calendar/gui/dialogs/delete-comp.c:199
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Are you sure you want to delete this memo?"
@@ -1940,8 +1915,7 @@ msgstr ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 
-#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
-#: ../modules/itip-formatter/itip-view.c:3094
+#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:315
 msgid "_Save"
 msgstr "_Save"
 
@@ -1970,102 +1944,74 @@ msgstr ""
 "lists up to date."
 
 #: ../calendar/calendar.error.xml.h:52
-msgid "The Evolution tasks have quit unexpectedly."
-msgstr "The Evolution tasks have quit unexpectedly."
-
-#: ../calendar/calendar.error.xml.h:53
-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 "The Evolution calendar has quit unexpectedly."
-msgstr "The Evolution calendar has 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: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 calendars have quit unexpectedly."
-msgstr "The Evolution calendars have quit unexpectedly."
-
-#: ../calendar/calendar.error.xml.h:59
 msgid "Editor could not be loaded."
 msgstr "Editor could not be loaded."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:53
 msgid "Delete calendar '{0}'?"
 msgstr "Delete calendar '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:54
 msgid "This calendar will be removed permanently."
 msgstr "This calendar will be removed permanently."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:55
 msgid "Delete task list '{0}'?"
 msgstr "Delete task list '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:56
 msgid "This task list will be removed permanently."
 msgstr "This task list will be removed permanently."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:57
 msgid "Delete memo list '{0}'?"
 msgstr "Delete memo list '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:58
 msgid "This memo list will be removed permanently."
 msgstr "This memo list will be removed permanently."
 
-#: ../calendar/calendar.error.xml.h:66
-msgid "Delete remote calendar &quot;{0}&quot;?"
-msgstr "Delete remote calendar &quot;{0}&quot;?"
+#: ../calendar/calendar.error.xml.h:59
+msgid "Delete remote calendar '{0}'?"
+msgstr "Delete remote calendar '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:60
 msgid ""
-"This will permanently remove the calendar &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the calendar '{0}' from the server. Are you "
+"sure you want to proceed?"
 msgstr ""
-"This will permanently remove the calendar &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the calendar '{0}' from the server. Are you "
+"sure you want to proceed?"
 
-#: ../calendar/calendar.error.xml.h:69
-msgid "Delete remote task list &quot;{0}&quot;?"
-msgstr "Delete remote task list &quot;{0}&quot;?"
+#: ../calendar/calendar.error.xml.h:62
+msgid "Delete remote task list '{0}'?"
+msgstr "Delete remote task list '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:63
 msgid ""
-"This will permanently remove the task list &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the task list '{0}' from the server. Are you "
+"sure you want to proceed?"
 msgstr ""
-"This will permanently remove the task list &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the task list '{0}' from the server. Are you "
+"sure you want to proceed?"
 
-#: ../calendar/calendar.error.xml.h:71
-msgid "Delete remote memo list &quot;{0}&quot;?"
-msgstr "Delete remote memo list &quot;{0}&quot;?"
+#: ../calendar/calendar.error.xml.h:64
+msgid "Delete remote memo list '{0}'?"
+msgstr "Delete remote memo list '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:65
 msgid ""
-"This will permanently remove the memo list &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the memo list '{0}' from the server. Are you "
+"sure you want to proceed?"
 msgstr ""
-"This will permanently remove the memo list &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the memo list '{0}' from the server. Are you "
+"sure you want to proceed?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:66
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "Are you sure you want to save the appointment without a summary?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:67
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
@@ -2073,11 +2019,11 @@ msgstr ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:68
 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:76
+#: ../calendar/calendar.error.xml.h:69
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
@@ -2085,37 +2031,25 @@ msgstr ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:70
 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:78
-msgid "Error loading calendar"
-msgstr "Error loading calendar"
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:72
+msgid "Error loading calendar '{0}'"
+msgstr "Error loading calendar '{0}'"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:73
 msgid "The calendar is not marked for offline usage."
 msgstr "The calendar is not marked for offline usage."
 
-#: ../calendar/calendar.error.xml.h:80
-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:82
-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."
-
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:74
 msgid "Cannot save event"
 msgstr "Cannot save event"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:85
+#. Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:76
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -2123,47 +2057,35 @@ msgstr ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:77
 msgid "Cannot save task"
 msgstr "Cannot save task"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:88
+#. Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:79
 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:89
-msgid "Error loading task list"
-msgstr "Error loading task list"
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:81
+msgid "Error loading task list '{0}'"
+msgstr "Error loading task list '{0}'"
 
-#: ../calendar/calendar.error.xml.h:90
+#: ../calendar/calendar.error.xml.h:82
 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:91
-msgid "Error loading memo list"
-msgstr "Error loading memo list"
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:84
+msgid "Error loading memo list '{0}'"
+msgstr "Error loading memo list '{0}'"
 
-#: ../calendar/calendar.error.xml.h:92
+#: ../calendar/calendar.error.xml.h:85
 msgid "The memo list is not marked for offline usage."
 msgstr "The memo list is not marked for offline usage."
 
-#. 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:95
-msgid "Error on {0}: {1}"
-msgstr "Error on {0}: {1}"
-
-#: ../calendar/calendar.error.xml.h:96
-msgid "Could not perform this operation."
-msgstr "Could not perform this operation."
-
-#: ../calendar/calendar.error.xml.h:97 ../mail/mail.error.xml.h:167
-msgid "You must be working online to complete this operation."
-msgstr "You must be working online to complete this operation."
-
 #: ../calendar/gui/calendar-view-factory.c:88
 msgid "Day View"
 msgstr "Day View"
@@ -2184,25 +2106,24 @@ msgstr "Month View"
 #: ../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:372
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:376
 msgid "Summary"
 msgstr "Summary"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:11
 msgid "contains"
 msgstr "contains"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:17
 msgid "does not contain"
 msgstr "does not contain"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/plugin-manager/evolution-plugin-manager.c:70
-#: ../widgets/misc/e-attachment-tree-view.c:528
-#: ../widgets/table/e-table-config.ui.h:24
+#: ../e-util/e-table-config.ui.h:24 ../e-util/e-attachment-tree-view.c:528
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
 msgid "Description"
 msgstr "Description"
 
@@ -2216,30 +2137,30 @@ msgid "Classification"
 msgstr "Classification"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:33
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:34
 msgid "is"
 msgstr "is"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:39
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:40
 msgid "is not"
 msgstr "is not"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:829 ../calendar/gui/e-cal-model.c:836
-#: ../calendar/gui/e-task-table.c:555 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:841 ../calendar/gui/e-cal-model.c:848
+#: ../calendar/gui/e-task-table.c:545 ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Public"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:838 ../calendar/gui/e-task-table.c:556
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:850 ../calendar/gui/e-task-table.c:546
 #: ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Private"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:840 ../calendar/gui/e-task-table.c:557
-#: ../calendar/gui/memotypes.xml.h:12 ../widgets/misc/e-send-options.ui.h:7
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:236
+#: ../calendar/gui/e-cal-model.c:852 ../calendar/gui/e-task-table.c:547
+#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Confidential"
 
@@ -2256,37 +2177,37 @@ msgstr "Attendee"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:870
+#: ../plugins/publish-calendar/publish-calendar.c:883
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Location"
 msgstr "Location"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:328
 msgid "Category"
 msgstr "Category"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
-#: ../em-format/e-mail-formatter-print-headers.c:198
-#: ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:56
+#: ../em-format/e-mail-formatter-print-headers.c:189
+#: ../mail/em-filter-i18n.h:6
 msgid "Attachments"
 msgstr "Attachments"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:26
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:27
 msgid "Exist"
 msgstr "Exist"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:23
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:24
 msgid "Do Not Exist"
 msgstr "Do Not Exist"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:321
-#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../calendar/gui/dialogs/event-editor.c:316
+#: ../calendar/gui/dialogs/event-editor.c:337
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "Recurrence"
@@ -2317,26 +2238,26 @@ msgstr "Summary Contains"
 msgid "Description Contains"
 msgstr "Description Contains"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:632
+#: ../calendar/gui/dialogs/alarm-dialog.c:629
 msgid "Edit Reminder"
 msgstr "Edit Reminder"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/dialogs/alarm-dialog.c:820
 #: ../calendar/gui/e-alarm-list.c:412
 msgid "Pop up an alert"
 msgstr "Pop up an alert"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/dialogs/alarm-dialog.c:821
 #: ../calendar/gui/e-alarm-list.c:408
 msgid "Play a sound"
 msgstr "Play a sound"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/dialogs/alarm-dialog.c:822
 #: ../calendar/gui/e-alarm-list.c:420
 msgid "Run a program"
 msgstr "Run a program"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:826
+#: ../calendar/gui/dialogs/alarm-dialog.c:823
 #: ../calendar/gui/e-alarm-list.c:416
 msgid "Send an email"
 msgstr "Send an e-mail"
@@ -2374,7 +2295,7 @@ msgid "Add Reminder"
 msgstr "Add Reminder"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-#: ../calendar/gui/dialogs/event-editor.c:364
+#: ../calendar/gui/dialogs/event-editor.c:359
 msgid "Reminder"
 msgstr "Reminder"
 
@@ -2427,7 +2348,7 @@ msgstr "_Arguments:"
 msgid "Send To:"
 msgstr "Send To:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:241
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
 msgid "Action/Trigger"
 msgstr "Action/Trigger"
 
@@ -2453,306 +2374,302 @@ msgstr "This task has been deleted."
 msgid "This memo has been deleted."
 msgstr "This memo has been deleted."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, 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:79
+#: ../calendar/gui/dialogs/changed-comp.c:80
 #, 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:84
+#: ../calendar/gui/dialogs/changed-comp.c:85
 msgid "This event has been changed."
 msgstr "This event has been changed."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:89
 msgid "This task has been changed."
 msgstr "This task has been changed."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:93
 msgid "This memo has been changed."
 msgstr "This memo has been changed."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, 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:103
+#: ../calendar/gui/dialogs/changed-comp.c:105
 #, 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.c:278
+#: ../calendar/gui/dialogs/comp-editor.c:272
 msgid "Could not save attachments"
 msgstr "Could not save attachments"
 
-#: ../calendar/gui/dialogs/comp-editor.c:629
+#: ../calendar/gui/dialogs/comp-editor.c:624
 msgid "Could not update object"
 msgstr "Could not update object"
 
-#: ../calendar/gui/dialogs/comp-editor.c:763
+#: ../calendar/gui/dialogs/comp-editor.c:758
 msgid "Edit Appointment"
 msgstr "Edit Appointment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:770
+#: ../calendar/gui/dialogs/comp-editor.c:765
 #, c-format
 msgid "Meeting - %s"
 msgstr "Meeting — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:772
+#: ../calendar/gui/dialogs/comp-editor.c:767
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appointment — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:778
+#: ../calendar/gui/dialogs/comp-editor.c:773
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Assigned Task — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:780
+#: ../calendar/gui/dialogs/comp-editor.c:775
 #, c-format
 msgid "Task - %s"
 msgstr "Task — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:785
+#: ../calendar/gui/dialogs/comp-editor.c:780
 #, c-format
 msgid "Memo - %s"
 msgstr "Memo — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:801
+#: ../calendar/gui/dialogs/comp-editor.c:796
 msgid "No Summary"
 msgstr "No Summary"
 
-#: ../calendar/gui/dialogs/comp-editor.c:922
+#: ../calendar/gui/dialogs/comp-editor.c:917
 msgid "Keep original item?"
 msgstr "Keep original item?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1157
+#: ../calendar/gui/dialogs/comp-editor.c:1154
 msgid "Close the current window"
 msgstr "Close the current window"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:134
-#: ../shell/e-shell-window-actions.c:1446
-#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
-#: ../widgets/misc/e-web-view.c:323 ../widgets/misc/e-web-view.c:1428
-#: ../widgets/misc/e-web-view-gtkhtml.c:456
-#: ../widgets/misc/e-web-view-gtkhtml.c:1299
+#: ../calendar/gui/dialogs/comp-editor.c:1161 ../e-util/e-focus-tracker.c:121
+#: ../e-util/e-focus-tracker.c:558 ../e-util/e-web-view-gtkhtml.c:455
+#: ../e-util/e-web-view-gtkhtml.c:1296 ../e-util/e-web-view.c:322
+#: ../e-util/e-web-view.c:1407 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:876
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1171 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1453
-#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
-#: ../widgets/misc/e-web-view.c:1422 ../widgets/misc/e-web-view-gtkhtml.c:1293
+#: ../calendar/gui/dialogs/comp-editor.c:1168 ../e-util/e-focus-tracker.c:114
+#: ../e-util/e-focus-tracker.c:553 ../e-util/e-web-view-gtkhtml.c:1290
+#: ../e-util/e-web-view.c:1401 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:883
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
-#: ../shell/e-shell-window-actions.c:1460
-#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:568
+#: ../calendar/gui/dialogs/comp-editor.c:1175 ../e-util/e-focus-tracker.c:135
+#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:890
 msgid "Delete the selection"
 msgstr "Delete the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1185
+#: ../calendar/gui/dialogs/comp-editor.c:1182
 msgid "View help"
 msgstr "View help"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1192 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1481
-#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
-#: ../widgets/misc/e-web-view.c:1434 ../widgets/misc/e-web-view-gtkhtml.c:1305
+#: ../calendar/gui/dialogs/comp-editor.c:1189 ../e-util/e-focus-tracker.c:128
+#: ../e-util/e-focus-tracker.c:563 ../e-util/e-web-view-gtkhtml.c:1302
+#: ../e-util/e-web-view.c:1413 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:911
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../calendar/gui/dialogs/comp-editor.c:1210
 msgid "Save current changes"
 msgstr "Save current changes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1218
-#: ../widgets/misc/e-mail-signature-editor.c:301
+#: ../calendar/gui/dialogs/comp-editor.c:1215
+#: ../e-util/e-mail-signature-editor.c:312
 msgid "Save and Close"
 msgstr "Save and Close"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1220
+#: ../calendar/gui/dialogs/comp-editor.c:1217
 msgid "Save current changes and close editor"
 msgstr "Save current changes and close editor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1227 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1558
-#: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
+#: ../calendar/gui/dialogs/comp-editor.c:1224 ../e-util/e-focus-tracker.c:142
+#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:151
+#: ../shell/e-shell-window-actions.c:988
 msgid "Select all text"
 msgstr "Select all text"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1234
+#: ../calendar/gui/dialogs/comp-editor.c:1231
 msgid "_Classification"
 msgstr "_Classification"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1241
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
-#: ../mail/e-mail-browser.c:169
+#: ../calendar/gui/dialogs/comp-editor.c:1238
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
+#: ../e-util/gal-define-views.ui.h:5 ../mail/e-mail-browser.c:165
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1586
-#: ../widgets/menus/gal-define-views.ui.h:5
+#: ../shell/e-shell-window-actions.c:1016
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1248 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1593
-#: ../widgets/misc/e-mail-signature-editor.c:306
+#: ../calendar/gui/dialogs/comp-editor.c:1245
+#: ../e-util/e-mail-signature-editor.c:317 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1023
 msgid "_File"
 msgstr "_File"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1255
-#: ../shell/e-shell-window-actions.c:1600
+#: ../calendar/gui/dialogs/comp-editor.c:1252
+#: ../shell/e-shell-window-actions.c:1030
 msgid "_Help"
 msgstr "_Help"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1259
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
-#: ../composer/e-composer-actions.c:339
+#: ../calendar/gui/dialogs/comp-editor.c:1266
+#: ../composer/e-composer-actions.c:338
 msgid "_Options"
 msgstr "_Options"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276 ../mail/e-mail-browser.c:176
-#: ../shell/e-shell-window-actions.c:1635 ../smime/gui/smime-ui.ui.h:28
+#: ../calendar/gui/dialogs/comp-editor.c:1273 ../mail/e-mail-browser.c:172
+#: ../shell/e-shell-window-actions.c:1065 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_View"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1286
-#: ../composer/e-composer-actions.c:288
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../composer/e-composer-actions.c:287
 msgid "_Attachment..."
 msgstr "_Attachment…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1288
-#: ../composer/e-composer-actions.c:290
-#: ../widgets/misc/e-attachment-view.c:414
+#: ../calendar/gui/dialogs/comp-editor.c:1285
+#: ../composer/e-composer-actions.c:289 ../e-util/e-attachment-view.c:413
 msgid "Attach a file"
 msgstr "Attach a file"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1296
+#: ../calendar/gui/dialogs/comp-editor.c:1293
 msgid "_Categories"
 msgstr "_Categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1298
+#: ../calendar/gui/dialogs/comp-editor.c:1295
 msgid "Toggles whether to display categories"
 msgstr "Toggles whether to display categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1304
+#: ../calendar/gui/dialogs/comp-editor.c:1301
 msgid "Time _Zone"
 msgstr "Time _Zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1306
+#: ../calendar/gui/dialogs/comp-editor.c:1303
 msgid "Toggles whether the time zone is displayed"
 msgstr "Toggles whether the time zone is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "Classify as public"
 msgstr "Classify as public"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1322
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "_Private"
 msgstr "_Private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1321
 msgid "Classify as private"
 msgstr "Classify as private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1329
+#: ../calendar/gui/dialogs/comp-editor.c:1326
 msgid "_Confidential"
 msgstr "_Confidential"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../calendar/gui/dialogs/comp-editor.c:1328
 msgid "Classify as confidential"
 msgstr "Classify as confidential"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1336
 msgid "R_ole Field"
 msgstr "R_ole Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1341
+#: ../calendar/gui/dialogs/comp-editor.c:1338
 msgid "Toggles whether the Role field is displayed"
 msgstr "Toggles whether the Role field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1347
+#: ../calendar/gui/dialogs/comp-editor.c:1344
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../calendar/gui/dialogs/comp-editor.c:1346
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Toggles whether the RSVP field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1355
+#: ../calendar/gui/dialogs/comp-editor.c:1352
 msgid "_Status Field"
 msgstr "_Status Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357
+#: ../calendar/gui/dialogs/comp-editor.c:1354
 msgid "Toggles whether the Status field is displayed"
 msgstr "Toggles whether the Status field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1363
+#: ../calendar/gui/dialogs/comp-editor.c:1360
 msgid "_Type Field"
 msgstr "_Type Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1365
+#: ../calendar/gui/dialogs/comp-editor.c:1362
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Toggles whether the Attendee Type is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../composer/e-composer-actions.c:507
+#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../composer/e-composer-actions.c:506
 msgid "Attach"
 msgstr "Attach"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2463
-#: ../calendar/gui/dialogs/comp-editor.c:2650
-#: ../calendar/gui/dialogs/comp-editor.c:3654
+#: ../calendar/gui/dialogs/comp-editor.c:2498
+#: ../calendar/gui/dialogs/comp-editor.c:2708
+#: ../calendar/gui/dialogs/comp-editor.c:3714
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Changes made to this item may be discarded if an update arrives"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3618
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:118
+#: ../calendar/gui/dialogs/comp-editor.c:3678
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:115
 msgid "attachment"
 msgstr "attachment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3686
+#: ../calendar/gui/dialogs/comp-editor.c:3746
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:439
+#: ../calendar/gui/dialogs/comp-editor-page.c:441
 #, c-format
 msgid "Validation error: %s"
 msgstr "Validation error: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:114
+#: ../calendar/gui/dialogs/copy-source-dialog.c:118
 msgid "Could not open destination"
 msgstr "Could not open destination"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:126
+#: ../calendar/gui/dialogs/copy-source-dialog.c:128
 msgid "Destination is read only"
 msgstr "Destination is read only"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:160
+#: ../calendar/gui/dialogs/copy-source-dialog.c:162
 msgid "Cannot create object"
 msgstr "Cannot create object"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:189
+#: ../calendar/gui/dialogs/copy-source-dialog.c:194
 msgid "Could not open source"
 msgstr "Could not open source"
 
-#: ../calendar/gui/dialogs/delete-comp.c:212
+#: ../calendar/gui/dialogs/delete-comp.c:216
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Delete this item from all other recipient's mailboxes?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:215
+#: ../calendar/gui/dialogs/delete-comp.c:219
 msgid "_Retract comment"
 msgstr "_Retract comment"
 
@@ -2832,107 +2749,106 @@ msgstr "Delegate To:"
 msgid "Contacts..."
 msgstr "Contacts…"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "_Reminders"
 msgstr "_Reminders"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/event-editor.c:213
 msgid "Set or unset reminders for this event"
 msgstr "Set or unset reminders for this event"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:221
 msgid "Show Time as _Busy"
 msgstr "Show Time as _Busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:223
 msgid "Toggles whether to show time as busy"
 msgstr "Toggles whether to show time as busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:237
+#: ../calendar/gui/dialogs/event-editor.c:232
 msgid "_Recurrence"
 msgstr "_Recurrence"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Make this a recurring event"
 msgstr "Make this a recurring event"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/dialogs/event-editor.c:239 ../e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "Send Options"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
-#: ../calendar/gui/dialogs/task-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "Insert advanced send options"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:249
 msgid "All _Day Event"
 msgstr "All _Day Event"
 
-#: ../calendar/gui/dialogs/event-editor.c:256
+#: ../calendar/gui/dialogs/event-editor.c:251
 msgid "Toggles whether to have All Day Event"
 msgstr "Toggles whether to have All Day Event"
 
-#: ../calendar/gui/dialogs/event-editor.c:265
+#: ../calendar/gui/dialogs/event-editor.c:260
 msgid "_Free/Busy"
 msgstr "_Free/Busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:267
+#: ../calendar/gui/dialogs/event-editor.c:262
 msgid "Query free / busy information for the attendees"
 msgstr "Query free / busy information for the attendees"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3391
+#: ../calendar/gui/dialogs/event-editor.c:313 ../calendar/gui/print.c:3468
 msgid "Appointment"
 msgstr "Appointment"
 
-#: ../calendar/gui/dialogs/event-editor.c:388
+#: ../calendar/gui/dialogs/event-editor.c:383
 #: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:165
 msgid "Attendees"
 msgstr "Attendees"
 
-#: ../calendar/gui/dialogs/event-editor.c:585
+#: ../calendar/gui/dialogs/event-editor.c:580
 msgid "Print this event"
 msgstr "Print this event"
 
-#: ../calendar/gui/dialogs/event-page.c:570
+#: ../calendar/gui/dialogs/event-page.c:557
 msgid "Event's start time is in the past"
 msgstr "Event's start time is in the past"
 
-#: ../calendar/gui/dialogs/event-page.c:647
+#: ../calendar/gui/dialogs/event-page.c:634
 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:651
+#: ../calendar/gui/dialogs/event-page.c:638
 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:663
-#: ../calendar/gui/dialogs/event-page.c:3143
+#: ../calendar/gui/dialogs/event-page.c:650
+#: ../calendar/gui/dialogs/event-page.c:3165
 msgid "This event has reminders"
 msgstr "This event has reminders"
 
-#: ../calendar/gui/dialogs/event-page.c:730
+#: ../calendar/gui/dialogs/event-page.c:717
 #: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Or_ganizer:"
 msgstr "Or_ganiser:"
 
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1299
 msgid "Event with no start date"
 msgstr "Event with no start date"
 
-#: ../calendar/gui/dialogs/event-page.c:1304
+#: ../calendar/gui/dialogs/event-page.c:1302
 msgid "Event with no end date"
 msgstr "Event with no end date"
 
-#: ../calendar/gui/dialogs/event-page.c:1477
-#: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:852
+#: ../calendar/gui/dialogs/event-page.c:1475
+#: ../calendar/gui/dialogs/memo-page.c:726
+#: ../calendar/gui/dialogs/task-page.c:853
 msgid "Start date is wrong"
 msgstr "Start date is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1487
+#: ../calendar/gui/dialogs/event-page.c:1486
 msgid "End date is wrong"
 msgstr "End date is wrong"
 
@@ -2940,61 +2856,56 @@ msgstr "End date is wrong"
 msgid "Start time is wrong"
 msgstr "Start time is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1517
+#: ../calendar/gui/dialogs/event-page.c:1518
 msgid "End time is wrong"
 msgstr "End time is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1680
-#: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1682
+#: ../calendar/gui/dialogs/memo-page.c:765
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "An organizer is required."
 msgstr "An organiser is required."
 
-#: ../calendar/gui/dialogs/event-page.c:1714
-#: ../calendar/gui/dialogs/task-page.c:939
+#: ../calendar/gui/dialogs/event-page.c:1717
+#: ../calendar/gui/dialogs/task-page.c:942
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: ../calendar/gui/dialogs/event-page.c:1921
+#: ../calendar/gui/dialogs/event-page.c:1923
 msgid "_Delegatees"
 msgstr "_Delegatees"
 
-#: ../calendar/gui/dialogs/event-page.c:1923
+#: ../calendar/gui/dialogs/event-page.c:1925
 msgid "Atte_ndees"
 msgstr "Atte_ndees"
 
-#: ../calendar/gui/dialogs/event-page.c:2998
-#, c-format
-msgid "Unable to open the calendar '%s': %s"
-msgstr "Unable to open the calendar '%s': %s"
-
-#: ../calendar/gui/dialogs/event-page.c:3423
+#: ../calendar/gui/dialogs/event-page.c:3445
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d day before appointment"
 msgstr[1] "%d days before appointment"
 
-#: ../calendar/gui/dialogs/event-page.c:3429
+#: ../calendar/gui/dialogs/event-page.c:3451
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hour before appointment"
 msgstr[1] "%d hours before appointment"
 
-#: ../calendar/gui/dialogs/event-page.c:3435
+#: ../calendar/gui/dialogs/event-page.c:3457
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minute before appointment"
 msgstr[1] "%d minutes before appointment"
 
-#: ../calendar/gui/dialogs/event-page.c:3454
+#: ../calendar/gui/dialogs/event-page.c:3478
 msgid "Customize"
 msgstr "Customise"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3460
+#: ../calendar/gui/dialogs/event-page.c:3485
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "None"
@@ -3036,7 +2947,7 @@ msgstr "_Location:"
 #: ../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
+#: ../e-util/e-attachment-dialog.c:350
 msgid "_Description:"
 msgstr "_Description:"
 
@@ -3059,7 +2970,7 @@ msgstr "Event Description"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:23
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Atte_ndees..."
 msgstr "Atte_ndees…"
 
@@ -3124,65 +3035,46 @@ msgid "Select Date"
 msgstr "Select Date"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Select _Today"
 msgstr "Select _Today"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3395
+#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3472
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-editor.c:159
+#: ../calendar/gui/dialogs/memo-editor.c:156
 msgid "Print this memo"
 msgstr "Print this memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:429
+#: ../calendar/gui/dialogs/memo-page.c:421
 msgid "Memo's start date is in the past"
 msgstr "Memo's start date is in the past"
 
-#: ../calendar/gui/dialogs/memo-page.c:465
+#: ../calendar/gui/dialogs/memo-page.c:457
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Memo cannot be edited, because the selected memo list is read only"
 
-#: ../calendar/gui/dialogs/memo-page.c:469
+#: ../calendar/gui/dialogs/memo-page.c:461
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Memo cannot be fully edited, because you are not the organiser"
 
-#: ../calendar/gui/dialogs/memo-page.c:981
-#, c-format
-msgid "Unable to open memos in '%s': %s"
-msgstr "Unable to open memos in '%s': %s"
-
-#: ../calendar/gui/dialogs/memo-page.c:983
-#: ../em-format/e-mail-parser-application-mbox.c:111
-#: ../em-format/e-mail-parser-application-smime.c:107
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:94
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:96
-#: ../em-format/e-mail-parser-multipart-encrypted.c:122
-#: ../em-format/e-mail-parser-multipart-signed.c:147
-#: ../libemail-engine/mail-ops.c:741 ../mail/e-mail-reader.c:1733
-#: ../mail/em-folder-tree.c:675 ../modules/itip-formatter/itip-view.c:4574
-#: ../modules/itip-formatter/itip-view.c:4925 ../plugins/face/face.c:174
-#: ../smime/gui/certificate-manager.c:317
-msgid "Unknown error"
-msgstr "Unknown error"
-
-#: ../calendar/gui/dialogs/memo-page.c:1173
-#: ../em-format/e-mail-formatter.c:1370
-#: ../em-format/e-mail-formatter-utils.c:180
-#: ../em-format/e-mail-formatter-utils.c:203 ../mail/em-filter-i18n.h:77
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:69
+#: ../calendar/gui/dialogs/memo-page.c:1161
+#: ../em-format/e-mail-formatter.c:1387
+#: ../em-format/e-mail-formatter-utils.c:194
+#: ../em-format/e-mail-formatter-utils.c:218 ../mail/em-filter-i18n.h:78
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:63
 msgid "To"
 msgstr "To"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:346
+#: ../calendar/gui/dialogs/task-page.c:336
 #: ../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.c:354
+#: ../calendar/gui/dialogs/task-page.c:344
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Organi_zer:"
 msgstr "Organi_ser:"
@@ -3237,21 +3129,21 @@ msgstr "This and Future Instances"
 msgid "All Instances"
 msgstr "All Instances"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:574
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:969
+#: ../calendar/gui/dialogs/recurrence-page.c:976
 msgid "Recurrence date is invalid"
 msgstr "Recurrence date is invalid"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1020
 msgid "End time of the recurrence was before event's start"
 msgstr "End time of the recurrence was before event's start"
 
 #. 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:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 msgid "on"
 msgstr "on"
 
@@ -3259,7 +3151,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:1106
+#: ../calendar/gui/dialogs/recurrence-page.c:1110
 msgid "first"
 msgstr "first"
 
@@ -3268,7 +3160,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:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 msgid "second"
 msgstr "second"
 
@@ -3276,7 +3168,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:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
 msgid "third"
 msgstr "third"
 
@@ -3284,7 +3176,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:1122
+#: ../calendar/gui/dialogs/recurrence-page.c:1126
 msgid "fourth"
 msgstr "fourth"
 
@@ -3292,7 +3184,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:1127
+#: ../calendar/gui/dialogs/recurrence-page.c:1131
 msgid "fifth"
 msgstr "fifth"
 
@@ -3300,13 +3192,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:1132
+#: ../calendar/gui/dialogs/recurrence-page.c:1136
 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:1156
+#: ../calendar/gui/dialogs/recurrence-page.c:1160
 msgid "Other Date"
 msgstr "Other Date"
 
@@ -3314,7 +3206,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:1162
+#: ../calendar/gui/dialogs/recurrence-page.c:1166
 msgid "1st to 10th"
 msgstr "1st to 10th"
 
@@ -3322,7 +3214,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:1168
+#: ../calendar/gui/dialogs/recurrence-page.c:1172
 msgid "11th to 20th"
 msgstr "11th to 20th"
 
@@ -3330,41 +3222,41 @@ 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:1174
+#: ../calendar/gui/dialogs/recurrence-page.c:1178
 msgid "21st to 31st"
 msgstr "21st to 31st"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1200
+#: ../calendar/gui/dialogs/recurrence-page.c:1205
 #: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Monday"
 msgstr "Monday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1201
+#: ../calendar/gui/dialogs/recurrence-page.c:1206
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1202
+#: ../calendar/gui/dialogs/recurrence-page.c:1207
 #: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1203
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 #: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "Thursday"
 msgstr "Thursday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1204
+#: ../calendar/gui/dialogs/recurrence-page.c:1209
 #: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "Friday"
 msgstr "Friday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1205
+#: ../calendar/gui/dialogs/recurrence-page.c:1210
 #: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "Saturday"
 msgstr "Saturday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1206
+#: ../calendar/gui/dialogs/recurrence-page.c:1211
 #: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "Sunday"
 msgstr "Sunday"
@@ -3372,31 +3264,31 @@ 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:1330
+#: ../calendar/gui/dialogs/recurrence-page.c:1342
 msgid "on the"
 msgstr "on the"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1509
+#: ../calendar/gui/dialogs/recurrence-page.c:1527
 msgid "occurrences"
 msgstr "occurrences"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2225
+#: ../calendar/gui/dialogs/recurrence-page.c:2253
 msgid "Add exception"
 msgstr "Add exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2266
+#: ../calendar/gui/dialogs/recurrence-page.c:2295
 msgid "Could not get a selection to modify."
 msgstr "Could not get a selection to modify."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2272
+#: ../calendar/gui/dialogs/recurrence-page.c:2301
 msgid "Modify exception"
 msgstr "Modify exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2316
+#: ../calendar/gui/dialogs/recurrence-page.c:2347
 msgid "Could not get a selection to delete."
 msgstr "Could not get a selection to delete."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2455
+#: ../calendar/gui/dialogs/recurrence-page.c:2488
 msgid "Date/Time"
 msgstr "Date/Time"
 
@@ -3458,96 +3350,96 @@ msgstr "Exceptions"
 msgid "Preview"
 msgstr "Preview"
 
-#: ../calendar/gui/dialogs/send-comp.c:196
+#: ../calendar/gui/dialogs/send-comp.c:223
 msgid "Send my reminders with this event"
 msgstr "Send my reminders with this event"
 
-#: ../calendar/gui/dialogs/send-comp.c:198
+#: ../calendar/gui/dialogs/send-comp.c:225
 msgid "Notify new attendees _only"
 msgstr "Notify new attendees _only"
 
-#: ../calendar/gui/dialogs/task-details-page.c:355
+#: ../calendar/gui/dialogs/task-details-page.c:352
 #: ../calendar/gui/dialogs/task-details-page.c:377
 msgid "Completed date is wrong"
 msgstr "Completed date is wrong"
 
-#: ../calendar/gui/dialogs/task-details-page.c:489
+#: ../calendar/gui/dialogs/task-details-page.c:490
 msgid "Web Page"
 msgstr "Web Page"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:345
-#: ../calendar/gui/e-task-table.c:579 ../calendar/gui/tasktypes.xml.h:19
-#: ../mail/message-list.c:1275 ../widgets/misc/e-send-options.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:348
+#: ../calendar/gui/e-task-table.c:571 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:1257
 msgid "High"
 msgstr "High"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:347
-#: ../calendar/gui/e-cal-model.c:1655 ../calendar/gui/e-task-table.c:580
-#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1274
-#: ../widgets/misc/e-send-options.ui.h:5
+#: ../calendar/gui/e-cal-component-preview.c:350
+#: ../calendar/gui/e-cal-model.c:1681 ../calendar/gui/e-task-table.c:572
+#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
+#: ../mail/message-list.c:1256
 msgid "Normal"
 msgstr "Normal"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:349
-#: ../calendar/gui/e-task-table.c:581 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1273 ../widgets/misc/e-send-options.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:352
+#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:1255
 msgid "Low"
 msgstr "Low"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:22
-#: ../widgets/misc/e-send-options.ui.h:1
+#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:22
+#: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Undefined"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:331
-#: ../calendar/gui/e-cal-model-tasks.c:489
-#: ../calendar/gui/e-cal-model-tasks.c:774 ../calendar/gui/e-task-table.c:227
-#: ../calendar/gui/e-task-table.c:242 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3472 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-component-preview.c:333
+#: ../calendar/gui/e-cal-model-tasks.c:491
+#: ../calendar/gui/e-cal-model-tasks.c:777 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:654
+#: ../calendar/gui/print.c:3554 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Not Started"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-cal-model-tasks.c:491
-#: ../calendar/gui/e-cal-model-tasks.c:776
-#: ../calendar/gui/e-cal-model-tasks.c:854 ../calendar/gui/e-task-table.c:229
-#: ../calendar/gui/e-task-table.c:244 ../calendar/gui/e-task-table.c:657
-#: ../calendar/gui/print.c:3475
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-model-tasks.c:493
+#: ../calendar/gui/e-cal-model-tasks.c:779
+#: ../calendar/gui/e-cal-model-tasks.c:857 ../calendar/gui/e-task-table.c:216
+#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:655
+#: ../calendar/gui/print.c:3557
 msgid "In Progress"
 msgstr "In Progress"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:14
-#: ../calendar/gui/e-cal-component-preview.c:324
-#: ../calendar/gui/e-cal-model-tasks.c:493
-#: ../calendar/gui/e-cal-model-tasks.c:778
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
-#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:246
-#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3478
+#: ../calendar/gui/e-cal-component-preview.c:326
+#: ../calendar/gui/e-cal-model-tasks.c:495
+#: ../calendar/gui/e-cal-model-tasks.c:781
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
+#: ../calendar/gui/e-task-table.c:656 ../calendar/gui/print.c:3560
 #: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "Completed"
 msgstr "Completed"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:327
-#: ../calendar/gui/e-cal-model-tasks.c:495
-#: ../calendar/gui/e-cal-model-tasks.c:780 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:248 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3481 ../mail/mail-send-recv.c:879
+#: ../calendar/gui/e-cal-component-preview.c:329
+#: ../calendar/gui/e-cal-model-tasks.c:497
+#: ../calendar/gui/e-cal-model-tasks.c:783 ../calendar/gui/e-task-table.c:220
+#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:657
+#: ../calendar/gui/print.c:3563 ../mail/mail-send-recv.c:878
 msgid "Canceled"
 msgstr "Cancelled"
 
@@ -3555,10 +3447,10 @@ msgstr "Cancelled"
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:17
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3624
-#: ../calendar/gui/e-meeting-list-view.c:684
+#: ../calendar/gui/e-cal-model.c:3520
+#: ../calendar/gui/e-meeting-list-view.c:692
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:74
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
 #: ../mail/message-list.etspec.h:1
 msgid "Status"
 msgstr "Status"
@@ -3572,7 +3464,7 @@ msgid "P_ercent complete:"
 msgstr "P_ercent complete:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../e-util/e-send-options.ui.h:26
 msgid "_Priority:"
 msgstr "_Priority:"
 
@@ -3584,48 +3476,48 @@ msgstr "_Date completed:"
 msgid "_Web Page:"
 msgstr "_Web Page:"
 
-#: ../calendar/gui/dialogs/task-editor.c:116
+#: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
 msgstr "_Status Details"
 
-#: ../calendar/gui/dialogs/task-editor.c:118
+#: ../calendar/gui/dialogs/task-editor.c:115
 msgid "Click to change or view the status details of the task"
 msgstr "Click to change or view the status details of the task"
 
-#: ../calendar/gui/dialogs/task-editor.c:126
+#: ../calendar/gui/dialogs/task-editor.c:123
 msgid "_Send Options"
 msgstr "_Send Options"
 
-#: ../calendar/gui/dialogs/task-editor.c:186 ../calendar/gui/print.c:3393
-#: ../widgets/misc/e-send-options.c:553
+#: ../calendar/gui/dialogs/task-editor.c:183 ../calendar/gui/print.c:3470
+#: ../e-util/e-send-options.c:553
 msgid "Task"
 msgstr "Task"
 
-#: ../calendar/gui/dialogs/task-editor.c:307
+#: ../calendar/gui/dialogs/task-editor.c:304
 msgid "Task Details"
 msgstr "Task Details"
 
-#: ../calendar/gui/dialogs/task-editor.c:351
+#: ../calendar/gui/dialogs/task-editor.c:348
 msgid "Print this task"
 msgstr "Print this task"
 
-#: ../calendar/gui/dialogs/task-page.c:259
+#: ../calendar/gui/dialogs/task-page.c:249
 msgid "Task's start date is in the past"
 msgstr "Task's start date is in the past"
 
-#: ../calendar/gui/dialogs/task-page.c:260
+#: ../calendar/gui/dialogs/task-page.c:250
 msgid "Task's due date is in the past"
 msgstr "Task's due date is in the past"
 
-#: ../calendar/gui/dialogs/task-page.c:293
+#: ../calendar/gui/dialogs/task-page.c:283
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "Task cannot be edited, because the selected task list is read only"
 
-#: ../calendar/gui/dialogs/task-page.c:297
+#: ../calendar/gui/dialogs/task-page.c:287
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Task cannot be fully edited, because you are not the organiser"
 
-#: ../calendar/gui/dialogs/task-page.c:301
+#: ../calendar/gui/dialogs/task-page.c:291
 msgid ""
 "Task cannot be edited, because the selected task list does not support "
 "assigned tasks"
@@ -3637,11 +3529,6 @@ msgstr ""
 msgid "Due date is wrong"
 msgstr "Due date is wrong"
 
-#: ../calendar/gui/dialogs/task-page.c:1813
-#, 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:3
 msgid "D_ue date:"
 msgstr "D_ue date:"
@@ -3650,56 +3537,56 @@ msgstr "D_ue date:"
 msgid "Time zone:"
 msgstr "Time zone:"
 
-#: ../calendar/gui/ea-cal-view.c:320
+#: ../calendar/gui/ea-cal-view.c:324
 msgid "New Appointment"
 msgstr "New Appointment"
 
-#: ../calendar/gui/ea-cal-view.c:321
+#: ../calendar/gui/ea-cal-view.c:325
 msgid "New All Day Event"
 msgstr "New All Day Event"
 
-#: ../calendar/gui/ea-cal-view.c:322
+#: ../calendar/gui/ea-cal-view.c:326
 msgid "New Meeting"
 msgstr "New Meeting"
 
-#: ../calendar/gui/ea-cal-view.c:323
+#: ../calendar/gui/ea-cal-view.c:327
 msgid "Go to Today"
 msgstr "Go to Today"
 
-#: ../calendar/gui/ea-cal-view.c:324
+#: ../calendar/gui/ea-cal-view.c:328
 msgid "Go to Date"
 msgstr "Go to Date"
 
-#: ../calendar/gui/ea-cal-view-event.c:291
+#: ../calendar/gui/ea-cal-view-event.c:298
 msgid "It has reminders."
 msgstr "It has reminders."
 
-#: ../calendar/gui/ea-cal-view-event.c:294
+#: ../calendar/gui/ea-cal-view-event.c:301
 msgid "It has recurrences."
 msgstr "It has recurrences."
 
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:304
 msgid "It is a meeting."
 msgstr "It is a meeting."
 
-#: ../calendar/gui/ea-cal-view-event.c:304
+#: ../calendar/gui/ea-cal-view-event.c:311
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Calendar Event: Summary is %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:307
+#: ../calendar/gui/ea-cal-view-event.c:314
 msgid "Calendar Event: It has no summary."
 msgstr "Calendar Event: It has no summary."
 
-#: ../calendar/gui/ea-cal-view-event.c:329
+#: ../calendar/gui/ea-cal-view-event.c:337
 msgid "calendar view event"
 msgstr "calendar view event"
 
-#: ../calendar/gui/ea-cal-view-event.c:558
+#: ../calendar/gui/ea-cal-view-event.c:566
 msgid "Grab Focus"
 msgstr "Grab Focus"
 
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
+#: ../calendar/gui/ea-day-view.c:154 ../calendar/gui/ea-week-view.c:154
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -3708,47 +3595,41 @@ 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
+#: ../calendar/gui/ea-day-view.c:161 ../calendar/gui/ea-week-view.c:157
 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
+#: ../calendar/gui/ea-day-view.c:169
 #, 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
+#: ../calendar/gui/ea-day-view.c:176
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Day View: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:210
 msgid "calendar view for a work week"
 msgstr "calendar view for a work week"
 
-#: ../calendar/gui/ea-day-view.c:205
+#: ../calendar/gui/ea-day-view.c:212
 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
+#: ../calendar/gui/ea-day-view-main-item.c:327
+#: ../calendar/gui/ea-week-view-main-item.c:354
 msgid "a table to view and select the current time range"
 msgstr "a table to view and select the current time range"
 
 #: ../calendar/gui/ea-gnome-calendar.c:48
 #: ../calendar/gui/ea-gnome-calendar.c:56
-#: ../calendar/importers/icalendar-importer.c:1118
+#: ../calendar/importers/icalendar-importer.c:1114
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
-#: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1104
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../modules/calendar/e-cal-shell-view-private.c:1143
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -3758,30 +3639,30 @@ msgstr "%A %d %b %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1853
-#: ../calendar/gui/e-day-view-top-item.c:835
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../modules/calendar/e-cal-shell-view-private.c:1108
+#: ../calendar/gui/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:2316
+#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1147
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../calendar/gui/ea-gnome-calendar.c:209
 #: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../modules/calendar/e-cal-shell-view-private.c:1111
-#: ../modules/calendar/e-cal-shell-view-private.c:1117
-#: ../modules/calendar/e-cal-shell-view-private.c:1120
+#: ../calendar/gui/ea-gnome-calendar.c:217
+#: ../calendar/gui/ea-gnome-calendar.c:220
+#: ../modules/calendar/e-cal-shell-view-private.c:1150
+#: ../modules/calendar/e-cal-shell-view-private.c:1156
+#: ../modules/calendar/e-cal-shell-view-private.c:1159
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:228
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1137
-#: ../modules/calendar/e-cal-shell-view-private.c:1148
-#: ../modules/calendar/e-cal-shell-view-private.c:1155
-#: ../modules/calendar/e-cal-shell-view-private.c:1158
+#: ../calendar/gui/ea-gnome-calendar.c:239
+#: ../calendar/gui/ea-gnome-calendar.c:247
+#: ../calendar/gui/ea-gnome-calendar.c:254
+#: ../calendar/gui/ea-gnome-calendar.c:257
+#: ../modules/calendar/e-cal-shell-view-private.c:1176
+#: ../modules/calendar/e-cal-shell-view-private.c:1187
+#: ../modules/calendar/e-cal-shell-view-private.c:1194
+#: ../modules/calendar/e-cal-shell-view-private.c:1197
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -3790,10 +3671,10 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:232 ../calendar/gui/e-day-view.c:1869
-#: ../calendar/gui/e-day-view-top-item.c:839
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../modules/calendar/e-cal-shell-view-private.c:1144
+#: ../calendar/gui/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:2332
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:247
+#: ../modules/calendar/e-cal-shell-view-private.c:1183
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -3825,94 +3706,86 @@ msgstr[1] "%d weeks"
 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:440
+#: ../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:445
+#: ../calendar/gui/e-alarm-list.c:447
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s after the start of the appointment"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:454
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s at the start of the appointment"
 
-#. 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:463
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s before the end of the appointment"
 
-#. 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:468
+#: ../calendar/gui/e-alarm-list.c:472
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s after the end of the appointment"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:475
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s at the end of the appointment"
 
 #. 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:499
+#: ../calendar/gui/e-alarm-list.c:503
 #, 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:507
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: ../calendar/gui/ea-week-view.c:159
+#: ../calendar/gui/ea-week-view.c:163
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Month View: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:163
+#: ../calendar/gui/ea-week-view.c:168
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Week View: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:197
+#: ../calendar/gui/ea-week-view.c:202
 msgid "calendar view for a month"
 msgstr "calendar view for a month"
 
-#: ../calendar/gui/ea-week-view.c:199
+#: ../calendar/gui/ea-week-view.c:204
 msgid "calendar view for one or more weeks"
 msgstr "calendar view for one or more weeks"
 
-#: ../calendar/gui/e-cal-component-preview.c:237 ../filter/e-filter-rule.c:751
+#: ../calendar/gui/e-cal-component-preview.c:234 ../e-util/e-filter-rule.c:750
 #: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "Untitled"
 
-#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:242
 msgid "Categories:"
 msgstr "Categories:"
 
-#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-cal-component-preview.c:274
 msgid "Summary:"
 msgstr "Summary:"
 
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:283
 msgid "Start Date:"
 msgstr "Start Date:"
 
@@ -3920,26 +3793,26 @@ msgstr "Start Date:"
 msgid "End Date:"
 msgstr "End Date:"
 
-#: ../calendar/gui/e-cal-component-preview.c:306
+#: ../calendar/gui/e-cal-component-preview.c:307
 msgid "Due Date:"
 msgstr "Due Date:"
 
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../modules/itip-formatter/itip-view.c:1475
-#: ../modules/itip-formatter/itip-view.c:1592
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../modules/itip-formatter/itip-view.c:1492
+#: ../modules/itip-formatter/itip-view.c:1609
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:343
+#: ../calendar/gui/e-cal-component-preview.c:346
 msgid "Priority:"
 msgstr "Priority:"
 
-#: ../calendar/gui/e-cal-component-preview.c:367
+#: ../calendar/gui/e-cal-component-preview.c:371
 #: ../mail/e-mail-config-service-page.c:672
 msgid "Description:"
 msgstr "Description:"
 
-#: ../calendar/gui/e-cal-component-preview.c:397
+#: ../calendar/gui/e-cal-component-preview.c:402
 msgid "Web Page:"
 msgstr "Web Page:"
 
@@ -3952,11 +3825,11 @@ msgid "Start date"
 msgstr "Start date"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:644
+#: ../calendar/gui/e-meeting-list-view.c:649
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../mail/e-mail-account-tree-view.c:157
-#: ../widgets/misc/e-attachment-tree-view.c:586
+#: ../e-util/e-attachment-tree-view.c:586
+#: ../mail/e-mail-account-tree-view.c:159
 msgid "Type"
 msgstr "Type"
 
@@ -3964,7 +3837,7 @@ msgstr "Type"
 msgid "Completion date"
 msgstr "Completion date"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:881
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:880
 msgid "Complete"
 msgstr "Complete"
 
@@ -3979,14 +3852,14 @@ msgstr "% Complete"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Priority"
 msgstr "Priority"
 
 #: ../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:377
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Created"
 msgstr "Created"
 
@@ -3996,37 +3869,37 @@ msgstr "Created"
 msgid "Last modified"
 msgstr "Last modified"
 
-#: ../calendar/gui/e-calendar-view.c:434
+#: ../calendar/gui/e-calendar-view.c:438
 msgid "Cut selected events to the clipboard"
 msgstr "Cut selected events to the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:440
+#: ../calendar/gui/e-calendar-view.c:444
 msgid "Copy selected events to the clipboard"
 msgstr "Copy selected events to the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:446
+#: ../calendar/gui/e-calendar-view.c:450
 msgid "Paste events from the clipboard"
 msgstr "Paste events from the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:452
+#: ../calendar/gui/e-calendar-view.c:456
 msgid "Delete selected events"
 msgstr "Delete selected events"
 
-#: ../calendar/gui/e-calendar-view.c:472 ../calendar/gui/e-memo-table.c:195
-#: ../calendar/gui/e-task-table.c:283
+#: ../calendar/gui/e-calendar-view.c:476 ../calendar/gui/e-memo-table.c:183
+#: ../calendar/gui/e-task-table.c:270
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
 
-#: ../calendar/gui/e-calendar-view.c:631 ../calendar/gui/e-memo-table.c:875
-#: ../calendar/gui/e-task-table.c:1158
+#: ../calendar/gui/e-calendar-view.c:635 ../calendar/gui/e-memo-table.c:863
+#: ../calendar/gui/e-task-table.c:1161
 msgid "Updating objects"
 msgstr "Updating objects"
 
 #. 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:1992 ../calendar/gui/e-memo-table.c:552
-#: ../calendar/gui/e-task-table.c:824
+#: ../calendar/gui/e-calendar-view.c:1999 ../calendar/gui/e-memo-table.c:540
+#: ../calendar/gui/e-task-table.c:827
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organiser: %s <%s>"
@@ -4034,20 +3907,21 @@ 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:1996 ../calendar/gui/e-memo-table.c:557
-#: ../calendar/gui/e-task-table.c:828
+#: ../calendar/gui/e-calendar-view.c:2003 ../calendar/gui/e-memo-table.c:545
+#: ../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:2012 ../calendar/gui/print.c:3427
+#: ../calendar/gui/e-calendar-view.c:2019
+#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3508
 #, c-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2043
+#: ../calendar/gui/e-calendar-view.c:2050
 #, c-format
 msgid "Time: %s %s"
 msgstr "Time: %s %s"
@@ -4061,86 +3935,81 @@ msgstr "Start Date"
 msgid "End Date"
 msgstr "End Date"
 
-#: ../calendar/gui/e-cal-model.c:842 ../calendar/gui/e-meeting-list-view.c:186
-#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
-#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1222
-#: ../calendar/gui/print.c:1239 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3480
-#: ../modules/itip-formatter/itip-view.c:6012
-#: ../modules/plugin-manager/evolution-plugin-manager.c:101
+#: ../calendar/gui/e-cal-model.c:854 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1235
+#: ../calendar/gui/print.c:1252 ../e-util/e-charset.c:52
+#: ../modules/itip-formatter/itip-view.c:3505
+#: ../modules/itip-formatter/itip-view.c:5995
+#: ../modules/plugin-manager/evolution-plugin-manager.c:100
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../calendar/gui/e-cal-model.c:1657
+#: ../calendar/gui/e-cal-model.c:1683
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../calendar/gui/e-cal-model.c:1659
+#: ../calendar/gui/e-cal-model.c:1685
 msgid "Assigned"
 msgstr "Assigned"
 
-#: ../calendar/gui/e-cal-model.c:1661 ../calendar/gui/e-cal-model-tasks.c:1145
-#: ../calendar/gui/e-meeting-list-view.c:210
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
-#: ../calendar/gui/e-meeting-store.c:1075
+#: ../calendar/gui/e-cal-model.c:1687 ../calendar/gui/e-cal-model-tasks.c:1148
+#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:1024
 msgid "Yes"
 msgstr "Yes"
 
-#: ../calendar/gui/e-cal-model.c:1661 ../calendar/gui/e-cal-model-tasks.c:1145
-#: ../calendar/gui/e-meeting-list-view.c:211
-#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-cal-model.c:1687 ../calendar/gui/e-cal-model-tasks.c:1148
+#: ../calendar/gui/e-meeting-list-view.c:210
+#: ../calendar/gui/e-meeting-store.c:189
 msgid "No"
 msgstr "No"
 
-#: ../calendar/gui/e-cal-model.c:3114
-#, c-format
-msgid "Opening %s"
-msgstr "Opening %s"
-
-#: ../calendar/gui/e-cal-model.c:3565
-#: ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../modules/itip-formatter/itip-view.c:6000
+#: ../calendar/gui/e-cal-model.c:3461
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../modules/itip-formatter/itip-view.c:5983
 msgid "Accepted"
 msgstr "Accepted"
 
-#: ../calendar/gui/e-cal-model.c:3566
-#: ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../modules/itip-formatter/itip-view.c:6006
+#: ../calendar/gui/e-cal-model.c:3462
+#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../modules/itip-formatter/itip-view.c:5989
 msgid "Declined"
 msgstr "Declined"
 
-#: ../calendar/gui/e-cal-model.c:3567
-#: ../calendar/gui/e-meeting-list-view.c:224
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-cal-model.c:3463
+#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid "Tentative"
 msgstr "Tentative"
 
-#: ../calendar/gui/e-cal-model.c:3568
-#: ../calendar/gui/e-meeting-list-view.c:225
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
-#: ../modules/itip-formatter/itip-view.c:6009
+#: ../calendar/gui/e-cal-model.c:3464
+#: ../calendar/gui/e-meeting-list-view.c:224
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../modules/itip-formatter/itip-view.c:5992
 msgid "Delegated"
 msgstr "Delegated"
 
-#: ../calendar/gui/e-cal-model.c:3569
+#: ../calendar/gui/e-cal-model.c:3465
 msgid "Needs action"
 msgstr "Needs action"
 
-#: ../calendar/gui/e-cal-model-calendar.c:157
-#: ../calendar/gui/e-task-table.c:633
+#: ../calendar/gui/e-cal-model-calendar.c:158
+#: ../calendar/gui/e-task-table.c:629
 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:634
+#: ../calendar/gui/e-cal-model-calendar.c:161
+#: ../calendar/gui/e-meeting-time-sel.c:527 ../calendar/gui/e-task-table.c:630
 msgid "Busy"
 msgstr "Busy"
 
-#: ../calendar/gui/e-cal-model-tasks.c:720
+#: ../calendar/gui/e-cal-model-tasks.c:723
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4151,22 +4020,22 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:772
+#: ../calendar/gui/e-cal-model-tasks.c:775
 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:162
+#: ../calendar/gui/e-cell-date-edit-text.c:159
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:165
+#: ../calendar/gui/e-cell-date-edit-text.c:162
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:173
+#: ../calendar/gui/e-cell-date-edit-text.c:170
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4176,16 +4045,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1027 ../calendar/gui/e-week-view.c:773
-#: ../calendar/gui/print.c:1048 ../calendar/gui/print.c:1067
-#: ../calendar/gui/print.c:2564 ../calendar/gui/print.c:2584
+#: ../calendar/gui/e-day-view.c:1581 ../calendar/gui/e-week-view.c:1500
+#: ../calendar/gui/print.c:1058 ../calendar/gui/print.c:1077
+#: ../calendar/gui/print.c:2608 ../calendar/gui/print.c:2628
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1030 ../calendar/gui/e-week-view.c:776
-#: ../calendar/gui/print.c:1053 ../calendar/gui/print.c:1069
-#: ../calendar/gui/print.c:2569 ../calendar/gui/print.c:2586
+#: ../calendar/gui/e-day-view.c:1584 ../calendar/gui/e-week-view.c:1503
+#: ../calendar/gui/print.c:1063 ../calendar/gui/print.c:1079
+#: ../calendar/gui/print.c:2613 ../calendar/gui/print.c:2630
 msgid "pm"
 msgstr "pm"
 
@@ -4195,13 +4064,13 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:1836 ../calendar/gui/e-day-view-top-item.c:831
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:2044
+#: ../calendar/gui/e-day-view.c:2299 ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2071
 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:2673
+#: ../calendar/gui/e-day-view.c:2942
 #, c-format
 msgid "Week %d"
 msgstr "Week %d"
@@ -4212,191 +4081,203 @@ msgstr "Week %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:790
+#: ../calendar/gui/e-day-view-time-item.c:794
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minute divisions"
 
-#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-day-view-time-item.c:819
 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:832
-#: ../modules/calendar/e-calendar-preferences.c:185
-#: ../modules/calendar/e-calendar-preferences.c:237
+#: ../calendar/gui/e-day-view-time-item.c:836
+#: ../modules/calendar/e-calendar-preferences.c:179
+#: ../modules/calendar/e-calendar-preferences.c:231
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "None"
 
-#: ../calendar/gui/e-day-view-time-item.c:866
-#: ../calendar/gui/e-timezone-entry.c:322
-#: ../modules/calendar/e-calendar-preferences.c:268
+#: ../calendar/gui/e-day-view-time-item.c:870
+#: ../calendar/gui/e-timezone-entry.c:324
+#: ../modules/calendar/e-calendar-preferences.c:262
 msgid "Select..."
 msgstr "Select…"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Chair Persons"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "Required Participants"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "Optional Participants"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "Resources"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/e-meeting-store.c:1069 ../calendar/gui/print.c:1218
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:1018 ../calendar/gui/print.c:1231
 msgid "Individual"
 msgstr "Individual"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1219 ../widgets/table/e-table-config.ui.h:8
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
+#: ../calendar/gui/print.c:1232 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Group"
 
-#: ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-store.c:118 ../calendar/gui/e-meeting-store.c:135
-#: ../calendar/gui/print.c:1220
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/print.c:1233
 msgid "Resource"
 msgstr "Resource"
 
-#: ../calendar/gui/e-meeting-list-view.c:185
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:1221
+#: ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1234
 msgid "Room"
 msgstr "Room"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1235
+#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/print.c:1248
 msgid "Chair"
 msgstr "Chair"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/e-meeting-store.c:1072 ../calendar/gui/print.c:1236
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1249
 msgid "Required Participant"
 msgstr "Required Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/print.c:1237
+#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1250
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/print.c:1238
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/print.c:1251
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../calendar/gui/e-meeting-store.c:1082
+#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:1031
 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:619
+#: ../calendar/gui/e-meeting-list-view.c:623
 msgid "Attendee                          "
 msgstr "Attendee                          "
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:671
+#: ../calendar/gui/e-meeting-list-view.c:678
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
 msgid "In Process"
 msgstr "In Process"
 
-#: ../calendar/gui/e-meeting-store.c:1906
+#: ../calendar/gui/e-meeting-store.c:1905
 #, 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:1916
+#: ../calendar/gui/e-meeting-store.c:1915
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Failure reason: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1921
-#: ../plugins/publish-calendar/publish-calendar.c:335
-#: ../smime/gui/component.c:54
+#: ../calendar/gui/e-meeting-store.c:1920
+#: ../plugins/publish-calendar/publish-calendar.c:341
+#: ../smime/gui/component.c:55
 msgid "Enter password"
 msgstr "Enter password"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:528
 msgid "Out of Office"
 msgstr "Out of Office"
 
-#: ../calendar/gui/e-meeting-time-sel.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:530
 msgid "No Information"
 msgstr "No Information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:602
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "O_ptions"
 msgstr "O_ptions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:590
 msgid "Show _only working hours"
 msgstr "Show _only working hours"
 
-#: ../calendar/gui/e-meeting-time-sel.c:632
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _zoomed out"
 msgstr "Show _zoomed out"
 
-#: ../calendar/gui/e-meeting-time-sel.c:649
+#: ../calendar/gui/e-meeting-time-sel.c:621
 msgid "_Update free/busy"
 msgstr "_Update free/busy"
 
-#: ../calendar/gui/e-meeting-time-sel.c:665
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:684
+#: ../calendar/gui/e-meeting-time-sel.c:658
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: ../calendar/gui/e-meeting-time-sel.c:700
+#: ../calendar/gui/e-meeting-time-sel.c:675
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:719
+#: ../calendar/gui/e-meeting-time-sel.c:696
 msgid "_All people and resources"
 msgstr "_All people and resources"
 
-#: ../calendar/gui/e-meeting-time-sel.c:730
+#: ../calendar/gui/e-meeting-time-sel.c:707
 msgid "All _people and one resource"
 msgstr "All _people and one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:741
+#: ../calendar/gui/e-meeting-time-sel.c:718
 msgid "_Required people"
 msgstr "_Required people"
 
-#: ../calendar/gui/e-meeting-time-sel.c:751
+#: ../calendar/gui/e-meeting-time-sel.c:728
 msgid "Required people and _one resource"
 msgstr "Required people and _one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:802
+#: ../calendar/gui/e-meeting-time-sel.c:767
 msgid "_Start time:"
 msgstr "_Start time:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:843
+#: ../calendar/gui/e-meeting-time-sel.c:796
 msgid "_End time:"
 msgstr "_End time:"
 
+#: ../calendar/gui/e-meeting-time-sel.c:2660
+#, c-format
+msgid ""
+"Summary: %s\n"
+"Location: %s"
+msgstr ""
+"Summary: %s\n"
+"Location: %s"
+
+#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3497
+#, c-format
+msgid "Summary: %s"
+msgstr "Summary: %s"
+
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Click here to add an attendee"
 msgstr "Click here to add an attendee"
@@ -4421,46 +4302,46 @@ msgstr "Common Name"
 msgid "Language"
 msgstr "Language"
 
-#: ../calendar/gui/e-memo-table.c:433
-#: ../modules/calendar/e-cal-shell-content.c:476
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view-actions.c:248
+#: ../calendar/gui/e-memo-table.c:421
+#: ../modules/calendar/e-cal-shell-content.c:472
+#: ../modules/calendar/e-memo-shell-view-actions.c:232
+#: ../modules/calendar/e-memo-shell-view-actions.c:247
 #: ../modules/calendar/e-memo-shell-view.c:306
 msgid "Memos"
 msgstr "Memos"
 
-#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:787
+#: ../calendar/gui/e-memo-table.c:502 ../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:601 ../calendar/gui/e-task-table.c:871
+#: ../calendar/gui/e-memo-table.c:589 ../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:620 ../calendar/gui/e-task-table.c:889
+#: ../calendar/gui/e-memo-table.c:608 ../calendar/gui/e-task-table.c:892
 msgid "Due: "
 msgstr "Due: "
 
-#: ../calendar/gui/e-memo-table.c:739
+#: ../calendar/gui/e-memo-table.c:727
 msgid "Cut selected memos to the clipboard"
 msgstr "Cut selected memos to the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:745
+#: ../calendar/gui/e-memo-table.c:733
 msgid "Copy selected memos to the clipboard"
 msgstr "Copy selected memos to the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:751
+#: ../calendar/gui/e-memo-table.c:739
 msgid "Paste memos from the clipboard"
 msgstr "Paste memos from the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:757
-#: ../modules/calendar/e-memo-shell-view-actions.c:611
+#: ../calendar/gui/e-memo-table.c:745
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
 msgid "Delete selected memos"
 msgstr "Delete selected memos"
 
-#: ../calendar/gui/e-memo-table.c:763
+#: ../calendar/gui/e-memo-table.c:751
 msgid "Select all visible memos"
 msgstr "Select all visible memos"
 
@@ -4472,60 +4353,60 @@ 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:608
+#: ../calendar/gui/e-task-table.c:602
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:705 ../calendar/gui/print.c:2353
-#: ../calendar/importers/icalendar-importer.c:84
-#: ../calendar/importers/icalendar-importer.c:1082
+#: ../calendar/gui/e-task-table.c:708 ../calendar/gui/print.c:2389
+#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/importers/icalendar-importer.c:1078
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:437
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view-actions.c:271
+#: ../modules/calendar/e-cal-shell-content.c:433
+#: ../modules/calendar/e-task-shell-view-actions.c:255
+#: ../modules/calendar/e-task-shell-view-actions.c:270
 #: ../modules/calendar/e-task-shell-view.c:461
 msgid "Tasks"
 msgstr "Tasks"
 
-#: ../calendar/gui/e-task-table.c:1022
+#: ../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:1028
+#: ../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:1034
+#: ../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:1040
-#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../calendar/gui/e-task-table.c:1043
+#: ../modules/calendar/e-task-shell-view-actions.c:734
 msgid "Delete selected tasks"
 msgstr "Delete selected tasks"
 
-#: ../calendar/gui/e-task-table.c:1046
+#: ../calendar/gui/e-task-table.c:1049
 msgid "Select all visible tasks"
 msgstr "Select all visible tasks"
 
-#: ../calendar/gui/e-timezone-entry.c:333
+#: ../calendar/gui/e-timezone-entry.c:335
 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:239 ../calendar/gui/print.c:2025
+#: ../calendar/gui/e-week-view-main-item.c:241 ../calendar/gui/print.c:2050
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2318
+#: ../calendar/gui/gnome-cal.c:2319
 msgid "Purging"
 msgstr "Purging"
 
-#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:706
-#: ../calendar/gui/itip-utils.c:819
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
+#: ../calendar/gui/itip-utils.c:818
 msgid "An organizer must be set."
 msgstr "An organiser must be set."
 
@@ -4533,23 +4414,23 @@ msgstr "An organiser must be set."
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: ../calendar/gui/itip-utils.c:906 ../calendar/gui/itip-utils.c:1067
+#: ../calendar/gui/itip-utils.c:905 ../calendar/gui/itip-utils.c:1066
 msgid "Event information"
 msgstr "Event information"
 
-#: ../calendar/gui/itip-utils.c:909 ../calendar/gui/itip-utils.c:1070
+#: ../calendar/gui/itip-utils.c:908 ../calendar/gui/itip-utils.c:1069
 msgid "Task information"
 msgstr "Task information"
 
-#: ../calendar/gui/itip-utils.c:912 ../calendar/gui/itip-utils.c:1073
+#: ../calendar/gui/itip-utils.c:911 ../calendar/gui/itip-utils.c:1072
 msgid "Memo information"
 msgstr "Memo information"
 
-#: ../calendar/gui/itip-utils.c:915 ../calendar/gui/itip-utils.c:1091
+#: ../calendar/gui/itip-utils.c:914 ../calendar/gui/itip-utils.c:1090
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
-#: ../calendar/gui/itip-utils.c:918
+#: ../calendar/gui/itip-utils.c:917
 msgid "Calendar information"
 msgstr "Calendar information"
 
@@ -4557,7 +4438,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:955
+#: ../calendar/gui/itip-utils.c:954
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Accepted"
@@ -4566,7 +4447,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:962
+#: ../calendar/gui/itip-utils.c:961
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
@@ -4578,7 +4459,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:969 ../calendar/gui/itip-utils.c:1017
+#: ../calendar/gui/itip-utils.c:968 ../calendar/gui/itip-utils.c:1016
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Declined"
@@ -4587,7 +4468,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:976
+#: ../calendar/gui/itip-utils.c:975
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegated"
@@ -4595,7 +4476,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:989
+#: ../calendar/gui/itip-utils.c:988
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Updated"
@@ -4603,7 +4484,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:996
+#: ../calendar/gui/itip-utils.c:995
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancel"
@@ -4611,7 +4492,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:1003
+#: ../calendar/gui/itip-utils.c:1002
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Refresh"
@@ -4619,252 +4500,248 @@ 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:1010
+#: ../calendar/gui/itip-utils.c:1009
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
 
-#: ../calendar/gui/itip-utils.c:1088
+#: ../calendar/gui/itip-utils.c:1087
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy information (%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:1096
+#: ../calendar/gui/itip-utils.c:1095
 msgid "iCalendar information"
 msgstr "iCalendar information"
 
-#: ../calendar/gui/itip-utils.c:1123
+#: ../calendar/gui/itip-utils.c:1122
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Unable to book a resource, the new event collides with some other."
 
 #: ../calendar/gui/itip-utils.c:1127
-msgid "Unable to book a resource, error: "
-msgstr "Unable to book a resource, error: "
+#, c-format
+msgid "Unable to book a resource, error: %s"
+msgstr "Unable to book a resource, error: %s"
 
-#: ../calendar/gui/itip-utils.c:1306
+#: ../calendar/gui/itip-utils.c:1304
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:657
 msgid "1st"
 msgstr "1st"
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:657
 msgid "2nd"
 msgstr "2nd"
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:657
 msgid "3rd"
 msgstr "3rd"
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:657
 msgid "4th"
 msgstr "4th"
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:657
 msgid "5th"
 msgstr "5th"
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:658
 msgid "6th"
 msgstr "6th"
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:658
 msgid "7th"
 msgstr "7th"
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:658
 msgid "8th"
 msgstr "8th"
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:658
 msgid "9th"
 msgstr "9th"
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:658
 msgid "10th"
 msgstr "10th"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:659
 msgid "11th"
 msgstr "11th"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:659
 msgid "12th"
 msgstr "12th"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:659
 msgid "13th"
 msgstr "13th"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:659
 msgid "14th"
 msgstr "14th"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:659
 msgid "15th"
 msgstr "15th"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:660
 msgid "16th"
 msgstr "16th"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:660
 msgid "17th"
 msgstr "17th"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:660
 msgid "18th"
 msgstr "18th"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:660
 msgid "19th"
 msgstr "19th"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:660
 msgid "20th"
 msgstr "20th"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:661
 msgid "21st"
 msgstr "21st"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:661
 msgid "22nd"
 msgstr "22nd"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:661
 msgid "23rd"
 msgstr "23rd"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:661
 msgid "24th"
 msgstr "24th"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:661
 msgid "25th"
 msgstr "25th"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:662
 msgid "26th"
 msgstr "26th"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:662
 msgid "27th"
 msgstr "27th"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:662
 msgid "28th"
 msgstr "28th"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:662
 msgid "29th"
 msgstr "29th"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:662
 msgid "30th"
 msgstr "30th"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:663
 msgid "31st"
 msgstr "31st"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:715
+#: ../calendar/gui/print.c:721
 msgid "Su"
 msgstr "Su"
 
-#: ../calendar/gui/print.c:715
+#: ../calendar/gui/print.c:721
 msgid "Mo"
 msgstr "Mo"
 
-#: ../calendar/gui/print.c:715
+#: ../calendar/gui/print.c:721
 msgid "Tu"
 msgstr "Tu"
 
-#: ../calendar/gui/print.c:715
+#: ../calendar/gui/print.c:721
 msgid "We"
 msgstr "We"
 
-#: ../calendar/gui/print.c:716
+#: ../calendar/gui/print.c:722
 msgid "Th"
 msgstr "Th"
 
-#: ../calendar/gui/print.c:716
+#: ../calendar/gui/print.c:722
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:716
+#: ../calendar/gui/print.c:722
 msgid "Sa"
 msgstr "Sa"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3220
+#: ../calendar/gui/print.c:3296
 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:3230
+#: ../calendar/gui/print.c:3306
 msgid " (Completed "
 msgstr " (Completed "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3236
+#: ../calendar/gui/print.c:3312
 msgid "Completed "
 msgstr "Completed "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3246
+#: ../calendar/gui/print.c:3322
 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:3253
+#: ../calendar/gui/print.c:3329
 msgid "Due "
 msgstr "Due "
 
-#: ../calendar/gui/print.c:3418
-#, c-format
-msgid "Summary: %s"
-msgstr "Summary: %s"
-
-#: ../calendar/gui/print.c:3445
+#: ../calendar/gui/print.c:3527
 msgid "Attendees: "
 msgstr "Attendees: "
 
-#: ../calendar/gui/print.c:3488
+#: ../calendar/gui/print.c:3571
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:3503
+#: ../calendar/gui/print.c:3587
 #, c-format
 msgid "Priority: %s"
 msgstr "Priority: %s"
 
-#: ../calendar/gui/print.c:3521
+#: ../calendar/gui/print.c:3605
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percent Complete: %i"
 
-#: ../calendar/gui/print.c:3532
+#: ../calendar/gui/print.c:3619
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3545
+#: ../calendar/gui/print.c:3633
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: ../calendar/gui/print.c:3556
+#: ../calendar/gui/print.c:3644
 msgid "Contacts: "
 msgstr "Contacts: "
 
@@ -4881,193 +4758,189 @@ msgstr "Cancelled"
 msgid "% Completed"
 msgstr "% Completed"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:37
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:38
 msgid "is greater than"
 msgstr "is greater than"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:38
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:39
 msgid "is less than"
 msgstr "is less than"
 
-#: ../calendar/importers/icalendar-importer.c:83
+#: ../calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
 msgstr "Appointments and Meetings"
 
-#: ../calendar/importers/icalendar-importer.c:468
-#: ../calendar/importers/icalendar-importer.c:905
-#: ../modules/itip-formatter/itip-view.c:5614
+#: ../calendar/importers/icalendar-importer.c:462
+#: ../calendar/importers/icalendar-importer.c:901
 msgid "Opening calendar"
 msgstr "Opening calendar"
 
-#: ../calendar/importers/icalendar-importer.c:616
+#: ../calendar/importers/icalendar-importer.c:610
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar files (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:617
+#: ../calendar/importers/icalendar-importer.c:611
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:707
+#: ../calendar/importers/icalendar-importer.c:703
 msgid "Reminder!"
 msgstr "Reminder!"
 
-#: ../calendar/importers/icalendar-importer.c:791
+#: ../calendar/importers/icalendar-importer.c:787
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar files (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:792
+#: ../calendar/importers/icalendar-importer.c:788
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:1075
+#: ../calendar/importers/icalendar-importer.c:1071
 msgid "Calendar Events"
 msgstr "Calendar Events"
 
-#: ../calendar/importers/icalendar-importer.c:1119
+#: ../calendar/importers/icalendar-importer.c:1115
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution Calendar intelligent importer"
 
-#: ../calendar/importers/icalendar-importer.c:1187
+#: ../calendar/importers/icalendar-importer.c:1186
 #: ../calendar/importers/icalendar-importer.c:1505
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Meeting"
 
-#: ../calendar/importers/icalendar-importer.c:1187
+#: ../calendar/importers/icalendar-importer.c:1186
 #: ../calendar/importers/icalendar-importer.c:1505
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Event"
 
-#: ../calendar/importers/icalendar-importer.c:1190
+#: ../calendar/importers/icalendar-importer.c:1189
 #: ../calendar/importers/icalendar-importer.c:1506
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Task"
 
-#: ../calendar/importers/icalendar-importer.c:1193
+#: ../calendar/importers/icalendar-importer.c:1192
 #: ../calendar/importers/icalendar-importer.c:1507
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/importers/icalendar-importer.c:1202
+#: ../calendar/importers/icalendar-importer.c:1201
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "has recurrences"
 
-#: ../calendar/importers/icalendar-importer.c:1207
+#: ../calendar/importers/icalendar-importer.c:1206
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "is an instance"
 
-#: ../calendar/importers/icalendar-importer.c:1212
+#: ../calendar/importers/icalendar-importer.c:1211
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "has reminders"
 
-#: ../calendar/importers/icalendar-importer.c:1217
+#: ../calendar/importers/icalendar-importer.c:1216
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "has attachments"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1230
+#: ../calendar/importers/icalendar-importer.c:1229
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Public"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1233
+#: ../calendar/importers/icalendar-importer.c:1232
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Private"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1236
+#: ../calendar/importers/icalendar-importer.c:1235
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Confidential"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1240
+#: ../calendar/importers/icalendar-importer.c:1239
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Classification"
 
 #. Translators: Appointment's summary
-#. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1245
-#: ../calendar/importers/icalendar-importer.c:1546
+#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1549
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Summary"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1251
+#: ../calendar/importers/icalendar-importer.c:1250
 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:1259
-#: ../calendar/importers/icalendar-importer.c:1542
+#: ../calendar/importers/icalendar-importer.c:1258
+#: ../calendar/importers/icalendar-importer.c:1544
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Start"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1270
+#: ../calendar/importers/icalendar-importer.c:1269
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Due"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1282
+#: ../calendar/importers/icalendar-importer.c:1281
 msgctxt "iCalImp"
 msgid "End"
 msgstr "End"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1292
+#: ../calendar/importers/icalendar-importer.c:1291
 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:1316
+#: ../calendar/importers/icalendar-importer.c:1315
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Completed"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1324
+#: ../calendar/importers/icalendar-importer.c:1323
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1335
-#: ../calendar/importers/icalendar-importer.c:1338
+#: ../calendar/importers/icalendar-importer.c:1334
+#: ../calendar/importers/icalendar-importer.c:1337
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organiser"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1358
-#: ../calendar/importers/icalendar-importer.c:1361
+#: ../calendar/importers/icalendar-importer.c:1357
+#: ../calendar/importers/icalendar-importer.c:1360
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Attendees"
 
-#: ../calendar/importers/icalendar-importer.c:1375
+#: ../calendar/importers/icalendar-importer.c:1374
 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:1538
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Type"
@@ -6620,164 +6493,164 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: ../composer/e-composer-actions.c:208
+#: ../composer/e-composer-actions.c:207
 msgid "Save as..."
 msgstr "Save as…"
 
-#: ../composer/e-composer-actions.c:295
-#: ../widgets/misc/e-mail-signature-editor.c:292
+#: ../composer/e-composer-actions.c:294
+#: ../e-util/e-mail-signature-editor.c:303
 msgid "_Close"
 msgstr "_Close"
 
-#: ../composer/e-composer-actions.c:297
+#: ../composer/e-composer-actions.c:296
 msgid "Close the current file"
 msgstr "Close the current file"
 
-#: ../composer/e-composer-actions.c:302
+#: ../composer/e-composer-actions.c:301
 msgid "New _Message"
 msgstr "New _Message"
 
-#: ../composer/e-composer-actions.c:304
+#: ../composer/e-composer-actions.c:303
 msgid "Open New Message window"
 msgstr "Open New Message window"
 
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1495
+#: ../composer/e-composer-actions.c:310 ../shell/e-shell-window-actions.c:925
 msgid "Configure Evolution"
 msgstr "Configure Evolution"
 
-#: ../composer/e-composer-actions.c:318
+#: ../composer/e-composer-actions.c:317
 msgid "Save the current file"
 msgstr "Save the current file"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:322
 msgid "Save _As..."
 msgstr "Save _As…"
 
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:324
 msgid "Save the current file with a different name"
 msgstr "Save the current file with a different name"
 
-#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-actions.c:331
 msgid "Character _Encoding"
 msgstr "Character _Encoding"
 
-#: ../composer/e-composer-actions.c:349
+#: ../composer/e-composer-actions.c:348
 msgid "_Print..."
 msgstr "_Print…"
 
-#: ../composer/e-composer-actions.c:356
+#: ../composer/e-composer-actions.c:355
 msgid "Print Pre_view"
 msgstr "Print Pre_view"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:362
 msgid "Save as _Draft"
 msgstr "Save as _Draft"
 
-#: ../composer/e-composer-actions.c:365
+#: ../composer/e-composer-actions.c:364
 msgid "Save as draft"
 msgstr "Save as draft"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:327
+#: ../composer/e-composer-actions.c:369 ../composer/e-composer-private.c:318
 msgid "S_end"
 msgstr "S_end"
 
-#: ../composer/e-composer-actions.c:372
+#: ../composer/e-composer-actions.c:371
 msgid "Send this message"
 msgstr "Send this message"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:379
 msgid "PGP _Encrypt"
 msgstr "PGP _Encrypt"
 
-#: ../composer/e-composer-actions.c:382
+#: ../composer/e-composer-actions.c:381
 msgid "Encrypt this message with PGP"
 msgstr "Encrypt this message with PGP"
 
-#: ../composer/e-composer-actions.c:388
+#: ../composer/e-composer-actions.c:387
 msgid "PGP _Sign"
 msgstr "PGP _Sign"
 
-#: ../composer/e-composer-actions.c:390
+#: ../composer/e-composer-actions.c:389
 msgid "Sign this message with your PGP key"
 msgstr "Sign this message with your PGP key"
 
-#: ../composer/e-composer-actions.c:396
+#: ../composer/e-composer-actions.c:395
 msgid "_Picture Gallery"
 msgstr "_Picture Gallery"
 
-#: ../composer/e-composer-actions.c:398
+#: ../composer/e-composer-actions.c:397
 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
+#: ../composer/e-composer-actions.c:403
 msgid "_Prioritize Message"
 msgstr "_Prioritise Message"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:405
 msgid "Set the message priority to high"
 msgstr "Set the message priority to high"
 
-#: ../composer/e-composer-actions.c:412
+#: ../composer/e-composer-actions.c:411
 msgid "Re_quest Read Receipt"
 msgstr "Re_quest Read Receipt"
 
-#: ../composer/e-composer-actions.c:414
+#: ../composer/e-composer-actions.c:413
 msgid "Get delivery notification when your message is read"
 msgstr "Get delivery notification when your message is read"
 
-#: ../composer/e-composer-actions.c:420
+#: ../composer/e-composer-actions.c:419
 msgid "S/MIME En_crypt"
 msgstr "S/MIME En_crypt"
 
-#: ../composer/e-composer-actions.c:422
+#: ../composer/e-composer-actions.c:421
 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:428
+#: ../composer/e-composer-actions.c:427
 msgid "S/MIME Sig_n"
 msgstr "S/MIME Sig_n"
 
-#: ../composer/e-composer-actions.c:430
+#: ../composer/e-composer-actions.c:429
 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:436
+#: ../composer/e-composer-actions.c:435
 msgid "_Bcc Field"
 msgstr "_Bcc Field"
 
-#: ../composer/e-composer-actions.c:438
+#: ../composer/e-composer-actions.c:437
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Toggles whether the Bcc field is displayed"
 
-#: ../composer/e-composer-actions.c:444
+#: ../composer/e-composer-actions.c:443
 msgid "_Cc Field"
 msgstr "_Cc Field"
 
-#: ../composer/e-composer-actions.c:446
+#: ../composer/e-composer-actions.c:445
 msgid "Toggles whether the CC field is displayed"
 msgstr "Toggles whether the Cc field is displayed"
 
-#: ../composer/e-composer-actions.c:452
+#: ../composer/e-composer-actions.c:451
 msgid "_Reply-To Field"
 msgstr "_Reply-To Field"
 
-#: ../composer/e-composer-actions.c:454
+#: ../composer/e-composer-actions.c:453
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Toggles whether the Reply-To field is displayed"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:512
 msgid "Save Draft"
 msgstr "Save Draft"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Enter the recipients of the message"
 
-#: ../composer/e-composer-header-table.c:45
+#: ../composer/e-composer-header-table.c:43
 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:48
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6785,40 +6658,40 @@ 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:849
+#: ../composer/e-composer-header-table.c:837
 msgid "Fr_om:"
 msgstr "Fr_om:"
 
-#: ../composer/e-composer-header-table.c:856
+#: ../composer/e-composer-header-table.c:844
 msgid "_Reply-To:"
 msgstr "_Reply-To:"
 
-#: ../composer/e-composer-header-table.c:861
+#: ../composer/e-composer-header-table.c:849
 msgid "_To:"
 msgstr "_To:"
 
-#: ../composer/e-composer-header-table.c:867
+#: ../composer/e-composer-header-table.c:855
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:873
+#: ../composer/e-composer-header-table.c:861
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:878
+#: ../composer/e-composer-header-table.c:866
 msgid "_Post To:"
 msgstr "_Post To:"
 
-#: ../composer/e-composer-header-table.c:882
+#: ../composer/e-composer-header-table.c:870
 msgid "S_ubject:"
 msgstr "S_ubject:"
 
-#: ../composer/e-composer-header-table.c:890
-#: ../mail/e-mail-config-identity-page.c:490
+#: ../composer/e-composer-header-table.c:878
+#: ../mail/e-mail-config-identity-page.c:488
 msgid "Si_gnature:"
 msgstr "Si_gnature:"
 
-#: ../composer/e-composer-name-header.c:215
+#: ../composer/e-composer-name-header.c:235
 msgid "Click here for the address book"
 msgstr "Click here for the address book"
 
@@ -6826,18 +6699,18 @@ msgstr "Click here for the address book"
 msgid "Click here to select folders to post to"
 msgstr "Click here to select folders to post to"
 
-#: ../composer/e-composer-private.c:347
+#: ../composer/e-composer-private.c:338
 msgid "Save draft"
 msgstr "Save draft"
 
-#: ../composer/e-msg-composer.c:856
+#: ../composer/e-msg-composer.c:862
 #, 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:865
+#: ../composer/e-msg-composer.c:871
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6846,15 +6719,15 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
-#: ../composer/e-msg-composer.c:1545 ../composer/e-msg-composer.c:1954
+#: ../composer/e-msg-composer.c:1552 ../composer/e-msg-composer.c:1961
 msgid "Compose Message"
 msgstr "Compose Message"
 
-#: ../composer/e-msg-composer.c:4204
+#: ../composer/e-msg-composer.c:4215
 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:4881
+#: ../composer/e-msg-composer.c:4890
 msgid "Untitled Message"
 msgstr "Untitled Message"
 
@@ -7024,13 +6897,13 @@ msgstr "Evolution Alarm Notify"
 msgid "Calendar event notifications"
 msgstr "Calendar event notifications"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:936
-#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:932
+#: ../modules/mailto-handler/evolution-mailto-handler.c:214
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:651
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:83
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
@@ -8289,41 +8162,26 @@ msgid "This option would help in improving the speed of fetching."
 msgstr "This option would help in improving the speed of fetching."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-msgid "List of MIME types to check for Bonobo component viewers"
-msgstr "List of MIME types to check for Bonobo component viewers"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
-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."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Mark as Seen after specified timeout"
 msgstr "Mark as Seen after specified timeout"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Mark as Seen after specified timeout."
 msgstr "Mark as Seen after specified timeout."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Timeout for marking messages as seen"
 msgstr "Timeout for marking messages as seen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Timeout in milliseconds for marking messages as seen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Sender email-address column in the message list"
 msgstr "Sender e-mail address column in the message list"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -8331,7 +8189,7 @@ msgstr ""
 "Show the e-mail address of the sender in a separate column in the message "
 "list."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
@@ -8339,7 +8197,7 @@ msgstr ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -8347,19 +8205,19 @@ msgstr ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Show deleted messages in the message-list"
 msgstr "Show deleted messages in the message-list"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Show deleted messages (with a strike-through) in the message-list."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Enable Unmatched search folder"
 msgstr "Enable Unmatched search folder"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -8367,11 +8225,11 @@ msgstr ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Hides the per-folder preview and removes the selection"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 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."
@@ -8379,19 +8237,19 @@ msgstr ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Height of the message-list pane"
 msgstr "Height of the message-list pane"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Height of the message-list pane."
 msgstr "Height of the message-list pane."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "State of message headers in paned view"
 msgstr "State of message headers in paned view"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../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"
@@ -8399,19 +8257,19 @@ msgstr ""
 "Describes whether message headers in paned view should be collapsed or "
 "expanded by default. \"0\" = expanded and \"1\" = collapsed"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Width of the message-list pane"
 msgstr "Width of the message-list pane"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Width of the message-list pane."
 msgstr "Width of the message-list pane."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Layout style"
 msgstr "Layout style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 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 "
@@ -8423,35 +8281,35 @@ msgstr ""
 "message list. \"1\" (Vertical View) places the preview pane next to the "
 "message list."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Variable width font"
 msgstr "Variable width font"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "The variable width font for mail display."
 msgstr "The variable width font for mail display."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Terminal font"
 msgstr "Terminal font"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "The terminal font for mail display."
 msgstr "The terminal font for mail display."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Use custom fonts"
 msgstr "Use custom fonts"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Use custom fonts for displaying mail."
 msgstr "Use custom fonts for displaying mail."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Compress display of addresses in To/Cc/Bcc"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -8459,11 +8317,11 @@ msgstr ""
 "Compress display of addresses in To/Cc/Bcc to the number specified in "
 "address_count."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Number of addresses to display in To/Cc/Bcc"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -8471,11 +8329,11 @@ msgstr ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '…' is shown."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Thread the message-list based on Subject"
 msgstr "Thread the message-list based on Subject"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -8483,11 +8341,11 @@ msgstr ""
 "Whether to fall back on threading by subjects when the messages do not "
 "contain In-Reply-To or References headers."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Default value for thread expand state"
 msgstr "Default value for thread expand state"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -8495,11 +8353,11 @@ msgstr ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Whether sort threads based on latest message in that thread"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 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 "
@@ -8509,11 +8367,11 @@ msgstr ""
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Sort accounts alphabetically in a folder tree"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 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 "
@@ -8525,27 +8383,27 @@ msgstr ""
 "Computer and Search folders, otherwise accounts are sorted based on an order "
 "given by a user"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Log filter actions"
 msgstr "Log filter actions"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Log filter actions to the specified log file."
 msgstr "Log filter actions to the specified log file."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Logfile to log filter actions"
 msgstr "Logfile to log filter actions"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Logfile to log filter actions."
 msgstr "Logfile to log filter actions."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Flush Outbox after filtering"
 msgstr "Flush Outbox after filtering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 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 "
@@ -8555,41 +8413,41 @@ msgstr ""
 "only when a 'Forward to' filter action is used and approximately one minute "
 "after the last action invocation."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Default forward style"
 msgstr "Default forward style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid "Prompt on empty subject"
 msgstr "Prompt on empty subject"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Prompt the user when he or she tries to send a message without a Subject."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Prompt when emptying the trash"
 msgstr "Prompt when emptying the wastebasket"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Prompt the user when he or she tries to empty the wastebasket."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Prompt the user when he or she tries to expunge a folder."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "Prompt before sending to recipients not entered as mail addresses"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -8597,19 +8455,19 @@ msgstr ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Prompt when user tries to send a message with no To or Cc recipients."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Prompt when user tries to send unwanted HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -8617,11 +8475,11 @@ msgstr ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Prompt when user tries to open 10 or more messages at once"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -8629,19 +8487,19 @@ msgstr ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Prompt while marking multiple messages"
 msgstr "Prompt while marking multiple messages"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Enable or disable the prompt whilst marking multiple messages."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Prompt when deleting messages in search folder"
 msgstr "Prompt when deleting messages in search folder"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 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 "
@@ -8651,11 +8509,11 @@ msgstr ""
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -8667,11 +8525,11 @@ msgstr ""
 "folders in folder tree without asking, or 'ask' - (or any other value) will "
 "ask user."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr "Asks whether to move a folder by drag &amp; drop in the folder tree"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -8683,11 +8541,11 @@ msgstr ""
 "folders in folder tree without asking, or 'ask' - (or any other value) will "
 "ask user."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Prompt when replying privately to list messages"
 msgstr "Prompt when replying privately to list messages"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 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."
@@ -8695,11 +8553,11 @@ msgstr ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Prompt when mailing list hijacks private replies"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 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 "
@@ -8709,11 +8567,11 @@ msgstr ""
 "a private reply to a message which arrived via a mailing list, but the list "
 "sets a Reply-To: header which redirects your reply back to the list."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Prompt when replying to many recipients"
 msgstr "Prompt when replying to many recipients"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -8721,7 +8579,7 @@ msgstr ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "Asks whether to close the message window when the user forwards or replies "
 "to the message shown in the window"
@@ -8729,7 +8587,7 @@ msgstr ""
 "Asks whether to close the message window when the user forwards or replies "
 "to the message shown in the window"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 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."
@@ -8737,42 +8595,42 @@ 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."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Empty Trash folders on exit"
 msgstr "Empty Wastebasket folders on exit"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Empty all Wastebasket folders when exiting Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum number of days between emptying the wastebasket on exit"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimum time between emptying the wastebasket on exit, in days."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Last time Empty Trash was run"
 msgstr "Last time Empty Wastebasket was run"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "The last time Empty Wastebasket was run, in days since January 1st, 1970 "
 "(Epoch)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Amount of time in seconds the error should be shown on the status bar."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Level beyond which the message should be logged."
 msgstr "Level beyond which the message should be logged."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -8780,11 +8638,11 @@ msgstr ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Show original \"Date\" header value."
 msgstr "Show original \"Date\" header value."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 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 "
@@ -8794,11 +8652,11 @@ msgstr ""
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "List of Labels and their associated colors"
 msgstr "List of Labels and their associated colours"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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."
@@ -8806,45 +8664,45 @@ msgstr ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Check incoming mail being junk"
 msgstr "Check incoming mail being junk"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "Run junk test on incoming mail."
 msgstr "Run junk test on incoming mail."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Empty Junk folders on exit"
 msgstr "Empty Junk folders on exit"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Empty all Junk folders when exiting Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Minimum days between emptying the junk on exit"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Minimum time between emptying the junk on exit, in days."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Last time Empty Junk was run"
 msgstr "Last time Empty Junk was run"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "The default plugin for Junk hook"
 msgstr "The default plugin for Junk hook"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 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 "
@@ -8854,11 +8712,11 @@ msgstr ""
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Determines whether to look up in address book for sender e-mail"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 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 "
@@ -8870,7 +8728,7 @@ msgstr ""
 "autocompletion. It can be slow, if remote address books (like LDAP) are "
 "marked for autocompletion."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -8878,7 +8736,7 @@ msgstr ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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 "
@@ -8888,11 +8746,11 @@ msgstr ""
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Determines whether to use custom headers to check for junk"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 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 "
@@ -8902,11 +8760,11 @@ msgstr ""
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Custom headers to use while checking for junk."
 msgstr "Custom headers to use while checking for junk."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -8914,31 +8772,31 @@ msgstr ""
 "Custom headers to use while checking for junk. The list elements are strings "
 "in the format \"headername=value\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "UID string of the default account."
 msgstr "UID string of the default account."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Save directory"
 msgstr "Save directory"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Directory for saving mail component files."
 msgstr "Directory for saving mail component files."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Composer load/attach directory"
 msgstr "Composer load/attach directory"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directory for loading/attaching files to composer."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Check for new messages on start"
 msgstr "Check for new messages on start"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -8946,11 +8804,11 @@ msgstr ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Check for new messages in all active accounts"
 msgstr "Check for new messages in all active accounts"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 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 "
@@ -8960,11 +8818,11 @@ msgstr ""
 "account \"Check for new messages every X minutes\" option when Evolution is "
 "started. This option is used only together with 'send_recv_on_start' option."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Server synchronization interval"
 msgstr "Server synchronisation interval"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -9078,7 +8936,7 @@ msgid "The default command that must be used as the editor."
 msgstr "The default command that must be used as the editor."
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
-#: ../plugins/external-editor/external-editor.c:125
+#: ../plugins/external-editor/external-editor.c:123
 msgid "Automatically launch when a new mail is edited"
 msgstr "Automatically launch when a new mail is edited"
 
@@ -9260,7 +9118,7 @@ msgstr "Initial file chooser folder"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Initial folder for GtkFileChooser dialogues."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:317
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:309
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
@@ -9362,104 +9220,95 @@ msgid "Use SpamAssassin daemon and client"
 msgstr "Use SpamAssassin daemon and client"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
-msgid "SpamAssassin client binary"
-msgstr "SpamAssassin client binary"
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:7
-msgid "SpamAssassin daemon binary"
-msgstr "SpamAssassin daemon binary"
-
-#: ../em-format/e-mail-formatter-attachment.c:364
-#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-bar.c:101
-#: ../widgets/misc/e-attachment-bar.c:106
-#: ../widgets/misc/e-attachment-paned.c:176
-#: ../widgets/misc/e-attachment-paned.c:181
+msgid "Use spamc and spamd programs, if available."
+msgstr "Use spamc and spamd programs, if available."
+
+#: ../em-format/e-mail-formatter-attachment.c:370
+#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
+#: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Attachment"
 msgstr[1] "Attachments"
 
-#: ../em-format/e-mail-formatter-attachment.c:370
+#: ../em-format/e-mail-formatter-attachment.c:371
 msgid "Display as attachment"
 msgstr "Display as attachment"
 
-#: ../em-format/e-mail-formatter.c:1368 ../mail/e-mail-tag-editor.c:327
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:67
+#: ../em-format/e-mail-formatter.c:1385 ../mail/e-mail-tag-editor.c:272
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:61
 msgid "From"
 msgstr "From"
 
-#: ../em-format/e-mail-formatter.c:1369 ../modules/mail/em-mailer-prefs.c:68
+#: ../em-format/e-mail-formatter.c:1386 ../modules/mail/em-mailer-prefs.c:62
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: ../em-format/e-mail-formatter.c:1371
-#: ../em-format/e-mail-formatter-utils.c:182
-#: ../em-format/e-mail-formatter-utils.c:205
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-formatter.c:1388
+#: ../em-format/e-mail-formatter-utils.c:196
+#: ../em-format/e-mail-formatter-utils.c:220
+#: ../modules/mail/em-mailer-prefs.c:64
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/e-mail-formatter.c:1372
-#: ../em-format/e-mail-formatter-utils.c:184
-#: ../em-format/e-mail-formatter-utils.c:207
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-formatter.c:1389
+#: ../em-format/e-mail-formatter-utils.c:198
+#: ../em-format/e-mail-formatter-utils.c:222
+#: ../modules/mail/em-mailer-prefs.c:65
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/e-mail-formatter.c:1373
-#: ../em-format/e-mail-formatter-quote-headers.c:165
-#: ../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:72
-#: ../smime/lib/e-cert.c:1125
+#: ../em-format/e-mail-formatter.c:1390
+#: ../em-format/e-mail-formatter-quote-headers.c:154
+#: ../mail/e-mail-tag-editor.c:277 ../mail/em-filter-i18n.h:77
+#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:66
+#: ../smime/lib/e-asn1-object.c:712
 msgid "Subject"
 msgstr "Subject"
 
-#: ../em-format/e-mail-formatter.c:1374 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:73 ../widgets/misc/e-dateedit.c:526
-#: ../widgets/misc/e-dateedit.c:548
+#: ../em-format/e-mail-formatter.c:1391 ../e-util/e-dateedit.c:549
+#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:67
 msgid "Date"
 msgstr "Date"
 
-#: ../em-format/e-mail-formatter.c:1375 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/e-mail-formatter.c:1392 ../modules/mail/em-mailer-prefs.c:68
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: ../em-format/e-mail-formatter.c:1376 ../modules/mail/em-mailer-prefs.c:75
+#: ../em-format/e-mail-formatter.c:1393 ../modules/mail/em-mailer-prefs.c:69
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Face"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../em-format/e-mail-formatter-headers.c:114
-#: ../plugins/mail-notification/mail-notification.c:396
+#: ../em-format/e-mail-formatter-headers.c:100
+#: ../plugins/mail-notification/mail-notification.c:395
 #, c-format
 msgid "From: %s"
 msgstr "From: %s"
 
-#: ../em-format/e-mail-formatter-headers.c:134
-#: ../em-format/e-mail-formatter-headers.c:139
+#: ../em-format/e-mail-formatter-headers.c:123
+#: ../em-format/e-mail-formatter-headers.c:128
 msgid "(no subject)"
 msgstr "(no subject)"
 
-#: ../em-format/e-mail-formatter-headers.c:340
+#: ../em-format/e-mail-formatter-headers.c:332
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "This message was sent by %s on behalf of %s"
 
-#: ../em-format/e-mail-formatter-image.c:152
+#: ../em-format/e-mail-formatter-image.c:143
 msgid "Regular Image"
 msgstr "Regular Image"
 
-#: ../em-format/e-mail-formatter-image.c:158
+#: ../em-format/e-mail-formatter-image.c:144
 msgid "Display part as an image"
 msgstr "Display part as an image"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:237
+#: ../em-format/e-mail-formatter-message-rfc822.c:242
 msgid "RFC822 message"
 msgstr "RFC822 message"
 
@@ -9467,87 +9316,87 @@ msgstr "RFC822 message"
 msgid "Format part as an RFC822 message"
 msgstr "Format part as an RFC822 message"
 
-#: ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print.c:56
+#: ../e-util/gal-define-views-dialog.c:361
+#: ../e-util/gal-view-instance-save-as-dialog.c:95
 #: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1270
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1328
 #: ../modules/cal-config-google/e-google-chooser.c:209
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/menus/gal-define-views-dialog.c:352
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Name"
 msgstr "Name"
 
-#: ../em-format/e-mail-formatter-print.c:53 ../mail/message-list.etspec.h:10
-#: ../widgets/misc/e-attachment-tree-view.c:574
+#: ../em-format/e-mail-formatter-print.c:56
+#: ../e-util/e-attachment-tree-view.c:574 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Size"
 
 #. Add encryption/signature header
-#: ../em-format/e-mail-formatter-print-headers.c:130
+#: ../em-format/e-mail-formatter-print-headers.c:122
 #: ../mail/e-mail-config-security-page.c:642
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:207
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:131
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
 msgid "Security"
 msgstr "Security"
 
-#: ../em-format/e-mail-formatter-print-headers.c:147
+#: ../em-format/e-mail-formatter-print-headers.c:140
 msgid "GPG signed"
 msgstr "GPG signed"
 
-#: ../em-format/e-mail-formatter-print-headers.c:152
+#: ../em-format/e-mail-formatter-print-headers.c:146
 msgid "GPG encrpyted"
 msgstr "GPG encrypted"
 
-#: ../em-format/e-mail-formatter-print-headers.c:158
+#: ../em-format/e-mail-formatter-print-headers.c:152
 msgid "S/MIME signed"
 msgstr "S/MIME signed"
 
-#: ../em-format/e-mail-formatter-print-headers.c:164
+#: ../em-format/e-mail-formatter-print-headers.c:158
 msgid "S/MIME encrpyted"
 msgstr "S/MIME encrypted"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:176
-#: ../em-format/e-mail-formatter-utils.c:316
-#: ../modules/mail/em-mailer-prefs.c:1121
+#: ../em-format/e-mail-formatter-quote-headers.c:165
+#: ../em-format/e-mail-formatter-utils.c:348
+#: ../modules/mail/em-mailer-prefs.c:1117
 msgid "Mailer"
 msgstr "Mailer"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:102
-#: ../em-format/e-mail-formatter-text-enriched.c:115
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:88
+#: ../em-format/e-mail-formatter-text-enriched.c:102
 msgid "Richtext"
 msgstr "Richtext"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:108
-#: ../em-format/e-mail-formatter-text-enriched.c:121
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:89
+#: ../em-format/e-mail-formatter-text-enriched.c:103
 msgid "Display part as enriched text"
 msgstr "Display part as enriched text"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:104
-#: ../em-format/e-mail-formatter-text-html.c:340
+#: ../em-format/e-mail-formatter-quote-text-html.c:90
+#: ../em-format/e-mail-formatter-text-html.c:353
 msgid "HTML"
 msgstr "HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:110
-#: ../em-format/e-mail-formatter-text-html.c:346
+#: ../em-format/e-mail-formatter-quote-text-html.c:91
+#: ../em-format/e-mail-formatter-text-html.c:354
 msgid "Format part as HTML"
 msgstr "Format part as HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:123
-#: ../em-format/e-mail-formatter-text-plain.c:183
+#: ../em-format/e-mail-formatter-quote-text-plain.c:111
+#: ../em-format/e-mail-formatter-text-plain.c:186
 msgid "Plain Text"
 msgstr "Plain Text"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:129
-#: ../em-format/e-mail-formatter-text-plain.c:189
+#: ../em-format/e-mail-formatter-quote-text-plain.c:112
+#: ../em-format/e-mail-formatter-text-plain.c:187
 msgid "Format part as plain text"
 msgstr "Format part as plain text"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -9555,11 +9404,11 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid "Valid signature"
 msgstr "Valid signature"
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9567,11 +9416,11 @@ msgstr ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 
-#: ../em-format/e-mail-formatter-secure-button.c:67
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
-#: ../em-format/e-mail-formatter-secure-button.c:67
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -9579,11 +9428,11 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: ../em-format/e-mail-formatter-secure-button.c:68
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid "Valid signature, but cannot verify sender"
 msgstr "Valid signature, but cannot verify sender"
 
-#: ../em-format/e-mail-formatter-secure-button.c:68
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9591,11 +9440,11 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: ../em-format/e-mail-formatter-secure-button.c:69
+#: ../em-format/e-mail-formatter-secure-button.c:56
 msgid "Signature exists, but need public key"
 msgstr "Signature exists, but need public key"
 
-#: ../em-format/e-mail-formatter-secure-button.c:69
+#: ../em-format/e-mail-formatter-secure-button.c:56
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -9603,11 +9452,11 @@ msgstr ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 
-#: ../em-format/e-mail-formatter-secure-button.c:76
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
-#: ../em-format/e-mail-formatter-secure-button.c:76
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9615,11 +9464,11 @@ msgstr ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 
-#: ../em-format/e-mail-formatter-secure-button.c:77
+#: ../em-format/e-mail-formatter-secure-button.c:64
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
-#: ../em-format/e-mail-formatter-secure-button.c:77
+#: ../em-format/e-mail-formatter-secure-button.c:64
 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 "
@@ -9629,11 +9478,11 @@ msgstr ""
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 
-#: ../em-format/e-mail-formatter-secure-button.c:78
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: ../em-format/e-mail-formatter-secure-button.c:78
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -9641,11 +9490,11 @@ msgstr ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 
-#: ../em-format/e-mail-formatter-secure-button.c:79
+#: ../em-format/e-mail-formatter-secure-button.c:66
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
-#: ../em-format/e-mail-formatter-secure-button.c:79
+#: ../em-format/e-mail-formatter-secure-button.c:66
 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 "
@@ -9655,659 +9504,396 @@ msgstr ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 
-#: ../em-format/e-mail-formatter-secure-button.c:191
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../em-format/e-mail-formatter-secure-button.c:180
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: ../em-format/e-mail-formatter-secure-button.c:206
+#: ../em-format/e-mail-formatter-secure-button.c:195
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: ../em-format/e-mail-formatter-source.c:139
+#: ../em-format/e-mail-formatter-source.c:126
 msgid "Source"
 msgstr "Source"
 
-#: ../em-format/e-mail-formatter-source.c:145
+#: ../em-format/e-mail-formatter-source.c:127
 msgid "Display source of a MIME part"
 msgstr "Display source of a MIME part"
 
-#: ../em-format/e-mail-parser-application-mbox.c:108
+#: ../em-format/e-mail-parser-application-mbox.c:88
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr "Error parsing MBOX part: %s"
 
-#: ../em-format/e-mail-parser-application-smime.c:104
+#: ../em-format/e-mail-parser-application-smime.c:84
 #, c-format
 msgid "Could not parse S/MIME message: %s"
 msgstr "Could not parse S/MIME message: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:91
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:80
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "Could not parse PGP message: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:93
-#: ../em-format/e-mail-parser-multipart-signed.c:144
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:83
+#: ../em-format/e-mail-parser-multipart-signed.c:128
 #, c-format
 msgid "Error verifying signature: %s"
 msgstr "Error verifying signature: %s"
 
-#: ../em-format/e-mail-parser-message-external.c:86
+#: ../em-format/e-mail-parser-message-external.c:69
 msgid "Malformed external-body part"
 msgstr "Malformed external-body part"
 
-#: ../em-format/e-mail-parser-message-external.c:118
+#: ../em-format/e-mail-parser-message-external.c:101
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointer to FTP site (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:129
+#: ../em-format/e-mail-parser-message-external.c:112
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pointer to local file (%s) valid at site \"%s\""
 
-#: ../em-format/e-mail-parser-message-external.c:131
+#: ../em-format/e-mail-parser-message-external.c:114
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointer to local file (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:150
+#: ../em-format/e-mail-parser-message-external.c:133
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointer to remote data (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:167
+#: ../em-format/e-mail-parser-message-external.c:150
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointer to unknown external data (\"%s\" type)"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:81
-#: ../em-format/e-mail-parser-multipart-signed.c:95
+#: ../em-format/e-mail-parser-multipart-encrypted.c:67
+#: ../em-format/e-mail-parser-multipart-signed.c:81
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Could not parse MIME message. Displaying as source."
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:99
+#: ../em-format/e-mail-parser-multipart-encrypted.c:83
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:119
+#: ../em-format/e-mail-parser-multipart-encrypted.c:102
 #, c-format
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "Could not parse PGP/MIME message: %s"
 
-#: ../em-format/e-mail-parser-multipart-signed.c:129
+#: ../em-format/e-mail-parser-multipart-signed.c:114
 msgid "Unsupported signature format"
 msgstr "Unsupported signature format"
 
-#: ../em-format/e-mail-part-utils.c:496
+#: ../em-format/e-mail-part-utils.c:500
 #, c-format
 msgid "%s attachment"
 msgstr "%s attachment"
 
-#. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:248
-#, c-format
-msgid "%s (cancelled)"
-msgstr "%s (cancelled)"
+#: ../e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "Standard"
 
-#. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:251
-#, c-format
-msgid "%s (completed)"
-msgstr "%s (completed)"
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "Proprietary"
 
-#. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:254
-#, c-format
-msgid "%s (waiting)"
-msgstr "%s (waiting)"
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "Secret"
 
-#. 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)"
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "Top Secret"
 
-#: ../e-util/e-activity.c:260
-#, c-format
-msgid "%s"
-msgstr "%s"
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr "For Your Eyes Only"
 
-#: ../e-util/e-activity.c:265
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% complete)"
+#. Translators: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "None"
 
-#: ../e-util/e-charset.c:53
-msgid "Arabic"
-msgstr "Arabic"
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "Mail Receipt"
 
-#: ../e-util/e-charset.c:54
-msgid "Baltic"
-msgstr "Baltic"
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "R_eply requested"
 
-#: ../e-util/e-charset.c:55
-msgid "Central European"
-msgstr "Central European"
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "Wi_thin"
 
-#: ../e-util/e-charset.c:56
-msgid "Chinese"
-msgstr "Chinese"
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "days"
 
-#: ../e-util/e-charset.c:57
-msgid "Cyrillic"
-msgstr "Cyrillic"
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr "_When convenient"
 
-#: ../e-util/e-charset.c:58
-msgid "Greek"
-msgstr "Greek"
+#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:840
+msgid "Replies"
+msgstr "Replies"
 
-#: ../e-util/e-charset.c:59
-msgid "Hebrew"
-msgstr "Hebrew"
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr "_Delay message delivery"
 
-#: ../e-util/e-charset.c:60
-msgid "Japanese"
-msgstr "Japanese"
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_After"
 
-#: ../e-util/e-charset.c:61
-msgid "Korean"
-msgstr "Korean"
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "days"
 
-#: ../e-util/e-charset.c:62
-msgid "Thai"
-msgstr "Thai"
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr "_Set expiration date"
 
-#: ../e-util/e-charset.c:63
-msgid "Turkish"
-msgstr "Turkish"
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Until"
 
-#: ../e-util/e-charset.c:64
-msgid "Unicode"
-msgstr "Unicode"
+#: ../e-util/e-send-options.ui.h:25
+msgid "Delivery Options"
+msgstr "Delivery Options"
 
-#: ../e-util/e-charset.c:65
-msgid "Western European"
-msgstr "Western European"
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "_Classification:"
 
-#: ../e-util/e-charset.c:66
-msgid "Western European, New"
-msgstr "Western European, New"
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "Gene_ral Options"
 
-#. 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"
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr "Creat_e a sent item to track information"
 
-#. 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"
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr "_Delivered"
 
-#. Translators: Character set "Cyrillic, Ukrainian"
-#: ../e-util/e-charset.c:101
-msgid "Ukrainian"
-msgstr "Ukrainian"
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr "Deli_vered and opened"
 
-#. Translators: Character set "Hebrew, Visual"
-#: ../e-util/e-charset.c:105
-msgid "Visual"
-msgstr "Visual"
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "_All information"
 
-#. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1927
-#: ../modules/itip-formatter/itip-view.c:235
-#: ../widgets/table/e-cell-date-edit.c:307
-msgid "Today"
-msgstr "Today"
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr "A_uto-delete sent item"
 
-#. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:217 ../modules/itip-formatter/itip-view.c:263
-msgid "Tomorrow"
-msgstr "Tomorrow"
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr "Status Tracking"
 
-#: ../e-util/e-datetime-format.c:219
-msgid "Yesterday"
-msgstr "Yesterday"
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "_When opened:"
 
-#. 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"
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr "When decli_ned:"
 
-#. 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"
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr "When co_mpleted:"
 
-#. 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"
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr "When acce_pted:"
 
-#. 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"
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "Return Notification"
 
-#. 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"
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr "Sta_tus Tracking"
 
-#. 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"
+#: ../e-util/e-table-config.ui.h:1 ../e-util/e-table-config.c:670
+msgid "Show Fields"
+msgstr "Show Fields"
 
-#. 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"
+#: ../e-util/e-table-config.ui.h:2
+msgid "A_vailable Fields:"
+msgstr "A_vailable Fields:"
 
-#: ../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"
+#: ../e-util/e-table-config.ui.h:3
+msgid "_Show these fields in order:"
+msgstr "_Show these fields in order:"
 
-#: ../e-util/e-datetime-format.c:574
-msgid "Format:"
-msgstr "Format:"
+#: ../e-util/e-table-config.ui.h:4
+msgid "Move _Up"
+msgstr "Move _Up"
 
-#: ../e-util/e-file-utils.c:150
-msgid "(Unknown Filename)"
-msgstr "(Unknown Filename)"
+#: ../e-util/e-table-config.ui.h:5
+msgid "Move _Down"
+msgstr "Move _Down"
 
-#. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:154
-#, c-format
-msgid "Writing \"%s\""
-msgstr "Writing \"%s\""
+#: ../e-util/e-table-config.ui.h:7 ../e-util/e-name-selector-dialog.c:981
+msgid "_Remove"
+msgstr "_Remove"
 
-#. 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 "Writing \"%s\" to %s"
-msgstr "Writing \"%s\" to %s"
+#: ../e-util/e-table-config.ui.h:9
+msgid "_Show field in View"
+msgstr "_Show field in View"
 
-#: ../e-util/e-print.c:161
-msgid "An error occurred while printing"
-msgstr "An error occurred while printing"
+#: ../e-util/e-table-config.ui.h:10 ../e-util/e-table-header-item.c:1751
+msgid "Ascending"
+msgstr "Ascending"
 
-#: ../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:"
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1751
+msgid "Descending"
+msgstr "Descending"
 
-#: ../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."
+#: ../e-util/e-table-config.ui.h:12
+msgid "Group Items By"
+msgstr "Group Items By"
 
-#: ../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?"
+#: ../e-util/e-table-config.ui.h:13
+msgid "Show _field in View"
+msgstr "Show _field in View"
 
-#: ../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."
+#: ../e-util/e-table-config.ui.h:14
+msgid "Then By"
+msgstr "Then By"
 
-#: ../e-util/e-system.error.xml.h:3
-msgid "_Replace"
-msgstr "_Replace"
+#: ../e-util/e-table-config.ui.h:15
+msgid "Show field i_n View"
+msgstr "Show field i_n View"
 
-#: ../e-util/e-system.error.xml.h:4
-msgid "Cannot save file \"{0}\"."
-msgstr "Cannot save file \"{0}\"."
+#: ../e-util/e-table-config.ui.h:16
+msgid "Show field in _View"
+msgstr "Show field in _View"
 
-#: ../e-util/e-system.error.xml.h:5
-msgid "Because \"{1}\"."
-msgstr "Because \"{1}\"."
+#: ../e-util/e-table-config.ui.h:17
+msgid "Clear _All"
+msgstr "Clear _All"
 
-#: ../e-util/e-system.error.xml.h:6
-msgid "Cannot open file \"{0}\"."
-msgstr "Cannot open file \"{0}\"."
+#: ../e-util/e-table-config.ui.h:18
+msgid "Sort"
+msgstr "Sort"
 
-#: ../e-util/e-system.error.xml.h:7
-msgid "Failed to remove data source &quot;{0}&quot;."
-msgstr "Failed to remove data source &quot;{0}&quot;."
-
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
-msgid "The reported error was &quot;{1}&quot;."
-msgstr "The reported error was &quot;{1}&quot;."
-
-#: ../e-util/e-system.error.xml.h:9
-msgid "Failed to update data source &quot;{0}&quot;."
-msgstr "Failed to update data source &quot;{0}&quot;."
-
-#: ../e-util/e-system.error.xml.h:10
-msgid "Failed to delete resource &quot;{0}&quot;."
-msgstr "Failed to delete resource &quot;{0}&quot;."
-
-#: ../e-util/e-util.c:249
-msgid "Could not open the link."
-msgstr "Could not open the link."
-
-#: ../e-util/e-util.c:296
-msgid "Could not display help for Evolution."
-msgstr "Could not display help for Evolution."
-
-#. 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 "1 second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "1 second ago"
-msgstr[1] "%d seconds ago"
-
-#: ../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"
-
-#: ../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"
-
-#: ../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"
-
-#: ../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"
-
-#: ../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"
-
-#: ../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"
-
-#: ../filter/e-filter-datespec.c:76
-#, 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"
-
-#: ../filter/e-filter-datespec.c:77
-#, c-format
-msgid "1 week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "1 week ago"
-msgstr[1] "%d weeks ago"
-
-#: ../filter/e-filter-datespec.c:78
-#, 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"
-
-#: ../filter/e-filter-datespec.c:79
-#, c-format
-msgid "1 month ago"
-msgid_plural "%d months ago"
-msgstr[0] "1 month ago"
-msgstr[1] "%d months ago"
-
-#: ../filter/e-filter-datespec.c:80
-#, 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"
-
-#: ../filter/e-filter-datespec.c:81
-#, c-format
-msgid "1 year ago"
-msgid_plural "%d years ago"
-msgstr[0] "1 year ago"
-msgstr[1] "%d years ago"
-
-#: ../filter/e-filter-datespec.c:82
-#, 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"
-
-#: ../filter/e-filter-datespec.c:132
-msgid "<click here to select a date>"
-msgstr "<click here to select a date>"
-
-#: ../filter/e-filter-datespec.c:135 ../filter/e-filter-datespec.c:146
-#: ../filter/e-filter-datespec.c:157
-msgid "now"
-msgstr "now"
-
-#. 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"
-
-#: ../filter/e-filter-datespec.c:291
-msgid "Select a time to compare against"
-msgstr "Select a time to compare against"
-
-#: ../filter/e-filter-file.c:188
-msgid "Choose a File"
-msgstr "Choose a File"
-
-#: ../filter/e-filter-rule.c:744
-msgid "R_ule name:"
-msgstr "R_ule name:"
-
-#: ../filter/e-filter-rule.c:794
-msgid "all the following conditions"
-msgstr "all the following conditions"
-
-#: ../filter/e-filter-rule.c:795
-msgid "any of the following conditions"
-msgstr "any of the following conditions"
+#: ../e-util/e-table-config.ui.h:19
+msgid "Sort Items By"
+msgstr "Sort Items By"
 
-#: ../filter/e-filter-rule.c:801
-msgid "_Find items which match:"
-msgstr "_Find items which match:"
+#: ../e-util/e-table-config.ui.h:20
+msgid "Clear All"
+msgstr "Clear All"
 
-#: ../filter/e-filter-rule.c:824
-msgid "Find items that meet the following conditions"
-msgstr "Find items that meet the following conditions"
+#: ../e-util/e-table-config.ui.h:21
+msgid "_Sort..."
+msgstr "_Sort…"
 
-#. Translators: "None" for not including threads;
-#. * part of "Include threads: None"
-#. protocol:
-#. name:
-#: ../filter/e-filter-rule.c:839 ../libemail-engine/camel-null-store.c:28
-#: ../mail/e-mail-config-summary-page.c:139
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
-#: ../widgets/misc/e-mail-signature-combo-box.c:369
-msgid "None"
-msgstr "None"
+#: ../e-util/e-table-config.ui.h:22
+msgid "_Group By..."
+msgstr "_Group By…"
 
-#: ../filter/e-filter-rule.c:840
-msgid "All related"
-msgstr "All related"
+#: ../e-util/e-table-config.ui.h:23
+msgid "_Fields Shown..."
+msgstr "_Fields Shown…"
 
-#: ../filter/e-filter-rule.c:841 ../widgets/misc/e-send-options.ui.h:19
-msgid "Replies"
-msgstr "Replies"
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "Select a Time Zone"
 
-#: ../filter/e-filter-rule.c:842
-msgid "Replies and parents"
-msgstr "Replies and parents"
+#: ../e-util/e-timezone-dialog.ui.h:2
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
 
-#: ../filter/e-filter-rule.c:843
-msgid "No reply or parent"
-msgstr "No reply or parent"
+#: ../e-util/e-timezone-dialog.ui.h:4
+msgid "Time Zones"
+msgstr "Time Zones"
 
-#: ../filter/e-filter-rule.c:846
-msgid "I_nclude threads:"
-msgstr "I_nclude threads:"
+#: ../e-util/e-timezone-dialog.ui.h:5
+msgid "_Selection"
+msgstr "_Selection"
 
-#: ../filter/e-filter-rule.c:923
-msgid "A_dd Condition"
-msgstr "A_dd Condition"
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Timezone drop-down combination box"
+msgstr "Timezone drop-down combination box"
 
-#: ../filter/e-filter-rule.c:1240 ../filter/filter.ui.h:1
-#: ../mail/em-utils.c:302
+#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1239
+#: ../mail/em-utils.c:293
 msgid "Incoming"
 msgstr "Incoming"
 
-#: ../filter/e-filter-rule.c:1240 ../mail/em-utils.c:303
-msgid "Outgoing"
-msgstr "Outgoing"
-
-#: ../filter/e-rule-editor.c:288
-msgid "Add Rule"
-msgstr "Add Rule"
-
-#: ../filter/e-rule-editor.c:395
-msgid "Edit Rule"
-msgstr "Edit Rule"
-
-#: ../filter/filter.error.xml.h:1
-msgid "Missing date."
-msgstr "Missing date."
-
-#: ../filter/filter.error.xml.h:2
-msgid "You must choose a date."
-msgstr "You must choose a date."
-
-#: ../filter/filter.error.xml.h:3
-msgid "Missing filename."
-msgstr "Missing filename."
-
-#: ../filter/filter.error.xml.h:4
-msgid "You must specify a filename."
-msgstr "You must specify a filename."
-
-#: ../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."
-
-#: ../filter/filter.error.xml.h:6
-msgid "Bad regular expression &quot;{0}&quot;."
-msgstr "Bad regular expression &quot;{0}&quot;."
-
-#: ../filter/filter.error.xml.h:7
-msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr "Could not compile regular expression &quot;{1}&quot;."
-
-#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
-msgid "Missing name."
-msgstr "Missing name."
-
-#: ../filter/filter.error.xml.h:9
-msgid "You must name this filter."
-msgstr "You must name this filter."
-
-#: ../filter/filter.error.xml.h:10
-msgid "Name &quot;{0}&quot; already used."
-msgstr "Name &quot;{0}&quot; already used."
-
-#: ../filter/filter.error.xml.h:11
-msgid "Please choose another name."
-msgstr "Please choose another name."
-
-#: ../filter/filter.ui.h:2
+#: ../e-util/filter.ui.h:2
 msgid "the current time"
 msgstr "the current time"
 
-#: ../filter/filter.ui.h:3
+#: ../e-util/filter.ui.h:3
 msgid "the time you specify"
 msgstr "the time you specify"
 
-#: ../filter/filter.ui.h:4
+#: ../e-util/filter.ui.h:4
 msgid "a time relative to the current time"
 msgstr "a time relative to the current time"
 
-#: ../filter/filter.ui.h:5 ../mail/mail-config.ui.h:78
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:78
 msgid "seconds"
 msgstr "seconds"
 
-#: ../filter/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
 msgid "weeks"
 msgstr "weeks"
 
-#: ../filter/filter.ui.h:10
+#: ../e-util/filter.ui.h:10
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "months"
 msgstr "months"
 
-#: ../filter/filter.ui.h:11
+#: ../e-util/filter.ui.h:11
 msgid "years"
 msgstr "years"
 
-#: ../filter/filter.ui.h:12
+#: ../e-util/filter.ui.h:12
 msgid "ago"
 msgstr "ago"
 
-#: ../filter/filter.ui.h:13
+#: ../e-util/filter.ui.h:13
 msgid "in the future"
 msgstr "in the future"
 
-#: ../filter/filter.ui.h:14
+#: ../e-util/filter.ui.h:14
 msgid "Show filters for mail:"
 msgstr "Show filters for mail:"
 
-#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:166
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:166
 msgid "_Filter Rules"
 msgstr "_Filter Rules"
 
-#: ../filter/filter.ui.h:17
+#: ../e-util/filter.ui.h:17
 msgid "Compare against"
 msgstr "Compare against"
 
-#: ../filter/filter.ui.h:18
+#: ../e-util/filter.ui.h:18
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -10315,7 +9901,7 @@ msgstr ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 
-#: ../filter/filter.ui.h:20
+#: ../e-util/filter.ui.h:20
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -10323,7 +9909,7 @@ msgstr ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 
-#: ../filter/filter.ui.h:22
+#: ../e-util/filter.ui.h:22
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -10331,10873 +9917,11438 @@ msgstr ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 
-#: ../libemail-engine/e-mail-authenticator.c:182
-#, c-format
-msgid "Invalid authentication result code (%d)"
-msgstr "Invalid authentication result code (%d)"
-
-#: ../libemail-engine/e-mail-folder-utils.c:114
-#, c-format
-msgid "Saving message to folder '%s'"
-msgstr "Saving message to folder '%s'"
+#: ../e-util/gal-define-views.ui.h:2
+#, no-c-format
+msgid "Define Views for \"%s\""
+msgstr "Define Views for \"%s\""
 
-#: ../libemail-engine/e-mail-folder-utils.c:566
-msgid "Forwarded messages"
-msgstr "Forwarded messages"
+#: ../e-util/gal-define-views.ui.h:4 ../e-util/gal-define-views-dialog.c:375
+#, no-c-format
+msgid "Define Views for %s"
+msgstr "Define Views for %s"
 
-#: ../libemail-engine/e-mail-folder-utils.c:676
-#: ../libemail-engine/e-mail-folder-utils.c:927
-#, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "Retrieving %d message"
-msgstr[1] "Retrieving %d messages"
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "_Create new view"
 
-#: ../libemail-engine/e-mail-folder-utils.c:770
-msgid "Scanning messages for duplicates"
-msgstr "Scanning messages for duplicates"
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../e-util/e-mail-signature-script-dialog.c:417
+#: ../mail/e-mail-config-identity-page.c:311
+#: ../mail/e-mail-config-summary-page.c:341
+msgid "_Name:"
+msgstr "_Name:"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1178
-#, c-format
-msgid "Removing folder '%s'"
-msgstr "Removing folder '%s'"
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "_Replace existing view"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1315
+#: ../e-util/gal-view-new-dialog.ui.h:1
+msgid "Name of new view:"
+msgstr "Name of new view:"
+
+#: ../e-util/gal-view-new-dialog.ui.h:2
+msgid "Type of view:"
+msgstr "Type of view:"
+
+#: ../e-util/gal-view-new-dialog.ui.h:3
+msgid "Type of View"
+msgstr "Type of View"
+
+#: ../e-util/e-activity-proxy.c:313
+#: ../modules/mail/e-mail-shell-view-actions.c:1484
+msgid "Cancel"
+msgstr "Cancel"
+
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:247
 #, c-format
-msgid "File \"%s\" has been removed."
-msgstr "File \"%s\" has been removed."
+msgid "%s (cancelled)"
+msgstr "%s (cancelled)"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1319
-msgid "File has been removed."
-msgstr "File has been removed."
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:250
+#, c-format
+msgid "%s (completed)"
+msgstr "%s (completed)"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1378
-msgid "Removing attachments"
-msgstr "Removing attachments"
+#. Translators: This is an activity waiting to run.
+#: ../e-util/e-activity.c:253
+#, c-format
+msgid "%s (waiting)"
+msgstr "%s (waiting)"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1542
+#. Translators: This is a running activity which
+#. *              the user has requested to cancel.
+#: ../e-util/e-activity.c:257
 #, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messages"
-msgstr[0] "Saving %d message"
-msgstr[1] "Saving %d messages"
+msgid "%s (cancelling)"
+msgstr "%s (cancelling)"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1898 ../mail/em-folder-utils.c:613
+#: ../e-util/e-activity.c:259
 #, c-format
-msgid "Invalid folder URI '%s'"
-msgstr "Invalid folder URI '%s'"
+msgid "%s"
+msgstr "%s"
 
-#: ../libemail-engine/e-mail-session.c:116 ../mail/em-folder-properties.c:333
-#: ../mail/em-folder-tree-model.c:765
-#: ../modules/mail/e-mail-shell-view-private.c:1114
-#: ../modules/mail/e-mail-shell-view-private.c:1125
-msgid "Inbox"
-msgstr "Inbox"
+#: ../e-util/e-activity.c:264
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% complete)"
 
-#. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:117 ../mail/em-folder-tree-model.c:758
-#: ../modules/mail/e-mail-shell-view-private.c:1112
-msgid "Drafts"
-msgstr "Drafts"
+#: ../e-util/e-alert-bar.c:120
+msgid "Close this message"
+msgstr "Close this message"
 
-#. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:118 ../mail/em-folder-tree-model.c:769
-#: ../modules/mail/e-mail-shell-view-private.c:1116
-msgid "Outbox"
-msgstr "Outbox"
+#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
+msgid "Icon View"
+msgstr "Icon View"
 
-#. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:119 ../mail/em-folder-tree-model.c:773
-#: ../modules/mail/e-mail-shell-view-private.c:1118
-msgid "Sent"
-msgstr "Sent"
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
+msgid "List View"
+msgstr "List View"
 
-#. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-tree-model.c:761
-#: ../modules/mail/e-mail-shell-view-private.c:1120
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1048 ../plugins/templates/templates.c:1345
-#: ../plugins/templates/templates.c:1355
-msgid "Templates"
-msgstr "Templates"
+#: ../e-util/e-attachment-dialog.c:311
+msgid "Attachment Properties"
+msgstr "Attachment Properties"
 
-#: ../libemail-engine/e-mail-session.c:1319
-#, c-format
-msgid "User cancelled operation"
-msgstr "User cancelled operation"
+#: ../e-util/e-attachment-dialog.c:333 ../e-util/e-import-assistant.c:273
+msgid "F_ilename:"
+msgstr "F_ilename:"
 
-#: ../libemail-engine/e-mail-session.c:1489
-#, c-format
-msgid "%s authentication failed"
-msgstr "%s authentication failed"
+#: ../e-util/e-attachment-dialog.c:368
+msgid "MIME Type:"
+msgstr "MIME Type:"
 
-#: ../libemail-engine/e-mail-session.c:1534
-#, c-format
-msgid "No data source found for UID '%s'"
-msgstr "No data source found for UID '%s'"
+#: ../e-util/e-attachment-dialog.c:376 ../e-util/e-attachment-store.c:441
+msgid "_Suggest automatic display of attachment"
+msgstr "_Suggest automatic display of attachment"
 
-#: ../libemail-engine/e-mail-session.c:1585
-#, c-format
-msgid ""
-"No destination address provided, forwarding of the message has been "
-"cancelled."
-msgstr ""
-"No destination address provided, forwarding of the message has been "
-"cancelled."
+#: ../e-util/e-attachment-handler-image.c:97
+msgid "Could not set as background"
+msgstr "Could not set as background"
 
-#: ../libemail-engine/e-mail-session.c:1598
-#, c-format
-msgid "No identity found to use, forwarding of the message has been cancelled."
-msgstr ""
-"No identity found to use, forwarding of the message has been cancelled."
+#: ../e-util/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "Set as _Background"
 
-#: ../libemail-engine/e-mail-session-utils.c:540
-#, c-format
-msgid "No mail service found with UID '%s'"
-msgstr "No mail service found with UID '%s'"
+#: ../e-util/e-attachment-handler-sendto.c:93
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "Could not send attachment"
+msgstr[1] "Could not send attachments"
 
-#: ../libemail-engine/e-mail-session-utils.c:549
-#, c-format
-msgid "UID '%s' is not a mail transport"
-msgstr "UID '%s' is not a mail transport"
+#: ../e-util/e-attachment-handler-sendto.c:135
+msgid "_Send To..."
+msgstr "_Send To…"
 
-#: ../libemail-engine/e-mail-session-utils.c:641
-#: ../libemail-engine/mail-ops.c:719
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Failed to apply outgoing filters: %s"
+#: ../e-util/e-attachment-handler-sendto.c:137
+msgid "Send the selected attachments somewhere"
+msgstr "Send the selected attachments somewhere"
 
-#: ../libemail-engine/e-mail-session-utils.c:670
-#: ../libemail-engine/e-mail-session-utils.c:704
-#: ../libemail-engine/mail-ops.c:736 ../libemail-engine/mail-ops.c:772
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
+#: ../e-util/e-attachment-icon-view.c:166
+#: ../e-util/e-attachment-tree-view.c:549
+msgid "Loading"
+msgstr "Loading"
 
-#: ../libemail-engine/e-mail-session-utils.c:724
-#: ../libemail-engine/mail-ops.c:794
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "Failed to append to local 'Sent' folder: %s"
+#: ../e-util/e-attachment-icon-view.c:178
+#: ../e-util/e-attachment-tree-view.c:561
+msgid "Saving"
+msgstr "Saving"
 
-#: ../libemail-engine/e-mail-session-utils.c:954
-#: ../libemail-engine/mail-ops.c:926 ../libemail-engine/mail-ops.c:1028
-msgid "Sending message"
-msgstr "Sending message"
+#: ../e-util/e-attachment-paned.c:104
+msgid "Hide Attachment _Bar"
+msgstr "Hide Attachment _Bar"
 
-#: ../libemail-engine/e-mail-store-utils.c:171
-#, c-format
-msgid "Disconnecting from '%s'"
-msgstr "Disconnecting from '%s'"
+#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
+msgid "Show Attachment _Bar"
+msgstr "Show Attachment _Bar"
 
-#: ../libemail-engine/e-mail-store-utils.c:263
-#, c-format
-msgid "Reconnecting to '%s'"
-msgstr "Reconnecting to '%s'"
+#: ../e-util/e-attachment-store.c:429
+msgid "Add Attachment"
+msgstr "Add Attachment"
 
-#: ../libemail-engine/e-mail-store-utils.c:340
-#, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "Preparing account '%s' for offline"
+#: ../e-util/e-attachment-store.c:432
+msgid "A_ttach"
+msgstr "A_ttach"
 
-#: ../libemail-engine/mail-folder-cache.c:880
-#, c-format
-msgid "Pinging %s"
-msgstr "Pinging %s"
+#: ../e-util/e-attachment-store.c:495
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "Save Attachment"
+msgstr[1] "Save Attachments"
 
-#: ../libemail-engine/mail-ops.c:94
-msgid "Filtering Selected Messages"
-msgstr "Filtering Selected Messages"
+#. Translators: Default attachment filename.
+#: ../e-util/e-attachment-store.c:524 ../e-util/e-attachment.c:1841
+#: ../e-util/e-attachment.c:2477
+msgid "attachment.dat"
+msgstr "attachment.dat"
 
-#: ../libemail-engine/mail-ops.c:219
-msgid "Fetching Mail"
-msgstr "Fetching Mail"
+#: ../e-util/e-attachment-view.c:378
+msgid "Open With Other Application..."
+msgstr "Open With Other Application…"
 
-#: ../libemail-engine/mail-ops.c:937
-#, c-format
-msgid "Sending message %d of %d"
-msgstr "Sending message %d of %d"
+#: ../e-util/e-attachment-view.c:385
+msgid "S_ave All"
+msgstr "S_ave All"
 
-#: ../libemail-engine/mail-ops.c:989
-#, 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"
+#: ../e-util/e-attachment-view.c:411
+msgid "A_dd Attachment..."
+msgstr "A_dd Attachment…"
 
-#: ../libemail-engine/mail-ops.c:995
-msgid "Canceled."
-msgstr "Cancelled."
+#: ../e-util/e-attachment-view.c:435
+msgid "_Hide"
+msgstr "_Hide"
 
-#: ../libemail-engine/mail-ops.c:997
-msgid "Complete."
-msgstr "Complete."
+#: ../e-util/e-attachment-view.c:442
+msgid "Hid_e All"
+msgstr "Hid_e All"
 
-#: ../libemail-engine/mail-ops.c:1109
-#, c-format
-msgid "Moving messages to '%s'"
-msgstr "Moving messages to '%s'"
+#: ../e-util/e-attachment-view.c:449
+msgid "_View Inline"
+msgstr "_View Inline"
 
-#: ../libemail-engine/mail-ops.c:1110
-#, c-format
-msgid "Copying messages to '%s'"
-msgstr "Copying messages to '%s'"
+#: ../e-util/e-attachment-view.c:456
+msgid "Vie_w All Inline"
+msgstr "Vie_w All Inline"
 
-#: ../libemail-engine/mail-ops.c:1228
+#: ../e-util/e-attachment-view.c:777
 #, c-format
-msgid "Storing folder '%s'"
-msgstr "Storing folder '%s'"
+msgid "Open With \"%s\""
+msgstr "Open With \"%s\""
 
-#: ../libemail-engine/mail-ops.c:1302
+#: ../e-util/e-attachment-view.c:780
 #, c-format
-msgid "Expunging and storing account '%s'"
-msgstr "Expunging and storing account '%s'"
+msgid "Open this attachment in %s"
+msgstr "Open this attachment in %s"
 
-#: ../libemail-engine/mail-ops.c:1303
-#, c-format
-msgid "Storing account '%s'"
-msgstr "Storing account '%s'"
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../e-util/e-attachment.c:978
+msgid "Attached message"
+msgstr "Attached message"
+
+#: ../e-util/e-attachment.c:1917 ../e-util/e-attachment.c:2779
+msgid "A load operation is already in progress"
+msgstr "A load operation is already in progress"
+
+#: ../e-util/e-attachment.c:1925 ../e-util/e-attachment.c:2787
+msgid "A save operation is already in progress"
+msgstr "A save operation is already in progress"
 
-#: ../libemail-engine/mail-ops.c:1377
+#: ../e-util/e-attachment.c:2033
 #, c-format
-msgid "Emptying trash in '%s'"
-msgstr "Emptying wastebasket in '%s'"
+msgid "Could not load '%s'"
+msgstr "Could not load '%s'"
 
-#: ../libemail-engine/mail-tools.c:71
+#: ../e-util/e-attachment.c:2036
 #, c-format
-msgid "Could not create spool directory '%s': %s"
-msgstr "Could not create spool directory '%s': %s"
+msgid "Could not load the attachment"
+msgstr "Could not load the attachment"
 
-#: ../libemail-engine/mail-tools.c:111
+#: ../e-util/e-attachment.c:2334
 #, c-format
-msgid "Trying to movemail a non-mbox source '%s'"
-msgstr "Trying to movemail a non-mbox source '%s'"
+msgid "Could not open '%s'"
+msgstr "Could not open '%s'"
 
-#: ../libemail-engine/mail-tools.c:229
+#: ../e-util/e-attachment.c:2337
 #, c-format
-msgid "Forwarded message - %s"
-msgstr "Forwarded message — %s"
+msgid "Could not open the attachment"
+msgstr "Could not open the attachment"
 
-#: ../libemail-engine/mail-tools.c:231
-msgid "Forwarded message"
-msgstr "Forwarded message"
+#: ../e-util/e-attachment.c:2795
+msgid "Attachment contents not loaded"
+msgstr "Attachment contents not loaded"
 
-#: ../libemail-engine/mail-vfolder.c:130
+#: ../e-util/e-attachment.c:2871
 #, c-format
-msgid "Setting up Search Folder: %s"
-msgstr "Setting up Search Folder: %s"
+msgid "Could not save '%s'"
+msgstr "Could not save '%s'"
 
-#: ../libemail-engine/mail-vfolder.c:283
+#: ../e-util/e-attachment.c:2874
 #, c-format
-msgid "Updating Search Folders for '%s' - %s"
-msgstr "Updating Search Folders for '%s' - %s"
+msgid "Could not save the attachment"
+msgstr "Could not save the attachment"
 
-#. 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:648
-#, 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\"."
+#: ../e-util/e-book-source-config.c:98
+msgid "Mark as default address book"
+msgstr "Mark as default address book"
 
-#: ../mail/e-mail-account-manager.c:460
-msgid "_Restore Default"
-msgstr "_Restore Default"
+#: ../e-util/e-book-source-config.c:103
+msgid "Autocomplete with this address book"
+msgstr "Autocomplete with this address book"
 
-#: ../mail/e-mail-account-manager.c:473
-msgid "You can drag and drop account names to reorder them."
-msgstr "You can drag and drop account names to reorder them."
+#: ../e-util/e-book-source-config.c:277
+msgid "Copy book content locally for offline operation"
+msgstr "Copy book content locally for offline operation"
 
-#: ../mail/e-mail-account-manager.c:518
-msgid "De_fault"
-msgstr "De_fault"
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
+#: ../e-util/e-buffer-tagger.c:410
+msgid "Ctrl-click to open a link"
+msgstr "Ctrl-click to open a link"
 
-#: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:495
-#: ../modules/plugin-manager/evolution-plugin-manager.c:360
-#: ../plugins/publish-calendar/publish-calendar.c:864
-msgid "Enabled"
-msgstr "Enabled"
+#: ../e-util/e-cal-source-config.c:170
+msgid "Mark as default calendar"
+msgstr "Mark as default calendar"
 
-#: ../mail/e-mail-account-tree-view.c:109
-msgid "Account Name"
-msgstr "Account Name"
+#: ../e-util/e-cal-source-config.c:173
+msgid "Mark as default task list"
+msgstr "Mark as default task list"
 
-#: ../mail/e-mail-account-tree-view.c:134
-#: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3661
-#: ../mail/mail-config.ui.h:44
-msgid "Default"
-msgstr "Default"
+#: ../e-util/e-cal-source-config.c:176
+msgid "Mark as default memo list"
+msgstr "Mark as default memo list"
 
-#: ../mail/e-mail-autoconfig.c:194
-#, c-format
-msgid "No mail exchanger record for '%s'"
-msgstr "No mail exchanger record for '%s'"
+#: ../e-util/e-cal-source-config.c:201
+msgid "Color:"
+msgstr "Colour:"
 
-#: ../mail/e-mail-autoconfig.c:201
-#, c-format
-msgid "Temporarily unable to resolve '%s'"
-msgstr "Temporarily unable to resolve '%s'"
+#: ../e-util/e-cal-source-config.c:406
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Copy calendar contents locally for offline operation"
 
-#: ../mail/e-mail-autoconfig.c:208
-#, c-format
-msgid "Error resolving '%s'"
-msgstr "Error resolving '%s'"
+#: ../e-util/e-cal-source-config.c:410
+msgid "Copy task list contents locally for offline operation"
+msgstr "Copy task list contents locally for offline operation"
 
-#: ../mail/e-mail-autoconfig.c:264
-#, c-format
-msgid "No authoritative name server for '%s'"
-msgstr "No authoritative name server for '%s'"
+#: ../e-util/e-cal-source-config.c:414
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Copy memo list contents locally for offline operation"
 
-#: ../mail/e-mail-autoconfig.c:661
-msgid "No email address provided"
-msgstr "No e-mail address provided"
+#. This is a strftime() format. %B = Month name.
+#: ../e-util/e-calendar-item.c:1324 ../e-util/e-calendar-item.c:2186
+msgctxt "CalItem"
+msgid "%B"
+msgstr "%B"
 
-#: ../mail/e-mail-autoconfig.c:670
-msgid "Missing domain in email address"
-msgstr "Missing domain in e-mail address"
+#. This is a strftime() format. %Y = Year.
+#: ../e-util/e-calendar-item.c:1326
+msgctxt "CalItem"
+msgid "%Y"
+msgstr "%Y"
 
-#: ../mail/e-mail-backend.c:737
-msgid "Unknown background operation"
-msgstr "Unknown background operation"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../e-util/e-calendar-item.c:1363
+msgctxt "CalItem"
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: ../mail/e-mail-browser.c:127 ../shell/e-shell-window-actions.c:1418
-#: ../shell/e-shell-window-actions.c:1425
-#: ../shell/e-shell-window-actions.c:1432
-msgid "Close this window"
-msgstr "Close this window"
+#: ../e-util/e-calendar.c:190
+msgid "Previous month"
+msgstr "Previous month"
 
-#: ../mail/e-mail-browser.c:284
-msgid "(No Subject)"
-msgstr "(No Subject)"
+#: ../e-util/e-calendar.c:215
+msgid "Next month"
+msgstr "Next month"
 
-#: ../mail/e-mail-config-assistant.c:501
-msgid "Evolution Account Assistant"
-msgstr "Evolution Account Assistant"
+#: ../e-util/e-calendar.c:241
+msgid "Previous year"
+msgstr "Previous year"
 
-#: ../mail/e-mail-config-auth-check.c:348
-msgid "Check for Supported Types"
-msgstr "Check for Supported Types"
+#: ../e-util/e-calendar.c:266
+msgid "Next year"
+msgstr "Next year"
 
-#: ../mail/e-mail-config-confirm-page.c:157
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive e-mail using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
+#: ../e-util/e-calendar.c:290
+msgid "Month Calendar"
+msgstr "Month Calendar"
 
-#: ../mail/e-mail-config-confirm-page.c:169
-msgid "Done"
-msgstr "Done"
+#: ../e-util/e-categories-editor.c:224
+msgid "Currently _used categories:"
+msgstr "Currently _used categories:"
 
-#: ../mail/e-mail-config-defaults-page.c:549
-msgid "Special Folders"
-msgstr "Special Folders"
+#: ../e-util/e-categories-editor.c:235
+msgid "_Available Categories:"
+msgstr "_Available Categories:"
 
-#: ../mail/e-mail-config-defaults-page.c:558
-msgid "Draft Messages _Folder:"
-msgstr "Draft Messages _Folder:"
+#: ../e-util/e-categories-selector.c:323
+msgid "Icon"
+msgstr "Icon"
 
-#: ../mail/e-mail-config-defaults-page.c:568
-msgid "Choose a folder for saving draft messages."
-msgstr "Choose a folder for saving draft messages."
+#: ../e-util/e-category-completion.c:300
+#, c-format
+msgid "Create category \"%s\""
+msgstr "Create category \"%s\""
 
-#: ../mail/e-mail-config-defaults-page.c:582
-msgid "Sent _Messages Folder:"
-msgstr "Sent _Messages Folder:"
+#: ../e-util/e-category-editor.c:137
+msgid "Category Icon"
+msgstr "Category Icon"
 
-#: ../mail/e-mail-config-defaults-page.c:592
-msgid "Choose a folder for saving sent messages."
-msgstr "Choose a folder for saving sent messages."
+#: ../e-util/e-category-editor.c:141
+msgid "_No Image"
+msgstr "_No Image"
 
-#: ../mail/e-mail-config-defaults-page.c:611
-msgid "_Restore Defaults"
-msgstr "_Restore Defaults"
+#: ../e-util/e-category-editor.c:178
+msgid "Category _Name"
+msgstr "Category _Name"
 
-#: ../mail/e-mail-config-defaults-page.c:625
-msgid "Use a Real Folder for _Trash:"
-msgstr "Use a Real Folder for _Wastebasket:"
+#: ../e-util/e-category-editor.c:190
+msgid "Category _Icon"
+msgstr "Category _Icon"
 
-#: ../mail/e-mail-config-defaults-page.c:626
-msgid "Choose a folder for deleted messages."
-msgstr "Choose a folder for deleted messages."
+#: ../e-util/e-category-editor.c:216
+msgid "Category Properties"
+msgstr "Category Properties"
 
-#: ../mail/e-mail-config-defaults-page.c:635
-msgid "Use a Real Folder for _Junk:"
-msgstr "Use a Real Folder for _Junk:"
+#: ../e-util/e-category-editor.c:277
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
 
-#: ../mail/e-mail-config-defaults-page.c:636
-msgid "Choose a folder for junk messages."
-msgstr "Choose a folder for junk messages."
+#: ../e-util/e-cell-combo.c:186
+msgid "popup list"
+msgstr "popup list"
 
-#: ../mail/e-mail-config-defaults-page.c:653
-msgid "Composing Messages"
-msgstr "Composing Messages"
+#: ../e-util/e-cell-date-edit.c:299
+msgid "Now"
+msgstr "Now"
 
-#: ../mail/e-mail-config-defaults-page.c:662
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Alway_s carbon-copy (cc) to:"
+#. strftime format of a weekday and a date.
+#: ../e-util/e-cell-date-edit.c:307 ../e-util/e-datetime-format.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1924
+#: ../modules/itip-formatter/itip-view.c:230
+msgid "Today"
+msgstr "Today"
 
-#: ../mail/e-mail-config-defaults-page.c:687
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Always _blind carbon-copy (bcc) to:"
+#. Translators: "None" as a label of a button to unset date in a
+#. * date table cell.
+#: ../e-util/e-cell-date-edit.c:317
+msgctxt "table-date"
+msgid "None"
+msgstr "None"
 
-#: ../mail/e-mail-config-defaults-page.c:722
-msgid "Message Receipts"
-msgstr "Message Receipts"
+#: ../e-util/e-cell-date-edit.c:325
+msgid "OK"
+msgstr "OK"
 
-#: ../mail/e-mail-config-defaults-page.c:731
-msgid "S_end message receipts:"
-msgstr "S_end message receipts:"
+#: ../e-util/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"
 
-#: ../mail/e-mail-config-defaults-page.c:756
-msgid "Never"
-msgstr "Never"
+#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1882
+msgid "?"
+msgstr "?"
 
-#: ../mail/e-mail-config-defaults-page.c:762
-msgid "Always"
-msgstr "Always"
+#: ../e-util/e-cell-percent.c:80
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "The percent value must be between 0 and 100, inclusive"
 
-#: ../mail/e-mail-config-defaults-page.c:768
-msgid "Ask for each message"
-msgstr "Ask for each message"
+#: ../e-util/e-charset-combo-box.c:100
+msgid "Character Encoding"
+msgstr "Character Encoding"
 
-#: ../mail/e-mail-config-defaults-page.c:839
-msgid "Defaults"
-msgstr "Defaults"
+#: ../e-util/e-charset-combo-box.c:123
+msgid "Enter the character set to use"
+msgstr "Enter the character set to use"
 
-#: ../mail/e-mail-config-identity-page.c:268
-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."
-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."
+#: ../e-util/e-charset-combo-box.c:342
+msgid "Other..."
+msgstr "Other…"
 
-#: ../mail/e-mail-config-identity-page.c:296
-#: ../mail/e-mail-config-summary-page.c:324
-msgid "Account Information"
-msgstr "Account Information"
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "Arabic"
 
-#: ../mail/e-mail-config-identity-page.c:305
-#: ../mail/e-mail-config-summary-page.c:333
-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\"."
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "Baltic"
 
-#: ../mail/e-mail-config-identity-page.c:313
-#: ../mail/e-mail-config-summary-page.c:341
-#: ../modules/addressbook/ldap-config.ui.h:12
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-mail-signature-script-dialog.c:417
-msgid "_Name:"
-msgstr "_Name:"
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "Central European"
 
-#: ../mail/e-mail-config-identity-page.c:350
-msgid "Required Information"
-msgstr "Required Information"
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "Chinese"
 
-#: ../mail/e-mail-config-identity-page.c:359
-msgid "Full Nam_e:"
-msgstr "Full Nam_e:"
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "Cyrillic"
 
-#: ../mail/e-mail-config-identity-page.c:386
-msgid "Email _Address:"
-msgstr "E-mail _Address:"
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "Greek"
 
-#: ../mail/e-mail-config-identity-page.c:433
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
-msgid "Optional Information"
-msgstr "Optional Information"
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "Hebrew"
 
-#: ../mail/e-mail-config-identity-page.c:441
-msgid "Re_ply-To:"
-msgstr "Re_ply-To:"
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "Japanese"
 
-#: ../mail/e-mail-config-identity-page.c:468
-msgid "Or_ganization:"
-msgstr "Or_ganisation:"
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "Korean"
 
-#: ../mail/e-mail-config-identity-page.c:523
-msgid "Add Ne_w Signature..."
-msgstr "Add Ne_w Signature…"
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "Thai"
 
-#: ../mail/e-mail-config-identity-page.c:679
-msgid "Identity"
-msgstr "Identity"
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "Turkish"
 
-#: ../mail/e-mail-config-lookup-page.c:68
-msgid "Looking up account details..."
-msgstr "Looking up account details…"
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "Unicode"
 
-#: ../mail/e-mail-config-provider-page.c:485
-msgid "Checking for New Mail"
-msgstr "Checking for New Mail"
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "Western European"
 
-#: ../mail/e-mail-config-provider-page.c:501
-msgid "Check for _new messages every"
-msgstr "Check for _new messages every"
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "Western European, New"
 
-#: ../mail/e-mail-config-provider-page.c:700
-msgid "Receiving Options"
-msgstr "Receiving Options"
+#. 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/e-mail-config-receiving-page.c:50
-msgid "Receiving Email"
-msgstr "Receiving E-mail"
+#. 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/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:257 ../mail/mail-config.ui.h:19
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
-#: ../modules/itip-formatter/plugin/config-ui.c:91
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
-#: ../smime/gui/smime-ui.ui.h:21
-msgid "General"
-msgstr "General"
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
+msgid "Ukrainian"
+msgstr "Ukrainian"
 
-#: ../mail/e-mail-config-security-page.c:268
-msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "_Do not sign meeting requests (for Outlook compatibility)"
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
+msgid "Visual"
+msgstr "Visual"
 
-#: ../mail/e-mail-config-security-page.c:290
-msgid "Pretty Good Privacy (OpenPGP)"
-msgstr "Pretty Good Privacy (OpenPGP)"
+#: ../e-util/e-client-cache.c:1067
+#, c-format
+msgid "Cannot create a client object from extension name '%s'"
+msgstr "Cannot create a client object from extension name '%s'"
 
-#: ../mail/e-mail-config-security-page.c:298
-msgid "OpenPGP _Key ID:"
-msgstr "OpenPGP _Key ID:"
+#: ../e-util/e-dateedit.c:523
+msgid "Date and Time"
+msgstr "Date and Time"
 
-#: ../mail/e-mail-config-security-page.c:320
-msgid "Si_gning algorithm:"
-msgstr "Si_gning algorithm:"
+#: ../e-util/e-dateedit.c:548
+msgid "Text entry to input date"
+msgstr "Text entry to input date"
 
-#: ../mail/e-mail-config-security-page.c:336
-#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:45
-msgid "SHA1"
-msgstr "SHA1"
+#: ../e-util/e-dateedit.c:571
+msgid "Click this button to show a calendar"
+msgstr "Click this button to show a calendar"
 
-#: ../mail/e-mail-config-security-page.c:339
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:46
-msgid "SHA256"
-msgstr "SHA256"
+#: ../e-util/e-dateedit.c:625
+msgid "Drop-down combination box to select time"
+msgstr "Drop-down combination box to select time"
 
-#: ../mail/e-mail-config-security-page.c:342
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:47
-msgid "SHA384"
-msgstr "SHA384"
+#: ../e-util/e-dateedit.c:626
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+msgid "Time"
+msgstr "Time"
 
-#: ../mail/e-mail-config-security-page.c:345
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:48
-msgid "SHA512"
-msgstr "SHA512"
+#: ../e-util/e-dateedit.c:700
+msgid "No_w"
+msgstr "No_w"
 
-#: ../mail/e-mail-config-security-page.c:361
-msgid "Al_ways sign outgoing messages when using this account"
-msgstr "Al_ways sign outgoing messages when using this account"
+#: ../e-util/e-dateedit.c:707
+msgid "_Today"
+msgstr "_Today"
 
-#: ../mail/e-mail-config-security-page.c:373
-msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "Always encrypt to _myself when sending encrypted messages"
+#. Note that we don't show this here, since by default a 'None' date
+#. * is not permitted.
+#: ../e-util/e-dateedit.c:716
+msgid "_None"
+msgstr "_None"
 
-#: ../mail/e-mail-config-security-page.c:385
-msgid "Always _trust keys in my keyring when encrypting"
-msgstr "Always _trust keys in my keyring when encrypting"
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../e-util/e-dateedit.c:1811 ../e-util/e-dateedit.c:2059
+msgctxt "date"
+msgid "None"
+msgstr "None"
 
-#: ../mail/e-mail-config-security-page.c:409
-msgid "Secure MIME (S/MIME)"
-msgstr "Secure MIME (S/MIME)"
+#: ../e-util/e-dateedit.c:1951
+msgid "Invalid Date Value"
+msgstr "Invalid Date Value"
 
-#: ../mail/e-mail-config-security-page.c:417
-msgid "Sig_ning certificate:"
-msgstr "Sig_ning certificate:"
+#: ../e-util/e-dateedit.c:1996
+msgid "Invalid Time Value"
+msgstr "Invalid Time Value"
 
-#: ../mail/e-mail-config-security-page.c:441
-#: ../mail/e-mail-config-security-page.c:547
-msgid "Select"
-msgstr "Select"
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:258
+msgid "Tomorrow"
+msgstr "Tomorrow"
 
-#: ../mail/e-mail-config-security-page.c:459
-msgid "Signing _algorithm:"
-msgstr "Signing _algorithm:"
+#: ../e-util/e-datetime-format.c:222
+msgid "Yesterday"
+msgstr "Yesterday"
 
-#: ../mail/e-mail-config-security-page.c:500
-msgid "Always sign outgoing messages when using this account"
-msgstr "Always sign outgoing messages when using this account"
+#. Translators: This is used for abbreviated days in the future.
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:230
+msgctxt "DateFmt"
+msgid "Next Mon"
+msgstr "Next Mon"
 
-#: ../mail/e-mail-config-security-page.c:523
-msgid "Encryption certificate:"
-msgstr "Encryption certificate:"
+#. Translators: This is used for abbreviated days in the future.
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:236
+msgctxt "DateFmt"
+msgid "Next Tue"
+msgstr "Next Tue"
 
-#: ../mail/e-mail-config-security-page.c:565
-msgid "Always encrypt outgoing messages when using this account"
-msgstr "Always encrypt outgoing messages when using this account"
+#. Translators: This is used for abbreviated days in the future.
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:242
+msgctxt "DateFmt"
+msgid "Next Wed"
+msgstr "Next Wed"
 
-#: ../mail/e-mail-config-security-page.c:585
-msgid "Always encrypt to myself when sending encrypted messages"
-msgstr "Always encrypt to myself when sending encrypted 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:248
+msgctxt "DateFmt"
+msgid "Next Thu"
+msgstr "Next Thu"
 
-#: ../mail/e-mail-config-sending-page.c:50
-msgid "Sending Email"
-msgstr "Sending E-mail"
+#. Translators: This is used for abbreviated days in the future.
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:254
+msgctxt "DateFmt"
+msgid "Next Fri"
+msgstr "Next Fri"
 
-#: ../mail/e-mail-config-service-page.c:640
-msgid "Server _Type:"
-msgstr "Server _Type:"
+#. Translators: This is used for abbreviated days in the future.
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:260
+msgctxt "DateFmt"
+msgid "Next Sat"
+msgstr "Next Sat"
 
-#: ../mail/e-mail-config-summary-page.c:142
-msgid "SSL"
-msgstr "SSL"
+#. Translators: This is used for abbreviated days in the future.
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:266
+msgctxt "DateFmt"
+msgid "Next Sun"
+msgstr "Next Sun"
 
-#: ../mail/e-mail-config-summary-page.c:145
-msgid "TLS"
-msgstr "TLS"
+#: ../e-util/e-datetime-format.c:353 ../e-util/e-datetime-format.c:363
+#: ../e-util/e-datetime-format.c:372
+msgid "Use locale default"
+msgstr "Use locale default"
 
-#: ../mail/e-mail-config-summary-page.c:307
-msgid ""
-"This is a summary of the settings which will be used to access your mail."
-msgstr ""
-"This is a summary of the settings which will be used to access your mail."
+#: ../e-util/e-datetime-format.c:577
+msgid "Format:"
+msgstr "Format:"
 
-#: ../mail/e-mail-config-summary-page.c:372
-msgid "Personal Details"
-msgstr "Personal Details"
+#: ../e-util/e-file-utils.c:150
+msgid "(Unknown Filename)"
+msgstr "(Unknown Filename)"
 
-#: ../mail/e-mail-config-summary-page.c:381
-msgid "Full Name:"
-msgstr "Full Name:"
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:154
+#, c-format
+msgid "Writing \"%s\""
+msgstr "Writing \"%s\""
 
-#: ../mail/e-mail-config-summary-page.c:395
-msgid "Email Address:"
-msgstr "E-mail Address:"
+#. 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 "Writing \"%s\" to %s"
+msgstr "Writing \"%s\" to %s"
 
-#: ../mail/e-mail-config-summary-page.c:409
-msgid "Receiving"
-msgstr "Receiving"
+#. Don't delete this code, since it is needed so that xgettext can extract the translations.
+#. * Please, keep these strings in sync with the strings in the timespans array
+#: ../e-util/e-filter-datespec.c:67
+#, c-format
+msgid "1 second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 second ago"
+msgstr[1] "%d seconds ago"
 
-#: ../mail/e-mail-config-summary-page.c:421
-msgid "Sending"
-msgstr "Sending"
+#: ../e-util/e-filter-datespec.c:68
+#, 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/e-mail-config-summary-page.c:433
-msgid "Server Type:"
-msgstr "Server Type:"
+#: ../e-util/e-filter-datespec.c:69
+#, c-format
+msgid "1 minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 minute ago"
+msgstr[1] "%d minutes ago"
 
-#: ../mail/e-mail-config-summary-page.c:454
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:610
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:244
-msgid "Server:"
-msgstr "Server:"
-
-#: ../mail/e-mail-config-summary-page.c:475
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
-msgid "Username:"
-msgstr "Username:"
+#: ../e-util/e-filter-datespec.c:70
+#, 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/e-mail-config-summary-page.c:496
-msgid "Security:"
-msgstr "Security:"
+#: ../e-util/e-filter-datespec.c:71
+#, c-format
+msgid "1 hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "1 hour ago"
+msgstr[1] "%d hours ago"
 
-#: ../mail/e-mail-config-summary-page.c:787
-msgid "Account Summary"
-msgstr "Account Summary"
+#: ../e-util/e-filter-datespec.c:72
+#, 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/e-mail-config-welcome-page.c:157
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Continue\" to begin."
-msgstr ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Continue\" to begin."
+#: ../e-util/e-filter-datespec.c:73
+#, c-format
+msgid "1 day ago"
+msgid_plural "%d days ago"
+msgstr[0] "1 day ago"
+msgstr[1] "%d days ago"
 
-#: ../mail/e-mail-config-welcome-page.c:167
-#: ../modules/startup-wizard/e-startup-assistant.c:150
-msgid "Welcome"
-msgstr "Welcome"
+#: ../e-util/e-filter-datespec.c:74
+#, 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"
 
-#: ../mail/e-mail-config-window.c:329
-msgid "Account Editor"
-msgstr "Account Editor"
+#: ../e-util/e-filter-datespec.c:75
+#, c-format
+msgid "1 week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 week ago"
+msgstr[1] "%d weeks ago"
 
-#: ../mail/e-mail-display.c:119
-msgid "_Add to Address Book..."
-msgstr "_Add to Address Book…"
+#: ../e-util/e-filter-datespec.c:76
+#, 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"
 
-#: ../mail/e-mail-display.c:126
-msgid "_To This Address"
-msgstr "_To this Address"
+#: ../e-util/e-filter-datespec.c:77
+#, c-format
+msgid "1 month ago"
+msgid_plural "%d months ago"
+msgstr[0] "1 month ago"
+msgstr[1] "%d months ago"
 
-#: ../mail/e-mail-display.c:133
-msgid "_From This Address"
-msgstr "_From This Address"
+#: ../e-util/e-filter-datespec.c:78
+#, 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"
 
-#: ../mail/e-mail-display.c:140
-msgid "Send _Reply To..."
-msgstr "Send _Reply To…"
+#: ../e-util/e-filter-datespec.c:79
+#, c-format
+msgid "1 year ago"
+msgid_plural "%d years ago"
+msgstr[0] "1 year ago"
+msgstr[1] "%d years ago"
 
-#: ../mail/e-mail-display.c:142
-msgid "Send a reply message to this address"
-msgstr "Send a reply message to this address"
+#: ../e-util/e-filter-datespec.c:80
+#, 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"
 
-#: ../mail/e-mail-display.c:149
-msgid "Create Search _Folder"
-msgstr "Create Search _Folder"
+#: ../e-util/e-filter-datespec.c:130
+msgid "<click here to select a date>"
+msgstr "<click here to select a date>"
 
-#: ../mail/e-mail-display.c:159
-msgid "Save _Image..."
-msgstr "Save _Image…"
+#: ../e-util/e-filter-datespec.c:133 ../e-util/e-filter-datespec.c:144
+#: ../e-util/e-filter-datespec.c:155
+msgid "now"
+msgstr "now"
 
-#: ../mail/e-mail-display.c:161
-msgid "Save the image to a file"
-msgstr "Save the image to a file"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: ../e-util/e-filter-datespec.c:140
+msgid "%d-%b-%Y"
+msgstr "%d-%b-%Y"
 
-#. 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:"
+#: ../e-util/e-filter-datespec.c:289
+msgid "Select a time to compare against"
+msgstr "Select a time to compare against"
 
-#: ../mail/e-mail-label-dialog.c:225
-msgid "_Label name:"
-msgstr "_Label name:"
+#: ../e-util/e-filter-file.c:187
+msgid "Choose a File"
+msgstr "Choose a File"
 
-#: ../mail/e-mail-label-list-store.c:49
-msgid "I_mportant"
-msgstr "I_mportant"
+#: ../e-util/e-filter-rule.c:743
+msgid "R_ule name:"
+msgstr "R_ule name:"
 
-#. red
-#: ../mail/e-mail-label-list-store.c:50
-msgid "_Work"
-msgstr "_Work"
+#: ../e-util/e-filter-rule.c:793
+msgid "all the following conditions"
+msgstr "all the following conditions"
 
-#. orange
-#: ../mail/e-mail-label-list-store.c:51
-msgid "_Personal"
-msgstr "_Personal"
+#: ../e-util/e-filter-rule.c:794
+msgid "any of the following conditions"
+msgstr "any of the following conditions"
 
-#. green
-#: ../mail/e-mail-label-list-store.c:52
-msgid "_To Do"
-msgstr "_To Do"
+#: ../e-util/e-filter-rule.c:800
+msgid "_Find items which match:"
+msgstr "_Find items which match:"
 
-#. blue
-#: ../mail/e-mail-label-list-store.c:53
-msgid "_Later"
-msgstr "_Later"
+#: ../e-util/e-filter-rule.c:823
+msgid "Find items that meet the following conditions"
+msgstr "Find items that meet the following conditions"
 
-#: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:718
-msgid "Add Label"
-msgstr "Add Label"
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#. protocol:
+#. name:
+#: ../e-util/e-filter-rule.c:838 ../e-util/e-mail-signature-combo-box.c:369
+#: ../libemail-engine/camel-null-store.c:28
+#: ../mail/e-mail-config-summary-page.c:139
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+msgid "None"
+msgstr "None"
 
-#: ../mail/e-mail-label-manager.c:221
-msgid "Edit Label"
-msgstr "Edit Label"
+#: ../e-util/e-filter-rule.c:839
+msgid "All related"
+msgstr "All related"
 
-#: ../mail/e-mail-label-manager.c:353
-msgid ""
-"Note: Underscore in the label name is used\n"
-"as mnemonic identifier in menu."
-msgstr ""
-"Note: Underscore in the label name is used\n"
-"as mnemonic identifier in menu."
+#: ../e-util/e-filter-rule.c:841
+msgid "Replies and parents"
+msgstr "Replies and parents"
 
-#: ../mail/e-mail-label-tree-view.c:89
-msgid "Color"
-msgstr "Colour"
+#: ../e-util/e-filter-rule.c:842
+msgid "No reply or parent"
+msgstr "No reply or parent"
 
-#: ../mail/e-mail-migrate.c:332
-#, c-format
-msgid "Unable to create local mail folders at '%s': %s"
-msgstr "Unable to create local mail folders at '%s': %s"
+#: ../e-util/e-filter-rule.c:845
+msgid "I_nclude threads:"
+msgstr "I_nclude threads:"
 
-#: ../mail/e-mail-notebook-view.c:269
-msgid "Please select a folder"
-msgstr "Please select a folder"
+#: ../e-util/e-filter-rule.c:922
+msgid "A_dd Condition"
+msgstr "A_dd Condition"
 
-#: ../mail/e-mail-printer.c:124
-#, c-format
-msgid "Page %d of %d"
-msgstr "Page %d of %d"
+#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:294
+msgid "Outgoing"
+msgstr "Outgoing"
 
-#: ../mail/e-mail-printer.c:549
-#: ../modules/calendar/e-cal-shell-view-actions.c:217
-#: ../modules/calendar/e-cal-shell-view-actions.c:246
-msgid "Print"
-msgstr "Print"
+#: ../e-util/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."
+msgstr ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
 
-#: ../mail/e-mail-printer.c:555
-msgid "Header Name"
-msgstr "Header Name"
+#: ../e-util/e-import-assistant.c:283
+msgid "Select a file"
+msgstr "Select a file"
 
-#: ../mail/e-mail-printer.c:561
-msgid "Header Value"
-msgstr "Header Value"
+#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
+msgid "File _type:"
+msgstr "File _type:"
 
-#: ../mail/e-mail-printer.c:615 ../mail/mail-config.ui.h:102
-msgid "Headers"
-msgstr "Headers"
+#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:921
+msgid "Choose the destination for this import"
+msgstr "Choose the destination for this import"
 
-#: ../mail/e-mail-reader.c:350
-msgid "Save Image"
-msgstr "Save Image"
+#: ../e-util/e-import-assistant.c:365
+msgid "Choose the type of importer to run:"
+msgstr "Choose the type of importer to run:"
 
-#: ../mail/e-mail-reader.c:432 ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "Copy to Folder"
+#: ../e-util/e-import-assistant.c:373
+msgid "Import data and settings from _older programs"
+msgstr "Import data and settings from _older programs"
 
-#: ../mail/e-mail-reader.c:432 ../mail/em-folder-utils.c:492
-msgid "C_opy"
-msgstr "C_opy"
+#: ../e-util/e-import-assistant.c:381
+msgid "Import a _single file"
+msgstr "Import a _single file"
 
-#: ../mail/e-mail-reader.c:966 ../mail/em-filter-i18n.h:53
-msgid "Move to Folder"
-msgstr "Move to Folder"
+#: ../e-util/e-import-assistant.c:403
+#: ../modules/startup-wizard/e-mail-config-import-page.c:202
+msgid "Please select the information that you would like to import:"
+msgstr "Please select the information that you would like to import:"
 
-#: ../mail/e-mail-reader.c:966 ../mail/em-folder-utils.c:492
-msgid "_Move"
-msgstr "_Move"
+#: ../e-util/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 "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
 
-#: ../mail/e-mail-reader.c:1314 ../mail/e-mail-reader.c:1496
-#: ../mail/e-mail-reader.c:1536
-msgid "_Do not ask me again."
-msgstr "_Do not ask me again."
+#: ../e-util/e-import-assistant.c:559
+#: ../modules/startup-wizard/e-mail-config-import-page.c:231
+#, c-format
+msgid "From %s:"
+msgstr "From %s:"
 
-#: ../mail/e-mail-reader.c:1542
-msgid "_Always ignore Reply-To: for mailing lists."
-msgstr "_Always ignore Reply-To: for mailing lists."
+#. Install a custom "Cancel Import" button.
+#: ../e-util/e-import-assistant.c:775
+msgid "_Cancel Import"
+msgstr "_Cancel Import"
 
-#: ../mail/e-mail-reader.c:1732
-msgid "Failed to retrieve message:"
-msgstr "Failed to retrieve message:"
+#: ../e-util/e-import-assistant.c:920
+msgid "Preview data to be imported"
+msgstr "Preview data to be imported"
 
-#: ../mail/e-mail-reader.c:1778 ../mail/e-mail-reader.c:2868
-#, c-format
-msgid "Retrieving message '%s'"
-msgstr "Retrieving message '%s'"
+#: ../e-util/e-import-assistant.c:926 ../e-util/e-import-assistant.c:939
+#: ../e-util/e-import-assistant.c:1292 ../e-util/e-import-assistant.c:1368
+#: ../e-util/e-import-assistant.c:1377
+msgid "Import Data"
+msgstr "Import Data"
 
-#: ../mail/e-mail-reader.c:1955
-msgid "A_dd Sender to Address Book"
-msgstr "A_dd Sender to Address Book"
+#: ../e-util/e-import-assistant.c:934
+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."
 
-#: ../mail/e-mail-reader.c:1957
-msgid "Add sender to address book"
-msgstr "Add sender to address book"
+#: ../e-util/e-import-assistant.c:1282 ../e-util/e-import-assistant.c:1317
+msgid "Evolution Import Assistant"
+msgstr "Evolution Import Assistant"
 
-#: ../mail/e-mail-reader.c:1962
-msgid "Check for _Junk"
-msgstr "Check for _Junk"
+#: ../e-util/e-import-assistant.c:1299 ../e-util/e-import-assistant.c:1355
+msgid "Import Location"
+msgstr "Import Location"
 
-#: ../mail/e-mail-reader.c:1964
-msgid "Filter the selected messages for junk status"
-msgstr "Filter the selected messages for junk status"
+#: ../e-util/e-import-assistant.c:1310
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
 
-#: ../mail/e-mail-reader.c:1969
-msgid "_Copy to Folder..."
-msgstr "_Copy to Folder…"
+#: ../e-util/e-import-assistant.c:1327
+msgid "Importer Type"
+msgstr "Importer Type"
 
-#: ../mail/e-mail-reader.c:1971
-msgid "Copy selected messages to another folder"
-msgstr "Copy selected messages to another folder"
+#: ../e-util/e-import-assistant.c:1337
+msgid "Select Information to Import"
+msgstr "Select Information to Import"
 
-#: ../mail/e-mail-reader.c:1976
-msgid "_Delete Message"
-msgstr "_Delete Message"
+#: ../e-util/e-import-assistant.c:1346
+msgid "Select a File"
+msgstr "Select a File"
 
-#: ../mail/e-mail-reader.c:1978
-msgid "Mark the selected messages for deletion"
-msgstr "Mark the selected messages for deletion"
+#: ../e-util/e-import-assistant.c:1363
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Click \"Apply\" to begin importing the file into Evolution."
 
-#: ../mail/e-mail-reader.c:1983
-msgid "Create a Filter Rule for Mailing _List..."
-msgstr "Create a Filter Rule for Mailing _List…"
+#: ../e-util/e-mail-signature-combo-box.c:378
+msgid "Autogenerated"
+msgstr "Autogenerated"
 
-#: ../mail/e-mail-reader.c:1985
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "Create a rule to filter messages to this mailing list"
+#: ../e-util/e-mail-signature-editor.c:305
+msgid "Close"
+msgstr "Close"
 
-#: ../mail/e-mail-reader.c:1990
-msgid "Create a Filter Rule for _Recipients..."
-msgstr "Create a Filter Rule for _Recipients…"
+#: ../e-util/e-mail-signature-editor.c:310
+msgid "_Save and Close"
+msgstr "_Save and Close"
 
-#: ../mail/e-mail-reader.c:1992
-msgid "Create a rule to filter messages to these recipients"
-msgstr "Create a rule to filter messages to these recipients"
+#: ../e-util/e-mail-signature-editor.c:524
+msgid "Edit Signature"
+msgstr "Edit Signature"
 
-#: ../mail/e-mail-reader.c:1997
-msgid "Create a Filter Rule for Se_nder..."
-msgstr "Create a Filter Rule for Se_nder…"
+#: ../e-util/e-mail-signature-editor.c:544
+msgid "_Signature Name:"
+msgstr "_Signature Name:"
 
-#: ../mail/e-mail-reader.c:1999
-msgid "Create a rule to filter messages from this sender"
-msgstr "Create a rule to filter messages from this sender"
+#: ../e-util/e-mail-signature-editor.c:590
+msgid "Unnamed"
+msgstr "Unnamed"
 
-#: ../mail/e-mail-reader.c:2004
-msgid "Create a Filter Rule for _Subject..."
-msgstr "Create a Filter Rule for _Subject…"
+#: ../e-util/e-mail-signature-manager.c:337
+msgid "Add _Script"
+msgstr "Add _Script"
 
-#: ../mail/e-mail-reader.c:2006
-msgid "Create a rule to filter messages with this subject"
-msgstr "Create a rule to filter messages with this subject"
+#: ../e-util/e-mail-signature-manager.c:422
+msgid "Add Signature Script"
+msgstr "Add Signature Script"
 
-#: ../mail/e-mail-reader.c:2011
-msgid "A_pply Filters"
-msgstr "A_pply Filters"
+#: ../e-util/e-mail-signature-manager.c:492
+msgid "Edit Signature Script"
+msgstr "Edit Signature Script"
 
-#: ../mail/e-mail-reader.c:2013
-msgid "Apply filter rules to the selected messages"
-msgstr "Apply filter rules to the selected messages"
+#: ../e-util/e-mail-signature-script-dialog.c:395
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
 
-#: ../mail/e-mail-reader.c:2018
-msgid "_Find in Message..."
-msgstr "_Find in Message…"
+#: ../e-util/e-mail-signature-script-dialog.c:446
+msgid "S_cript:"
+msgstr "S_cript:"
 
-#: ../mail/e-mail-reader.c:2020
-msgid "Search for text in the body of the displayed message"
-msgstr "Search for text in the body of the displayed message"
+#: ../e-util/e-mail-signature-script-dialog.c:477
+msgid "Script file must be executable."
+msgstr "Script file must be executable."
 
-#: ../mail/e-mail-reader.c:2025
-msgid "_Clear Flag"
-msgstr "_Clear Flag"
+#: ../e-util/e-map.c:886
+msgid "World Map"
+msgstr "World Map"
 
-#: ../mail/e-mail-reader.c:2027
-msgid "Remove the follow-up flag from the selected messages"
-msgstr "Remove the follow-up flag from the selected messages"
+#: ../e-util/e-map.c:889
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
 
-#: ../mail/e-mail-reader.c:2032
-msgid "_Flag Completed"
-msgstr "_Flag Completed"
+#: ../e-util/e-misc-utils.c:242
+msgid "Could not open the link."
+msgstr "Could not open the link."
 
-#: ../mail/e-mail-reader.c:2034
-msgid "Set the follow-up flag to completed on the selected messages"
-msgstr "Set the follow-up flag to completed on the selected messages"
+#: ../e-util/e-misc-utils.c:289
+msgid "Could not display help for Evolution."
+msgstr "Could not display help for Evolution."
 
-#: ../mail/e-mail-reader.c:2039
-msgid "Follow _Up..."
-msgstr "Follow _Up…"
+#: ../e-util/e-name-selector-dialog.c:278
+msgid "Show Contacts"
+msgstr "Show Contacts"
 
-#: ../mail/e-mail-reader.c:2041
-msgid "Flag the selected messages for follow-up"
-msgstr "Flag the selected messages for follow-up"
+#: ../e-util/e-name-selector-dialog.c:310
+msgid "Address B_ook:"
+msgstr "Address B_ook:"
 
-#: ../mail/e-mail-reader.c:2046
-msgid "_Attached"
-msgstr "_Attached"
+#: ../e-util/e-name-selector-dialog.c:317
+msgid "Cat_egory:"
+msgstr "Cat_egory:"
 
-#: ../mail/e-mail-reader.c:2048 ../mail/e-mail-reader.c:2055
-msgid "Forward the selected message to someone as an attachment"
-msgstr "Forward the selected message to someone as an attachment"
+#: ../e-util/e-name-selector-dialog.c:341
+msgid "_Search:"
+msgstr "_Search:"
 
-#: ../mail/e-mail-reader.c:2053
-msgid "Forward As _Attached"
-msgstr "Forward As _Attached"
+#: ../e-util/e-name-selector-dialog.c:367
+#: ../e-util/e-name-selector-dialog.c:1256
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+#: ../modules/calendar/e-cal-shell-view-actions.c:1757
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:959
+msgid "Any Category"
+msgstr "Any Category"
 
-#: ../mail/e-mail-reader.c:2060
-msgid "_Inline"
-msgstr "_Inline"
+#: ../e-util/e-name-selector-dialog.c:369
+msgid "Co_ntacts"
+msgstr "Co_ntacts"
 
-#: ../mail/e-mail-reader.c:2062 ../mail/e-mail-reader.c:2069
-msgid "Forward the selected message in the body of a new message"
-msgstr "Forward the selected message in the body of a new message"
+#: ../e-util/e-name-selector-dialog.c:446
+msgid "Search"
+msgstr "Search"
 
-#: ../mail/e-mail-reader.c:2067
-msgid "Forward As _Inline"
-msgstr "Forward As _Inline"
+#: ../e-util/e-name-selector-dialog.c:449
+#: ../mail/importers/pine-importer.c:426
+msgid "Address Book"
+msgstr "Address Book"
 
-#: ../mail/e-mail-reader.c:2074
-msgid "_Quoted"
-msgstr "_Quoted"
+#: ../e-util/e-name-selector-dialog.c:452
+#: ../modules/addressbook/e-book-shell-backend.c:305
+#: ../modules/addressbook/e-book-shell-view.c:356
+msgid "Contacts"
+msgstr "Contacts"
 
-#: ../mail/e-mail-reader.c:2076 ../mail/e-mail-reader.c:2083
-msgid "Forward the selected message quoted like a reply"
-msgstr "Forward the selected message quoted like a reply"
+#: ../e-util/e-name-selector-dialog.c:580
+msgid "Select Contacts from Address Book"
+msgstr "Select Contacts from Address Book"
 
-#: ../mail/e-mail-reader.c:2081
-msgid "Forward As _Quoted"
-msgstr "Forward As _Quoted"
+#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
+#: ../e-util/e-name-selector-entry.c:3032
+#, c-format
+msgid "E_xpand %s Inline"
+msgstr "E_xpand %s Inline"
 
-#: ../mail/e-mail-reader.c:2088
-msgid "_Load Images"
-msgstr "_Load Images"
+#. Copy Contact Item
+#: ../e-util/e-name-selector-entry.c:3048
+#, c-format
+msgid "Cop_y %s"
+msgstr "Cop_y %s"
 
-#: ../mail/e-mail-reader.c:2090
-msgid "Force images in HTML mail to be loaded"
-msgstr "Force images in HTML mail to be loaded"
+#. Cut Contact Item
+#: ../e-util/e-name-selector-entry.c:3059
+#, c-format
+msgid "C_ut %s"
+msgstr "C_ut %s"
 
-#: ../mail/e-mail-reader.c:2095
-msgid "_Important"
-msgstr "_Important"
+#. Edit Contact item
+#: ../e-util/e-name-selector-entry.c:3077
+#, c-format
+msgid "_Edit %s"
+msgstr "_Edit %s"
 
-#: ../mail/e-mail-reader.c:2097
-msgid "Mark the selected messages as important"
-msgstr "Mark the selected messages as important"
+#: ../e-util/e-name-selector-list.c:583
+#, c-format
+msgid "_Delete %s"
+msgstr "_Delete %s"
 
-#: ../mail/e-mail-reader.c:2102
-msgid "_Junk"
-msgstr "_Junk"
+#: ../e-util/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."
 
-#: ../mail/e-mail-reader.c:2104
-msgid "Mark the selected messages as junk"
-msgstr "Mark the selected messages as junk"
+#: ../e-util/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."
 
-#: ../mail/e-mail-reader.c:2109
-msgid "_Not Junk"
-msgstr "_Not Junk"
+#: ../e-util/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."
 
-#: ../mail/e-mail-reader.c:2111
-msgid "Mark the selected messages as not being junk"
-msgstr "Mark the selected messages as not being junk"
+#: ../e-util/e-passwords.c:127
+msgid "Keyring key is unusable: no user or host name"
+msgstr "Keyring key is unusable: no user or host name"
 
-#: ../mail/e-mail-reader.c:2116
-msgid "_Read"
-msgstr "_Read"
+#: ../e-util/e-passwords.c:447
+msgid "You have the Caps Lock key on."
+msgstr "You have the Caps Lock key on."
 
-#: ../mail/e-mail-reader.c:2118
-msgid "Mark the selected messages as having been read"
-msgstr "Mark the selected messages as having been read"
+#: ../e-util/e-passwords.c:578
+msgid "_Remember this passphrase"
+msgstr "_Remember this passphrase"
 
-#: ../mail/e-mail-reader.c:2123
-msgid "Uni_mportant"
-msgstr "Uni_mportant"
+#: ../e-util/e-passwords.c:579
+msgid "_Remember this passphrase for the remainder of this session"
+msgstr "_Remember this passphrase for the remainder of this session"
 
-#: ../mail/e-mail-reader.c:2125
-msgid "Mark the selected messages as unimportant"
-msgstr "Mark the selected messages as unimportant"
+#: ../e-util/e-passwords.c:584
+msgid "_Remember this password"
+msgstr "_Remember this password"
 
-#: ../mail/e-mail-reader.c:2130
-msgid "_Unread"
-msgstr "_Unread"
+#: ../e-util/e-passwords.c:585
+msgid "_Remember this password for the remainder of this session"
+msgstr "_Remember this password for the remainder of this session"
 
-#: ../mail/e-mail-reader.c:2132
-msgid "Mark the selected messages as not having been read"
-msgstr "Mark the selected messages as not having been read"
+#: ../e-util/e-preferences-window.c:318
+msgid "Evolution Preferences"
+msgstr "Evolution Preferences"
 
-#: ../mail/e-mail-reader.c:2137
-msgid "_Edit as New Message..."
-msgstr "_Edit as New Message…"
+#: ../e-util/e-print.c:161
+msgid "An error occurred while printing"
+msgstr "An error occurred while printing"
 
-#: ../mail/e-mail-reader.c:2139
-msgid "Open the selected messages in the composer for editing"
-msgstr "Open the selected messages in the composer for editing"
+#: ../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/e-mail-reader.c:2144
-msgid "Compose _New Message"
-msgstr "Compose _New Message"
+#: ../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."
 
-#: ../mail/e-mail-reader.c:2146
-msgid "Open a window for composing a mail message"
-msgstr "Open a window for composing a mail message"
+#: ../e-util/e-rule-editor.c:288
+msgid "Add Rule"
+msgstr "Add Rule"
 
-#: ../mail/e-mail-reader.c:2151
-msgid "_Open in New Window"
-msgstr "_Open in New Window"
+#: ../e-util/e-rule-editor.c:395
+msgid "Edit Rule"
+msgstr "Edit Rule"
 
-#: ../mail/e-mail-reader.c:2153
-msgid "Open the selected messages in a new window"
-msgstr "Open the selected messages in a new window"
+#: ../e-util/e-search-bar.c:79
+#, c-format
+msgid "Matches: %u"
+msgstr "Matches: %u"
 
-#: ../mail/e-mail-reader.c:2158
-msgid "_Move to Folder..."
-msgstr "_Move to Folder…"
+#: ../e-util/e-search-bar.c:527
+msgid "Close the find bar"
+msgstr "Close the find bar"
 
-#: ../mail/e-mail-reader.c:2160
-msgid "Move selected messages to another folder"
-msgstr "Move selected messages to another folder"
+#: ../e-util/e-search-bar.c:535
+msgid "Fin_d:"
+msgstr "Fin_d:"
 
-#: ../mail/e-mail-reader.c:2165
-msgid "_Switch to Folder"
-msgstr "_Switch to Folder"
+#: ../e-util/e-search-bar.c:547
+msgid "Clear the search"
+msgstr "Clear the search"
 
-#: ../mail/e-mail-reader.c:2167
-msgid "Display the parent folder"
-msgstr "Display the parent folder"
+#: ../e-util/e-search-bar.c:571
+msgid "_Previous"
+msgstr "_Previous"
 
-#: ../mail/e-mail-reader.c:2172
-msgid "Switch to _next tab"
-msgstr "Switch to _next tab"
+#: ../e-util/e-search-bar.c:577
+msgid "Find the previous occurrence of the phrase"
+msgstr "Find the previous occurrence of the phrase"
 
-#: ../mail/e-mail-reader.c:2174
-msgid "Switch to the next tab"
-msgstr "Switch to the next tab"
+#: ../e-util/e-search-bar.c:590
+msgid "_Next"
+msgstr "_Next"
 
-#: ../mail/e-mail-reader.c:2179
-msgid "Switch to _previous tab"
-msgstr "Switch to _previous tab"
+#: ../e-util/e-search-bar.c:596
+msgid "Find the next occurrence of the phrase"
+msgstr "Find the next occurrence of the phrase"
 
-#: ../mail/e-mail-reader.c:2181
-msgid "Switch to the previous tab"
-msgstr "Switch to the previous tab"
+#: ../e-util/e-search-bar.c:609
+msgid "Mat_ch case"
+msgstr "Mat_ch case"
 
-#: ../mail/e-mail-reader.c:2186
-msgid "Cl_ose current tab"
-msgstr "Cl_ose current tab"
+#: ../e-util/e-search-bar.c:637
+msgid "Reached bottom of page, continued from top"
+msgstr "Reached bottom of page, continued from top"
 
-#: ../mail/e-mail-reader.c:2188
-msgid "Close current tab"
-msgstr "Close current tab"
+#: ../e-util/e-search-bar.c:659
+msgid "Reached top of page, continued from bottom"
+msgstr "Reached top of page, continued from bottom"
 
-#: ../mail/e-mail-reader.c:2193
-msgid "_Next Message"
-msgstr "_Next Message"
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:331
+#: ../mail/importers/pine-importer.c:419
+#: ../modules/mail/e-mail-shell-view.c:1045
+msgid "Mail"
+msgstr "Mail"
 
-#: ../mail/e-mail-reader.c:2195
-msgid "Display the next message"
-msgstr "Display the next message"
+#: ../e-util/e-send-options.c:570
+msgid "When de_leted:"
+msgstr "When de_leted:"
 
-#: ../mail/e-mail-reader.c:2200
-msgid "Next _Important Message"
-msgstr "Next _Important Message"
-
-#: ../mail/e-mail-reader.c:2202
-msgid "Display the next important message"
-msgstr "Display the next important message"
+#: ../e-util/e-source-config.c:679 ../e-util/e-source-config.c:683
+msgid "Type:"
+msgstr "Type:"
 
-#: ../mail/e-mail-reader.c:2207
-msgid "Next _Thread"
-msgstr "Next _Thread"
+#: ../e-util/e-source-config.c:691 ../e-util/e-source-config.c:695
+msgid "Name:"
+msgstr "Name:"
 
-#: ../mail/e-mail-reader.c:2209
-msgid "Display the next thread"
-msgstr "Display the next thread"
+#. Translators: This is the first of a sequence of widgets:
+#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
+#: ../e-util/e-source-config.c:1293
+msgid "Refresh every"
+msgstr "Refresh every"
 
-#: ../mail/e-mail-reader.c:2214
-msgid "Next _Unread Message"
-msgstr "Next _Unread Message"
+#: ../e-util/e-source-config.c:1323 ../e-util/e-source-config.c:1392
+msgid "Use a secure connection"
+msgstr "Use a secure connection"
 
-#: ../mail/e-mail-reader.c:2216
-msgid "Display the next unread message"
-msgstr "Display the next unread message"
+#: ../e-util/e-source-config.c:1416
+msgid "Unset _trust for SSL certificate"
+msgstr "Unset _trust for SSL certificate"
 
-#: ../mail/e-mail-reader.c:2221
-msgid "_Previous Message"
-msgstr "_Previous Message"
+#: ../e-util/e-source-config.c:1450
+msgid "User"
+msgstr "User"
 
-#: ../mail/e-mail-reader.c:2223
-msgid "Display the previous message"
-msgstr "Display the previous message"
+#: ../e-util/e-source-selector-dialog.c:229
+msgid "_Destination"
+msgstr "_Destination"
 
-#: ../mail/e-mail-reader.c:2228
-msgid "Pr_evious Important Message"
-msgstr "Pr_evious Important Message"
+#: ../e-util/e-source-selector-dialog.c:342
+msgid "Select destination"
+msgstr "Select destination"
 
-#: ../mail/e-mail-reader.c:2230
-msgid "Display the previous important message"
-msgstr "Display the previous important message"
+#. no suggestions. Put something in the menu anyway...
+#: ../e-util/e-spell-entry.c:384
+msgid "(no suggestions)"
+msgstr "(no suggestions)"
 
-#: ../mail/e-mail-reader.c:2235
-msgid "Previous T_hread"
-msgstr "Previous T_hread"
+#: ../e-util/e-spell-entry.c:408
+msgid "More..."
+msgstr "More…"
 
-#: ../mail/e-mail-reader.c:2237
-msgid "Display the previous thread"
-msgstr "Display the previous thread"
+#. + Add to Dictionary
+#: ../e-util/e-spell-entry.c:479
+#, c-format
+msgid "Add \"%s\" to Dictionary"
+msgstr "Add \"%s\" to Dictionary"
 
-#: ../mail/e-mail-reader.c:2242
-msgid "P_revious Unread Message"
-msgstr "P_revious Unread Message"
+#. - Ignore All
+#: ../e-util/e-spell-entry.c:530
+msgid "Ignore All"
+msgstr "Ignore All"
 
-#: ../mail/e-mail-reader.c:2244
-msgid "Display the previous unread message"
-msgstr "Display the previous unread message"
+#: ../e-util/e-spell-entry.c:558
+msgid "Spelling Suggestions"
+msgstr "Spelling Suggestions"
 
-#: ../mail/e-mail-reader.c:2251
-msgid "Print this message"
-msgstr "Print this message"
+#: ../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/e-mail-reader.c:2258
-msgid "Preview the message to be printed"
-msgstr "Preview the message to be printed"
+#: ../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/e-mail-reader.c:2263
-msgid "Re_direct"
-msgstr "Re_direct"
+#: ../e-util/e-system.error.xml.h:3
+msgid "_Replace"
+msgstr "_Replace"
 
-#: ../mail/e-mail-reader.c:2265
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "Redirect (bounce) the selected message to someone"
+#: ../e-util/e-system.error.xml.h:4
+msgid "Cannot save file \"{0}\"."
+msgstr "Cannot save file \"{0}\"."
 
-#: ../mail/e-mail-reader.c:2270
-msgid "Remo_ve Attachments"
-msgstr "Remo_ve Attachments"
+#: ../e-util/e-system.error.xml.h:5
+msgid "Because \"{1}\"."
+msgstr "Because \"{1}\"."
 
-#: ../mail/e-mail-reader.c:2272
-msgid "Remove attachments"
-msgstr "Remove attachments"
+#: ../e-util/e-system.error.xml.h:6
+msgid "Cannot open file \"{0}\"."
+msgstr "Cannot open file \"{0}\"."
 
-#: ../mail/e-mail-reader.c:2277
-msgid "Remove Du_plicate Messages"
-msgstr "Remove Du_plicate Messages"
+#: ../e-util/e-system.error.xml.h:7
+msgid "Failed to remove data source &quot;{0}&quot;."
+msgstr "Failed to remove data source &quot;{0}&quot;."
 
-#: ../mail/e-mail-reader.c:2279
-msgid "Checks selected messages for duplicates"
-msgstr "Checks selected messages for duplicates"
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
+msgid "The reported error was &quot;{1}&quot;."
+msgstr "The reported error was &quot;{1}&quot;."
 
-#: ../mail/e-mail-reader.c:2284 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1574
-#: ../modules/mail/e-mail-attachment-handler.c:160
-msgid "Reply to _All"
-msgstr "Reply to _All"
+#: ../e-util/e-system.error.xml.h:9
+msgid "Failed to update data source &quot;{0}&quot;."
+msgstr "Failed to update data source &quot;{0}&quot;."
 
-#: ../mail/e-mail-reader.c:2286
-msgid "Compose a reply to all the recipients of the selected message"
-msgstr "Compose a reply to all the recipients of the selected message"
+#: ../e-util/e-system.error.xml.h:10
+msgid "Failed to delete resource &quot;{0}&quot;."
+msgstr "Failed to delete resource &quot;{0}&quot;."
 
-#: ../mail/e-mail-reader.c:2291 ../mail/mail.error.xml.h:25
-msgid "Reply to _List"
-msgstr "Reply to _List"
+#: ../e-util/e-system.error.xml.h:11
+msgid ""
+"The address book backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr ""
+"The address book backend servicing &quot;{0}&quot; has quit unexpectedly."
 
-#: ../mail/e-mail-reader.c:2293
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Compose a reply to the mailing list of the selected message"
+#: ../e-util/e-system.error.xml.h:12
+msgid ""
+"Some of your contacts may not be available until Evolution is restarted."
+msgstr ""
+"Some of your contacts may not be available until Evolution is restarted."
 
-#: ../mail/e-mail-reader.c:2298
-#: ../modules/mail/e-mail-attachment-handler.c:167
-msgid "_Reply to Sender"
-msgstr "_Reply to Sender"
+#: ../e-util/e-system.error.xml.h:13
+msgid "The calendar backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr "The calendar backend servicing &quot;{0}&quot; has quit unexpectedly."
 
-#: ../mail/e-mail-reader.c:2300
-msgid "Compose a reply to the sender of the selected message"
-msgstr "Compose a reply to the sender of the selected message"
+#: ../e-util/e-system.error.xml.h:14
+msgid ""
+"Some of your appointments may not be available until Evolution is restarted."
+msgstr ""
+"Some of your appointments may not be available until Evolution is restarted."
 
-#: ../mail/e-mail-reader.c:2305
-msgid "_Save as mbox..."
-msgstr "_Save as mbox…"
+#: ../e-util/e-system.error.xml.h:15
+msgid "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
 
-#: ../mail/e-mail-reader.c:2307
-msgid "Save selected messages as an mbox file"
-msgstr "Save selected messages as an mbox file"
+#: ../e-util/e-system.error.xml.h:16
+msgid "Some of your memos may not be available until Evolution is restarted."
+msgstr "Some of your memos may not be available until Evolution is restarted."
 
-#: ../mail/e-mail-reader.c:2312
-msgid "_Message Source"
-msgstr "_Message Source"
+#: ../e-util/e-system.error.xml.h:17
+msgid "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
 
-#: ../mail/e-mail-reader.c:2314
-msgid "Show the raw email source of the message"
-msgstr "Show the raw e-mail source of the message"
+#: ../e-util/e-system.error.xml.h:18
+msgid "Some of your tasks may not be available until Evolution is restarted."
+msgstr "Some of your tasks may not be available until Evolution is restarted."
 
-#: ../mail/e-mail-reader.c:2326
-msgid "_Undelete Message"
-msgstr "_Undelete Message"
+#: ../e-util/e-system.error.xml.h:19
+msgid ""
+"The address book backend servicing &quot;{0}&quot; encountered an error."
+msgstr ""
+"The address book backend servicing &quot;{0}&quot; encountered an error."
 
-#: ../mail/e-mail-reader.c:2328
-msgid "Undelete the selected messages"
-msgstr "Undelete the selected messages"
+#: ../e-util/e-system.error.xml.h:20
+msgid "The calendar backend servicing &quot;{0}&quot; encountered an error."
+msgstr "The calendar backend servicing &quot;{0}&quot; encountered an error."
 
-#: ../mail/e-mail-reader.c:2333
-msgid "_Normal Size"
-msgstr "_Normal Size"
+#: ../e-util/e-system.error.xml.h:21
+msgid "The memo list backend servicing &quot;{0}&quot; encountered an error."
+msgstr "The memo list backend servicing &quot;{0}&quot; encountered an error."
 
-#: ../mail/e-mail-reader.c:2335
-msgid "Reset the text to its original size"
-msgstr "Reset the text to its original size"
+#: ../e-util/e-system.error.xml.h:22
+msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
+msgstr "The task list backend servicing &quot;{0}&quot; encountered an error."
 
-#: ../mail/e-mail-reader.c:2340
-msgid "_Zoom In"
-msgstr "_Zoom In"
+#: ../e-util/e-table-click-to-add.c:643
+#: ../e-util/gal-a11y-e-table-click-to-add.c:62
+#: ../e-util/gal-a11y-e-table-click-to-add.c:143
+msgid "click to add"
+msgstr "click to add"
 
-#: ../mail/e-mail-reader.c:2342
-msgid "Increase the text size"
-msgstr "Increase the text size"
+#: ../e-util/e-table-config.c:397 ../e-util/e-table-config.c:439
+msgid "(Ascending)"
+msgstr "(Ascending)"
 
-#: ../mail/e-mail-reader.c:2347
-msgid "Zoom _Out"
-msgstr "Zoom _Out"
+#: ../e-util/e-table-config.c:397 ../e-util/e-table-config.c:439
+msgid "(Descending)"
+msgstr "(Descending)"
 
-#: ../mail/e-mail-reader.c:2349
-msgid "Decrease the text size"
-msgstr "Decrease the text size"
+#: ../e-util/e-table-config.c:404
+msgid "Not sorted"
+msgstr "Not sorted"
 
-#: ../mail/e-mail-reader.c:2356
-msgid "Cre_ate"
-msgstr "Cre_ate"
+#: ../e-util/e-table-config.c:445
+msgid "No grouping"
+msgstr "No grouping"
 
-#: ../mail/e-mail-reader.c:2363
-msgid "Ch_aracter Encoding"
-msgstr "Ch_aracter Encoding"
+#: ../e-util/e-table-config.c:690
+msgid "Available Fields"
+msgstr "Available Fields"
 
-#: ../mail/e-mail-reader.c:2370
-msgid "F_orward As"
-msgstr "F_orward As"
+#: ../e-util/e-table-field-chooser-dialog.c:227
+msgid "Add a Column"
+msgstr "Add a Column"
 
-#: ../mail/e-mail-reader.c:2377
-msgid "_Group Reply"
-msgstr "_Group Reply"
+#: ../e-util/e-table-field-chooser.c:164
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
 
-#: ../mail/e-mail-reader.c:2384
-msgid "_Go To"
-msgstr "_Go To"
+#: ../e-util/e-table-group-container.c:363
+#, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%s: %s (%d item)"
+msgstr[1] "%s: %s (%d items)"
 
-#: ../mail/e-mail-reader.c:2391
-msgid "Mar_k As"
-msgstr "Mar_k As"
+#: ../e-util/e-table-group-container.c:377
+#, c-format
+msgid "%s (%d item)"
+msgid_plural "%s (%d items)"
+msgstr[0] "%s (%d item)"
+msgstr[1] "%s (%d items)"
 
-#: ../mail/e-mail-reader.c:2398
-msgid "_Message"
-msgstr "_Message"
+#: ../e-util/e-table-header-item.c:1579
+msgid "Customize Current View"
+msgstr "Customise Current View"
 
-#: ../mail/e-mail-reader.c:2405
-msgid "_Zoom"
-msgstr "_Zoom"
+#: ../e-util/e-table-header-item.c:1602
+msgid "Sort _Ascending"
+msgstr "Sort _Ascending"
 
-#: ../mail/e-mail-reader.c:2415
-msgid "Create a Search Folder from Mailing _List..."
-msgstr "Create a Search Folder from Mailing _List…"
+#: ../e-util/e-table-header-item.c:1605
+msgid "Sort _Descending"
+msgstr "Sort _Descending"
 
-#: ../mail/e-mail-reader.c:2417
-msgid "Create a search folder for this mailing list"
-msgstr "Create a search folder for this mailing list"
+#: ../e-util/e-table-header-item.c:1608
+msgid "_Unsort"
+msgstr "_Unsort"
 
-#: ../mail/e-mail-reader.c:2422
-msgid "Create a Search Folder from Recipien_ts..."
-msgstr "Create a Search Folder from Recipien_ts…"
+#: ../e-util/e-table-header-item.c:1611
+msgid "Group By This _Field"
+msgstr "Group By This _Field"
 
-#: ../mail/e-mail-reader.c:2424
-msgid "Create a search folder for these recipients"
-msgstr "Create a search folder for these recipients"
+#: ../e-util/e-table-header-item.c:1614
+msgid "Group By _Box"
+msgstr "Group By _Box"
 
-#: ../mail/e-mail-reader.c:2429
-msgid "Create a Search Folder from Sen_der..."
-msgstr "Create a Search Folder from Sen_der…"
+#: ../e-util/e-table-header-item.c:1618
+msgid "Remove This _Column"
+msgstr "Remove This _Column"
 
-#: ../mail/e-mail-reader.c:2431
-msgid "Create a search folder for this sender"
-msgstr "Create a search folder for this sender"
+#: ../e-util/e-table-header-item.c:1621
+msgid "Add a C_olumn..."
+msgstr "Add a C_olumn…"
 
-#: ../mail/e-mail-reader.c:2436
-msgid "Create a Search Folder from S_ubject..."
-msgstr "Create a Search Folder from S_ubject…"
+#: ../e-util/e-table-header-item.c:1625
+msgid "A_lignment"
+msgstr "A_lignment"
 
-#: ../mail/e-mail-reader.c:2438
-msgid "Create a search folder for this subject"
-msgstr "Create a search folder for this subject"
+#: ../e-util/e-table-header-item.c:1628
+msgid "B_est Fit"
+msgstr "B_est Fit"
 
-#: ../mail/e-mail-reader.c:2461
-msgid "Mark for Follo_w Up..."
-msgstr "Mark for Follo_w Up…"
+#: ../e-util/e-table-header-item.c:1631
+msgid "Format Column_s..."
+msgstr "Format Column_s…"
 
-#: ../mail/e-mail-reader.c:2469
-msgid "Mark as _Important"
-msgstr "Mark as _Important"
+#: ../e-util/e-table-header-item.c:1635
+msgid "Custo_mize Current View..."
+msgstr "Custo_mise Current View…"
 
-#: ../mail/e-mail-reader.c:2473
-msgid "Mark as _Junk"
-msgstr "Mark as _Junk"
+#: ../e-util/e-table-header-item.c:1706
+msgid "_Sort By"
+msgstr "_Sort By"
 
-#: ../mail/e-mail-reader.c:2477
-msgid "Mark as _Not Junk"
-msgstr "Mark as _Not Junk"
+#. Custom
+#: ../e-util/e-table-header-item.c:1724
+msgid "_Custom"
+msgstr "_Custom"
 
-#: ../mail/e-mail-reader.c:2481
-msgid "Mar_k as Read"
-msgstr "Mar_k as Read"
+#: ../e-util/e-text.c:2098
+msgid "Select All"
+msgstr "Select All"
 
-#: ../mail/e-mail-reader.c:2485
-msgid "Mark as Uni_mportant"
-msgstr "Mark as Uni_mportant"
+#: ../e-util/e-text.c:2111
+msgid "Input Methods"
+msgstr "Input Methods"
 
-#: ../mail/e-mail-reader.c:2489
-msgid "Mark as _Unread"
-msgstr "Mark as _Unread"
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../e-util/e-timezone-dialog.c:207 ../e-util/e-timezone-dialog.c:429
+#: ../e-util/e-timezone-dialog.c:433 ../e-util/e-timezone-dialog.c:437
+#: ../e-util/e-timezone-dialog.c:803
+msgid "UTC"
+msgstr "UTC"
 
-#: ../mail/e-mail-reader.c:2533
-msgid "_Caret Mode"
-msgstr "_Caret Mode"
+#: ../e-util/e-url-entry.c:80
+msgid "Click here to go to URL"
+msgstr "Click here to go to URL"
 
-#: ../mail/e-mail-reader.c:2535
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Show a blinking cursor in the body of displayed messages"
+#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:273
+msgid "_Copy Link Location"
+msgstr "_Copy Link Location"
 
-#: ../mail/e-mail-reader.c:2541
-msgid "All Message _Headers"
-msgstr "All Message _Headers"
+#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:275
+msgid "Copy the link to the clipboard"
+msgstr "Copy the link to the clipboard"
 
-#: ../mail/e-mail-reader.c:2543
-msgid "Show messages with all email headers"
-msgstr "Show messages with all e-mail headers"
+#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:283
+msgid "_Open Link in Browser"
+msgstr "_Open Link in Browser"
 
-#: ../mail/e-mail-reader.c:2874
-msgid "Retrieving message"
-msgstr "Retrieving message"
+#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:285
+msgid "Open the link in a web browser"
+msgstr "Open the link in a web browser"
 
-#: ../mail/e-mail-reader.c:3854
-#: ../modules/mail/e-mail-attachment-handler.c:153
-msgid "_Forward"
-msgstr "_Forward"
+#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:293
+msgid "_Copy Email Address"
+msgstr "_Copy E-mail Address"
 
-#: ../mail/e-mail-reader.c:3855
-msgid "Forward the selected message to someone"
-msgstr "Forward the selected message to someone"
+#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:310
+msgid "_Copy Image"
+msgstr "_Copy Image"
 
-#: ../mail/e-mail-reader.c:3874
-msgid "Group Reply"
-msgstr "Group Reply"
+#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:312
+msgid "Copy the image to the clipboard"
+msgstr "Copy the image to the clipboard"
 
-#: ../mail/e-mail-reader.c:3875
-msgid "Reply to the mailing list, or to all recipients"
-msgstr "Reply to the mailing list, or to all recipients"
+#: ../e-util/e-web-view-gtkhtml.c:465 ../e-util/e-web-view-gtkhtml.c:1308
+#: ../e-util/e-web-view.c:332 ../e-util/e-web-view.c:1419
+msgid "Select all text and images"
+msgstr "Select all text and images"
 
-#: ../mail/e-mail-reader.c:3941 ../mail/em-filter-i18n.h:14
-msgid "Delete"
-msgstr "Delete"
+#: ../e-util/e-web-view-gtkhtml.c:972 ../e-util/e-web-view-gtkhtml.c:974
+#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:1086
+#: ../e-util/e-web-view.c:1088 ../e-util/e-web-view.c:1090
+#, c-format
+msgid "Click to call %s"
+msgstr "Click to call %s"
 
-#: ../mail/e-mail-reader.c:3974
-#: ../modules/calendar/e-cal-shell-view-actions.c:1399
-msgid "Next"
-msgstr "Next"
+#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:1092
+msgid "Click to hide/unhide addresses"
+msgstr "Click to hide/unhide addresses"
 
-#: ../mail/e-mail-reader.c:3978
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
-msgid "Previous"
-msgstr "Previous"
+#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:1094
+#, c-format
+msgid "Click to open %s"
+msgstr "Click to open %s"
 
-#: ../mail/e-mail-reader.c:3987 ../mail/mail-dialogs.ui.h:15
-msgid "Reply"
-msgstr "Reply"
+#: ../e-util/ea-calendar-item.c:315 ../e-util/ea-calendar-item.c:324
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
 
-#: ../mail/e-mail-reader.c:4705
+#: ../e-util/ea-calendar-item.c:327
 #, c-format
-msgid "Folder '%s'"
-msgstr "Folder '%s'"
+msgid "Calendar: from %s to %s"
+msgstr "Calendar: from %s to %s"
 
-#: ../mail/e-mail-reader-utils.c:154
-msgid "Do not warn me again"
-msgstr "Do not warn me again"
+#: ../e-util/ea-calendar-item.c:364
+msgid "evolution calendar item"
+msgstr "evolution calendar item"
 
-#: ../mail/e-mail-reader-utils.c:954
-msgid "Printing"
-msgstr "Printing"
+#: ../e-util/evolution-source-viewer.c:635
+msgid "Evolution Source Viewer"
+msgstr "Evolution Source Viewer"
 
-#. Translators: %s is replaced with a folder
-#. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1136
-#, 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?"
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:665
+msgid "Display Name"
+msgstr "Display Name"
 
-#: ../mail/e-mail-reader-utils.c:1544
-msgid "Save Message"
-msgid_plural "Save Messages"
-msgstr[0] "Save Message"
-msgstr[1] "Save Messages"
+#: ../e-util/evolution-source-viewer.c:674
+msgid "Flags"
+msgstr "Flags"
 
-#. 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:1565
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "Message"
-msgstr[1] "Messages"
+#: ../e-util/evolution-source-viewer.c:726
+#: ../mail/e-mail-config-identity-page.c:677
+msgid "Identity"
+msgstr "Identity"
 
-#: ../mail/e-mail-reader-utils.c:2020
-msgid "Parsing message"
-msgstr "Parsing message"
+#: ../e-util/filter.error.xml.h:1
+msgid "Missing date."
+msgstr "Missing date."
 
-#: ../mail/e-mail-request.c:152
-#, c-format
-msgid "Failed to load part '%s'"
-msgstr "Failed to load part '%s'"
+#: ../e-util/filter.error.xml.h:2
+msgid "You must choose a date."
+msgstr "You must choose a date."
 
-#: ../mail/e-mail-tag-editor.c:293
-msgid "Flag to Follow Up"
-msgstr "Flag to Follow Up"
+#: ../e-util/filter.error.xml.h:3
+msgid "Missing filename."
+msgstr "Missing filename."
 
-#. 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:1282
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
+#: ../e-util/filter.error.xml.h:4
+msgid "You must specify a filename."
+msgstr "You must specify a filename."
 
-#: ../mail/em-composer-utils.c:1288
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Forwarded Message --------"
+#: ../e-util/filter.error.xml.h:5
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr "File &quot;{0}&quot; does not exist or is not a regular file."
 
-#: ../mail/em-composer-utils.c:1293
-msgid "-----Original Message-----"
-msgstr "-----Original Message-----"
+#: ../e-util/filter.error.xml.h:6
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr "Bad regular expression &quot;{0}&quot;."
 
-#: ../mail/em-composer-utils.c:2573
-msgid "an unknown sender"
-msgstr "an unknown sender"
+#: ../e-util/filter.error.xml.h:7
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr "Could not compile regular expression &quot;{1}&quot;."
 
-#: ../mail/em-composer-utils.c:2991
-msgid "Posting destination"
-msgstr "Posting destination"
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
+msgid "Missing name."
+msgstr "Missing name."
 
-#: ../mail/em-composer-utils.c:2992
-msgid "Choose folders to post the message to."
-msgstr "Choose folders to post the message to."
+#: ../e-util/filter.error.xml.h:9
+msgid "You must name this filter."
+msgstr "You must name this filter."
 
-#: ../mail/em-filter-editor-folder-element.c:158
-msgid "Select Folder"
-msgstr "Select Folder"
+#: ../e-util/filter.error.xml.h:10
+msgid "Name &quot;{0}&quot; already used."
+msgstr "Name &quot;{0}&quot; already used."
 
-#. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Adjust Score"
+#: ../e-util/filter.error.xml.h:11
+msgid "Please choose another name."
+msgstr "Please choose another name."
 
-#: ../mail/em-filter-i18n.h:3
-msgid "Assign Color"
-msgstr "Assign Colour"
+#. Translators: description of a "popup" action
+#: ../e-util/gal-a11y-e-cell-popup.c:128
+msgid "popup a child"
+msgstr "pop up a child"
 
-#: ../mail/em-filter-i18n.h:4
-msgid "Assign Score"
-msgstr "Assign Score"
+#. Translators: description of a "toggle" action
+#: ../e-util/gal-a11y-e-cell-toggle.c:180
+msgid "toggle the cell"
+msgstr "toggle the cell"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
+#. Translators: description of an "expand" action
+#: ../e-util/gal-a11y-e-cell-tree.c:215
+msgid "expands the row in the ETree containing this cell"
+msgstr "expands the row in the ETree containing this cell"
 
-#: ../mail/em-filter-i18n.h:7
-msgid "Beep"
-msgstr "Beep"
+#. Translators: description of a "collapse" action
+#: ../e-util/gal-a11y-e-cell-tree.c:223
+msgid "collapses the row in the ETree containing this cell"
+msgstr "collapses the row in the ETree containing this cell"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
+#: ../e-util/gal-a11y-e-cell.c:123
+msgid "Table Cell"
+msgstr "Table Cell"
 
-#: ../mail/em-filter-i18n.h:9
-msgid "Completed On"
-msgstr "Completed On"
+#: ../e-util/gal-a11y-e-table-click-to-add.c:72
+msgid "click"
+msgstr "click"
 
-#: ../mail/em-filter-i18n.h:12
-msgid "Date received"
-msgstr "Date received"
+#: ../e-util/gal-a11y-e-table-column-header.c:163
+msgid "sort"
+msgstr "sort"
 
-#: ../mail/em-filter-i18n.h:13
-msgid "Date sent"
-msgstr "Date sent"
+#: ../e-util/gal-define-views-dialog.c:385
+#: ../e-util/gal-define-views-dialog.c:388
+msgid "Define Views"
+msgstr "Define Views"
 
-#: ../mail/em-filter-i18n.h:15
-msgid "Deleted"
-msgstr "Deleted"
+#: ../e-util/gal-view-factory-etable.c:114
+msgid "Table"
+msgstr "Table"
 
-#: ../mail/em-filter-i18n.h:17
-msgid "does not end with"
-msgstr "does not end with"
+#: ../e-util/gal-view-instance-save-as-dialog.c:296
+msgid "Save Current View"
+msgstr "Save Current View"
 
-#: ../mail/em-filter-i18n.h:18
-msgid "does not exist"
-msgstr "does not exist"
+#: ../e-util/gal-view-new-dialog.c:173
+msgid "Define New View"
+msgstr "Define New View"
 
-#: ../mail/em-filter-i18n.h:19
-msgid "does not have words"
-msgstr "does not have words"
+#: ../e-util/widgets.error.xml.h:1
+msgid "Do you wish to save your changes?"
+msgstr "Do you wish to save your changes?"
 
-#: ../mail/em-filter-i18n.h:20
-msgid "does not return"
-msgstr "does not return"
+#: ../e-util/widgets.error.xml.h:2
+msgid "This signature has been changed, but has not been saved."
+msgstr "This signature has been changed, but has not been saved."
 
-#: ../mail/em-filter-i18n.h:21
-msgid "does not sound like"
-msgstr "does not sound like"
+#: ../e-util/widgets.error.xml.h:3
+msgid "_Discard changes"
+msgstr "_Discard changes"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "does not start with"
-msgstr "does not start with"
+#: ../e-util/widgets.error.xml.h:4
+msgid "Blank Signature"
+msgstr "Blank Signature"
 
-#: ../mail/em-filter-i18n.h:24
-msgid "Draft"
-msgstr "Draft"
+#: ../e-util/widgets.error.xml.h:5
+msgid "Please provide an unique name to identify this signature."
+msgstr "Please provide an unique name to identify this signature."
 
-#: ../mail/em-filter-i18n.h:25
-msgid "ends with"
-msgstr "ends with"
+#: ../e-util/widgets.error.xml.h:6
+msgid "Could not load signature."
+msgstr "Could not load signature."
 
-#: ../mail/em-filter-i18n.h:27
-msgid "exists"
-msgstr "exists"
+#: ../e-util/widgets.error.xml.h:7
+msgid "Could not save signature."
+msgstr "Could not save signature."
 
-#: ../mail/em-filter-i18n.h:28
-msgid "Expression"
-msgstr "Expression"
+#: ../libemail-engine/camel-sasl-xoauth2.c:27
+msgid "OAuth2"
+msgstr "OAuth2"
 
-#: ../mail/em-filter-i18n.h:29
-msgid "Follow Up"
-msgstr "Follow Up"
+#: ../libemail-engine/camel-sasl-xoauth2.c:28
+msgid "This option will use an OAuth 2.0 access token to connect to the server"
+msgstr "This option will use an OAuth 2.0 access token to connect to the server"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "Forward to"
-msgstr "Forward to"
+#: ../libemail-engine/e-mail-authenticator.c:182
+#, c-format
+msgid "Invalid authentication result code (%d)"
+msgstr "Invalid authentication result code (%d)"
 
-#: ../mail/em-filter-i18n.h:31
-msgid "has words"
-msgstr "has words"
+#: ../libemail-engine/e-mail-folder-utils.c:114
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "Saving message to folder '%s'"
 
-#: ../mail/em-filter-i18n.h:32
-msgid "Important"
-msgstr "Important"
+#: ../libemail-engine/e-mail-folder-utils.c:573
+msgid "Forwarded messages"
+msgstr "Forwarded messages"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is after"
-msgstr "is after"
+#: ../libemail-engine/e-mail-folder-utils.c:683
+#: ../libemail-engine/e-mail-folder-utils.c:934
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Retrieving %d message"
+msgstr[1] "Retrieving %d messages"
 
-#: ../mail/em-filter-i18n.h:35
-msgid "is before"
-msgstr "is before"
+#: ../libemail-engine/e-mail-folder-utils.c:777
+msgid "Scanning messages for duplicates"
+msgstr "Scanning messages for duplicates"
 
-#: ../mail/em-filter-i18n.h:36
-msgid "is Flagged"
-msgstr "is Flagged"
+#: ../libemail-engine/e-mail-folder-utils.c:1185
+#, c-format
+msgid "Removing folder '%s'"
+msgstr "Removing folder '%s'"
 
-#: ../mail/em-filter-i18n.h:40
-msgid "is not Flagged"
-msgstr "is not Flagged"
+#: ../libemail-engine/e-mail-folder-utils.c:1322
+#, c-format
+msgid "File \"%s\" has been removed."
+msgstr "File \"%s\" has been removed."
 
-#: ../mail/em-filter-i18n.h:41
-msgid "is not set"
-msgstr "is not set"
+#: ../libemail-engine/e-mail-folder-utils.c:1326
+msgid "File has been removed."
+msgstr "File has been removed."
 
-#: ../mail/em-filter-i18n.h:42
-msgid "is set"
-msgstr "is set"
+#: ../libemail-engine/e-mail-folder-utils.c:1385
+msgid "Removing attachments"
+msgstr "Removing attachments"
 
-#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:109
-msgid "Junk"
-msgstr "Junk"
+#: ../libemail-engine/e-mail-folder-utils.c:1549
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messages"
+msgstr[0] "Saving %d message"
+msgstr[1] "Saving %d messages"
 
-#: ../mail/em-filter-i18n.h:44
-msgid "Junk Test"
-msgstr "Junk Test"
+#: ../libemail-engine/e-mail-folder-utils.c:1905 ../mail/em-folder-utils.c:610
+#, c-format
+msgid "Invalid folder URI '%s'"
+msgstr "Invalid folder URI '%s'"
 
-#: ../mail/em-filter-i18n.h:45
-msgid "Label"
-msgstr "Label"
+#: ../libemail-engine/e-mail-session-utils.c:540
+#, c-format
+msgid "No mail service found with UID '%s'"
+msgstr "No mail service found with UID '%s'"
 
-#: ../mail/em-filter-i18n.h:46
-msgid "Mailing list"
-msgstr "Mailing list"
+#: ../libemail-engine/e-mail-session-utils.c:549
+#, c-format
+msgid "UID '%s' is not a mail transport"
+msgstr "UID '%s' is not a mail transport"
 
-#: ../mail/em-filter-i18n.h:47
-msgid "Match All"
-msgstr "Match All"
+#: ../libemail-engine/e-mail-session-utils.c:647
+#: ../libemail-engine/mail-ops.c:765
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Failed to apply outgoing filters: %s"
 
-#: ../mail/em-filter-i18n.h:48
-msgid "Message Body"
-msgstr "Message Body"
+#: ../libemail-engine/e-mail-session-utils.c:676
+#: ../libemail-engine/e-mail-session-utils.c:710
+#: ../libemail-engine/mail-ops.c:784 ../libemail-engine/mail-ops.c:817
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
 
-#: ../mail/em-filter-i18n.h:49
-msgid "Message Header"
-msgstr "Message Header"
+#: ../libemail-engine/e-mail-session-utils.c:730
+#: ../libemail-engine/mail-ops.c:839
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Failed to append to local 'Sent' folder: %s"
 
-#: ../mail/em-filter-i18n.h:50
-msgid "Message is Junk"
-msgstr "Message is Junk"
+#: ../libemail-engine/e-mail-session-utils.c:973
+#: ../libemail-engine/mail-ops.c:971 ../libemail-engine/mail-ops.c:1073
+msgid "Sending message"
+msgstr "Sending message"
 
-#: ../mail/em-filter-i18n.h:51
-msgid "Message is not Junk"
-msgstr "Message is not Junk"
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:336
+#: ../mail/em-folder-tree-model.c:764
+#: ../modules/mail/e-mail-shell-view-private.c:1094
+#: ../modules/mail/e-mail-shell-view-private.c:1105
+msgid "Inbox"
+msgstr "Inbox"
 
-#: ../mail/em-filter-i18n.h:52
-msgid "Message Location"
-msgstr "Message Location"
+#. E_MAIL_LOCAL_FOLDER_INBOX
+#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:757
+#: ../modules/mail/e-mail-shell-view-private.c:1092
+msgid "Drafts"
+msgstr "Drafts"
 
-#: ../mail/em-filter-i18n.h:54
-msgid "Pipe to Program"
-msgstr "Pipe to Program"
+#. E_MAIL_LOCAL_FOLDER_DRAFTS
+#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:768
+#: ../modules/mail/e-mail-shell-view-private.c:1096
+msgid "Outbox"
+msgstr "Outbox"
 
-#: ../mail/em-filter-i18n.h:55
-msgid "Play Sound"
-msgstr "Play Sound"
+#. E_MAIL_LOCAL_FOLDER_OUTBOX
+#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:772
+#: ../modules/mail/e-mail-shell-view-private.c:1098
+msgid "Sent"
+msgstr "Sent"
 
-#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:14
-msgid "Read"
-msgstr "Read"
+#. E_MAIL_LOCAL_FOLDER_SENT
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:760
+#: ../modules/mail/e-mail-shell-view-private.c:1100
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+#: ../plugins/templates/templates.c:1071 ../plugins/templates/templates.c:1368
+#: ../plugins/templates/templates.c:1378
+msgid "Templates"
+msgstr "Templates"
 
-#: ../mail/em-filter-i18n.h:57 ../mail/message-list.etspec.h:16
-msgid "Recipients"
-msgstr "Recipients"
+#: ../libemail-engine/e-mail-session.c:1344
+#, c-format
+msgid "User cancelled operation"
+msgstr "User cancelled operation"
 
-#: ../mail/em-filter-i18n.h:58
-msgid "Regex Match"
-msgstr "Regex Match"
+#: ../libemail-engine/e-mail-session.c:1533
+#, c-format
+msgid "%s authentication failed"
+msgstr "%s authentication failed"
 
-#: ../mail/em-filter-i18n.h:59
-msgid "Replied to"
-msgstr "Replied to"
+#: ../libemail-engine/e-mail-session.c:1578
+#, c-format
+msgid "No data source found for UID '%s'"
+msgstr "No data source found for UID '%s'"
 
-#: ../mail/em-filter-i18n.h:60
-msgid "returns"
-msgstr "returns"
+#: ../libemail-engine/e-mail-session.c:1629
+#, c-format
+msgid ""
+"No destination address provided, forwarding of the message has been "
+"cancelled."
+msgstr ""
+"No destination address provided, forwarding of the message has been "
+"cancelled."
 
-#: ../mail/em-filter-i18n.h:61
-msgid "returns greater than"
-msgstr "returns greater than"
+#: ../libemail-engine/e-mail-session.c:1642
+#, c-format
+msgid "No identity found to use, forwarding of the message has been cancelled."
+msgstr ""
+"No identity found to use, forwarding of the message has been cancelled."
 
-#: ../mail/em-filter-i18n.h:62
-msgid "returns less than"
-msgstr "returns less than"
+#: ../libemail-engine/e-mail-store-utils.c:171
+#, c-format
+msgid "Disconnecting from '%s'"
+msgstr "Disconnecting from '%s'"
 
-#: ../mail/em-filter-i18n.h:63
-msgid "Run Program"
-msgstr "Run Program"
+#: ../libemail-engine/e-mail-store-utils.c:263
+#, c-format
+msgid "Reconnecting to '%s'"
+msgstr "Reconnecting to '%s'"
 
-#: ../mail/em-filter-i18n.h:64 ../mail/message-list.etspec.h:3
-msgid "Score"
-msgstr "Score"
+#: ../libemail-engine/e-mail-store-utils.c:340
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "Preparing account '%s' for offline"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:15
-msgid "Sender"
-msgstr "Sender"
+#: ../libemail-engine/mail-folder-cache.c:884
+#, c-format
+msgid "Pinging %s"
+msgstr "Pinging %s"
 
-#: ../mail/em-filter-i18n.h:66
-msgid "Sender or Recipients"
-msgstr "Sender or Recipients"
+#: ../libemail-engine/mail-ops.c:94
+msgid "Filtering Selected Messages"
+msgstr "Filtering Selected Messages"
 
-#: ../mail/em-filter-i18n.h:67
-msgid "Set Label"
-msgstr "Set Label"
+#: ../libemail-engine/mail-ops.c:152
+#, c-format
+msgid ""
+"Failed to filter selected messages. One reason can be that folder location "
+"set in one or more filters is invalid. Please check your filters in Edit-"
+">Message Filters.\n"
+"Original error was: %s"
+msgstr ""
+"Failed to filter selected messages. One reason can be that folder location "
+"set in one or more filters is invalid. Please check your filters in "
+"Edit->Message Filters.\n"
+"Original error was: %s"
 
-#: ../mail/em-filter-i18n.h:68
-msgid "Set Status"
-msgstr "Set Status"
+#: ../libemail-engine/mail-ops.c:233
+#, c-format
+msgid "Fetching mail from '%s'"
+msgstr "Fetching mail from '%s'"
 
-#: ../mail/em-filter-i18n.h:69
-msgid "Size (kB)"
-msgstr "Size (kB)"
+#: ../libemail-engine/mail-ops.c:759
+#, c-format
+msgid ""
+"Failed to apply outgoing filters. One reason can be that folder location set "
+"in one or more filters is invalid. Please check your filters in Edit-"
+">Message Filters.\n"
+"Original error was: %s"
+msgstr ""
+"Failed to apply outgoing filters. One reason can be that folder location set "
+"in one or more filters is invalid. Please check your filters in "
+"Edit->Message Filters.\n"
+"Original error was: %s"
 
-#: ../mail/em-filter-i18n.h:70
-msgid "sounds like"
-msgstr "sounds like"
+#: ../libemail-engine/mail-ops.c:982
+#, c-format
+msgid "Sending message %d of %d"
+msgstr "Sending message %d of %d"
 
-#: ../mail/em-filter-i18n.h:71
-msgid "Source Account"
-msgstr "Source Account"
+#: ../libemail-engine/mail-ops.c:1034
+#, 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/em-filter-i18n.h:72
-msgid "Specific header"
-msgstr "Specific header"
+#: ../libemail-engine/mail-ops.c:1040
+msgid "Canceled."
+msgstr "Cancelled."
 
-#: ../mail/em-filter-i18n.h:73
-msgid "starts with"
-msgstr "starts with"
+#: ../libemail-engine/mail-ops.c:1042
+msgid "Complete."
+msgstr "Complete."
 
-#: ../mail/em-filter-i18n.h:75
-msgid "Stop Processing"
-msgstr "Stop Processing"
+#: ../libemail-engine/mail-ops.c:1154
+#, c-format
+msgid "Moving messages to '%s'"
+msgstr "Moving messages to '%s'"
 
-#: ../mail/em-filter-i18n.h:78
-msgid "Unset Color"
-msgstr "Unset Colour"
+#: ../libemail-engine/mail-ops.c:1155
+#, c-format
+msgid "Copying messages to '%s'"
+msgstr "Copying messages to '%s'"
 
-#: ../mail/em-filter-i18n.h:79
-msgid "Unset Status"
-msgstr "Unset Status"
+#: ../libemail-engine/mail-ops.c:1274
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "Storing folder '%s'"
 
-#. and now for the action area
-#: ../mail/em-filter-rule.c:583
-msgid "Then"
-msgstr "Then"
+#: ../libemail-engine/mail-ops.c:1402
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr "Expunging and storing account '%s'"
 
-#: ../mail/em-filter-rule.c:648
-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
+#: ../libemail-engine/mail-ops.c:1403
 #, c-format
-msgid "Quota usage (%s):"
-msgstr "Quota usage (%s):"
+msgid "Storing account '%s'"
+msgstr "Storing account '%s'"
 
-#: ../mail/em-folder-properties.c:179
+#: ../libemail-engine/mail-ops.c:1477
 #, 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:390
-msgid "C_reate"
-msgstr "C_reate"
-
-#: ../mail/em-folder-selector.c:396
-msgid "Folder _name:"
-msgstr "Folder _name:"
-
-#: ../mail/em-folder-tree.c:644
-msgid "Folder names cannot contain '/'"
-msgstr "Folder names cannot contain '/'"
+msgid "Emptying trash in '%s'"
+msgstr "Emptying wastebasket in '%s'"
 
-#: ../mail/em-folder-tree.c:780
+#: ../libemail-engine/mail-tools.c:71
 #, c-format
-msgctxt "folder-display"
-msgid "%s (%u%s)"
-msgstr "%s (%u%s)"
-
-#: ../mail/em-folder-tree.c:1605
-msgid "Mail Folder Tree"
-msgstr "Mail Folder Tree"
+msgid "Could not create spool directory '%s': %s"
+msgstr "Could not create spool directory '%s': %s"
 
-#: ../mail/em-folder-tree.c:2132 ../mail/em-folder-utils.c:115
+#: ../libemail-engine/mail-tools.c:111
 #, c-format
-msgid "Moving folder %s"
-msgstr "Moving folder %s"
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr "Trying to movemail a non-mbox source '%s'"
 
-#: ../mail/em-folder-tree.c:2135 ../mail/em-folder-utils.c:117
+#: ../libemail-engine/mail-tools.c:229
 #, c-format
-msgid "Copying folder %s"
-msgstr "Copying folder %s"
+msgid "Forwarded message - %s"
+msgstr "Forwarded message — %s"
+
+#: ../libemail-engine/mail-tools.c:231
+msgid "Forwarded message"
+msgstr "Forwarded message"
 
-#: ../mail/em-folder-tree.c:2142 ../mail/message-list.c:2301
+#: ../libemail-engine/mail-vfolder.c:127
 #, c-format
-msgid "Moving messages into folder %s"
-msgstr "Moving messages into folder %s"
+msgid "Setting up Search Folder: %s"
+msgstr "Setting up Search Folder: %s"
 
-#: ../mail/em-folder-tree.c:2146 ../mail/message-list.c:2303
+#: ../libemail-engine/mail-vfolder.c:280
 #, c-format
-msgid "Copying messages into folder %s"
-msgstr "Copying messages into folder %s"
+msgid "Updating Search Folders for '%s' - %s"
+msgstr "Updating Search Folders for '%s' - %s"
 
-#: ../mail/em-folder-tree.c:2165
+#. 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:646
 #, c-format
-msgid "Cannot drop message(s) into toplevel store"
-msgstr "Cannot drop message(s) into toplevel store"
+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\"."
 
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
-msgid "UNMATCHED"
-msgstr "UNMATCHED"
+#: ../mail/e-mail-account-manager.c:460
+msgid "_Restore Default"
+msgstr "_Restore Default"
 
-#: ../mail/em-folder-tree-model.c:849 ../mail/em-folder-tree-model.c:1134
-msgid "Loading..."
-msgstr "Loading…"
+#: ../mail/e-mail-account-manager.c:473
+msgid "You can drag and drop account names to reorder them."
+msgstr "You can drag and drop account names to reorder them."
 
-#: ../mail/em-folder-utils.c:493
-msgid "Move Folder To"
-msgstr "Move Folder To"
+#: ../mail/e-mail-account-manager.c:518
+msgid "De_fault"
+msgstr "De_fault"
 
-#: ../mail/em-folder-utils.c:493
-msgid "Copy Folder To"
-msgstr "Copy Folder To"
+#: ../mail/e-mail-account-tree-view.c:85
+#: ../modules/mail/em-composer-prefs.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:359
+#: ../plugins/publish-calendar/publish-calendar.c:876
+msgid "Enabled"
+msgstr "Enabled"
 
-#: ../mail/em-folder-utils.c:590
-msgid "Create Folder"
-msgstr "Create Folder"
+#: ../mail/e-mail-account-tree-view.c:109
+msgid "Account Name"
+msgstr "Account Name"
 
-#: ../mail/em-folder-utils.c:591
-msgid "Specify where to create the folder:"
-msgstr "Specify where to create the folder:"
+#: ../mail/e-mail-account-tree-view.c:136
+#: ../mail/e-mail-config-security-page.c:333
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3707
+#: ../mail/mail-config.ui.h:44
+msgid "Default"
+msgstr "Default"
 
-#: ../mail/em-subscription-editor.c:869
-msgid "_Subscribe"
-msgstr "_Subscribe"
+#: ../mail/e-mail-autoconfig.c:563
+msgid "No email address provided"
+msgstr "No e-mail address provided"
 
-#: ../mail/em-subscription-editor.c:878
-msgid "Su_bscribe To Shown"
-msgstr "Su_bscribe To Shown"
+#: ../mail/e-mail-autoconfig.c:572
+msgid "Missing domain in email address"
+msgstr "Missing domain in e-mail address"
 
-#: ../mail/em-subscription-editor.c:886
-msgid "Subscribe To _All"
-msgstr "Subscribe To _All"
+#: ../mail/e-mail-backend.c:754
+msgid "Unknown background operation"
+msgstr "Unknown background operation"
 
-#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1847
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
-msgid "_Unsubscribe"
-msgstr "_Unsubscribe"
+#: ../mail/e-mail-browser.c:123 ../shell/e-shell-window-actions.c:848
+#: ../shell/e-shell-window-actions.c:855 ../shell/e-shell-window-actions.c:862
+msgid "Close this window"
+msgstr "Close this window"
 
-#: ../mail/em-subscription-editor.c:995
-msgid "Unsu_bscribe From Hidden"
-msgstr "Unsu_bscribe From Hidden"
+#: ../mail/e-mail-browser.c:280
+msgid "(No Subject)"
+msgstr "(No Subject)"
 
-#: ../mail/em-subscription-editor.c:1003
-msgid "Unsubscribe From _All"
-msgstr "Unsubscribe From _All"
+#. GtkAssistant sinks the floating button reference.
+#: ../mail/e-mail-config-assistant.c:102
+msgid "_Skip Lookup"
+msgstr "_Skip Lookup"
 
-#: ../mail/em-subscription-editor.c:1682
-msgid "Folder Subscriptions"
-msgstr "Folder Subscriptions"
+#: ../mail/e-mail-config-assistant.c:562
+msgid "Evolution Account Assistant"
+msgstr "Evolution Account Assistant"
 
-#: ../mail/em-subscription-editor.c:1722
-msgid "_Account:"
-msgstr "_Account:"
+#: ../mail/e-mail-config-auth-check.c:352
+msgid "Check for Supported Types"
+msgstr "Check for Supported Types"
 
-#: ../mail/em-subscription-editor.c:1737
-msgid "Clear Search"
-msgstr "Clear Search"
+#: ../mail/e-mail-config-confirm-page.c:157
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive e-mail using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
 
-#: ../mail/em-subscription-editor.c:1755
-msgid "Sho_w items that contain:"
-msgstr "Sho_w items that contain:"
+#: ../mail/e-mail-config-confirm-page.c:169
+msgid "Done"
+msgstr "Done"
 
-#: ../mail/em-subscription-editor.c:1800
-msgid "Subscribe to the selected folder"
-msgstr "Subscribe to the selected folder"
+#: ../mail/e-mail-config-defaults-page.c:552
+msgid "Special Folders"
+msgstr "Special Folders"
 
-#: ../mail/em-subscription-editor.c:1801
-msgid "Su_bscribe"
-msgstr "Su_bscribe"
+#: ../mail/e-mail-config-defaults-page.c:561
+msgid "Draft Messages _Folder:"
+msgstr "Draft Messages _Folder:"
 
-#: ../mail/em-subscription-editor.c:1846
-#: ../modules/mail/e-mail-shell-view-actions.c:1340
-msgid "Unsubscribe from the selected folder"
-msgstr "Unsubscribe from the selected folder"
+#: ../mail/e-mail-config-defaults-page.c:571
+msgid "Choose a folder for saving draft messages."
+msgstr "Choose a folder for saving draft messages."
 
-#: ../mail/em-subscription-editor.c:1886
-msgid "Collapse all folders"
-msgstr "Collapse all folders"
+#: ../mail/e-mail-config-defaults-page.c:585
+msgid "Sent _Messages Folder:"
+msgstr "Sent _Messages Folder:"
 
-#: ../mail/em-subscription-editor.c:1887
-msgid "C_ollapse All"
-msgstr "C_ollapse All"
+#: ../mail/e-mail-config-defaults-page.c:595
+msgid "Choose a folder for saving sent messages."
+msgstr "Choose a folder for saving sent messages."
 
-#: ../mail/em-subscription-editor.c:1897
-msgid "Expand all folders"
-msgstr "Expand all folders"
+#: ../mail/e-mail-config-defaults-page.c:614
+msgid "S_ave replies in the folder of the message being replied to"
+msgstr "S_ave replies in the folder of the message being replied to"
 
-#: ../mail/em-subscription-editor.c:1898
-msgid "E_xpand All"
-msgstr "E_xpand All"
+#: ../mail/e-mail-config-defaults-page.c:631
+msgid "_Restore Defaults"
+msgstr "_Restore Defaults"
 
-#: ../mail/em-subscription-editor.c:1908
-msgid "Refresh the folder list"
-msgstr "Refresh the folder list"
+#: ../mail/e-mail-config-defaults-page.c:645
+msgid "Use a Real Folder for _Trash:"
+msgstr "Use a Real Folder for _Wastebasket:"
 
-#: ../mail/em-subscription-editor.c:1920
-msgid "Stop the current operation"
-msgstr "Stop the current operation"
+#: ../mail/e-mail-config-defaults-page.c:646
+msgid "Choose a folder for deleted messages."
+msgstr "Choose a folder for deleted messages."
 
-#. 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:106
-#, 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/e-mail-config-defaults-page.c:655
+msgid "Use a Real Folder for _Junk:"
+msgstr "Use a Real Folder for _Junk:"
 
-#: ../mail/em-utils.c:162
-#: ../modules/mailto-handler/evolution-mailto-handler.c:154
-msgid "_Do not show this message again"
-msgstr "_Do not show this message again"
+#: ../mail/e-mail-config-defaults-page.c:656
+msgid "Choose a folder for junk messages."
+msgstr "Choose a folder for junk messages."
 
-#: ../mail/em-utils.c:314
-msgid "Message Filters"
-msgstr "Message Filters"
+#: ../mail/e-mail-config-defaults-page.c:673
+msgid "Composing Messages"
+msgstr "Composing Messages"
 
-#: ../mail/em-utils.c:1067
-#, c-format
-msgid "Messages from %s"
-msgstr "Messages from %s"
+#: ../mail/e-mail-config-defaults-page.c:682
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Alway_s carbon-copy (cc) to:"
 
-#: ../mail/em-vfolder-editor.c:105
-msgid "Search _Folders"
-msgstr "Search _Folders"
+#: ../mail/e-mail-config-defaults-page.c:707
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Always _blind carbon-copy (bcc) to:"
 
-#: ../mail/em-vfolder-editor-rule.c:391
-msgid "Add Folder"
-msgstr "Add Folder"
+#: ../mail/e-mail-config-defaults-page.c:742
+msgid "Message Receipts"
+msgstr "Message Receipts"
 
-#: ../mail/em-vfolder-editor-rule.c:517
-msgid "Search Folder Sources"
-msgstr "Search Folder Sources"
+#: ../mail/e-mail-config-defaults-page.c:751
+msgid "S_end message receipts:"
+msgstr "S_end message receipts:"
 
-#: ../mail/em-vfolder-editor-rule.c:549
-msgid "Automatically update on any _source folder change"
-msgstr "Automatically update on any _source folder change"
+#: ../mail/e-mail-config-defaults-page.c:776
+msgid "Never"
+msgstr "Never"
 
-#: ../mail/em-vfolder-editor-rule.c:561
-msgid "All local folders"
-msgstr "All local folders"
+#: ../mail/e-mail-config-defaults-page.c:782
+msgid "Always"
+msgstr "Always"
 
-#: ../mail/em-vfolder-editor-rule.c:562
-msgid "All active remote folders"
-msgstr "All active remote folders"
+#: ../mail/e-mail-config-defaults-page.c:788
+msgid "Ask for each message"
+msgstr "Ask for each message"
 
-#: ../mail/em-vfolder-editor-rule.c:563
-msgid "All local and active remote folders"
-msgstr "All local and active remote folders"
+#: ../mail/e-mail-config-defaults-page.c:859
+msgid "Defaults"
+msgstr "Defaults"
 
-#: ../mail/em-vfolder-editor-rule.c:564
-msgid "Specific folders"
-msgstr "Specific folders"
+#: ../mail/e-mail-config-identity-page.c:266
+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."
+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."
 
-#: ../mail/em-vfolder-editor-rule.c:602
-msgid "include subfolders"
-msgstr "include subfolders"
+#: ../mail/e-mail-config-identity-page.c:294
+#: ../mail/e-mail-config-summary-page.c:324
+msgid "Account Information"
+msgstr "Account Information"
 
-#: ../mail/importers/elm-importer.c:179
-msgid "Importing Elm data"
-msgstr "Importing Elm data"
+#: ../mail/e-mail-config-identity-page.c:303
+#: ../mail/e-mail-config-summary-page.c:333
+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/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
-#: ../modules/mail/e-mail-shell-view.c:1034
-#: ../widgets/misc/e-send-options.c:538
-msgid "Mail"
-msgstr "Mail"
+#: ../mail/e-mail-config-identity-page.c:348
+msgid "Required Information"
+msgstr "Required Information"
 
-#: ../mail/importers/elm-importer.c:379
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm importer"
+#: ../mail/e-mail-config-identity-page.c:357
+msgid "Full Nam_e:"
+msgstr "Full Nam_e:"
 
-#: ../mail/importers/elm-importer.c:380
-msgid "Import mail from Elm."
-msgstr "Import mail from Elm."
+#: ../mail/e-mail-config-identity-page.c:384
+msgid "Email _Address:"
+msgstr "E-mail _Address:"
 
-#: ../mail/importers/evolution-mbox-importer.c:142
-#: ../plugins/dbx-import/dbx-importer.c:255
-msgid "_Destination folder:"
-msgstr "_Destination folder:"
+#: ../mail/e-mail-config-identity-page.c:431
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+msgid "Optional Information"
+msgstr "Optional Information"
 
-#: ../mail/importers/evolution-mbox-importer.c:148
-#: ../plugins/dbx-import/dbx-importer.c:261
-#: ../plugins/pst-import/pst-importer.c:570
-msgid "Select folder"
-msgstr "Select folder"
+#: ../mail/e-mail-config-identity-page.c:439
+msgid "Re_ply-To:"
+msgstr "Re_ply-To:"
 
-#: ../mail/importers/evolution-mbox-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:262
-#: ../plugins/pst-import/pst-importer.c:571
-msgid "Select folder to import into"
-msgstr "Select folder to import into"
+#: ../mail/e-mail-config-identity-page.c:466
+msgid "Or_ganization:"
+msgstr "Or_ganisation:"
 
-#: ../mail/importers/evolution-mbox-importer.c:439
-msgctxt "mboxImp"
-msgid "Subject"
-msgstr "Subject"
+#: ../mail/e-mail-config-identity-page.c:521
+msgid "Add Ne_w Signature..."
+msgstr "Add Ne_w Signature…"
 
-#: ../mail/importers/evolution-mbox-importer.c:444
-msgctxt "mboxImp"
-msgid "From"
-msgstr "From"
+#: ../mail/e-mail-config-lookup-page.c:68
+msgid "Looking up account details..."
+msgstr "Looking up account details…"
 
-#: ../mail/importers/evolution-mbox-importer.c:488
-#: ../shell/e-shell-utils.c:195
-msgid "Berkeley Mailbox (mbox)"
-msgstr "Berkeley Mailbox (mbox)"
+#: ../mail/e-mail-config-provider-page.c:485
+msgid "Checking for New Mail"
+msgstr "Checking for New Mail"
 
-#: ../mail/importers/evolution-mbox-importer.c:489
-msgid "Importer Berkeley Mailbox format folders"
-msgstr "Importer Berkeley Mailbox format folders"
+#: ../mail/e-mail-config-provider-page.c:501
+msgid "Check for _new messages every"
+msgstr "Check for _new messages every"
 
-#: ../mail/importers/mail-importer.c:63
-msgid "Importing mailbox"
-msgstr "Importing mailbox"
+#: ../mail/e-mail-config-provider-page.c:700
+msgid "Receiving Options"
+msgstr "Receiving Options"
 
-#. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:616
-#: ../plugins/pst-import/pst-importer.c:784
-#, c-format
-msgid "Importing '%s'"
-msgstr "Importing '%s'"
+#: ../mail/e-mail-config-receiving-page.c:50
+msgid "Receiving Email"
+msgstr "Receiving E-mail"
 
-#: ../mail/importers/mail-importer.c:316
-#, c-format
-msgid "Scanning %s"
-msgstr "Scanning %s"
+#: ../mail/e-mail-config-security-page.c:260
+#: ../mail/em-folder-properties.c:260 ../mail/mail-config.ui.h:19
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/itip-formatter/plugin/config-ui.c:91
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+#: ../smime/gui/certificate-viewer.c:653
+msgid "General"
+msgstr "General"
 
-#: ../mail/importers/pine-importer.c:251
-msgid "Importing Pine data"
-msgstr "Importing Pine data"
+#: ../mail/e-mail-config-security-page.c:268
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr "_Do not sign meeting requests (for Outlook compatibility)"
 
-#: ../mail/importers/pine-importer.c:430
-msgid "Address Book"
-msgstr "Address Book"
+#: ../mail/e-mail-config-security-page.c:290
+msgid "Pretty Good Privacy (OpenPGP)"
+msgstr "Pretty Good Privacy (OpenPGP)"
 
-#: ../mail/importers/pine-importer.c:478
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine importer"
+#: ../mail/e-mail-config-security-page.c:298
+msgid "OpenPGP _Key ID:"
+msgstr "OpenPGP _Key ID:"
 
-#: ../mail/importers/pine-importer.c:479
-msgid "Import mail from Pine."
-msgstr "Import mail from Pine."
+#: ../mail/e-mail-config-security-page.c:320
+msgid "Si_gning algorithm:"
+msgstr "Si_gning algorithm:"
 
-#: ../mail/mail-autofilter.c:73
-#, c-format
-msgid "Mail to %s"
-msgstr "Mail to %s"
+#: ../mail/e-mail-config-security-page.c:336
+#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:45
+msgid "SHA1"
+msgstr "SHA1"
 
-#: ../mail/mail-autofilter.c:229 ../mail/mail-autofilter.c:272
-#, c-format
-msgid "Mail from %s"
-msgstr "Mail from %s"
+#: ../mail/e-mail-config-security-page.c:339
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:46
+msgid "SHA256"
+msgstr "SHA256"
 
-#: ../mail/mail-autofilter.c:255
-#, c-format
-msgid "Subject is %s"
-msgstr "Subject is %s"
+#: ../mail/e-mail-config-security-page.c:342
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:47
+msgid "SHA384"
+msgstr "SHA384"
 
-#: ../mail/mail-autofilter.c:296
-#, c-format
-msgid "%s mailing list"
-msgstr "%s mailing list"
+#: ../mail/e-mail-config-security-page.c:345
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:48
+msgid "SHA512"
+msgstr "SHA512"
 
-#: ../mail/mail-autofilter.c:406
-msgid "Add Filter Rule"
-msgstr "Add Filter Rule"
+#: ../mail/e-mail-config-security-page.c:361
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "Al_ways sign outgoing messages when using this account"
 
-#. 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/e-mail-config-security-page.c:373
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr "Always encrypt to _myself when sending encrypted messages"
 
-#: ../mail/mail-config.ui.h:1
-msgid "Set custom junk header"
-msgstr "Set custom junk header"
+#: ../mail/e-mail-config-security-page.c:385
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr "Always _trust keys in my keyring when encrypting"
 
-#: ../mail/mail-config.ui.h:2
-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/e-mail-config-security-page.c:409
+msgid "Secure MIME (S/MIME)"
+msgstr "Secure MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:3
-msgid "Header name"
-msgstr "Header name"
+#: ../mail/e-mail-config-security-page.c:417
+msgid "Sig_ning certificate:"
+msgstr "Sig_ning certificate:"
 
-#: ../mail/mail-config.ui.h:4
-msgid "Header content"
-msgstr "Header content"
+#: ../mail/e-mail-config-security-page.c:441
+#: ../mail/e-mail-config-security-page.c:547
+msgid "Select"
+msgstr "Select"
 
-#: ../mail/mail-config.ui.h:5
-msgid "Default Behavior"
-msgstr "Default Behaviour"
+#: ../mail/e-mail-config-security-page.c:459
+msgid "Signing _algorithm:"
+msgstr "Signing _algorithm:"
 
-#: ../mail/mail-config.ui.h:6
-msgid "For_mat messages in HTML"
-msgstr "For_mat messages in HTML"
+#: ../mail/e-mail-config-security-page.c:500
+msgid "Always sign outgoing messages when using this account"
+msgstr "Always sign outgoing messages when using this account"
 
-#: ../mail/mail-config.ui.h:7
-msgid "Automatically insert _emoticon images"
-msgstr "Automatically insert _emoticon images"
+#: ../mail/e-mail-config-security-page.c:523
+msgid "Encryption certificate:"
+msgstr "Encryption certificate:"
 
-#: ../mail/mail-config.ui.h:8
-msgid "Always request rea_d receipt"
-msgstr "Always request rea_d receipt"
+#: ../mail/e-mail-config-security-page.c:565
+msgid "Always encrypt outgoing messages when using this account"
+msgstr "Always encrypt outgoing messages when using this account"
 
-#: ../mail/mail-config.ui.h:9
-msgid "Encode filenames in an _Outlook/GMail way"
-msgstr "Encode filenames in an _Outlook/GMail way"
+#: ../mail/e-mail-config-security-page.c:585
+msgid "Always encrypt to myself when sending encrypted messages"
+msgstr "Always encrypt to myself when sending encrypted messages"
 
-#: ../mail/mail-config.ui.h:10
-msgid "Ch_aracter encoding:"
-msgstr "Ch_aracter encoding:"
+#: ../mail/e-mail-config-sending-page.c:50
+msgid "Sending Email"
+msgstr "Sending E-mail"
 
-#: ../mail/mail-config.ui.h:11
-msgid "Replies and Forwards"
-msgstr "Replies and Forwards"
+#: ../mail/e-mail-config-service-page.c:640
+msgid "Server _Type:"
+msgstr "Server _Type:"
 
-#: ../mail/mail-config.ui.h:12
-msgid "_Reply style:"
-msgstr "_Reply style:"
+#: ../mail/e-mail-config-summary-page.c:142
+msgid "SSL"
+msgstr "SSL"
 
-#: ../mail/mail-config.ui.h:13
-msgid "_Forward style:"
-msgstr "_Forward style:"
+#: ../mail/e-mail-config-summary-page.c:145
+msgid "TLS"
+msgstr "TLS"
 
-#: ../mail/mail-config.ui.h:14
-msgid "Start _typing at the bottom on replying"
-msgstr "Start _typing at the bottom on replying"
+#: ../mail/e-mail-config-summary-page.c:307
+msgid ""
+"This is a summary of the settings which will be used to access your mail."
+msgstr ""
+"This is a summary of the settings which will be used to access your mail."
 
-#: ../mail/mail-config.ui.h:15
-msgid "_Keep signature above the original message on replying"
-msgstr "_Keep signature above the original message on replying"
+#: ../mail/e-mail-config-summary-page.c:372
+msgid "Personal Details"
+msgstr "Personal Details"
 
-#: ../mail/mail-config.ui.h:16
-msgid "Ig_nore Reply-To: for mailing lists"
-msgstr "Ig_nore Reply-To: for mailing lists"
+#: ../mail/e-mail-config-summary-page.c:381
+msgid "Full Name:"
+msgstr "Full Name:"
 
-#: ../mail/mail-config.ui.h:17
-msgid "Gro_up Reply goes only to mailing list, if possible"
-msgstr "Gro_up Reply goes only to mailing list, if possible"
+#: ../mail/e-mail-config-summary-page.c:395
+msgid "Email Address:"
+msgstr "E-mail Address:"
 
-#: ../mail/mail-config.ui.h:18
-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/e-mail-config-summary-page.c:409
+msgid "Receiving"
+msgstr "Receiving"
 
-#: ../mail/mail-config.ui.h:20
-msgid "Sig_natures"
-msgstr "Sig_natures"
+#: ../mail/e-mail-config-summary-page.c:421
+msgid "Sending"
+msgstr "Sending"
 
-#: ../mail/mail-config.ui.h:21
-msgid "Signatures"
-msgstr "Signatures"
+#: ../mail/e-mail-config-summary-page.c:433
+msgid "Server Type:"
+msgstr "Server Type:"
 
-#: ../mail/mail-config.ui.h:22
-msgid "_Languages"
-msgstr "_Languages"
+#: ../mail/e-mail-config-summary-page.c:454
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+msgid "Server:"
+msgstr "Server:"
 
-#: ../mail/mail-config.ui.h:23
-msgid "Languages Table"
-msgstr "Languages Table"
+#: ../mail/e-mail-config-summary-page.c:475
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:697
+msgid "Username:"
+msgstr "Username:"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/e-mail-config-summary-page.c:496
+msgid "Security:"
+msgstr "Security:"
+
+#: ../mail/e-mail-config-summary-page.c:787
+msgid "Account Summary"
+msgstr "Account Summary"
+
+#: ../mail/e-mail-config-welcome-page.c:157
 msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
 msgstr ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-
-#: ../mail/mail-config.ui.h:26
-msgid "Check spelling while I _type"
-msgstr "Check spelling while I _type"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
 
-#: ../mail/mail-config.ui.h:27
-msgid "Color for _misspelled words:"
-msgstr "Colour for _misspelt words:"
+#: ../mail/e-mail-config-welcome-page.c:167
+#: ../modules/startup-wizard/e-startup-assistant.c:152
+msgid "Welcome"
+msgstr "Welcome"
 
-#: ../mail/mail-config.ui.h:28
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "Pick a color"
-msgstr "Pick a colour"
+#: ../mail/e-mail-config-window.c:327
+msgid "Account Editor"
+msgstr "Account Editor"
 
-#: ../mail/mail-config.ui.h:29
-msgid "Spell Checking"
-msgstr "Spell Checking"
+#: ../mail/e-mail-display.c:113
+msgid "_Add to Address Book..."
+msgstr "_Add to Address Book…"
 
-#: ../mail/mail-config.ui.h:30
-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/e-mail-display.c:120
+msgid "_To This Address"
+msgstr "_To this Address"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:32
-msgid "Sending a message with an _empty subject line"
-msgstr "Sending a message with an _empty subject line"
+#: ../mail/e-mail-display.c:127
+msgid "_From This Address"
+msgstr "_From This Address"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:34
-msgid "Sending a message with only _Bcc recipients defined"
-msgstr "Sending a message with only _Bcc recipients defined"
+#: ../mail/e-mail-display.c:134
+msgid "Send _Reply To..."
+msgstr "Send _Reply To…"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:36
-msgid "Sending a _private reply to a mailing list message"
-msgstr "Sending a _private reply to a mailing list message"
+#: ../mail/e-mail-display.c:136
+msgid "Send a reply message to this address"
+msgstr "Send a reply message to this address"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:38
-msgid "Sending a reply to a large _number of recipients"
-msgstr "Sending a reply to a large _number of recipients"
+#: ../mail/e-mail-display.c:143
+msgid "Create Search _Folder"
+msgstr "Create Search _Folder"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:40
-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/e-mail-display.c:153
+msgid "Save _Image..."
+msgstr "Save _Image…"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:42
-msgid "Sending a message with _recipients not entered as mail addresses"
-msgstr "Sending a message with _recipients not entered as mail addresses"
+#: ../mail/e-mail-display.c:155
+msgid "Save the image to a file"
+msgstr "Save the image to a file"
 
-#: ../mail/mail-config.ui.h:43
-msgid "Confirmations"
-msgstr "Confirmations"
+#. 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/mail-config.ui.h:49 ../smime/gui/smime-ui.ui.h:1
-msgid "a"
-msgstr "a"
+#: ../mail/e-mail-label-dialog.c:225
+msgid "_Label name:"
+msgstr "_Label name:"
 
-#: ../mail/mail-config.ui.h:50 ../smime/gui/smime-ui.ui.h:2
-msgid "b"
-msgstr "b"
+#: ../mail/e-mail-label-list-store.c:49
+msgid "I_mportant"
+msgstr "I_mportant"
 
-#: ../mail/mail-config.ui.h:51
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "Attachment"
+#. red
+#: ../mail/e-mail-label-list-store.c:50
+msgid "_Work"
+msgstr "_Work"
 
-#: ../mail/mail-config.ui.h:52
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
-msgstr "Inline (Outlook style)"
+#. orange
+#: ../mail/e-mail-label-list-store.c:51
+msgid "_Personal"
+msgstr "_Personal"
 
-#: ../mail/mail-config.ui.h:53
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "Quoted"
+#. green
+#: ../mail/e-mail-label-list-store.c:52
+msgid "_To Do"
+msgstr "_To Do"
 
-#: ../mail/mail-config.ui.h:54
-msgctxt "ReplyForward"
-msgid "Do not quote"
-msgstr "Do not quote"
+#. blue
+#: ../mail/e-mail-label-list-store.c:53
+msgid "_Later"
+msgstr "_Later"
 
-#: ../mail/mail-config.ui.h:55
-msgctxt "ReplyForward"
-msgid "Inline"
-msgstr "Inline"
+#: ../mail/e-mail-label-manager.c:170
+#: ../modules/mail/e-mail-shell-view-actions.c:771
+msgid "Add Label"
+msgstr "Add Label"
 
-#: ../mail/mail-config.ui.h:56
-msgid "Proxy Settings"
-msgstr "Proxy Settings"
+#: ../mail/e-mail-label-manager.c:221
+msgid "Edit Label"
+msgstr "Edit Label"
 
-#: ../mail/mail-config.ui.h:57
-msgid "_Use system defaults"
-msgstr "_Use system defaults"
+#: ../mail/e-mail-label-manager.c:353
+msgid ""
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
+msgstr ""
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
 
-#: ../mail/mail-config.ui.h:58
-msgid "_Direct connection to the Internet"
-msgstr "_Direct connection to the Internet"
+#: ../mail/e-mail-label-tree-view.c:89
+msgid "Color"
+msgstr "Colour"
 
-#: ../mail/mail-config.ui.h:59
-msgid "_Manual proxy configuration:"
-msgstr "_Manual proxy configuration:"
+#: ../mail/e-mail-notebook-view.c:269
+msgid "Please select a folder"
+msgstr "Please select a folder"
 
-#: ../mail/mail-config.ui.h:60
-msgid "H_TTP Proxy:"
-msgstr "H_TTP Proxy:"
+#: ../mail/e-mail-printer.c:123
+#, c-format
+msgid "Page %d of %d"
+msgstr "Page %d of %d"
 
-#: ../mail/mail-config.ui.h:61
-msgid "_Secure HTTP Proxy:"
-msgstr "_Secure HTTP Proxy:"
+#: ../mail/e-mail-printer.c:573
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+msgid "Print"
+msgstr "Print"
 
-#: ../mail/mail-config.ui.h:62
-msgid "SOC_KS Proxy:"
-msgstr "SOC_KS Proxy:"
+#: ../mail/e-mail-printer.c:579
+msgid "Header Name"
+msgstr "Header Name"
 
-#: ../mail/mail-config.ui.h:63
-msgid "No _Proxy for:"
-msgstr "No _Proxy for:"
+#: ../mail/e-mail-printer.c:585
+msgid "Header Value"
+msgstr "Header Value"
 
-#: ../mail/mail-config.ui.h:64
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
-msgid "Port:"
-msgstr "Port:"
+#: ../mail/e-mail-printer.c:639 ../mail/mail-config.ui.h:102
+msgid "Headers"
+msgstr "Headers"
 
-#: ../mail/mail-config.ui.h:65
-msgid "Use Authe_ntication"
-msgstr "Use Authe_ntication"
+#: ../mail/e-mail-reader.c:370
+msgid "Save Image"
+msgstr "Save Image"
 
-#: ../mail/mail-config.ui.h:66
-msgid "Us_ername:"
-msgstr "Us_ername:"
+#: ../mail/e-mail-reader.c:452 ../mail/em-filter-i18n.h:12
+msgid "Copy to Folder"
+msgstr "Copy to Folder"
 
-#: ../mail/mail-config.ui.h:67
-msgid "Pass_word:"
-msgstr "Pass_word:"
+#: ../mail/e-mail-reader.c:452 ../mail/em-folder-utils.c:489
+msgid "C_opy"
+msgstr "C_opy"
 
-#: ../mail/mail-config.ui.h:68
-msgid "Start up"
-msgstr "Start up"
+#: ../mail/e-mail-reader.c:986 ../mail/em-filter-i18n.h:54
+msgid "Move to Folder"
+msgstr "Move to Folder"
 
-#: ../mail/mail-config.ui.h:69
-msgid "Check for new _messages on start"
-msgstr "Check for new _messages on start"
+#: ../mail/e-mail-reader.c:986 ../mail/em-folder-utils.c:489
+msgid "_Move"
+msgstr "_Move"
 
-#: ../mail/mail-config.ui.h:70
-msgid "Check for new messa_ges in all active accounts"
-msgstr "Check for new messa_ges in all active accounts"
+#: ../mail/e-mail-reader.c:1334 ../mail/e-mail-reader.c:1534
+#: ../mail/e-mail-reader.c:1574
+msgid "_Do not ask me again."
+msgstr "_Do not ask me again."
 
-#: ../mail/mail-config.ui.h:71
-msgid "Message Display"
-msgstr "Message Display"
+#: ../mail/e-mail-reader.c:1580
+msgid "_Always ignore Reply-To: for mailing lists."
+msgstr "_Always ignore Reply-To: for mailing lists."
 
-#: ../mail/mail-config.ui.h:72
-msgid "_Use the same fonts as other applications"
-msgstr "_Use the same fonts as other applications"
+#: ../mail/e-mail-reader.c:1775
+msgid "Failed to retrieve message:"
+msgstr "Failed to retrieve message:"
 
-#: ../mail/mail-config.ui.h:73
-msgid "S_tandard Font:"
-msgstr "S_tandard Font:"
+#: ../mail/e-mail-reader.c:1821 ../mail/e-mail-reader.c:2914
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "Retrieving message '%s'"
 
-#: ../mail/mail-config.ui.h:74
-msgid "Select HTML fixed width font"
-msgstr "Select HTML fixed width font"
+#: ../mail/e-mail-reader.c:1998
+msgid "A_dd Sender to Address Book"
+msgstr "A_dd Sender to Address Book"
 
-#: ../mail/mail-config.ui.h:75
-msgid "Select HTML variable width font"
-msgstr "Select HTML variable width font"
+#: ../mail/e-mail-reader.c:2000
+msgid "Add sender to address book"
+msgstr "Add sender to address book"
 
-#: ../mail/mail-config.ui.h:76
-msgid "Fix_ed Width Font:"
-msgstr "Fix_ed Width Font:"
+#: ../mail/e-mail-reader.c:2005
+msgid "Check for _Junk"
+msgstr "Check for _Junk"
 
-#: ../mail/mail-config.ui.h:77
-msgid "_Mark messages as read after"
-msgstr "_Mark messages as read after"
+#: ../mail/e-mail-reader.c:2007
+msgid "Filter the selected messages for junk status"
+msgstr "Filter the selected messages for junk status"
 
-#: ../mail/mail-config.ui.h:79
-msgid "Highlight _quotations with"
-msgstr "Highlight _quotations with"
+#: ../mail/e-mail-reader.c:2012
+msgid "_Copy to Folder..."
+msgstr "_Copy to Folder…"
 
-#: ../mail/mail-config.ui.h:80
-msgid "color"
-msgstr "colour"
+#: ../mail/e-mail-reader.c:2014
+msgid "Copy selected messages to another folder"
+msgstr "Copy selected messages to another folder"
 
-#: ../mail/mail-config.ui.h:81
-msgid "Default character e_ncoding:"
-msgstr "Default character e_ncoding:"
+#: ../mail/e-mail-reader.c:2019
+msgid "_Delete Message"
+msgstr "_Delete Message"
 
-#: ../mail/mail-config.ui.h:82
-msgid "Apply the same _view settings to all folders"
-msgstr "Apply the same _view settings to all folders"
+#: ../mail/e-mail-reader.c:2021
+msgid "Mark the selected messages for deletion"
+msgstr "Mark the selected messages for deletion"
 
-#: ../mail/mail-config.ui.h:83
-msgid "F_all back to threading messages by subject"
-msgstr "F_all back to threading messages by subject"
+#: ../mail/e-mail-reader.c:2026
+msgid "Create a Filter Rule for Mailing _List..."
+msgstr "Create a Filter Rule for Mailing _List…"
 
-#: ../mail/mail-config.ui.h:84
-msgid "Delete Mail"
-msgstr "Delete Mail"
+#: ../mail/e-mail-reader.c:2028
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Create a rule to filter messages to this mailing list"
 
-#: ../mail/mail-config.ui.h:85
-msgid "Empty trash folders on e_xit"
-msgstr "Empty wastebasket folders on e_xit"
+#: ../mail/e-mail-reader.c:2033
+msgid "Create a Filter Rule for _Recipients..."
+msgstr "Create a Filter Rule for _Recipients…"
 
-#: ../mail/mail-config.ui.h:86
-msgid "Confirm _when expunging a folder"
-msgstr "Confirm _when expunging a folder"
+#: ../mail/e-mail-reader.c:2035
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Create a rule to filter messages to these recipients"
 
-#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:88
-msgid "_Show animated images"
-msgstr "_Show animated images"
+#: ../mail/e-mail-reader.c:2040
+msgid "Create a Filter Rule for Se_nder..."
+msgstr "Create a Filter Rule for Se_nder…"
 
-#: ../mail/mail-config.ui.h:89
-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/e-mail-reader.c:2042
+msgid "Create a rule to filter messages from this sender"
+msgstr "Create a rule to filter messages from this sender"
 
-#: ../mail/mail-config.ui.h:90
-msgid "Loading Images"
-msgstr "Loading Images"
+#: ../mail/e-mail-reader.c:2047
+msgid "Create a Filter Rule for _Subject..."
+msgstr "Create a Filter Rule for _Subject…"
 
-#: ../mail/mail-config.ui.h:91
-msgid "_Never load images from the Internet"
-msgstr "_Never load images from the Internet"
+#: ../mail/e-mail-reader.c:2049
+msgid "Create a rule to filter messages with this subject"
+msgstr "Create a rule to filter messages with this subject"
 
-#: ../mail/mail-config.ui.h:92
-msgid "_Load images only in messages from contacts"
-msgstr "_Load images only in messages from contacts"
+#: ../mail/e-mail-reader.c:2054
+msgid "A_pply Filters"
+msgstr "A_pply Filters"
 
-#: ../mail/mail-config.ui.h:93
-msgid "_Always load images from the Internet"
-msgstr "_Always load images from the Internet"
+#: ../mail/e-mail-reader.c:2056
+msgid "Apply filter rules to the selected messages"
+msgstr "Apply filter rules to the selected messages"
 
-#: ../mail/mail-config.ui.h:94
-msgid "HTML Messages"
-msgstr "HTML Messages"
+#: ../mail/e-mail-reader.c:2061
+msgid "_Find in Message..."
+msgstr "_Find in Message…"
 
-#: ../mail/mail-config.ui.h:95 ../mail/message-list.etspec.h:19
-msgid "Labels"
-msgstr "Labels"
+#: ../mail/e-mail-reader.c:2063
+msgid "Search for text in the body of the displayed message"
+msgstr "Search for text in the body of the displayed message"
 
-#: ../mail/mail-config.ui.h:96
-msgid "Sender Photograph"
-msgstr "Sender Photograph"
+#: ../mail/e-mail-reader.c:2068
+msgid "_Clear Flag"
+msgstr "_Clear Flag"
 
-#: ../mail/mail-config.ui.h:97
-msgid "_Show the photograph of sender in the message preview"
-msgstr "_Show the photograph of sender in the message preview"
+#: ../mail/e-mail-reader.c:2070
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "Remove the follow-up flag from the selected messages"
 
-#: ../mail/mail-config.ui.h:98
-msgid "S_earch for sender photograph only in local address books"
-msgstr "S_earch for sender photograph only in local address books"
+#: ../mail/e-mail-reader.c:2075
+msgid "_Flag Completed"
+msgstr "_Flag Completed"
 
-#: ../mail/mail-config.ui.h:99
-msgid "Displayed Message Headers"
-msgstr "Displayed Message Headers"
+#: ../mail/e-mail-reader.c:2077
+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/mail-config.ui.h:100
-msgid "Mail Headers Table"
-msgstr "Mail Headers Table"
+#: ../mail/e-mail-reader.c:2082
+msgid "Follow _Up..."
+msgstr "Follow _Up…"
 
-#: ../mail/mail-config.ui.h:101
-#: ../modules/addressbook/autocompletion-config.c:90
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
-msgid "Date/Time Format"
-msgstr "Date/Time Format"
+#: ../mail/e-mail-reader.c:2084
+msgid "Flag the selected messages for follow-up"
+msgstr "Flag the selected messages for follow-up"
 
-#: ../mail/mail-config.ui.h:103
-msgid "Check incoming _messages for junk"
-msgstr "Check incoming _messages for junk"
+#: ../mail/e-mail-reader.c:2089
+msgid "_Attached"
+msgstr "_Attached"
 
-#: ../mail/mail-config.ui.h:104
-msgid "Delete junk messages on e_xit"
-msgstr "Delete junk messages on e_xit"
+#: ../mail/e-mail-reader.c:2091 ../mail/e-mail-reader.c:2098
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Forward the selected message to someone as an attachment"
 
-#: ../mail/mail-config.ui.h:105
-msgid "Check cu_stom headers for junk"
-msgstr "Check cu_stom headers for junk"
+#: ../mail/e-mail-reader.c:2096
+msgid "Forward As _Attached"
+msgstr "Forward As _Attached"
 
-#: ../mail/mail-config.ui.h:106
-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/e-mail-reader.c:2103
+msgid "_Inline"
+msgstr "_Inline"
 
-#: ../mail/mail-config.ui.h:107
-msgid "_Lookup in local address book only"
-msgstr "_Look up in local address book only"
+#: ../mail/e-mail-reader.c:2105 ../mail/e-mail-reader.c:2112
+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/mail-config.ui.h:108
-msgid "Option is ignored if a match for custom junk headers is found."
-msgstr "Option is ignored if a match for custom junk headers is found."
+#: ../mail/e-mail-reader.c:2110
+msgid "Forward As _Inline"
+msgstr "Forward As _Inline"
 
-#: ../mail/mail-config.ui.h:110 ../modules/addressbook/ldap-config.ui.h:3
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:237
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:161
-msgid "No encryption"
-msgstr "No encryption"
+#: ../mail/e-mail-reader.c:2117
+msgid "_Quoted"
+msgstr "_Quoted"
 
-#: ../mail/mail-config.ui.h:111 ../modules/addressbook/ldap-config.ui.h:1
-msgid "TLS encryption"
-msgstr "TLS encryption"
+#: ../mail/e-mail-reader.c:2119 ../mail/e-mail-reader.c:2126
+msgid "Forward the selected message quoted like a reply"
+msgstr "Forward the selected message quoted like a reply"
 
-#: ../mail/mail-config.ui.h:112 ../modules/addressbook/ldap-config.ui.h:2
-msgid "SSL encryption"
-msgstr "SSL encryption"
+#: ../mail/e-mail-reader.c:2124
+msgid "Forward As _Quoted"
+msgstr "Forward As _Quoted"
 
-#: ../mail/mail-dialogs.ui.h:1
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
+#: ../mail/e-mail-reader.c:2131
+msgid "_Load Images"
+msgstr "_Load Images"
 
-#: ../mail/mail-dialogs.ui.h:3
-msgid "_Flag:"
-msgstr "_Flag:"
+#: ../mail/e-mail-reader.c:2133
+msgid "Force images in HTML mail to be loaded"
+msgstr "Force images in HTML mail to be loaded"
 
-#: ../mail/mail-dialogs.ui.h:4
-msgid "_Due By:"
-msgstr "_Due By:"
+#: ../mail/e-mail-reader.c:2138
+msgid "_Important"
+msgstr "_Important"
 
-#. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:6
-msgid "Co_mpleted"
-msgstr "Co_mpleted"
+#: ../mail/e-mail-reader.c:2140
+msgid "Mark the selected messages as important"
+msgstr "Mark the selected messages as important"
 
-#: ../mail/mail-dialogs.ui.h:7
-msgid "Call"
-msgstr "Call"
+#: ../mail/e-mail-reader.c:2145
+msgid "_Junk"
+msgstr "_Junk"
 
-#: ../mail/mail-dialogs.ui.h:8
-msgid "Do Not Forward"
-msgstr "Do Not Forward"
+#: ../mail/e-mail-reader.c:2147
+msgid "Mark the selected messages as junk"
+msgstr "Mark the selected messages as junk"
 
-#: ../mail/mail-dialogs.ui.h:9
-msgid "Follow-Up"
-msgstr "Follow-Up"
+#: ../mail/e-mail-reader.c:2152
+msgid "_Not Junk"
+msgstr "_Not Junk"
 
-#: ../mail/mail-dialogs.ui.h:10
-msgid "For Your Information"
-msgstr "For Your Information"
+#: ../mail/e-mail-reader.c:2154
+msgid "Mark the selected messages as not being junk"
+msgstr "Mark the selected messages as not being junk"
 
-#: ../mail/mail-dialogs.ui.h:11
-msgid "Forward"
-msgstr "Forward"
+#: ../mail/e-mail-reader.c:2159
+msgid "_Read"
+msgstr "_Read"
 
-#: ../mail/mail-dialogs.ui.h:12
-msgid "No Response Necessary"
-msgstr "No Response Necessary"
+#: ../mail/e-mail-reader.c:2161
+msgid "Mark the selected messages as having been read"
+msgstr "Mark the selected messages as having been read"
 
-#: ../mail/mail-dialogs.ui.h:16
-msgid "Reply to All"
-msgstr "Reply to All"
+#: ../mail/e-mail-reader.c:2166
+msgid "Uni_mportant"
+msgstr "Uni_mportant"
 
-#: ../mail/mail-dialogs.ui.h:17
-msgid "Review"
-msgstr "Review"
+#: ../mail/e-mail-reader.c:2168
+msgid "Mark the selected messages as unimportant"
+msgstr "Mark the selected messages as unimportant"
 
-#: ../mail/mail-dialogs.ui.h:18
-msgid "License Agreement"
-msgstr "Licence Agreement"
+#: ../mail/e-mail-reader.c:2173
+msgid "_Unread"
+msgstr "_Unread"
 
-#: ../mail/mail-dialogs.ui.h:19
-msgid "_Tick this to accept the license agreement"
-msgstr "_Tick this to accept the licence agreement"
+#: ../mail/e-mail-reader.c:2175
+msgid "Mark the selected messages as not having been read"
+msgstr "Mark the selected messages as not having been read"
 
-#: ../mail/mail-dialogs.ui.h:20
-msgid "_Accept License"
-msgstr "_Accept Licence"
+#: ../mail/e-mail-reader.c:2180
+msgid "_Edit as New Message..."
+msgstr "_Edit as New Message…"
 
-#: ../mail/mail-dialogs.ui.h:21
-msgid "Security Information"
-msgstr "Security Information"
+#: ../mail/e-mail-reader.c:2182
+msgid "Open the selected messages in the composer for editing"
+msgstr "Open the selected messages in the composer for editing"
 
-#: ../mail/mail-dialogs.ui.h:22
-msgid "Digital Signature"
-msgstr "Digital Signature"
+#: ../mail/e-mail-reader.c:2187
+msgid "Compose _New Message"
+msgstr "Compose _New Message"
 
-#: ../mail/mail-dialogs.ui.h:23
-msgid "Encryption"
-msgstr "Encryption"
+#: ../mail/e-mail-reader.c:2189
+msgid "Open a window for composing a mail message"
+msgstr "Open a window for composing a mail message"
 
-#: ../mail/mail.error.xml.h:1
-msgid "Invalid authentication"
-msgstr "Invalid authentication"
+#: ../mail/e-mail-reader.c:2194
+msgid "_Open in New Window"
+msgstr "_Open in New Window"
 
-#: ../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/e-mail-reader.c:2196
+msgid "Open the selected messages in a new window"
+msgstr "Open the selected messages in a new window"
 
-#: ../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/e-mail-reader.c:2201
+msgid "_Move to Folder..."
+msgstr "_Move to Folder…"
 
-#: ../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/e-mail-reader.c:2203
+msgid "Move selected messages to another folder"
+msgstr "Move selected messages to another folder"
 
-#: ../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/e-mail-reader.c:2208
+msgid "_Switch to Folder"
+msgstr "_Switch to Folder"
 
-#: ../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/e-mail-reader.c:2210
+msgid "Display the parent folder"
+msgstr "Display the parent folder"
 
-#: ../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/e-mail-reader.c:2215
+msgid "Switch to _next tab"
+msgstr "Switch to _next tab"
 
-#: ../mail/mail.error.xml.h:10
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+#: ../mail/e-mail-reader.c:2217
+msgid "Switch to the next tab"
+msgstr "Switch to the next tab"
 
-#: ../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/e-mail-reader.c:2222
+msgid "Switch to _previous tab"
+msgstr "Switch to _previous tab"
 
-#: ../mail/mail.error.xml.h:12
-msgid ""
-"The contact list you are sending to is configured to hide list recipients.\n"
-"\n"
-"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 in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
-msgstr ""
-"The contact list you are sending to is configured to hide list recipients.\n"
-"\n"
-"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 in "
-"your message. To avoid this, you should add at least one To: or Cc: "
-"recipient. "
+#: ../mail/e-mail-reader.c:2224
+msgid "Switch to the previous tab"
+msgstr "Switch to the previous tab"
 
-#: ../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/e-mail-reader.c:2229
+msgid "Cl_ose current tab"
+msgstr "Cl_ose current tab"
 
-#: ../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/e-mail-reader.c:2231
+msgid "Close current tab"
+msgstr "Close current tab"
 
-#: ../mail/mail.error.xml.h:17
-msgid ""
-"The following recipient was not recognized as a valid mail address:\n"
-"{0}"
-msgstr ""
-"The following recipient was not recognised as a valid mail address:\n"
-"{0}"
+#: ../mail/e-mail-reader.c:2236
+msgid "_Next Message"
+msgstr "_Next Message"
 
-#: ../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/e-mail-reader.c:2238
+msgid "Display the next message"
+msgstr "Display the next message"
 
-#: ../mail/mail.error.xml.h:20
-msgid ""
-"The following recipients were not recognized as valid mail addresses:\n"
-"{0}"
-msgstr ""
-"The following recipients were not recognised as valid mail addresses:\n"
-"{0}"
+#: ../mail/e-mail-reader.c:2243
+msgid "Next _Important Message"
+msgstr "Next _Important Message"
 
-#: ../mail/mail.error.xml.h:22
-msgid "Send private reply?"
-msgstr "Send private reply?"
+#: ../mail/e-mail-reader.c:2245
+msgid "Display the next important message"
+msgstr "Display the next important message"
 
-#: ../mail/mail.error.xml.h:23
-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?"
-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?"
+#: ../mail/e-mail-reader.c:2250
+msgid "Next _Thread"
+msgstr "Next _Thread"
 
-#: ../mail/mail.error.xml.h:24
-msgid "Reply _Privately"
-msgstr "Reply _Privately"
+#: ../mail/e-mail-reader.c:2252
+msgid "Display the next thread"
+msgstr "Display the next thread"
 
-#: ../mail/mail.error.xml.h:26
-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/e-mail-reader.c:2257
+msgid "Next _Unread Message"
+msgstr "Next _Unread Message"
 
-#: ../mail/mail.error.xml.h:28
-msgid "Send reply to all recipients?"
-msgstr "Send reply to all recipients?"
+#: ../mail/e-mail-reader.c:2259
+msgid "Display the next unread message"
+msgstr "Display the next unread message"
 
-#: ../mail/mail.error.xml.h:29
-msgid ""
-"You are replying to a message which was sent to many recipients. Are you "
-"sure you want to reply to ALL of them?"
-msgstr ""
-"You are replying to a message which was sent to many recipients. Are you "
-"sure you want to reply to ALL of them?"
+#: ../mail/e-mail-reader.c:2264
+msgid "_Previous Message"
+msgstr "_Previous Message"
 
-#: ../mail/mail.error.xml.h:30
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
-msgstr ""
-"This message cannot be sent because you have not specified any recipients"
+#: ../mail/e-mail-reader.c:2266
+msgid "Display the previous message"
+msgstr "Display the previous message"
 
-#: ../mail/mail.error.xml.h:31
-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/e-mail-reader.c:2271
+msgid "Pr_evious Important Message"
+msgstr "Pr_evious Important Message"
 
-#: ../mail/mail.error.xml.h:32
-msgid "Use default drafts folder?"
-msgstr "Use default drafts folder?"
+#: ../mail/e-mail-reader.c:2273
+msgid "Display the previous important message"
+msgstr "Display the previous important message"
 
-#: ../mail/mail.error.xml.h:33
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-
-#: ../mail/mail.error.xml.h:34
-msgid "Use _Default"
-msgstr "Use _Default"
+#: ../mail/e-mail-reader.c:2278
+msgid "Previous T_hread"
+msgstr "Previous T_hread"
 
-#: ../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/e-mail-reader.c:2280
+msgid "Display the previous thread"
+msgstr "Display the previous thread"
 
-#: ../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/e-mail-reader.c:2285
+msgid "P_revious Unread Message"
+msgstr "P_revious Unread Message"
 
-#: ../mail/mail.error.xml.h:37
-msgid "_Expunge"
-msgstr "_Expunge"
+#: ../mail/e-mail-reader.c:2287
+msgid "Display the previous unread message"
+msgstr "Display the previous unread message"
 
-#: ../mail/mail.error.xml.h:38
-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/e-mail-reader.c:2294
+msgid "Print this message"
+msgstr "Print this message"
 
-#: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
-msgid "_Empty Trash"
-msgstr "_Empty Wastebasket"
+#: ../mail/e-mail-reader.c:2301
+msgid "Preview the message to be printed"
+msgstr "Preview the message to be printed"
 
-#: ../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/e-mail-reader.c:2306
+msgid "Re_direct"
+msgstr "Re_direct"
 
-#: ../mail/mail.error.xml.h:41
-msgid "_Open Messages"
-msgstr "_Open Messages"
+#: ../mail/e-mail-reader.c:2308
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Redirect (bounce) the selected message to someone"
 
-#: ../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/e-mail-reader.c:2313
+msgid "Remo_ve Attachments"
+msgstr "Remo_ve Attachments"
 
-#: ../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."
+#: ../mail/e-mail-reader.c:2315
+msgid "Remove attachments"
+msgstr "Remove attachments"
 
-#. 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/e-mail-reader.c:2320
+msgid "Remove Du_plicate Messages"
+msgstr "Remove Du_plicate Messages"
 
-#: ../mail/mail.error.xml.h:48
-msgid "Error while performing operation."
-msgstr "Error while performing operation."
+#: ../mail/e-mail-reader.c:2322
+msgid "Checks selected messages for duplicates"
+msgstr "Checks selected messages for duplicates"
 
-#: ../mail/mail.error.xml.h:49
-msgid "Enter password."
-msgstr "Enter password."
+#: ../mail/e-mail-reader.c:2327 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/mail/e-mail-attachment-handler.c:196
+msgid "Reply to _All"
+msgstr "Reply to _All"
 
-#: ../mail/mail.error.xml.h:50
-msgid "Error loading filter definitions."
-msgstr "Error loading filter definitions."
+#: ../mail/e-mail-reader.c:2329
+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/mail.error.xml.h:51
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Cannot save to directory \"{0}\"."
+#: ../mail/e-mail-reader.c:2334 ../mail/mail.error.xml.h:25
+msgid "Reply to _List"
+msgstr "Reply to _List"
 
-#: ../mail/mail.error.xml.h:52
-msgid "Cannot save to file \"{0}\"."
-msgstr "Cannot save to file \"{0}\"."
+#: ../mail/e-mail-reader.c:2336
+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/mail.error.xml.h:53
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Cannot create the save directory, because \"{1}\""
+#: ../mail/e-mail-reader.c:2341
+#: ../modules/mail/e-mail-attachment-handler.c:203
+msgid "_Reply to Sender"
+msgstr "_Reply to Sender"
 
-#: ../mail/mail.error.xml.h:54
-msgid "Cannot create temporary save directory."
-msgstr "Cannot create temporary save directory."
+#: ../mail/e-mail-reader.c:2343
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Compose a reply to the sender of the selected message"
 
-#: ../mail/mail.error.xml.h:55
-msgid "File exists but cannot overwrite it."
-msgstr "File exists but cannot overwrite it."
+#: ../mail/e-mail-reader.c:2348
+msgid "_Save as mbox..."
+msgstr "_Save as mbox…"
 
-#: ../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/e-mail-reader.c:2350
+msgid "Save selected messages as an mbox file"
+msgstr "Save selected messages as an mbox file"
 
-#: ../mail/mail.error.xml.h:57
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Cannot delete folder \"{0}\"."
+#: ../mail/e-mail-reader.c:2355
+msgid "_Message Source"
+msgstr "_Message Source"
 
-#: ../mail/mail.error.xml.h:58
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Cannot delete system folder \"{0}\"."
+#: ../mail/e-mail-reader.c:2357
+msgid "Show the raw email source of the message"
+msgstr "Show the raw e-mail source of the message"
 
-#: ../mail/mail.error.xml.h:59
-msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
-msgstr ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+#: ../mail/e-mail-reader.c:2369
+msgid "_Undelete Message"
+msgstr "_Undelete Message"
 
-#: ../mail/mail.error.xml.h:60
-msgid "Failed to expunge folder &quot;{0}&quot;."
-msgstr "Failed to expunge folder &quot;{0}&quot;."
+#: ../mail/e-mail-reader.c:2371
+msgid "Undelete the selected messages"
+msgstr "Undelete the selected messages"
 
-#: ../mail/mail.error.xml.h:62
-msgid "Failed to refresh folder &quot;{0}&quot;."
-msgstr "Failed to refresh folder &quot;{0}&quot;."
+#: ../mail/e-mail-reader.c:2376
+msgid "_Normal Size"
+msgstr "_Normal Size"
 
-#: ../mail/mail.error.xml.h:63
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Cannot rename or move system folder \"{0}\"."
+#: ../mail/e-mail-reader.c:2378
+msgid "Reset the text to its original size"
+msgstr "Reset the text to its original size"
 
-#: ../mail/mail.error.xml.h:64
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Really delete folder \"{0}\" and all of its subfolders?"
+#: ../mail/e-mail-reader.c:2383
+msgid "_Zoom In"
+msgstr "_Zoom In"
 
-#: ../mail/mail.error.xml.h:65
-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/e-mail-reader.c:2385
+msgid "Increase the text size"
+msgstr "Increase the text size"
 
-#: ../mail/mail.error.xml.h:67
-msgid "Really delete folder \"{0}\"?"
-msgstr "Really delete folder \"{0}\"?"
+#: ../mail/e-mail-reader.c:2390
+msgid "Zoom _Out"
+msgstr "Zoom _Out"
 
-#: ../mail/mail.error.xml.h:68
-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/e-mail-reader.c:2392
+msgid "Decrease the text size"
+msgstr "Decrease the text size"
 
-#: ../mail/mail.error.xml.h:69
-msgid "These messages are not copies."
-msgstr "These messages are not copies."
+#: ../mail/e-mail-reader.c:2399
+msgid "Cre_ate"
+msgstr "Cre_ate"
 
-#: ../mail/mail.error.xml.h:70
-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?"
-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?"
+#: ../mail/e-mail-reader.c:2406
+msgid "Ch_aracter Encoding"
+msgstr "Ch_aracter Encoding"
 
-#: ../mail/mail.error.xml.h:71
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Cannot rename \"{0}\" to \"{1}\"."
+#: ../mail/e-mail-reader.c:2413
+msgid "F_orward As"
+msgstr "F_orward As"
 
-#: ../mail/mail.error.xml.h:72
-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/e-mail-reader.c:2420
+msgid "_Group Reply"
+msgstr "_Group Reply"
 
-#: ../mail/mail.error.xml.h:73
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Cannot move folder \"{0}\" to \"{1}\"."
+#: ../mail/e-mail-reader.c:2427
+msgid "_Go To"
+msgstr "_Go To"
 
-#: ../mail/mail.error.xml.h:74
-msgid "Cannot open source \"{2}\"."
-msgstr "Cannot open source \"{2}\"."
+#: ../mail/e-mail-reader.c:2434
+msgid "Mar_k As"
+msgstr "Mar_k As"
 
-#: ../mail/mail.error.xml.h:75
-msgid "Cannot open target \"{2}\"."
-msgstr "Cannot open target \"{2}\"."
+#: ../mail/e-mail-reader.c:2441
+msgid "_Message"
+msgstr "_Message"
 
-#: ../mail/mail.error.xml.h:76
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
+#: ../mail/e-mail-reader.c:2448
+msgid "_Zoom"
+msgstr "_Zoom"
 
-#: ../mail/mail.error.xml.h:77
-msgid "Cannot create folder \"{0}\"."
-msgstr "Cannot create folder \"{0}\"."
+#: ../mail/e-mail-reader.c:2458
+msgid "Create a Search Folder from Mailing _List..."
+msgstr "Create a Search Folder from Mailing _List…"
 
-#: ../mail/mail.error.xml.h:78
-msgid "Cannot open source \"{1}\"."
-msgstr "Cannot open source \"{1}\"."
+#: ../mail/e-mail-reader.c:2460
+msgid "Create a search folder for this mailing list"
+msgstr "Create a search folder for this mailing list"
 
-#: ../mail/mail.error.xml.h:79
-msgid "Cannot save changes to account."
-msgstr "Cannot save changes to account."
+#: ../mail/e-mail-reader.c:2465
+msgid "Create a Search Folder from Recipien_ts..."
+msgstr "Create a Search Folder from Recipien_ts…"
 
-#: ../mail/mail.error.xml.h:80
-msgid "You have not filled in all of the required information."
-msgstr "You have not filled in all of the required information."
+#: ../mail/e-mail-reader.c:2467
+msgid "Create a search folder for these recipients"
+msgstr "Create a search folder for these recipients"
 
-#: ../mail/mail.error.xml.h:81
-msgid "You may not create two accounts with the same name."
-msgstr "You may not create two accounts with the same name."
+#: ../mail/e-mail-reader.c:2472
+msgid "Create a Search Folder from Sen_der..."
+msgstr "Create a Search Folder from Sen_der…"
 
-#: ../mail/mail.error.xml.h:82
-msgid "Are you sure you want to delete this account?"
-msgstr "Are you sure you want to delete this account?"
+#: ../mail/e-mail-reader.c:2474
+msgid "Create a search folder for this sender"
+msgstr "Create a search folder for this sender"
 
-#: ../mail/mail.error.xml.h:83
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr "If you proceed, the account information will be deleted permanently."
+#: ../mail/e-mail-reader.c:2479
+msgid "Create a Search Folder from S_ubject..."
+msgstr "Create a Search Folder from S_ubject…"
 
-#: ../mail/mail.error.xml.h:84
-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/e-mail-reader.c:2481
+msgid "Create a search folder for this subject"
+msgstr "Create a search folder for this subject"
 
-#: ../mail/mail.error.xml.h:85
-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/e-mail-reader.c:2504
+msgid "Mark for Follo_w Up..."
+msgstr "Mark for Follo_w Up…"
 
-#: ../mail/mail.error.xml.h:87
-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/e-mail-reader.c:2512
+msgid "Mark as _Important"
+msgstr "Mark as _Important"
 
-#: ../mail/mail.error.xml.h:88
-msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "If you proceed, all proxy accounts will be deleted permanently."
+#: ../mail/e-mail-reader.c:2516
+msgid "Mark as _Junk"
+msgstr "Mark as _Junk"
 
-#: ../mail/mail.error.xml.h:89
-msgid "Do _Not Disable"
-msgstr "Do _Not Disable"
+#: ../mail/e-mail-reader.c:2520
+msgid "Mark as _Not Junk"
+msgstr "Mark as _Not Junk"
 
-#: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:626
-msgid "_Disable"
-msgstr "_Disable"
+#: ../mail/e-mail-reader.c:2524
+msgid "Mar_k as Read"
+msgstr "Mar_k as Read"
 
-#: ../mail/mail.error.xml.h:91
-msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr "Cannot edit Search Folder \"{0}\" as it does not exist."
+#: ../mail/e-mail-reader.c:2528
+msgid "Mark as Uni_mportant"
+msgstr "Mark as Uni_mportant"
 
-#: ../mail/mail.error.xml.h:92
-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/e-mail-reader.c:2532
+msgid "Mark as _Unread"
+msgstr "Mark as _Unread"
 
-#: ../mail/mail.error.xml.h:94
-msgid "Cannot add Search Folder \"{0}\"."
-msgstr "Cannot add Search Folder \"{0}\"."
+#: ../mail/e-mail-reader.c:2576
+msgid "_Caret Mode"
+msgstr "_Caret Mode"
 
-#: ../mail/mail.error.xml.h:95
-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/e-mail-reader.c:2578
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Show a blinking cursor in the body of displayed messages"
 
-#: ../mail/mail.error.xml.h:96
-msgid "Search Folders automatically updated."
-msgstr "Search Folders automatically updated."
+#: ../mail/e-mail-reader.c:2584
+msgid "All Message _Headers"
+msgstr "All Message _Headers"
 
-#: ../mail/mail.error.xml.h:97
-msgid "Mail filters automatically updated."
-msgstr "Mail filters automatically updated."
+#: ../mail/e-mail-reader.c:2586
+msgid "Show messages with all email headers"
+msgstr "Show messages with all e-mail headers"
 
-#: ../mail/mail.error.xml.h:98
-msgid "Missing folder."
-msgstr "Missing folder."
+#: ../mail/e-mail-reader.c:2920
+msgid "Retrieving message"
+msgstr "Retrieving message"
 
-#: ../mail/mail.error.xml.h:99
-msgid "You must specify a folder."
-msgstr "You must specify a folder."
+#: ../mail/e-mail-reader.c:3900
+#: ../modules/mail/e-mail-attachment-handler.c:189
+msgid "_Forward"
+msgstr "_Forward"
 
-#: ../mail/mail.error.xml.h:101
-msgid "You must name this Search Folder."
-msgstr "You must name this Search Folder."
+#: ../mail/e-mail-reader.c:3901
+msgid "Forward the selected message to someone"
+msgstr "Forward the selected message to someone"
 
-#: ../mail/mail.error.xml.h:102
-msgid "No sources selected."
-msgstr "No sources selected."
+#: ../mail/e-mail-reader.c:3920
+msgid "Group Reply"
+msgstr "Group Reply"
 
-#: ../mail/mail.error.xml.h:103
-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."
+#: ../mail/e-mail-reader.c:3921
+msgid "Reply to the mailing list, or to all recipients"
+msgstr "Reply to the mailing list, or to all recipients"
 
-#: ../mail/mail.error.xml.h:105
-msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "Problem migrating old mail folder \"{0}\"."
+#: ../mail/e-mail-reader.c:3987 ../mail/em-filter-i18n.h:15
+msgid "Delete"
+msgstr "Delete"
 
-#: ../mail/mail.error.xml.h:106
-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/e-mail-reader.c:4020
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+msgid "Next"
+msgstr "Next"
 
-#: ../mail/mail.error.xml.h:109
-msgid "Ignore"
-msgstr "Ignore"
+#: ../mail/e-mail-reader.c:4024
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
+msgid "Previous"
+msgstr "Previous"
 
-#: ../mail/mail.error.xml.h:110
-msgid "_Overwrite"
-msgstr "_Overwrite"
+#: ../mail/e-mail-reader.c:4033 ../mail/mail-dialogs.ui.h:15
+msgid "Reply"
+msgstr "Reply"
 
-#: ../mail/mail.error.xml.h:111
-msgid "_Append"
-msgstr "_Append"
+#: ../mail/e-mail-reader.c:4751
+#, c-format
+msgid "Folder '%s'"
+msgstr "Folder '%s'"
 
-#: ../mail/mail.error.xml.h:112
-msgid "Evolution's local mail format has changed."
-msgstr "Evolution's local mail format has changed."
+#: ../mail/e-mail-reader-utils.c:161
+msgid "Do not warn me again"
+msgstr "Do not warn me again"
 
-#: ../mail/mail.error.xml.h:113
-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/e-mail-reader-utils.c:962
+msgid "Printing"
+msgstr "Printing"
 
-#: ../mail/mail.error.xml.h:116
-msgid "_Exit Evolution"
-msgstr "_Exit Evolution"
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:1149
+#, 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/mail.error.xml.h:117
-msgid "_Migrate Now"
-msgstr "_Migrate Now"
+#: ../mail/e-mail-reader-utils.c:1614
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "Save Message"
+msgstr[1] "Save Messages"
 
-#: ../mail/mail.error.xml.h:118
-msgid "Unable to read license file."
-msgstr "Unable to read licence file."
+#. 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:1635
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "Message"
+msgstr[1] "Messages"
 
-#: ../mail/mail.error.xml.h:119
-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/e-mail-reader-utils.c:2089
+msgid "Parsing message"
+msgstr "Parsing message"
 
-#: ../mail/mail.error.xml.h:120
-msgid "Please wait."
-msgstr "Please wait."
+#: ../mail/e-mail-request.c:181
+#, c-format
+msgid "Failed to load part '%s'"
+msgstr "Failed to load part '%s'"
 
-#: ../mail/mail.error.xml.h:121
-msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "Querying server for a list of supported authentication mechanisms."
+#: ../mail/e-mail-tag-editor.c:238
+msgid "Flag to Follow Up"
+msgstr "Flag to Follow Up"
 
-#: ../mail/mail.error.xml.h:122
+#. Note to translators: this is the attribution string used
+#. * when quoting messages.  Each ${Variable} gets replaced
+#. * with a value.  To see a full list of available variables,
+#. * see mail/em-composer-utils.c:attribvars array.
+#: ../mail/em-composer-utils.c:1279
 msgid ""
-"Failed to query server for a list of supported authentication mechanisms."
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
 msgstr ""
-"Failed to query server for a list of supported authentication mechanisms."
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
 
-#: ../mail/mail.error.xml.h:123
-msgid "Synchronize folders locally for offline usage?"
-msgstr "Synchronise folders locally for offline usage?"
+#: ../mail/em-composer-utils.c:1285
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Forwarded Message --------"
 
-#: ../mail/mail.error.xml.h:124
-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/em-composer-utils.c:1290
+msgid "-----Original Message-----"
+msgstr "-----Original Message-----"
 
-#: ../mail/mail.error.xml.h:125
-msgid "Do _Not Synchronize"
-msgstr "Do _Not Synchronise"
+#: ../mail/em-composer-utils.c:2685
+msgid "an unknown sender"
+msgstr "an unknown sender"
 
-#: ../mail/mail.error.xml.h:126
-msgid "_Synchronize"
-msgstr "_Synchronise"
+#: ../mail/em-composer-utils.c:3104
+msgid "Posting destination"
+msgstr "Posting destination"
 
-#: ../mail/mail.error.xml.h:127
-msgid "Do you want to mark all messages as read?"
-msgstr "Do you want to mark all messages as read?"
+#: ../mail/em-composer-utils.c:3105
+msgid "Choose folders to post the message to."
+msgstr "Choose folders to post the message to."
 
-#: ../mail/mail.error.xml.h:128
-msgid "This will mark all messages as read in the selected folder."
-msgstr "This will mark all messages as read in the selected folder."
+#: ../mail/em-filter-editor-folder-element.c:157
+msgid "Select Folder"
+msgstr "Select Folder"
 
-#: ../mail/mail.error.xml.h:129
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
-msgstr ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
+#. Automatically generated. Do not edit.
+#: ../mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Adjust Score"
 
-#: ../mail/mail.error.xml.h:130
-msgid "Close message window."
-msgstr "Close message window."
+#: ../mail/em-filter-i18n.h:3
+msgid "Any header"
+msgstr "Any header"
 
-#: ../mail/mail.error.xml.h:131
-msgid "Would you like to close the message window?"
-msgstr "Would you like to close the message window?"
+#: ../mail/em-filter-i18n.h:4
+msgid "Assign Color"
+msgstr "Assign Colour"
 
-#: ../mail/mail.error.xml.h:132
-msgid "_Yes"
-msgstr "_Yes"
+#: ../mail/em-filter-i18n.h:5
+msgid "Assign Score"
+msgstr "Assign Score"
 
-#: ../mail/mail.error.xml.h:133
-msgid "_No"
-msgstr "_No"
+#: ../mail/em-filter-i18n.h:7
+msgid "BCC"
+msgstr "BCC"
 
-#: ../mail/mail.error.xml.h:134
-msgid "_Always"
-msgstr "_Always"
+#: ../mail/em-filter-i18n.h:8
+msgid "Beep"
+msgstr "Beep"
 
-#: ../mail/mail.error.xml.h:135
-msgid "N_ever"
-msgstr "N_ever"
+#: ../mail/em-filter-i18n.h:9
+msgid "CC"
+msgstr "CC"
 
-#: ../mail/mail.error.xml.h:136
-msgid "Copy folder in folder tree."
-msgstr "Copy folder in folder tree."
+#: ../mail/em-filter-i18n.h:10
+msgid "Completed On"
+msgstr "Completed On"
 
-#: ../mail/mail.error.xml.h:137
-msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
-msgstr "Are you sure you want to copy folder '{0}' to folder '{1}'?"
+#: ../mail/em-filter-i18n.h:13
+msgid "Date received"
+msgstr "Date received"
 
-#: ../mail/mail.error.xml.h:138
-msgid "Move folder in folder tree."
-msgstr "Move folder in folder tree."
+#: ../mail/em-filter-i18n.h:14
+msgid "Date sent"
+msgstr "Date sent"
 
-#: ../mail/mail.error.xml.h:139
-msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
-msgstr "Are you sure you want to to move folder '{0}' to folder '{1}'?"
+#: ../mail/em-filter-i18n.h:16
+msgid "Deleted"
+msgstr "Deleted"
 
-#: ../mail/mail.error.xml.h:140
-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"
+#: ../mail/em-filter-i18n.h:18
+msgid "does not end with"
+msgstr "does not end with"
 
-#  mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:141
-msgid "Please enable the account or send using another account."
-msgstr "Please enable the account or send using another account."
+#: ../mail/em-filter-i18n.h:19
+msgid "does not exist"
+msgstr "does not exist"
 
-#: ../mail/mail.error.xml.h:142
-msgid "Mail Deletion Failed"
-msgstr "Mail Deletion Failed"
+#: ../mail/em-filter-i18n.h:20
+msgid "does not have words"
+msgstr "does not have words"
 
-#: ../mail/mail.error.xml.h:143
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "You do not have sufficient permissions to delete this mail."
+#: ../mail/em-filter-i18n.h:21
+msgid "does not return"
+msgstr "does not return"
 
-#: ../mail/mail.error.xml.h:144
-msgid "\"Check Junk\" Failed"
-msgstr "\"Check Junk\" Failed"
+#: ../mail/em-filter-i18n.h:22
+msgid "does not sound like"
+msgstr "does not sound like"
 
-#: ../mail/mail.error.xml.h:145
-msgid "\"Report Junk\" Failed"
-msgstr "\"Report Junk\" Failed"
+#: ../mail/em-filter-i18n.h:23
+msgid "does not start with"
+msgstr "does not start with"
 
-#: ../mail/mail.error.xml.h:146
-msgid "\"Report Not Junk\" Failed"
-msgstr "\"Report Not Junk\" Failed"
+#: ../mail/em-filter-i18n.h:25
+msgid "Draft"
+msgstr "Draft"
 
-#: ../mail/mail.error.xml.h:147
-msgid "Remove duplicate messages?"
-msgstr "Remove duplicate messages?"
+#: ../mail/em-filter-i18n.h:26
+msgid "ends with"
+msgstr "ends with"
 
-#: ../mail/mail.error.xml.h:148
-msgid "No duplicate messages found."
-msgstr "No duplicate messages found."
+#: ../mail/em-filter-i18n.h:28
+msgid "exists"
+msgstr "exists"
 
-#. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:150
-msgid "Folder '{0}' doesn't contain any duplicate message."
-msgstr "Folder '{0}' doesn't contain any duplicate messages."
+#: ../mail/em-filter-i18n.h:29
+msgid "Expression"
+msgstr "Expression"
 
-#: ../mail/mail.error.xml.h:151
-msgid "Failed to disconnect account &quot;{0}&quot;."
-msgstr "Failed to disconnect account &quot;{0}&quot;."
+#: ../mail/em-filter-i18n.h:30
+msgid "Follow Up"
+msgstr "Follow Up"
 
-#: ../mail/mail.error.xml.h:153
-msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
-msgstr "Failed to unsubscribe from folder &quot;{0}&quot;."
+#: ../mail/em-filter-i18n.h:31
+msgid "Forward to"
+msgstr "Forward to"
 
-#: ../mail/mail.error.xml.h:154
-msgid "Unable to retrieve message."
-msgstr "Unable to retrieve message."
+#: ../mail/em-filter-i18n.h:32
+msgid "has words"
+msgstr "has words"
 
-#: ../mail/mail.error.xml.h:155
-msgid "{0}"
-msgstr "{0}"
+#: ../mail/em-filter-i18n.h:33
+msgid "Important"
+msgstr "Important"
 
-#: ../mail/mail.error.xml.h:156
-msgid "Failed to open folder."
-msgstr "Failed to open folder."
+#: ../mail/em-filter-i18n.h:35
+msgid "is after"
+msgstr "is after"
 
-#: ../mail/mail.error.xml.h:157
-msgid "Failed to find duplicate messages."
-msgstr "Failed to find duplicate messages."
+#: ../mail/em-filter-i18n.h:36
+msgid "is before"
+msgstr "is before"
 
-#: ../mail/mail.error.xml.h:158
-msgid "Failed to retrieve messages."
-msgstr "Failed to retrieve messages."
+#: ../mail/em-filter-i18n.h:37
+msgid "is Flagged"
+msgstr "is Flagged"
 
-#: ../mail/mail.error.xml.h:159
-msgid "Failed to remove attachments from messages."
-msgstr "Failed to remove attachments from messages."
+#: ../mail/em-filter-i18n.h:41
+msgid "is not Flagged"
+msgstr "is not Flagged"
 
-#: ../mail/mail.error.xml.h:160
-msgid "Failed to download messages for offline viewing."
-msgstr "Failed to download messages for offline viewing."
+#: ../mail/em-filter-i18n.h:42
+msgid "is not set"
+msgstr "is not set"
 
-#: ../mail/mail.error.xml.h:161
-msgid "Failed to save messages to disk."
-msgstr "Failed to save messages to disk."
+#: ../mail/em-filter-i18n.h:43
+msgid "is set"
+msgstr "is set"
 
-#: ../mail/mail.error.xml.h:162
-msgid "Hidden file is attached."
-msgstr "Hidden file is attached."
+#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:109
+msgid "Junk"
+msgstr "Junk"
 
-#: ../mail/mail.error.xml.h:163
-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."
+#: ../mail/em-filter-i18n.h:45
+msgid "Junk Test"
+msgstr "Junk Test"
 
-#: ../mail/mail.error.xml.h:164
-msgid "Printing failed."
-msgstr "Printing failed."
+#: ../mail/em-filter-i18n.h:46
+msgid "Label"
+msgstr "Label"
 
-#: ../mail/mail.error.xml.h:165
-msgid "The printer replied &quot;{0}&quot;."
-msgstr "The printer replied &quot;{0}&quot;."
+#: ../mail/em-filter-i18n.h:47
+msgid "Mailing list"
+msgstr "Mailing list"
 
-#: ../mail/mail.error.xml.h:166
-msgid "Could not perform this operation on {0}."
-msgstr "Could not perform this operation on {0}."
+#: ../mail/em-filter-i18n.h:48
+msgid "Match All"
+msgstr "Match All"
 
-#: ../mail/mail-send-recv.c:203
-msgid "Canceling..."
-msgstr "Cancelling…"
+#: ../mail/em-filter-i18n.h:49
+msgid "Message Body"
+msgstr "Message Body"
 
-#: ../mail/mail-send-recv.c:547
-msgid "Send & Receive Mail"
-msgstr "Send & Receive Mail"
+#: ../mail/em-filter-i18n.h:50
+msgid "Message Header"
+msgstr "Message Header"
 
-#: ../mail/mail-send-recv.c:563
-msgid "Cancel _All"
-msgstr "Cancel _All"
+#: ../mail/em-filter-i18n.h:51
+msgid "Message is Junk"
+msgstr "Message is Junk"
 
-#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:1040
-msgid "Updating..."
-msgstr "Updating…"
+#: ../mail/em-filter-i18n.h:52
+msgid "Message is not Junk"
+msgstr "Message is not Junk"
 
-#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:737
-msgid "Waiting..."
-msgstr "Waiting…"
+#: ../mail/em-filter-i18n.h:53
+msgid "Message Location"
+msgstr "Message Location"
 
-#: ../mail/mail-send-recv.c:1020
-#, c-format
-msgid "Checking for new mail"
-msgstr "Checking for new mail"
+#: ../mail/em-filter-i18n.h:55
+msgid "Pipe to Program"
+msgstr "Pipe to Program"
 
-#: ../mail/mail-vfolder-ui.c:79
-msgid "Search Folders"
-msgstr "Search Folders"
+#: ../mail/em-filter-i18n.h:56
+msgid "Play Sound"
+msgstr "Play Sound"
 
-#: ../mail/mail-vfolder-ui.c:159
-msgid "Edit Search Folder"
-msgstr "Edit Search Folder"
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:57 ../mail/mail-dialogs.ui.h:14
+msgid "Read"
+msgstr "Read"
 
-#: ../mail/mail-vfolder-ui.c:280
-msgid "New Search Folder"
-msgstr "New Search Folder"
+#: ../mail/em-filter-i18n.h:58 ../mail/message-list.etspec.h:16
+msgid "Recipients"
+msgstr "Recipients"
 
-#: ../mail/message-list.c:1262
-msgid "Unseen"
-msgstr "Unseen"
+#: ../mail/em-filter-i18n.h:59
+msgid "Regex Match"
+msgstr "Regex Match"
 
-#: ../mail/message-list.c:1263
-msgid "Seen"
-msgstr "Seen"
+#: ../mail/em-filter-i18n.h:60
+msgid "Replied to"
+msgstr "Replied to"
 
-#: ../mail/message-list.c:1264
-msgid "Answered"
-msgstr "Answered"
+#: ../mail/em-filter-i18n.h:61
+msgid "returns"
+msgstr "returns"
 
-#: ../mail/message-list.c:1265
-msgid "Forwarded"
-msgstr "Forwarded"
+#: ../mail/em-filter-i18n.h:62
+msgid "returns greater than"
+msgstr "returns greater than"
 
-#: ../mail/message-list.c:1266
-msgid "Multiple Unseen Messages"
-msgstr "Multiple Unseen Messages"
+#: ../mail/em-filter-i18n.h:63
+msgid "returns less than"
+msgstr "returns less than"
 
-#: ../mail/message-list.c:1267
-msgid "Multiple Messages"
-msgstr "Multiple Messages"
+#: ../mail/em-filter-i18n.h:64
+msgid "Run Program"
+msgstr "Run Program"
 
-#: ../mail/message-list.c:1271
-msgid "Lowest"
-msgstr "Lowest"
+#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:3
+msgid "Score"
+msgstr "Score"
 
-#: ../mail/message-list.c:1272
-msgid "Lower"
-msgstr "Lower"
+#: ../mail/em-filter-i18n.h:66 ../mail/message-list.etspec.h:15
+msgid "Sender"
+msgstr "Sender"
 
-#: ../mail/message-list.c:1276
-msgid "Higher"
-msgstr "Higher"
+#: ../mail/em-filter-i18n.h:67
+msgid "Sender or Recipients"
+msgstr "Sender or Recipients"
 
-#: ../mail/message-list.c:1277
-msgid "Highest"
-msgstr "Highest"
+#: ../mail/em-filter-i18n.h:68
+msgid "Set Label"
+msgstr "Set Label"
 
-#: ../mail/message-list.c:1900 ../widgets/table/e-cell-date.c:51
-msgid "?"
-msgstr "?"
+#: ../mail/em-filter-i18n.h:69
+msgid "Set Status"
+msgstr "Set Status"
 
-#. strftime format of a time,
-#. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1907 ../modules/itip-formatter/itip-view.c:249
-msgid "Today %l:%M %p"
-msgstr "Today %l:%M %p"
+#: ../mail/em-filter-i18n.h:70
+msgid "Size (kB)"
+msgstr "Size (kB)"
 
-#: ../mail/message-list.c:1916
-msgid "Yesterday %l:%M %p"
-msgstr "Yesterday %l:%M %p"
+#: ../mail/em-filter-i18n.h:71
+msgid "sounds like"
+msgstr "sounds like"
 
-#: ../mail/message-list.c:1928
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#: ../mail/em-filter-i18n.h:72
+msgid "Source Account"
+msgstr "Source Account"
 
-#: ../mail/message-list.c:1936
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %l:%M %p"
+#: ../mail/em-filter-i18n.h:73
+msgid "Specific header"
+msgstr "Specific header"
 
-#: ../mail/message-list.c:1938
-msgid "%b %d %Y"
-msgstr "%d %b %Y"
+#: ../mail/em-filter-i18n.h:74
+msgid "starts with"
+msgstr "starts with"
 
-#: ../mail/message-list.c:2769
-msgid "Select all visible messages"
-msgstr "Select all visible messages"
+#: ../mail/em-filter-i18n.h:76
+msgid "Stop Processing"
+msgstr "Stop Processing"
 
-#: ../mail/message-list.c:2907 ../mail/message-list.etspec.h:17
-msgid "Messages"
-msgstr "Messages"
+#: ../mail/em-filter-i18n.h:79
+msgid "Unset Color"
+msgstr "Unset Colour"
 
-#. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4132
-msgid "Follow-up"
-msgstr "Follow-up"
+#: ../mail/em-filter-i18n.h:80
+msgid "Unset Status"
+msgstr "Unset Status"
 
-#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4634 ../mail/message-list.c:5038
-msgid "Generating message list"
-msgstr "Generating message list"
+#. and now for the action area
+#: ../mail/em-filter-rule.c:583
+msgid "Then"
+msgstr "Then"
 
-#: ../mail/message-list.c:4868
-msgid ""
-"No message satisfies your search criteria. Change search criteria by "
-"selecting a new Show message filter from the drop down list above or by "
-"running a new search either by clearing it with Search->Clear menu item or "
-"by changing the query above."
-msgstr ""
-"No message satisfies your search criteria. Change search criteria by "
-"selecting a new Show message filter from the drop down list above or by "
-"running a new search either by clearing it with Search->Clear menu item or "
-"by changing the query above."
+#: ../mail/em-filter-rule.c:648
+msgid "Add Ac_tion"
+msgstr "Add Ac_tion"
 
-#: ../mail/message-list.c:4873
-msgid "There are no messages in this folder."
-msgstr "There are no messages in this folder."
+#: ../mail/em-folder-properties.c:145
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] "Unread messages:"
+msgstr[1] "Unread messages:"
 
-#: ../mail/message-list.etspec.h:2
-msgid "Flagged"
-msgstr "Flagged"
+#: ../mail/em-folder-properties.c:156
+msgid "Total messages:"
+msgid_plural "Total messages:"
+msgstr[0] "Total messages:"
+msgstr[1] "Total messages:"
 
-#: ../mail/message-list.etspec.h:8
-msgid "Received"
-msgstr "Received"
+#: ../mail/em-folder-properties.c:177
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Quota usage (%s):"
 
-#: ../mail/message-list.etspec.h:11
-msgid "Flag Status"
-msgstr "Flag Status"
+#: ../mail/em-folder-properties.c:179
+#, c-format
+msgid "Quota usage"
+msgstr "Quota usage"
 
-#: ../mail/message-list.etspec.h:12
-msgid "Follow Up Flag"
-msgstr "Follow Up Flag"
+#: ../mail/em-folder-properties.c:341
+msgid "Folder Properties"
+msgstr "Folder Properties"
 
-#: ../mail/message-list.etspec.h:13
-msgid "Due By"
-msgstr "Due By"
+#: ../mail/em-folder-selection-button.c:80
+msgid "<click here to select a folder>"
+msgstr "<click here to select a folder>"
 
-#: ../mail/message-list.etspec.h:18
-msgid "Sent Messages"
-msgstr "Sent Messages"
+#: ../mail/em-folder-selector.c:390
+msgid "C_reate"
+msgstr "C_reate"
 
-#: ../mail/message-list.etspec.h:20
-msgid "Subject - Trimmed"
-msgstr "Subject — Trimmed"
+#: ../mail/em-folder-selector.c:396
+msgid "Folder _name:"
+msgstr "Folder _name:"
 
-#: ../mail/searchtypes.xml.h:1
-msgid "Subject or Addresses contains"
-msgstr "Subject or Addresses contains"
+#: ../mail/em-folder-tree.c:637
+msgid "Folder names cannot contain '/'"
+msgstr "Folder names cannot contain '/'"
 
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
-msgid "Recipients contain"
-msgstr "Recipients contain"
+#: ../mail/em-folder-tree.c:774
+#, c-format
+msgctxt "folder-display"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
-msgid "Message contains"
-msgstr "Message contains"
+#: ../mail/em-folder-tree.c:1599
+msgid "Mail Folder Tree"
+msgstr "Mail Folder Tree"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1712
-msgid "Subject contains"
-msgstr "Subject contains"
+#: ../mail/em-folder-tree.c:2130 ../mail/em-folder-utils.c:112
+#, c-format
+msgid "Moving folder %s"
+msgstr "Moving folder %s"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1705
-msgid "Sender contains"
-msgstr "Sender contains"
+#: ../mail/em-folder-tree.c:2133 ../mail/em-folder-utils.c:114
+#, c-format
+msgid "Copying folder %s"
+msgstr "Copying folder %s"
 
-#: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
-msgid "Body contains"
-msgstr "Body contains"
+#: ../mail/em-folder-tree.c:2140 ../mail/message-list.c:2283
+#, c-format
+msgid "Moving messages into folder %s"
+msgstr "Moving messages into folder %s"
 
-#. 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:96
-#: ../modules/mail/em-mailer-prefs.c:1143
-msgid "_Table column:"
-msgstr "_Table column:"
+#: ../mail/em-folder-tree.c:2144 ../mail/message-list.c:2285
+#, c-format
+msgid "Copying messages into folder %s"
+msgstr "Copying messages into folder %s"
 
-#: ../modules/addressbook/autocompletion-config.c:99
-msgid "Address formatting"
-msgstr "Address formatting"
+#: ../mail/em-folder-tree.c:2163
+#, c-format
+msgid "Cannot drop message(s) into toplevel store"
+msgstr "Cannot drop message(s) into toplevel store"
 
-#: ../modules/addressbook/autocompletion-config.c:102
-msgid "_Format address according to standard of its destination country"
-msgstr "_Format address according to standard of its destination country"
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+msgid "UNMATCHED"
+msgstr "UNMATCHED"
 
-#: ../modules/addressbook/autocompletion-config.c:111
-msgid "Autocompletion"
-msgstr "Autocompletion"
+#: ../mail/em-folder-tree-model.c:848 ../mail/em-folder-tree-model.c:1133
+msgid "Loading..."
+msgstr "Loading…"
 
-#: ../modules/addressbook/autocompletion-config.c:114
-msgid "Always _show address of the autocompleted contact"
-msgstr "Always _show address of the autocompleted contact"
+#: ../mail/em-folder-utils.c:490
+msgid "Move Folder To"
+msgstr "Move Folder To"
 
-#: ../modules/addressbook/eab-composer-util.c:148
-msgid "Multiple vCards"
-msgstr "Multiple vCards"
+#: ../mail/em-folder-utils.c:490
+msgid "Copy Folder To"
+msgstr "Copy Folder To"
 
-#: ../modules/addressbook/eab-composer-util.c:156
-#, c-format
-msgid "vCard for %s"
-msgstr "vCard for %s"
+#: ../mail/em-folder-utils.c:587
+msgid "Create Folder"
+msgstr "Create Folder"
 
-#: ../modules/addressbook/eab-composer-util.c:168
-#: ../modules/addressbook/eab-composer-util.c:195
-#, c-format
-msgid "Contact information"
-msgstr "Contact information"
+#: ../mail/em-folder-utils.c:588
+msgid "Specify where to create the folder:"
+msgstr "Specify where to create the folder:"
 
-#: ../modules/addressbook/eab-composer-util.c:197
-#, c-format
-msgid "Contact information for %s"
-msgstr "Contact information for %s"
+#: ../mail/em-subscription-editor.c:867
+msgid "_Subscribe"
+msgstr "_Subscribe"
 
-#: ../modules/addressbook/e-book-shell-backend.c:229
-#: ../modules/addressbook/e-book-shell-view-actions.c:131
-msgid "New Address Book"
-msgstr "New Address Book"
-
-#: ../modules/addressbook/e-book-shell-backend.c:238
-msgctxt "New"
-msgid "_Contact"
-msgstr "_Contact"
-
-#: ../modules/addressbook/e-book-shell-backend.c:240
-#: ../modules/addressbook/e-book-shell-view-actions.c:904
-msgid "Create a new contact"
-msgstr "Create a new contact"
-
-#: ../modules/addressbook/e-book-shell-backend.c:245
-msgctxt "New"
-msgid "Contact _List"
-msgstr "Contact _List"
-
-#: ../modules/addressbook/e-book-shell-backend.c:247
-#: ../modules/addressbook/e-book-shell-view-actions.c:911
-msgid "Create a new contact list"
-msgstr "Create a new contact list"
-
-#: ../modules/addressbook/e-book-shell-backend.c:255
-msgctxt "New"
-msgid "Address _Book"
-msgstr "Address _Book"
+#: ../mail/em-subscription-editor.c:876
+msgid "Su_bscribe To Shown"
+msgstr "Su_bscribe To Shown"
 
-#: ../modules/addressbook/e-book-shell-backend.c:257
-#: ../modules/addressbook/e-book-shell-view-actions.c:834
-msgid "Create a new address book"
-msgstr "Create a new address book"
+#: ../mail/em-subscription-editor.c:884
+msgid "Subscribe To _All"
+msgstr "Subscribe To _All"
 
-#: ../modules/addressbook/e-book-shell-backend.c:274
-#: ../modules/addressbook/e-book-shell-view.c:356
-msgid "Contacts"
-msgstr "Contacts"
+#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1836
+#: ../modules/mail/e-mail-shell-view-actions.c:1398
+msgid "_Unsubscribe"
+msgstr "_Unsubscribe"
 
-#: ../modules/addressbook/e-book-shell-backend.c:285
-msgid "Certificates"
-msgstr "Certificates"
+#: ../mail/em-subscription-editor.c:990
+msgid "Unsu_bscribe From Hidden"
+msgstr "Unsu_bscribe From Hidden"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:204
-msgid "Address Book Properties"
-msgstr "Address Book Properties"
+#: ../mail/em-subscription-editor.c:998
+msgid "Unsubscribe From _All"
+msgstr "Unsubscribe From _All"
 
-#. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:386
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
-msgid "Save as vCard"
-msgstr "Save as vCard…"
+#: ../mail/em-subscription-editor.c:1677
+msgid "Folder Subscriptions"
+msgstr "Folder Subscriptions"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
-msgid "Co_py All Contacts To..."
-msgstr "Co_py All Contacts To…"
+#: ../mail/em-subscription-editor.c:1716
+msgid "_Account:"
+msgstr "_Account:"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:813
-msgid "Copy the contacts of the selected address book to another"
-msgstr "Copy the contacts of the selected address book to another"
+#: ../mail/em-subscription-editor.c:1729
+msgid "Clear Search"
+msgstr "Clear Search"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:818
-msgid "D_elete Address Book"
-msgstr "D_elete Address Book"
+#: ../mail/em-subscription-editor.c:1746
+msgid "Sho_w items that contain:"
+msgstr "Sho_w items that contain:"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:820
-msgid "Delete the selected address book"
-msgstr "Delete the selected address book"
+#: ../mail/em-subscription-editor.c:1789
+msgid "Subscribe to the selected folder"
+msgstr "Subscribe to the selected folder"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:825
-msgid "Mo_ve All Contacts To..."
-msgstr "Mo_ve All Contacts To…"
+#: ../mail/em-subscription-editor.c:1790
+msgid "Su_bscribe"
+msgstr "Su_bscribe"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:827
-msgid "Move the contacts of the selected address book to another"
-msgstr "Move the contacts of the selected address book to another"
+#: ../mail/em-subscription-editor.c:1835
+#: ../modules/mail/e-mail-shell-view-actions.c:1400
+msgid "Unsubscribe from the selected folder"
+msgstr "Unsubscribe from the selected folder"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:832
-msgid "_New Address Book"
-msgstr "_New Address Book"
+#: ../mail/em-subscription-editor.c:1875
+msgid "Collapse all folders"
+msgstr "Collapse all folders"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
-msgid "Address _Book Properties"
-msgstr "Address _Book Properties"
+#: ../mail/em-subscription-editor.c:1876
+msgid "C_ollapse All"
+msgstr "C_ollapse All"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
-msgid "Show properties of the selected address book"
-msgstr "Show properties of the selected address book"
+#: ../mail/em-subscription-editor.c:1886
+msgid "Expand all folders"
+msgstr "Expand all folders"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:846
-msgid "Address Book _Map"
-msgstr "Address Book _Map"
+#: ../mail/em-subscription-editor.c:1887
+msgid "E_xpand All"
+msgstr "E_xpand All"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:848
-msgid "Show map with all contacts from selected address book"
-msgstr "Show map with all contacts from selected address book"
+#: ../mail/em-subscription-editor.c:1897
+msgid "Refresh the folder list"
+msgstr "Refresh the folder list"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:853
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
-#: ../modules/calendar/e-task-shell-view-actions.c:789
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
-msgid "_Rename..."
-msgstr "_Rename…"
+#: ../mail/em-subscription-editor.c:1909
+msgid "Stop the current operation"
+msgstr "Stop the current operation"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:855
-msgid "Rename the selected address book"
-msgstr "Rename the selected address book"
+#. Translators: This message is shown only for ten or more
+#. * messages to be opened.  The %d is replaced with the actual
+#. * count of messages. If you need a '%' in your text, then
+#. * write it doubled, like '%%'.
+#: ../mail/em-utils.c:97
+#, 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?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
-msgid "Stop loading"
-msgstr "Stop loading"
+#: ../mail/em-utils.c:153
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
+msgid "_Do not show this message again"
+msgstr "_Do not show this message again"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-msgid "_Copy Contact To..."
-msgstr "_Copy Contact To…"
+#: ../mail/em-utils.c:305
+msgid "Message Filters"
+msgstr "Message Filters"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
-msgid "Copy selected contacts to another address book"
-msgstr "Copy selected contacts to another address book"
+#: ../mail/em-utils.c:1041
+#, c-format
+msgid "Messages from %s"
+msgstr "Messages from %s"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:874
-msgid "_Delete Contact"
-msgstr "_Delete Contact"
+#: ../mail/em-vfolder-editor.c:105
+msgid "Search _Folders"
+msgstr "Search _Folders"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
-msgid "_Find in Contact..."
-msgstr "_Find in Contact…"
+#: ../mail/em-vfolder-editor-rule.c:397
+msgid "Add Folder"
+msgstr "Add Folder"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:883
-msgid "Search for text in the displayed contact"
-msgstr "Search for text in the displayed contact"
+#: ../mail/em-vfolder-editor-rule.c:523
+msgid "Search Folder Sources"
+msgstr "Search Folder Sources"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
-msgid "_Forward Contact..."
-msgstr "_Forward Contact…"
+#: ../mail/em-vfolder-editor-rule.c:555
+msgid "Automatically update on any _source folder change"
+msgstr "Automatically update on any _source folder change"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:890
-msgid "Send selected contacts to another person"
-msgstr "Send selected contacts to another person"
+#: ../mail/em-vfolder-editor-rule.c:567
+msgid "All local folders"
+msgstr "All local folders"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:895
-msgid "_Move Contact To..."
-msgstr "_Move Contact To…"
+#: ../mail/em-vfolder-editor-rule.c:568
+msgid "All active remote folders"
+msgstr "All active remote folders"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:897
-msgid "Move selected contacts to another address book"
-msgstr "Move selected contacts to another address book"
+#: ../mail/em-vfolder-editor-rule.c:569
+msgid "All local and active remote folders"
+msgstr "All local and active remote folders"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
-msgid "_New Contact..."
-msgstr "_New Contact…"
+#: ../mail/em-vfolder-editor-rule.c:570
+msgid "Specific folders"
+msgstr "Specific folders"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
-msgid "New Contact _List..."
-msgstr "New Contact _List…"
+#: ../mail/em-vfolder-editor-rule.c:608
+msgid "include subfolders"
+msgstr "include subfolders"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:916
-msgid "_Open Contact"
-msgstr "_Open Contact"
+#: ../mail/importers/elm-importer.c:178
+msgid "Importing Elm data"
+msgstr "Importing Elm data"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:918
-msgid "View the current contact"
-msgstr "View the current contact"
+#: ../mail/importers/elm-importer.c:378
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm importer"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
-msgid "_Send Message to Contact..."
-msgstr "_Send Message to Contact…"
+#: ../mail/importers/elm-importer.c:379
+msgid "Import mail from Elm."
+msgstr "Import mail from Elm."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:925
-msgid "Send a message to the selected contacts"
-msgstr "Send a message to the selected contacts"
+#: ../mail/importers/evolution-mbox-importer.c:140
+#: ../plugins/dbx-import/dbx-importer.c:250
+msgid "_Destination folder:"
+msgstr "_Destination folder:"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:932
-#: ../modules/calendar/e-cal-shell-view-actions.c:1604
-#: ../modules/calendar/e-task-shell-view-actions.c:847
-msgid "_Actions"
-msgstr "_Actions"
+#: ../mail/importers/evolution-mbox-importer.c:146
+#: ../plugins/dbx-import/dbx-importer.c:256
+#: ../plugins/pst-import/pst-importer.c:545
+msgid "Select folder"
+msgstr "Select folder"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:939
-#: ../modules/calendar/e-memo-shell-view-actions.c:702
-#: ../modules/calendar/e-task-shell-view-actions.c:854
-#: ../modules/mail/e-mail-shell-view-actions.c:1475
-msgid "_Preview"
-msgstr "_Preview"
+#: ../mail/importers/evolution-mbox-importer.c:147
+#: ../plugins/dbx-import/dbx-importer.c:257
+#: ../plugins/pst-import/pst-importer.c:546
+msgid "Select folder to import into"
+msgstr "Select folder to import into"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
-#: ../modules/calendar/e-cal-shell-view-actions.c:1621
-#: ../modules/calendar/e-memo-shell-view-actions.c:715
-#: ../modules/calendar/e-task-shell-view-actions.c:867
-msgid "_Delete"
-msgstr "_Delete"
+#: ../mail/importers/evolution-mbox-importer.c:437
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Subject"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:952
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
-msgid "_Properties"
-msgstr "_Properties"
+#: ../mail/importers/evolution-mbox-importer.c:442
+msgctxt "mboxImp"
+msgid "From"
+msgstr "From"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Address Book Map"
-msgstr "Address Book Map"
+#: ../mail/importers/evolution-mbox-importer.c:486
+#: ../shell/e-shell-utils.c:193
+msgid "Berkeley Mailbox (mbox)"
+msgstr "Berkeley Mailbox (mbox)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
-msgid "Contact _Preview"
-msgstr "Contact _Preview"
+#: ../mail/importers/evolution-mbox-importer.c:487
+msgid "Importer Berkeley Mailbox format folders"
+msgstr "Importer Berkeley Mailbox format folders"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
-msgid "Show contact preview window"
-msgstr "Show contact preview window"
+#: ../mail/importers/mail-importer.c:63
+msgid "Importing mailbox"
+msgstr "Importing mailbox"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:996
-msgid "Show _Maps"
-msgstr "Show _Maps"
+#. Destination folder, was set in our widget
+#: ../mail/importers/mail-importer.c:153
+#: ../plugins/dbx-import/dbx-importer.c:612
+#: ../plugins/pst-import/pst-importer.c:767
+#, c-format
+msgid "Importing '%s'"
+msgstr "Importing '%s'"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:998
-msgid "Show maps in contact preview window"
-msgstr "Show maps in contact preview window"
+#: ../mail/importers/mail-importer.c:316
+#, c-format
+msgid "Scanning %s"
+msgstr "Scanning %s"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1017
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:936
-#: ../modules/mail/e-mail-shell-view-actions.c:1601
-msgid "_Classic View"
-msgstr "_Classic View"
+#: ../mail/importers/pine-importer.c:247
+msgid "Importing Pine data"
+msgstr "Importing Pine data"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1019
-msgid "Show contact preview below the contact list"
-msgstr "Show contact preview below the contact list"
+#: ../mail/importers/pine-importer.c:474
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine importer"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1024
-#: ../modules/calendar/e-memo-shell-view-actions.c:779
-#: ../modules/calendar/e-task-shell-view-actions.c:943
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
-msgid "_Vertical View"
-msgstr "_Vertical View"
+#: ../mail/importers/pine-importer.c:475
+msgid "Import mail from Pine."
+msgstr "Import mail from Pine."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1026
-msgid "Show contact preview alongside the contact list"
-msgstr "Show contact preview alongside the contact list"
+#: ../mail/mail-autofilter.c:70
+#, c-format
+msgid "Mail to %s"
+msgstr "Mail to %s"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1034
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:960
-msgid "Any Category"
-msgstr "Any Category"
+#: ../mail/mail-autofilter.c:226 ../mail/mail-autofilter.c:269
+#, c-format
+msgid "Mail from %s"
+msgstr "Mail from %s"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1041
-#: ../modules/calendar/e-cal-shell-view-actions.c:1781
-#: ../modules/calendar/e-memo-shell-view-actions.c:796
-#: ../modules/calendar/e-task-shell-view-actions.c:995
-msgid "Unmatched"
-msgstr "Unmatched"
+#: ../mail/mail-autofilter.c:252
+#, c-format
+msgid "Subject is %s"
+msgstr "Subject is %s"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
-#: ../modules/calendar/e-cal-shell-view-actions.c:1791
-#: ../modules/calendar/e-memo-shell-view-actions.c:806
-#: ../modules/calendar/e-task-shell-view-actions.c:1005
-#: ../modules/mail/e-mail-shell-view-actions.c:1677
-#: ../shell/e-shell-content.c:664
-msgid "Advanced Search"
-msgstr "Advanced Search"
+#: ../mail/mail-autofilter.c:293
+#, c-format
+msgid "%s mailing list"
+msgstr "%s mailing list"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1084
-msgid "Print all shown contacts"
-msgstr "Print all shown contacts"
+#: ../mail/mail-autofilter.c:403
+msgid "Add Filter Rule"
+msgstr "Add Filter Rule"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1091
-msgid "Preview the contacts to be printed"
-msgstr "Preview the contacts to be printed"
+#. 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:512
+#, 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\"."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1098
-msgid "Print selected contacts"
-msgstr "Print selected contacts"
+#: ../mail/mail-config.ui.h:1
+msgid "Set custom junk header"
+msgstr "Set custom junk header"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1113
-msgid "S_ave Address Book as vCard"
-msgstr "S_ave Address Book as vCard"
+#: ../mail/mail-config.ui.h:2
+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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1115
-msgid "Save the contacts of the selected address book as a vCard"
-msgstr "Save the contacts of the selected address book as a vCard"
+#: ../mail/mail-config.ui.h:3
+msgid "Header name"
+msgstr "Header name"
 
-#. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1121
-#: ../modules/addressbook/e-book-shell-view-actions.c:1131
-msgid "_Save as vCard..."
-msgstr "_Save as vCard…"
+#: ../mail/mail-config.ui.h:4
+msgid "Header content"
+msgstr "Header content"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1123
-msgid "Save selected contacts as a vCard"
-msgstr "Save selected contacts as a vCard"
+#: ../mail/mail-config.ui.h:5
+msgid "Default Behavior"
+msgstr "Default Behaviour"
 
-#: ../modules/addressbook/e-book-shell-view.c:300
-msgid "_Forward Contacts"
-msgstr "_Forward Contacts"
+#: ../mail/mail-config.ui.h:6
+msgid "For_mat messages in HTML"
+msgstr "For_mat messages in HTML"
 
-#: ../modules/addressbook/e-book-shell-view.c:302
-msgid "_Forward Contact"
-msgstr "_Forward Contact"
+#: ../mail/mail-config.ui.h:7
+msgid "Automatically insert _emoticon images"
+msgstr "Automatically insert _emoticon images"
 
-#: ../modules/addressbook/e-book-shell-view.c:333
-msgid "_Send Message to Contacts"
-msgstr "_Send Message to Contacts"
+#: ../mail/mail-config.ui.h:8
+msgid "Always request rea_d receipt"
+msgstr "Always request rea_d receipt"
 
-#: ../modules/addressbook/e-book-shell-view.c:335
-msgid "_Send Message to List"
-msgstr "_Send Message to List"
+#: ../mail/mail-config.ui.h:9
+msgid "Encode filenames in an _Outlook/GMail way"
+msgstr "Encode filenames in an _Outlook/GMail way"
 
-#: ../modules/addressbook/e-book-shell-view.c:337
-msgid "_Send Message to Contact"
-msgstr "_Send Message to Contact"
+#: ../mail/mail-config.ui.h:10
+msgid "Ch_aracter encoding:"
+msgstr "Ch_aracter encoding:"
 
-#: ../modules/addressbook/ldap-config.ui.h:4
-msgid "Anonymously"
-msgstr "Anonymously"
+#: ../mail/mail-config.ui.h:11
+msgid "Replies and Forwards"
+msgstr "Replies and Forwards"
 
-#: ../modules/addressbook/ldap-config.ui.h:5
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
-msgid "Using email address"
-msgstr "Using e-mail address"
+#: ../mail/mail-config.ui.h:12
+msgid "_Reply style:"
+msgstr "_Reply style:"
 
-#: ../modules/addressbook/ldap-config.ui.h:6
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:685
-msgid "Using distinguished name (DN)"
-msgstr "Using distinguished name (DN)"
+#: ../mail/mail-config.ui.h:13
+msgid "_Forward style:"
+msgstr "_Forward style:"
 
-#. 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"
+#: ../mail/mail-config.ui.h:14
+msgid "Start _typing at the bottom on replying"
+msgstr "Start _typing at the bottom on replying"
 
-#. 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"
+#: ../mail/mail-config.ui.h:15
+msgid "_Keep signature above the original message on replying"
+msgstr "_Keep signature above the original message on replying"
 
-#: ../modules/addressbook/ldap-config.ui.h:11
-msgid "Supported Search Bases"
-msgstr "Supported Search Bases"
+#: ../mail/mail-config.ui.h:16
+msgid "Ig_nore Reply-To: for mailing lists"
+msgstr "Ig_nore Reply-To: for mailing lists"
 
-#: ../modules/addressbook/ldap-config.ui.h:13
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:113
-msgid "_Port:"
-msgstr "_Port:"
+#: ../mail/mail-config.ui.h:17
+msgid "Gro_up Reply goes only to mailing list, if possible"
+msgstr "Gro_up Reply goes only to mailing list, if possible"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
-msgid "Ser_ver:"
-msgstr "Ser_ver:"
+#: ../mail/mail-config.ui.h:18
+msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
+msgstr "Digitally _sign messages when original message signed (PGP or S/MIME)"
+
+#: ../mail/mail-config.ui.h:20
+msgid "Sig_natures"
+msgstr "Sig_natures"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Use secure _connection:"
-msgstr "Use secure _connection:"
+#: ../mail/mail-config.ui.h:21
+msgid "Signatures"
+msgstr "Signatures"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
-msgid "_Login method:"
-msgstr "_Login method:"
+#: ../mail/mail-config.ui.h:22
+msgid "_Languages"
+msgstr "_Languages"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
-msgid "Lo_gin:"
-msgstr "Lo_gin:"
+#: ../mail/mail-config.ui.h:23
+msgid "Languages Table"
+msgstr "Languages Table"
 
-#: ../modules/addressbook/ldap-config.ui.h:18
-msgid "Search _base:"
-msgstr "Search _base:"
+#: ../mail/mail-config.ui.h:24
+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."
 
-#: ../modules/addressbook/ldap-config.ui.h:19
-msgid "_Search scope:"
-msgstr "_Search scope:"
+#: ../mail/mail-config.ui.h:26
+msgid "Check spelling while I _type"
+msgstr "Check spelling while I _type"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "_Find Possible Search Bases"
-msgstr "_Find Possible Search Bases"
+#: ../mail/mail-config.ui.h:27
+msgid "Color for _misspelled words:"
+msgstr "Colour for _misspelt words:"
 
-#: ../modules/addressbook/ldap-config.ui.h:21
-msgid "S_earch filter:"
-msgstr "S_earch filter:"
+#: ../mail/mail-config.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
+msgid "Pick a color"
+msgstr "Pick a colour"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
-msgid "Search Filter"
-msgstr "Search Filter"
+#: ../mail/mail-config.ui.h:29
+msgid "Spell Checking"
+msgstr "Spell Checking"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../mail/mail-config.ui.h:30
 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\"."
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
 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 help avoid e-mail accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
 
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:25
-msgid "1"
-msgstr "1"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:32
+msgid "Sending a message with an _empty subject line"
+msgstr "Sending a message with an _empty subject line"
 
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:27
-msgid "5"
-msgstr "5"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:34
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "Sending a message with only _Bcc recipients defined"
 
-#: ../modules/addressbook/ldap-config.ui.h:30
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:838
-msgid "contacts"
-msgstr "contacts"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:36
+msgid "Sending a _private reply to a mailing list message"
+msgstr "Sending a _private reply to a mailing list message"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Timeout:"
-msgstr "_Timeout:"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:38
+msgid "Sending a reply to a large _number of recipients"
+msgstr "Sending a reply to a large _number of recipients"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
-msgid "_Download limit:"
-msgstr "_Download limit:"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:40
+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"
 
-#. 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"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:42
+msgid "Sending a message with _recipients not entered as mail addresses"
+msgstr "Sending a message with _recipients not entered as mail addresses"
 
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
-msgid "Audio Player"
-msgstr "Audio Player"
+#: ../mail/mail-config.ui.h:43
+msgid "Confirmations"
+msgstr "Confirmations"
 
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:316
-msgid "Play the attachment in embedded audio player"
-msgstr "Play the attachment in embedded audio player"
+#: ../mail/mail-config.ui.h:49 ../smime/gui/smime-ui.ui.h:1
+msgid "a"
+msgstr "a"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:167
-msgid ""
-"You can restore Evolution from a backup file.\n"
-"\n"
-"This will restore all your personal data, settings mail filters, etc."
-msgstr ""
-"You can restore Evolution from a backup file.\n"
-"\n"
-"This will restore all your personal data, settings mail filters, etc."
+#: ../mail/mail-config.ui.h:50 ../smime/gui/smime-ui.ui.h:2
+msgid "b"
+msgstr "b"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:182
-msgid "_Restore from a backup file:"
-msgstr "_Restore from a backup file:"
+#: ../mail/mail-config.ui.h:51
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "Attachment"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:193
-msgid "Choose a backup file to restore"
-msgstr "Choose a backup file to restore"
+#: ../mail/mail-config.ui.h:52
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "Inline (Outlook style)"
 
-#. Keep the title identical to EMailConfigRestorePage
-#. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:313
-#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
-msgid "Restore from Backup"
-msgstr "Restore from Backup"
+#: ../mail/mail-config.ui.h:53
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "Quoted"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:217
-msgid "Select name of the Evolution backup file"
-msgstr "Select name of the Evolution backup file"
+#: ../mail/mail-config.ui.h:54
+msgctxt "ReplyForward"
+msgid "Do not quote"
+msgstr "Do not quote"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:250
-msgid "_Restart Evolution after backup"
-msgstr "_Restart Evolution after backup"
+#: ../mail/mail-config.ui.h:55
+msgctxt "ReplyForward"
+msgid "Inline"
+msgstr "Inline"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:277
-msgid "Select name of the Evolution backup file to restore"
-msgstr "Select name of the Evolution backup file to restore"
+#: ../mail/mail-config.ui.h:56
+msgid "Proxy Settings"
+msgstr "Proxy Settings"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:290
-msgid "_Restart Evolution after restore"
-msgstr "_Restart Evolution after restore"
+#: ../mail/mail-config.ui.h:57
+msgid "_Use system defaults"
+msgstr "_Use system defaults"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:308
-msgid "_Back up Evolution Data..."
-msgstr "_Back up Evolution Data…"
+#: ../mail/mail-config.ui.h:58
+msgid "_Direct connection to the Internet"
+msgstr "_Direct connection to the Internet"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:310
-msgid "Back up Evolution data and settings to an archive file"
-msgstr "Back up Evolution data and settings to an archive file"
-
-#: ../modules/backup-restore/evolution-backup-restore.c:315
-msgid "R_estore Evolution Data..."
-msgstr "R_estore Evolution Data…"
+#: ../mail/mail-config.ui.h:59
+msgid "_Manual proxy configuration:"
+msgstr "_Manual proxy configuration:"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:317
-msgid "Restore Evolution data and settings from an archive file"
-msgstr "Restore Evolution data and settings from an archive file"
+#: ../mail/mail-config.ui.h:60
+msgid "H_TTP Proxy:"
+msgstr "H_TTP Proxy:"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
-msgid "Back up Evolution directory"
-msgstr "Back up Evolution directory"
+#: ../mail/mail-config.ui.h:61
+msgid "_Secure HTTP Proxy:"
+msgstr "_Secure HTTP Proxy:"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
-msgid "Restore Evolution directory"
-msgstr "Restore Evolution directory"
+#: ../mail/mail-config.ui.h:62
+msgid "SOC_KS Proxy:"
+msgstr "SOC_KS Proxy:"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
-msgid "Check Evolution Back up"
-msgstr "Check Evolution Backup"
+#: ../mail/mail-config.ui.h:63
+msgid "No _Proxy for:"
+msgstr "No _Proxy for:"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:89
-msgid "Restart Evolution"
-msgstr "Restart Evolution"
+#: ../mail/mail-config.ui.h:64
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:614
+msgid "Port:"
+msgstr "Port:"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:91
-msgid "With Graphical User Interface"
-msgstr "With Graphical User Interface"
+#: ../mail/mail-config.ui.h:65
+msgid "Use Authe_ntication"
+msgstr "Use Authe_ntication"
 
-#. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:315
-#: ../modules/backup-restore/evolution-backup-tool.c:469
-msgid "Shutting down Evolution"
-msgstr "Shutting down Evolution"
+#: ../mail/mail-config.ui.h:66
+msgid "Us_ername:"
+msgstr "Us_ername:"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:324
-msgid "Backing Evolution accounts and settings"
-msgstr "Backing up Evolution accounts and settings"
+#: ../mail/mail-config.ui.h:67
+msgid "Pass_word:"
+msgstr "Pass_word:"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:341
-msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr "Backing up Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+#: ../mail/mail-config.ui.h:68
+msgid "Start up"
+msgstr "Start up"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:357
-msgid "Back up complete"
-msgstr "Backup complete"
+#: ../mail/mail-config.ui.h:69
+msgid "Check for new _messages on start"
+msgstr "Check for new _messages on start"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:364
-#: ../modules/backup-restore/evolution-backup-tool.c:659
-msgid "Restarting Evolution"
-msgstr "Restarting Evolution"
+#: ../mail/mail-config.ui.h:70
+msgid "Check for new messa_ges in all active accounts"
+msgstr "Check for new messa_ges in all active accounts"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:475
-msgid "Back up current Evolution data"
-msgstr "Back up current Evolution data"
+#: ../mail/mail-config.ui.h:71
+msgid "Message Display"
+msgstr "Message Display"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:483
-msgid "Extracting files from back up"
-msgstr "Extracting files from backup"
+#: ../mail/mail-config.ui.h:72
+msgid "_Use the same fonts as other applications"
+msgstr "_Use the same fonts as other applications"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:570
-msgid "Loading Evolution settings"
-msgstr "Loading Evolution settings"
+#: ../mail/mail-config.ui.h:73
+msgid "S_tandard Font:"
+msgstr "S_tandard Font:"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:629
-msgid "Removing temporary back up files"
-msgstr "Removing temporary backup files"
+#: ../mail/mail-config.ui.h:74
+msgid "Select HTML fixed width font"
+msgstr "Select HTML fixed width font"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:641
-msgid "Reloading registry service"
-msgstr "Reloading registry service"
+#: ../mail/mail-config.ui.h:75
+msgid "Select HTML variable width font"
+msgstr "Select HTML variable width font"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:866
-msgid "Evolution Back Up"
-msgstr "Evolution Back Up"
+#: ../mail/mail-config.ui.h:76
+msgid "Fix_ed Width Font:"
+msgstr "Fix_ed Width Font:"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:867
-#, c-format
-msgid "Backing up to the folder %s"
-msgstr "Backing up to the folder %s"
+#: ../mail/mail-config.ui.h:77
+msgid "_Mark messages as read after"
+msgstr "_Mark messages as read after"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:871
-msgid "Evolution Restore"
-msgstr "Evolution Restore"
+#: ../mail/mail-config.ui.h:79
+msgid "Highlight _quotations with"
+msgstr "Highlight _quotations with"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:872
-#, c-format
-msgid "Restoring from the folder %s"
-msgstr "Restoring from the folder %s"
+#: ../mail/mail-config.ui.h:80
+msgid "color"
+msgstr "colour"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:940
-msgid "Backing up Evolution Data"
-msgstr "Backing up Evolution Data"
+#: ../mail/mail-config.ui.h:81
+msgid "Default character e_ncoding:"
+msgstr "Default character e_ncoding:"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:941
-msgid "Please wait while Evolution is backing up your data."
-msgstr "Please wait while Evolution backs up your data."
+#: ../mail/mail-config.ui.h:82
+msgid "Apply the same _view settings to all folders"
+msgstr "Apply the same _view settings to all folders"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:943
-msgid "Restoring Evolution Data"
-msgstr "Restoring Evolution Data"
+#: ../mail/mail-config.ui.h:83
+msgid "F_all back to threading messages by subject"
+msgstr "F_all back to threading messages by subject"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:944
-msgid "Please wait while Evolution is restoring your data."
-msgstr "Please wait while Evolution restores your data."
+#: ../mail/mail-config.ui.h:84
+msgid "Delete Mail"
+msgstr "Delete Mail"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:962
-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."
+#: ../mail/mail-config.ui.h:85
+msgid "Empty _trash folders"
+msgstr "Empty wastebaske_t folders"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
-msgid "Invalid Evolution backup file"
-msgstr "Invalid Evolution backup file"
+#: ../mail/mail-config.ui.h:86
+msgid "Confirm _when expunging a folder"
+msgstr "Confirm _when expunging a folder"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Please select a valid backup file to restore."
-msgstr "Please select a valid backup file to restore."
+#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.ui.h:88
+msgid "_Show animated images"
+msgstr "_Show animated images"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Are you sure you want to close Evolution?"
-msgstr "Are you sure you want to close Evolution?"
+#: ../mail/mail-config.ui.h:89
+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"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
-msgid ""
-"To back up your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding."
-msgstr ""
-"To back up your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding."
+#: ../mail/mail-config.ui.h:90
+msgid "Loading Images"
+msgstr "Loading Images"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Close and Back up Evolution"
-msgstr "Close and Back Up Evolution"
+#: ../mail/mail-config.ui.h:91
+msgid "_Never load images from the Internet"
+msgstr "_Never load images from the Internet"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr ""
-"Are you sure you want to restore Evolution from the selected backup file?"
+#: ../mail/mail-config.ui.h:92
+msgid "_Load images only in messages from contacts"
+msgstr "_Load images only in messages from contacts"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid ""
-"To restore your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding. This will delete "
-"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."
+#: ../mail/mail-config.ui.h:93
+msgid "_Always load images from the Internet"
+msgstr "_Always load images from the Internet"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "Close and Restore Evolution"
-msgstr "Close and Restore Evolution"
+#: ../mail/mail-config.ui.h:94
+msgid "HTML Messages"
+msgstr "HTML Messages"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
-msgid "Insufficient Permissions"
-msgstr "Insufficient Permissions"
+#: ../mail/mail-config.ui.h:95 ../mail/message-list.etspec.h:19
+msgid "Labels"
+msgstr "Labels"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
-msgid "The selected folder is not writable."
-msgstr "The selected folder is not writable."
+#: ../mail/mail-config.ui.h:96
+msgid "Sender Photograph"
+msgstr "Sender Photograph"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:149
-#, c-format
-msgid "Failed to spawn Bogofilter (%s): "
-msgstr "Failed to spawn Bogofilter (%s): "
+#: ../mail/mail-config.ui.h:97
+msgid "_Show the photograph of sender in the message preview"
+msgstr "_Show the photograph of sender in the message preview"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:167
-msgid "Failed to stream mail message content to Bogofilter: "
-msgstr "Failed to stream mail message content to Bogofilter: "
+#: ../mail/mail-config.ui.h:98
+msgid "S_earch for sender photograph only in local address books"
+msgstr "S_earch for sender photograph only in local address books"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:216
-msgid "Bogofilter either crashed or failed to process a mail message"
-msgstr "Bogofilter either crashed or failed to process a mail message"
+#: ../mail/mail-config.ui.h:99
+msgid "Displayed Message Headers"
+msgstr "Displayed Message Headers"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:318
-msgid "Bogofilter Options"
-msgstr "Bogofilter Options"
+#: ../mail/mail-config.ui.h:100
+msgid "Mail Headers Table"
+msgstr "Mail Headers Table"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:327
-msgid "Convert message text to _Unicode"
-msgstr "Convert message text to _Unicode"
+#: ../mail/mail-config.ui.h:101
+#: ../modules/addressbook/autocompletion-config.c:86
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Date/Time Format"
+msgstr "Date/Time Format"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:483
-msgid "Bogofilter"
-msgstr "Bogofilter"
+#: ../mail/mail-config.ui.h:103
+msgid "Check incoming _messages for junk"
+msgstr "Check incoming _messages for junk"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:449
-msgid "Standard LDAP Port"
-msgstr "Standard LDAP Port"
+#: ../mail/mail-config.ui.h:104
+msgid "_Delete junk messages"
+msgstr "_Delete junk messages"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:455
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
-msgid "LDAP over SSL (deprecated)"
-msgstr "LDAP over SSL (deprecated)"
+#: ../mail/mail-config.ui.h:105
+msgid "Check cu_stom headers for junk"
+msgstr "Check cu_stom headers for junk"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:461
-msgid "Microsoft Global Catalog"
-msgstr "Microsoft Global Catalogue"
+#: ../mail/mail-config.ui.h:106
+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"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:467
-msgid "Microsoft Global Catalog over SSL"
-msgstr "Microsoft Global Catalogue over SSL"
-
-#. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:572
-msgid "Connecting to LDAP"
-msgstr "Connecting to LDAP"
-
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:589
-msgid "Server Information"
-msgstr "Server Information"
-
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:630
-msgid "StartTLS (recommended)"
-msgstr "StartTLS (recommended)"
+#: ../mail/mail-config.ui.h:107
+msgid "_Lookup in local address book only"
+msgstr "_Look up in local address book only"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:632
-msgid "Encryption:"
-msgstr "Encryption:"
+#: ../mail/mail-config.ui.h:108
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "Option is ignored if a match for custom junk headers is found."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:656
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:258
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
-msgid "Authentication"
-msgstr "Authentication"
+#: ../mail/mail-config.ui.h:110
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:225
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:159
+msgid "No encryption"
+msgstr "No encryption"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
-msgid "Anonymous"
-msgstr "Anonymous"
+#: ../mail/mail-config.ui.h:111
+msgid "TLS encryption"
+msgstr "TLS encryption"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:687
-msgid "Method:"
-msgstr "Method:"
+#: ../mail/mail-config.ui.h:112
+msgid "SSL encryption"
+msgstr "SSL encryption"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:692
+#: ../mail/mail-dialogs.ui.h:1
 msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Using email address\" requires anonymous access to your "
-"LDAP server."
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
 msgstr ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Using e-mail address\" requires anonymous access to your "
-"LDAP server."
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
 
-#. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:707
-msgid "Using LDAP"
-msgstr "Using LDAP"
+#: ../mail/mail-dialogs.ui.h:3
+msgid "_Flag:"
+msgstr "_Flag:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:724
-#: ../modules/mail/e-mail-shell-view.c:116
-msgid "Searching"
-msgstr "Searching"
+#: ../mail/mail-dialogs.ui.h:4
+msgid "_Due By:"
+msgstr "_Due By:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:746
-msgid "Search Base:"
-msgstr "Search Base:"
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
+msgid "Co_mpleted"
+msgstr "Co_mpleted"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:751
-msgid "Find Possible Search Bases"
-msgstr "Find Possible Search Bases"
+#: ../mail/mail-dialogs.ui.h:7
+msgid "Call"
+msgstr "Call"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
-msgid "One Level"
-msgstr "One Level"
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "Do Not Forward"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
-msgid "Subtree"
-msgstr "Subtree"
+#: ../mail/mail-dialogs.ui.h:9
+msgid "Follow-Up"
+msgstr "Follow-Up"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:780
-msgid "Search Scope:"
-msgstr "Search Scope:"
+#: ../mail/mail-dialogs.ui.h:10
+msgid "For Your Information"
+msgstr "For Your Information"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:785
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree.  A search scope of \"Subtree\" will include all entries "
-"below your search base.  A search scope of \"One Level\" will only include "
-"the entries one level beneath your search base."
-msgstr ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree.  A search scope of \"Subtree\" will include all entries "
-"below your search base.  A search scope of \"One Level\" will only include "
-"the entries one level beneath your search base."
+#: ../mail/mail-dialogs.ui.h:11
+msgid "Forward"
+msgstr "Forward"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
-msgid "Search Filter:"
-msgstr "Search Filter:"
+#: ../mail/mail-dialogs.ui.h:12
+msgid "No Response Necessary"
+msgstr "No Response Necessary"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:806
-msgid "Downloading"
-msgstr "Downloading"
+#: ../mail/mail-dialogs.ui.h:16
+msgid "Reply to All"
+msgstr "Reply to All"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:827
-msgid "Limit:"
-msgstr "Limit:"
+#: ../mail/mail-dialogs.ui.h:17
+msgid "Review"
+msgstr "Review"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:843
-msgid "Browse until limit is reached"
-msgstr "Browse until limit is reached"
+#: ../mail/mail-dialogs.ui.h:18
+msgid "License Agreement"
+msgstr "Licence Agreement"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:134
-#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:130
-msgid "URL:"
-msgstr "URL:"
+#: ../mail/mail-dialogs.ui.h:19
+msgid "_Tick this to accept the license agreement"
+msgstr "_Tick this to accept the licence agreement"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:144
-msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "Avoid IfMatch (needed on Apache < 2.2.8)"
+#: ../mail/mail-dialogs.ui.h:20
+msgid "_Accept License"
+msgstr "_Accept Licence"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:417
-#, c-format
-msgid "HTTP Error: %s"
-msgstr "HTTP Error: %s"
+#: ../mail/mail-dialogs.ui.h:21
+msgid "Security Information"
+msgstr "Security Information"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:445
-msgid "Could not parse response"
-msgstr "Could not parse response"
+#: ../mail/mail-dialogs.ui.h:22
+msgid "Digital Signature"
+msgstr "Digital Signature"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:454
-msgid "Empty response"
-msgstr "Empty response"
+#: ../mail/mail-dialogs.ui.h:23
+msgid "Encryption"
+msgstr "Encryption"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:462
-msgid "Unexpected reply from server"
-msgstr "Unexpected reply from server"
+#: ../mail/mail.error.xml.h:1
+msgid "Invalid authentication"
+msgstr "Invalid authentication"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1066
-msgid "Could not locate user's calendars"
-msgstr "Could not locate user's calendars"
+#: ../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."
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1290
-msgid "Path"
-msgstr "Path"
+#: ../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."
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:200
-msgid "Choose a Calendar"
-msgstr "Choose a Calendar"
+#: ../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."
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
-msgid "Choose a Memo List"
-msgstr "Choose a Memo List"
+#: ../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?"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
-msgid "Choose a Task List"
-msgstr "Choose a Task List"
+#: ../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}"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:269
-msgid "Find Calendars"
-msgstr "Find Calendars"
+#: ../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?"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:272
-msgid "Find Memo Lists"
-msgstr "Find Memo Lists"
+#: ../mail/mail.error.xml.h:10
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:275
-msgid "Find Task Lists"
-msgstr "Find Task Lists"
+#: ../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?"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:293
-msgid "Path:"
-msgstr "Path:"
+#: ../mail/mail.error.xml.h:12
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"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 in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
+msgstr ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"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 in "
+"your message. To avoid this, you should add at least one To: or Cc: "
+"recipient. "
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
-msgid "Email:"
-msgstr "E-mail:"
+#: ../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."
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:304
-msgid "Server handles meeting invitations"
-msgstr "Server handles meeting invitations"
+#: ../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?"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:73
-msgid "Choose which address books to use."
-msgstr "Choose which address books to use."
+#: ../mail/mail.error.xml.h:17
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
+msgstr ""
+"The following recipient was not recognised as a valid mail address:\n"
+"{0}"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
-msgid "Use in Birthdays & Anniversaries calendar"
-msgstr "Use in Birthdays & Anniversaries calendar"
+#: ../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?"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:127
-msgid "Default User Calendar"
-msgstr "Default User Calendar"
+#: ../mail/mail.error.xml.h:20
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+"The following recipients were not recognised as valid mail addresses:\n"
+"{0}"
 
-#: ../modules/cal-config-google/e-google-chooser.c:508
-#, c-format
-msgid "Enter Google password for user '%s'."
-msgstr "Enter Google password for user '%s'."
+#: ../mail/mail.error.xml.h:22
+msgid "Send private reply?"
+msgstr "Send private reply?"
 
-#: ../modules/cal-config-google/e-google-chooser.c:525
-msgid "User declined to provide a password"
-msgstr "User declined to provide a password"
+#: ../mail/mail.error.xml.h:23
+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?"
+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?"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:161
-msgid "Use an existing iCalendar (ics) file"
-msgstr "Use an existing iCalendar (ics) file"
+#: ../mail/mail.error.xml.h:24
+msgid "Reply _Privately"
+msgstr "Reply _Privately"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:186
-msgid "iCalendar File"
-msgstr "iCalendar File"
+#: ../mail/mail.error.xml.h:26
+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?"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:198
-msgid "Choose an iCalendar file"
-msgstr "Choose an iCalendar file"
+#: ../mail/mail.error.xml.h:28
+msgid "Send reply to all recipients?"
+msgstr "Send reply to all recipients?"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:201
-msgid "File:"
-msgstr "File:"
+#: ../mail/mail.error.xml.h:29
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+msgstr ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:216
-msgid "Allow Evolution to update the file"
-msgstr "Allow Evolution to update the file"
+#: ../mail/mail.error.xml.h:30
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+"This message cannot be sent because you have not specified any recipients"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:323
-#: ../smime/gui/smime-ui.ui.h:32
-msgid "I_mport"
-msgstr "I_mport"
+#: ../mail/mail.error.xml.h:31
+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."
 
-#: ../modules/calendar/e-cal-attachment-handler.c:409
-msgid "Select a Calendar"
-msgstr "Select a Calendar"
+#: ../mail/mail.error.xml.h:32
+msgid "Use default drafts folder?"
+msgstr "Use default drafts folder?"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:436
-msgid "Select a Task List"
-msgstr "Select a Task List"
+#: ../mail/mail.error.xml.h:33
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:446
-msgid "I_mport to Calendar"
-msgstr "I_mport to Calendar"
+#: ../mail/mail.error.xml.h:34
+msgid "Use _Default"
+msgstr "Use _Default"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:453
-msgid "I_mport to Tasks"
-msgstr "I_mport to Tasks"
+#: ../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}\"?"
 
-#: ../modules/calendar/e-calendar-preferences.c:407
-msgid "Selected Calendars for Alarms"
-msgstr "Selected Calendars for Alarms"
+#: ../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."
 
-#: ../modules/calendar/e-calendar-preferences.c:829
-msgid "Ti_me and date:"
-msgstr "Ti_me and date:"
+#: ../mail/mail.error.xml.h:37
+msgid "_Expunge"
+msgstr "_Expunge"
 
-#: ../modules/calendar/e-calendar-preferences.c:830
-msgid "_Date only:"
-msgstr "_Date only:"
+#: ../mail/mail.error.xml.h:38
+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?"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:8
-msgid "Minutes"
-msgstr "Minutes"
+#: ../mail/mail.error.xml.h:39
+#: ../modules/mail/e-mail-shell-view-actions.c:1286
+msgid "_Empty Trash"
+msgstr "_Empty Wastebasket"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Hours"
-msgstr "Hours"
+#: ../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."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
-msgid "Days"
-msgstr "Days"
+#: ../mail/mail.error.xml.h:41
+msgid "_Open Messages"
+msgstr "_Open Messages"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
-msgid "60 minutes"
-msgstr "60 minutes"
+#: ../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?"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
-msgid "30 minutes"
-msgstr "30 minutes"
+#: ../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."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
-msgid "15 minutes"
-msgstr "15 minutes"
+#. 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}."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
-msgid "10 minutes"
-msgstr "10 minutes"
+#: ../mail/mail.error.xml.h:48
+msgid "Error while performing operation."
+msgstr "Error while performing operation."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
-msgid "05 minutes"
-msgstr "05 minutes"
+#: ../mail/mail.error.xml.h:49
+msgid "Enter password."
+msgstr "Enter password."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
-#: ../widgets/misc/e-dateedit.c:595
-msgid "Time"
-msgstr "Time"
+#: ../mail/mail.error.xml.h:50
+msgid "Error loading filter definitions."
+msgstr "Error loading filter definitions."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
-msgid "Se_cond zone:"
-msgstr "Se_cond zone:"
+#: ../mail/mail.error.xml.h:51
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Cannot save to directory \"{0}\"."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
-msgid "(Shown in a Day View)"
-msgstr "(Shown in a Day View)"
+#: ../mail/mail.error.xml.h:52
+msgid "Cannot save to file \"{0}\"."
+msgstr "Cannot save to file \"{0}\"."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
-msgid "Use s_ystem time zone"
-msgstr "Use s_ystem time zone"
+#: ../mail/mail.error.xml.h:53
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Cannot create the save directory, because \"{1}\""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
-msgid "Time format:"
-msgstr "Time format:"
+#: ../mail/mail.error.xml.h:54
+msgid "Cannot create temporary save directory."
+msgstr "Cannot create temporary save directory."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
-msgid "_12 hour (AM/PM)"
-msgstr "_12 hour (AM/PM)"
+#: ../mail/mail.error.xml.h:55
+msgid "File exists but cannot overwrite it."
+msgstr "File exists but cannot overwrite it."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:24
-msgid "_24 hour"
-msgstr "_24 hour"
+#: ../mail/mail.error.xml.h:56
+msgid "File exists but is not a regular file."
+msgstr "File exists but is not a regular file."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1743
-msgid "Work Week"
-msgstr "Work Week"
+#: ../mail/mail.error.xml.h:57
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Cannot delete folder \"{0}\"."
 
-#. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
-msgid "Wee_k starts on:"
-msgstr "Wee_k starts on:"
+#: ../mail/mail.error.xml.h:58
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Cannot delete system folder \"{0}\"."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
-msgid "Work days:"
-msgstr "Work days:"
+#: ../mail/mail.error.xml.h:59
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "_Day begins:"
-msgstr "_Day begins:"
+#: ../mail/mail.error.xml.h:60
+msgid "Failed to expunge folder &quot;{0}&quot;."
+msgstr "Failed to expunge folder &quot;{0}&quot;."
 
-#. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
-msgid "_Mon"
-msgstr "_Mon"
+#: ../mail/mail.error.xml.h:62
+msgid "Failed to refresh folder &quot;{0}&quot;."
+msgstr "Failed to refresh folder &quot;{0}&quot;."
 
-#. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
-msgid "_Tue"
-msgstr "_Tue"
-
-#. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
-msgid "_Wed"
-msgstr "_Wed"
+#: ../mail/mail.error.xml.h:63
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Cannot rename or move system folder \"{0}\"."
 
-#. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
-msgid "T_hu"
-msgstr "T_hu"
+#: ../mail/mail.error.xml.h:64
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Really delete folder \"{0}\" and all of its subfolders?"
 
-#. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
-msgid "_Fri"
-msgstr "_Fri"
+#: ../mail/mail.error.xml.h:65
+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."
 
-#. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
-msgid "_Sat"
-msgstr "_Sat"
+#: ../mail/mail.error.xml.h:67
+msgid "Really delete folder \"{0}\"?"
+msgstr "Really delete folder \"{0}\"?"
 
-#. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
-msgid "S_un"
-msgstr "S_un"
+#: ../mail/mail.error.xml.h:68
+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."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
-msgid "Day _ends:"
-msgstr "Day _ends:"
+#: ../mail/mail.error.xml.h:69
+msgid "These messages are not copies."
+msgstr "These messages are not copies."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Alerts"
-msgstr "Alerts"
+#: ../mail/mail.error.xml.h:70
+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?"
+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?"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "_Ask for confirmation when deleting items"
-msgstr "_Ask for confirmation when deleting items"
+#: ../mail/mail.error.xml.h:71
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Cannot rename \"{0}\" to \"{1}\"."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
-msgid "_Time divisions:"
-msgstr "_Time divisions:"
+#: ../mail/mail.error.xml.h:72
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "A folder named \"{1}\" already exists. Please use a different name."
 
-#: ../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"
+#: ../mail/mail.error.xml.h:73
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Cannot move folder \"{0}\" to \"{1}\"."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
-msgid "_Compress weekends in month view"
-msgstr "_Compress weekends in month view"
+#: ../mail/mail.error.xml.h:74
+msgid "Cannot open source folder. Error: {2}"
+msgstr "Cannot open source folder. Error: {2}"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
-msgid "Show week _numbers"
-msgstr "Show week _numbers"
+#: ../mail/mail.error.xml.h:75
+msgid "Cannot open target folder. Error: {2}"
+msgstr "Cannot open target folder. Error: {2}"
 
-#: ../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"
+#: ../mail/mail.error.xml.h:76
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
-msgid "Sc_roll Month View by a week"
-msgstr "Sc_roll Month View by a week"
+#: ../mail/mail.error.xml.h:77
+msgid "Cannot create folder \"{0}\"."
+msgstr "Cannot create folder \"{0}\"."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
-msgid "Display"
-msgstr "Display"
+#: ../mail/mail.error.xml.h:78
+msgid "Cannot open folder. Error: {1}"
+msgstr "Cannot open folder. Error: {1}"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
-msgid "Task List"
-msgstr "Task List"
+#: ../mail/mail.error.xml.h:79
+msgid "Cannot save changes to account."
+msgstr "Cannot save changes to account."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
-msgid "Highlight t_asks due today"
-msgstr "Highlight t_asks due today"
+#: ../mail/mail.error.xml.h:80
+msgid "You have not filled in all of the required information."
+msgstr "You have not filled in all of the required information."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
-msgid "Highlight _overdue tasks"
-msgstr "Highlight _overdue tasks"
+#: ../mail/mail.error.xml.h:81
+msgid "You may not create two accounts with the same name."
+msgstr "You may not create two accounts with the same name."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
-msgid "_Hide completed tasks after"
-msgstr "_Hide completed tasks after"
+#: ../mail/mail.error.xml.h:82
+msgid "Are you sure you want to delete this account?"
+msgstr "Are you sure you want to delete this account?"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
-msgid "Display reminders in _notification area only"
-msgstr "Display reminders in _notification area only"
+#: ../mail/mail.error.xml.h:83
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr "If you proceed, the account information will be deleted permanently."
 
-#. 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"
+#: ../mail/mail.error.xml.h:84
+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?"
 
-#. 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"
+#: ../mail/mail.error.xml.h:85
+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."
 
-#. 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"
+#: ../mail/mail.error.xml.h:87
+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?"
 
-#. 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"
+#: ../mail/mail.error.xml.h:88
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr "If you proceed, all proxy accounts will be deleted permanently."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
-msgid "Select the calendars for reminder notification"
-msgstr "Select the calendars for reminder notification"
+#: ../mail/mail.error.xml.h:89
+msgid "Do _Not Disable"
+msgstr "Do _Not Disable"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
-msgid "Default Free/Busy Server"
-msgstr "Default Free/Busy Server"
+#: ../mail/mail.error.xml.h:90
+#: ../plugins/publish-calendar/publish-calendar.c:635
+msgid "_Disable"
+msgstr "_Disable"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
-msgid "Template:"
-msgstr "Template:"
+#: ../mail/mail.error.xml.h:91
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "Cannot edit Search Folder \"{0}\" as it does not exist."
 
-#: ../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."
+#: ../mail/mail.error.xml.h:92
+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."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
-msgid "Publishing Information"
-msgstr "Publishing Information"
+#: ../mail/mail.error.xml.h:94
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "Cannot add Search Folder \"{0}\"."
 
-#: ../modules/calendar/e-cal-shell-backend.c:278
-#: ../modules/calendar/e-cal-shell-view-actions.c:192
-msgid "New Calendar"
-msgstr "New Calendar"
+#: ../mail/mail.error.xml.h:95
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "A folder named \"{0}\" already exists. Please use a different name."
 
-#: ../modules/calendar/e-cal-shell-backend.c:287
-msgctxt "New"
-msgid "_Appointment"
-msgstr "_Appointment"
+#: ../mail/mail.error.xml.h:96
+msgid "Search Folders automatically updated."
+msgstr "Search Folders automatically updated."
 
-#: ../modules/calendar/e-cal-shell-backend.c:289
-#: ../modules/calendar/e-cal-shell-view-actions.c:1548
-msgid "Create a new appointment"
-msgstr "Create a new appointment"
+#: ../mail/mail.error.xml.h:97
+msgid "Mail filters automatically updated."
+msgstr "Mail filters automatically updated."
 
-#: ../modules/calendar/e-cal-shell-backend.c:294
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "All Day A_ppointment"
+#: ../mail/mail.error.xml.h:98
+msgid "Missing folder."
+msgstr "Missing folder."
 
-#: ../modules/calendar/e-cal-shell-backend.c:296
-msgid "Create a new all-day appointment"
-msgstr "Create a new all-day appointment"
+#: ../mail/mail.error.xml.h:99
+msgid "You must specify a folder."
+msgstr "You must specify a folder."
 
-#: ../modules/calendar/e-cal-shell-backend.c:301
-msgctxt "New"
-msgid "M_eeting"
-msgstr "M_eeting"
+#: ../mail/mail.error.xml.h:101
+msgid "You must name this Search Folder."
+msgstr "You must name this Search Folder."
 
-#: ../modules/calendar/e-cal-shell-backend.c:303
-msgid "Create a new meeting request"
-msgstr "Create a new meeting request"
+#: ../mail/mail.error.xml.h:102
+msgid "No folder selected."
+msgstr "No folder selected."
 
-#: ../modules/calendar/e-cal-shell-backend.c:311
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "Cale_ndar"
+#: ../mail/mail.error.xml.h:103
+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."
 
-#: ../modules/calendar/e-cal-shell-backend.c:313
-#: ../modules/calendar/e-cal-shell-view-actions.c:1422
-msgid "Create a new calendar"
-msgstr "Create a new calendar"
+#: ../mail/mail.error.xml.h:105
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "Problem migrating old mail folder \"{0}\"."
 
-#: ../modules/calendar/e-cal-shell-backend.c:627
-msgid "Calendar and Tasks"
-msgstr "Calendar and Tasks"
+#: ../mail/mail.error.xml.h:106
+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."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:211
-msgid "Loading calendars"
-msgstr "Loading calendars"
+#: ../mail/mail.error.xml.h:109
+msgid "Ignore"
+msgstr "Ignore"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:731
-msgid "Calendar Selector"
-msgstr "Calendar Selector"
+#: ../mail/mail.error.xml.h:110
+msgid "_Overwrite"
+msgstr "_Overwrite"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:1090
-#, c-format
-msgid "Opening calendar '%s'"
-msgstr "Opening calendar '%s'"
+#: ../mail/mail.error.xml.h:111
+msgid "_Append"
+msgstr "_Append"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:292
-msgid "Calendar Properties"
-msgstr "Calendar Properties"
+#: ../mail/mail.error.xml.h:112
+msgid "Evolution's local mail format has changed."
+msgstr "Evolution's local mail format has changed."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:323
+#: ../mail/mail.error.xml.h:113
 msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
+"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 ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
+"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."
 
-#. Translators: This is the first part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:340
-msgid "Purge events older than"
-msgstr "Purge events older than"
+#: ../mail/mail.error.xml.h:116
+msgid "_Exit Evolution"
+msgstr "_Exit Evolution"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:591
-msgid "Copying Items"
-msgstr "Copying Items"
+#: ../mail/mail.error.xml.h:117
+msgid "_Migrate Now"
+msgstr "_Migrate Now"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:885
-msgid "Moving Items"
-msgstr "Moving Items"
+#: ../mail/mail.error.xml.h:118
+msgid "Unable to read license file."
+msgstr "Unable to read licence file."
 
-#. Translators: Default filename part saving an event to a file when
-#. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1218
-msgid "event"
-msgstr "event"
+#: ../mail/mail.error.xml.h:119
+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."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1220
-#: ../modules/calendar/e-cal-shell-view-memopad.c:231
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:549
-#: ../modules/calendar/e-task-shell-view-actions.c:666
-msgid "Save as iCalendar"
-msgstr "Save as iCalendar"
+#: ../mail/mail.error.xml.h:120
+msgid "Please wait."
+msgstr "Please wait."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
-#: ../modules/calendar/e-memo-shell-view-actions.c:630
-msgid "_Copy..."
-msgstr "_Copy…"
+#: ../mail/mail.error.xml.h:121
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr "Querying server for a list of supported authentication mechanisms."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
-msgid "D_elete Calendar"
-msgstr "D_elete Calendar"
+#: ../mail/mail.error.xml.h:122
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr ""
+"Failed to query server for a list of supported authentication mechanisms."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
-msgid "Delete the selected calendar"
-msgstr "Delete the selected calendar"
+#: ../mail/mail.error.xml.h:123
+msgid "Synchronize folders locally for offline usage?"
+msgstr "Synchronise folders locally for offline usage?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
-msgid "Go Back"
-msgstr "Go Back"
+#: ../mail/mail.error.xml.h:124
+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?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1401
-msgid "Go Forward"
-msgstr "Go Forward"
+#: ../mail/mail.error.xml.h:125
+msgid "Do _Not Synchronize"
+msgstr "Do _Not Synchronise"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
-msgid "Select today"
-msgstr "Select today"
+#: ../mail/mail.error.xml.h:126
+msgid "_Synchronize"
+msgstr "_Synchronise"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
-msgid "Select _Date"
-msgstr "Select _Date"
+#: ../mail/mail.error.xml.h:127
+msgid "Do you want to mark all messages as read?"
+msgstr "Do you want to mark all messages as read?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
-msgid "Select a specific date"
-msgstr "Select a specific date"
+#: ../mail/mail.error.xml.h:128
+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/calendar/e-cal-shell-view-actions.c:1420
-msgid "_New Calendar"
-msgstr "_New Calendar"
+#: ../mail/mail.error.xml.h:129
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
-#: ../modules/calendar/e-task-shell-view-actions.c:838
-msgid "Purg_e"
-msgstr "Purg_e"
+#: ../mail/mail.error.xml.h:130
+msgid "Close message window."
+msgstr "Close message window."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
-msgid "Purge old appointments and meetings"
-msgstr "Purge old appointments and meetings"
+#: ../mail/mail.error.xml.h:131
+msgid "Would you like to close the message window?"
+msgstr "Would you like to close the message window?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
-#: ../modules/calendar/e-memo-shell-view-actions.c:658
-#: ../modules/calendar/e-task-shell-view-actions.c:782
-msgid "Re_fresh"
-msgstr "Re_fresh"
+#: ../mail/mail.error.xml.h:132
+msgid "_Yes"
+msgstr "_Yes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
-msgid "Refresh the selected calendar"
-msgstr "Refresh the selected calendar"
+#: ../mail/mail.error.xml.h:133
+msgid "_No"
+msgstr "_No"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1450
-msgid "Rename the selected calendar"
-msgstr "Rename the selected calendar"
+#: ../mail/mail.error.xml.h:134
+msgid "_Always"
+msgstr "_Always"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
-msgid "Find _next"
-msgstr "Find _next"
+#: ../mail/mail.error.xml.h:135
+msgid "N_ever"
+msgstr "N_ever"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1457
-msgid "Find next occurrence of the current search string"
-msgstr "Find next occurrence of the current search string"
+#: ../mail/mail.error.xml.h:136
+msgid "Copy folder in folder tree."
+msgstr "Copy folder in folder tree."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
-msgid "Find _previous"
-msgstr "Find _previous"
+#: ../mail/mail.error.xml.h:137
+msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
+msgstr "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1464
-msgid "Find previous occurrence of the current search string"
-msgstr "Find previous occurrence of the current search string"
+#: ../mail/mail.error.xml.h:138
+msgid "Move folder in folder tree."
+msgstr "Move folder in folder tree."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1469
-msgid "Stop _running search"
-msgstr "Stop _running search"
+#: ../mail/mail.error.xml.h:139
+msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
+msgstr "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1471
-msgid "Stop currently running search"
-msgstr "Stop currently running search"
+#: ../mail/mail.error.xml.h:140
+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/calendar/e-cal-shell-view-actions.c:1476
-msgid "Show _Only This Calendar"
-msgstr "Show _Only This Calendar"
+#  mail:gw-accountsetup-error secondary
+#: ../mail/mail.error.xml.h:141
+msgid "Please enable the account or send using another account."
+msgstr "Please enable the account or send using another account."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
-msgid "Cop_y to Calendar..."
-msgstr "Cop_y to Calendar…"
+#: ../mail/mail.error.xml.h:142
+msgid "Mail Deletion Failed"
+msgstr "Mail Deletion Failed"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1490
-msgid "_Delegate Meeting..."
-msgstr "_Delegate Meeting…"
+#: ../mail/mail.error.xml.h:143
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "You do not have sufficient permissions to delete this mail."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1497
-msgid "_Delete Appointment"
-msgstr "_Delete Appointment"
+#: ../mail/mail.error.xml.h:144
+msgid "\"Check Junk\" Failed"
+msgstr "\"Check Junk\" Failed"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1499
-msgid "Delete selected appointments"
-msgstr "Delete selected appointments"
+#: ../mail/mail.error.xml.h:145
+msgid "\"Report Junk\" Failed"
+msgstr "\"Report Junk\" Failed"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
-msgid "Delete This _Occurrence"
-msgstr "Delete This _Occurrence"
+#: ../mail/mail.error.xml.h:146
+msgid "\"Report Not Junk\" Failed"
+msgstr "\"Report Not Junk\" Failed"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
-msgid "Delete this occurrence"
-msgstr "Delete this occurrence"
+#: ../mail/mail.error.xml.h:147
+msgid "Remove duplicate messages?"
+msgstr "Remove duplicate messages?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
-msgid "Delete All Occ_urrences"
-msgstr "Delete All Occ_urrences"
+#: ../mail/mail.error.xml.h:148
+msgid "No duplicate messages found."
+msgstr "No duplicate messages found."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1513
-msgid "Delete all occurrences"
-msgstr "Delete all occurrences"
+#. Translators: {0} is replaced with a folder name
+#: ../mail/mail.error.xml.h:150
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr "Folder '{0}' doesn't contain any duplicate messages."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
-msgid "New All Day _Event..."
-msgstr "New All Day _Event…"
+#: ../mail/mail.error.xml.h:151
+msgid "Failed to disconnect account &quot;{0}&quot;."
+msgstr "Failed to disconnect account &quot;{0}&quot;."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1520
-msgid "Create a new all day event"
-msgstr "Create a new all-day event"
+#: ../mail/mail.error.xml.h:153
+msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
+msgstr "Failed to unsubscribe from folder &quot;{0}&quot;."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
-#: ../modules/calendar/e-cal-shell-view-memopad.c:265
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
-#: ../modules/calendar/e-task-shell-view-actions.c:747
-msgid "_Forward as iCalendar..."
-msgstr "_Forward as iCalendar…"
+#: ../mail/mail.error.xml.h:154
+msgid "Unable to retrieve message."
+msgstr "Unable to retrieve message."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
-msgid "New _Meeting..."
-msgstr "New _Meeting…"
+#: ../mail/mail.error.xml.h:155
+msgid "{0}"
+msgstr "{0}"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1534
-msgid "Create a new meeting"
-msgstr "Create a new meeting"
+#: ../mail/mail.error.xml.h:156
+msgid "Failed to open folder."
+msgstr "Failed to open folder."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1539
-msgid "Mo_ve to Calendar..."
-msgstr "Mo_ve to Calendar…"
+#: ../mail/mail.error.xml.h:157
+msgid "Failed to find duplicate messages."
+msgstr "Failed to find duplicate messages."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1546
-msgid "New _Appointment..."
-msgstr "New _Appointment…"
+#: ../mail/mail.error.xml.h:158
+msgid "Failed to retrieve messages."
+msgstr "Failed to retrieve messages."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1553
-msgid "Make this Occurrence _Movable"
-msgstr "Make this Occurrence _Movable"
+#: ../mail/mail.error.xml.h:159
+msgid "Failed to remove attachments from messages."
+msgstr "Failed to remove attachments from messages."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1560
-msgid "_Open Appointment"
-msgstr "_Open Appointment"
+#: ../mail/mail.error.xml.h:160
+msgid "Failed to download messages for offline viewing."
+msgstr "Failed to download messages for offline viewing."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1562
-msgid "View the current appointment"
-msgstr "View the current appointment"
+#: ../mail/mail.error.xml.h:161
+msgid "Failed to save messages to disk."
+msgstr "Failed to save messages to disk."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1567
-msgid "_Reply"
-msgstr "_Reply"
+#: ../mail/mail.error.xml.h:162
+msgid "Hidden file is attached."
+msgstr "Hidden file is attached."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1581
-msgid "_Schedule Meeting..."
-msgstr "_Schedule Meeting…"
+#: ../mail/mail.error.xml.h:163
+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/calendar/e-cal-shell-view-actions.c:1583
-msgid "Converts an appointment to a meeting"
-msgstr "Converts an appointment to a meeting"
+#: ../mail/mail.error.xml.h:164
+msgid "Printing failed."
+msgstr "Printing failed."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
-msgid "Conv_ert to Appointment..."
-msgstr "Conv_ert to Appointment…"
+#: ../mail/mail.error.xml.h:165
+msgid "The printer replied &quot;{0}&quot;."
+msgstr "The printer replied &quot;{0}&quot;."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1590
-msgid "Converts a meeting to an appointment"
-msgstr "Converts a meeting to an appointment"
+#: ../mail/mail.error.xml.h:166
+msgid "Could not perform this operation on {0}."
+msgstr "Could not perform this operation on {0}."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
-msgid "Quit"
-msgstr "Quit"
+#: ../mail/mail.error.xml.h:167
+msgid "You must be working online to complete this operation."
+msgstr "You must be working online to complete this operation."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1715
-msgid "Day"
-msgstr "Day"
+#: ../mail/mail-send-recv.c:202
+msgid "Canceling..."
+msgstr "Cancelling…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
-msgid "Show one day"
-msgstr "Show one day"
+#: ../mail/mail-send-recv.c:546
+msgid "Send & Receive Mail"
+msgstr "Send & Receive Mail"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1722
-msgid "List"
-msgstr "List"
+#: ../mail/mail-send-recv.c:562
+msgid "Cancel _All"
+msgstr "Cancel _All"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1724
-msgid "Show as list"
-msgstr "Show as list"
+#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:1041
+msgid "Updating..."
+msgstr "Updating…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1729
-msgid "Month"
-msgstr "Month"
+#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:736
+msgid "Waiting..."
+msgstr "Waiting…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
-msgid "Show one month"
-msgstr "Show one month"
+#: ../mail/mail-send-recv.c:1020
+#, c-format
+msgid "Checking for new mail at '%s'"
+msgstr "Checking for new mail at '%s'"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1736
-msgid "Week"
-msgstr "Week"
+#: ../mail/mail-vfolder-ui.c:78
+msgid "Search Folders"
+msgstr "Search Folders"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1738
-msgid "Show one week"
-msgstr "Show one week"
+#: ../mail/mail-vfolder-ui.c:158
+msgid "Edit Search Folder"
+msgstr "Edit Search Folder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1745
-msgid "Show one work week"
-msgstr "Show one work week"
+#: ../mail/mail-vfolder-ui.c:279
+msgid "New Search Folder"
+msgstr "New Search Folder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
-msgid "Active Appointments"
-msgstr "Active Appointments"
+#: ../mail/message-list.c:1244
+msgid "Unseen"
+msgstr "Unseen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1767
-msgid "Next 7 Days' Appointments"
-msgstr "Next 7 Days' Appointments"
+#: ../mail/message-list.c:1245
+msgid "Seen"
+msgstr "Seen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1774
-msgid "Occurs Less Than 5 Times"
-msgstr "Occurs Less Than 5 Times"
+#: ../mail/message-list.c:1246
+msgid "Answered"
+msgstr "Answered"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1805
-#: ../modules/calendar/e-memo-shell-view-actions.c:820
-#: ../modules/calendar/e-task-shell-view-actions.c:1019
-msgid "Description contains"
-msgstr "Description contains"
+#: ../mail/message-list.c:1247
+msgid "Forwarded"
+msgstr "Forwarded"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1812
-#: ../modules/calendar/e-memo-shell-view-actions.c:827
-#: ../modules/calendar/e-task-shell-view-actions.c:1026
-msgid "Summary contains"
-msgstr "Summary contains"
+#: ../mail/message-list.c:1248
+msgid "Multiple Unseen Messages"
+msgstr "Multiple Unseen Messages"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1824
-msgid "Print this calendar"
-msgstr "Print this calendar"
+#: ../mail/message-list.c:1249
+msgid "Multiple Messages"
+msgstr "Multiple Messages"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1831
-msgid "Preview the calendar to be printed"
-msgstr "Preview the calendar to be printed"
+#: ../mail/message-list.c:1253
+msgid "Lowest"
+msgstr "Lowest"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1853
-#: ../modules/calendar/e-cal-shell-view-memopad.c:306
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:393
-#: ../modules/calendar/e-memo-shell-view-actions.c:868
-#: ../modules/calendar/e-task-shell-view-actions.c:1067
-msgid "_Save as iCalendar..."
-msgstr "_Save as iCalendar…"
+#: ../mail/message-list.c:1254
+msgid "Lower"
+msgstr "Lower"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1930
-msgid "Go To"
-msgstr "Go To"
+#: ../mail/message-list.c:1258
+msgid "Higher"
+msgstr "Higher"
 
-#. Translators: Default filename part saving a memo to a file when
-#. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:229
-#: ../modules/calendar/e-memo-shell-view-actions.c:547
-msgid "memo"
-msgstr "memo"
+#: ../mail/message-list.c:1259
+msgid "Highest"
+msgstr "Highest"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../modules/calendar/e-memo-shell-view-actions.c:679
-msgid "New _Memo"
-msgstr "New _Memo"
+#. strftime format of a time,
+#. * in 12-hour format, without seconds.
+#: ../mail/message-list.c:1889 ../modules/itip-formatter/itip-view.c:244
+msgid "Today %l:%M %p"
+msgstr "Today %l:%M %p"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-memo-shell-backend.c:204
-#: ../modules/calendar/e-memo-shell-view-actions.c:681
-msgid "Create a new memo"
-msgstr "Create a new memo"
+#: ../mail/message-list.c:1898
+msgid "Yesterday %l:%M %p"
+msgstr "Yesterday %l:%M %p"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:279
-#: ../modules/calendar/e-memo-shell-view-actions.c:686
-msgid "_Open Memo"
-msgstr "_Open Memo"
+#: ../mail/message-list.c:1910
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M %p"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:688
-msgid "View the selected memo"
-msgstr "View the selected memo"
+#: ../mail/message-list.c:1918
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %l:%M %p"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:286
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-memo-shell-view-actions.c:693
-#: ../modules/calendar/e-task-shell-view-actions.c:831
-msgid "Open _Web Page"
-msgstr "Open _Web Page"
+#: ../mail/message-list.c:1920
+msgid "%b %d %Y"
+msgstr "%d %b %Y"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:853
-msgid "Print the selected memo"
-msgstr "Print the selected memo"
+#: ../mail/message-list.c:2751
+msgid "Select all visible messages"
+msgstr "Select all visible messages"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1496
-msgid "Searching next matching event"
-msgstr "Searching next matching event"
+#: ../mail/message-list.c:2889 ../mail/message-list.etspec.h:17
+msgid "Messages"
+msgstr "Messages"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1497
-msgid "Searching previous matching event"
-msgstr "Searching previous matching event"
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:4136
+msgid "Follow-up"
+msgstr "Follow-up"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1518
-#, c-format
-msgid "Cannot find matching event in the next %d year"
-msgid_plural "Cannot find matching event in the next %d years"
-msgstr[0] "Cannot find matching event in the next %d year"
-msgstr[1] "Cannot find matching event in the next %d years"
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:4638 ../mail/message-list.c:5042
+msgid "Generating message list"
+msgstr "Generating message list"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1522
-#, c-format
-msgid "Cannot find matching event in the previous %d year"
-msgid_plural "Cannot find matching event in the previous %d years"
-msgstr[0] "Cannot find matching event in the previous %d year"
-msgstr[1] "Cannot find matching event in the previous %d years"
+#: ../mail/message-list.c:4872
+msgid ""
+"No message satisfies your search criteria. Change search criteria by "
+"selecting a new Show message filter from the drop down list above or by "
+"running a new search either by clearing it with Search->Clear menu item or "
+"by changing the query above."
+msgstr ""
+"No message satisfies your search criteria. Change search criteria by "
+"selecting a new Show message filter from the drop down list above or by "
+"running a new search either by clearing it with Search->Clear menu item or "
+"by changing the query above."
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1547
-msgid "Cannot search with no active calendar"
-msgstr "Cannot search with no active calendar"
+#: ../mail/message-list.c:4877
+msgid "There are no messages in this folder."
+msgstr "There are no messages in this folder."
 
-#. Translators: Default filename part saving a task to a file when
-#. * no summary is filed, the '.ics' extension is concatenated to it.
-#. Translators: Default filename part saving a task to a file when
-#. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:296
-#: ../modules/calendar/e-task-shell-view-actions.c:664
-msgid "task"
-msgstr "task"
+#: ../mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr "Flagged"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../modules/calendar/e-task-shell-view-actions.c:726
-msgid "_Assign Task"
-msgstr "_Assign Task"
+#: ../mail/message-list.etspec.h:8
+msgid "Received"
+msgstr "Received"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:803
-msgid "_Mark as Complete"
-msgstr "_Mark as Complete"
+#: ../mail/message-list.etspec.h:11
+msgid "Flag Status"
+msgstr "Flag Status"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:805
-msgid "Mark selected tasks as complete"
-msgstr "Mark selected tasks as complete"
+#: ../mail/message-list.etspec.h:12
+msgid "Follow Up Flag"
+msgstr "Follow Up Flag"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-msgid "_Mark as Incomplete"
-msgstr "_Mark as Incomplete"
+#: ../mail/message-list.etspec.h:13
+msgid "Due By"
+msgstr "Due By"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:812
-msgid "Mark selected tasks as incomplete"
-msgstr "Mark selected tasks as incomplete"
+#: ../mail/message-list.etspec.h:18
+msgid "Messages To"
+msgstr "Messages To"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:817
-msgid "New _Task"
-msgstr "New _Task"
+#: ../mail/message-list.etspec.h:20
+msgid "Subject - Trimmed"
+msgstr "Subject — Trimmed"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-task-shell-backend.c:201
-#: ../modules/calendar/e-task-shell-view-actions.c:819
-msgid "Create a new task"
-msgstr "Create a new task"
+#: ../mail/searchtypes.xml.h:1
+msgid "Subject or Addresses contains"
+msgstr "Subject or Addresses contains"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:366
-#: ../modules/calendar/e-task-shell-view-actions.c:824
-msgid "_Open Task"
-msgstr "_Open Task"
+#: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1762
+msgid "Recipients contain"
+msgstr "Recipients contain"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:826
-msgid "View the selected task"
-msgstr "View the selected task"
+#: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1755
+msgid "Message contains"
+msgstr "Message contains"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:385
-#: ../modules/calendar/e-task-shell-view-actions.c:1052
-msgid "Print the selected task"
-msgstr "Print the selected task"
+#: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1776
+msgid "Subject contains"
+msgstr "Subject contains"
 
-#: ../modules/calendar/e-memo-shell-backend.c:193
-#: ../modules/calendar/e-memo-shell-view-actions.c:217
-msgid "New Memo List"
-msgstr "New Memo List"
+#: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1769
+msgid "Sender contains"
+msgstr "Sender contains"
 
-#: ../modules/calendar/e-memo-shell-backend.c:202
-msgctxt "New"
-msgid "Mem_o"
-msgstr "Mem_o"
+#: ../mail/searchtypes.xml.h:6
+#: ../modules/mail/e-mail-shell-view-actions.c:1748
+msgid "Body contains"
+msgstr "Body contains"
 
-#: ../modules/calendar/e-memo-shell-backend.c:209
-msgctxt "New"
-msgid "_Shared Memo"
-msgstr "_Shared Memo"
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
+#: ../modules/addressbook/autocompletion-config.c:92
+#: ../modules/mail/em-mailer-prefs.c:1139
+msgid "_Table column:"
+msgstr "_Table column:"
 
-#: ../modules/calendar/e-memo-shell-backend.c:211
-msgid "Create a new shared memo"
-msgstr "Create a new shared memo"
+#: ../modules/addressbook/autocompletion-config.c:95
+msgid "Address formatting"
+msgstr "Address formatting"
 
-#: ../modules/calendar/e-memo-shell-backend.c:219
-msgctxt "New"
-msgid "Memo Li_st"
-msgstr "Memo Li_st"
+#: ../modules/addressbook/autocompletion-config.c:98
+msgid "_Format address according to standard of its destination country"
+msgstr "_Format address according to standard of its destination country"
 
-#: ../modules/calendar/e-memo-shell-backend.c:221
-#: ../modules/calendar/e-memo-shell-view-actions.c:646
-msgid "Create a new memo list"
-msgstr "Create a new memo list"
+#: ../modules/addressbook/autocompletion-config.c:107
+msgid "Autocompletion"
+msgstr "Autocompletion"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:206
-msgid "Loading memos"
-msgstr "Loading memos"
+#: ../modules/addressbook/autocompletion-config.c:110
+msgid "Always _show address of the autocompleted contact"
+msgstr "Always _show address of the autocompleted contact"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:663
-msgid "Memo List Selector"
-msgstr "Memo List Selector"
+#: ../modules/addressbook/eab-composer-util.c:148
+msgid "Multiple vCards"
+msgstr "Multiple vCards"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:975
+#: ../modules/addressbook/eab-composer-util.c:156
 #, c-format
-msgid "Opening memo list '%s'"
-msgstr "Opening memo list '%s'"
+msgid "vCard for %s"
+msgstr "vCard for %s"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view-actions.c:248
-msgid "Print Memos"
-msgstr "Print Memos"
+#: ../modules/addressbook/eab-composer-util.c:168
+#: ../modules/addressbook/eab-composer-util.c:195
+#, c-format
+msgid "Contact information"
+msgstr "Contact information"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:289
-msgid "Memo List Properties"
-msgstr "Memo List Properties"
+#: ../modules/addressbook/eab-composer-util.c:197
+#, c-format
+msgid "Contact information for %s"
+msgstr "Contact information for %s"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:609
-msgid "_Delete Memo"
-msgstr "_Delete Memo"
+#: ../modules/addressbook/e-book-shell-backend.c:260
+#: ../modules/addressbook/e-book-shell-view-actions.c:125
+msgid "New Address Book"
+msgstr "New Address Book"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
-msgid "_Find in Memo..."
-msgstr "_Find in Memo…"
+#: ../modules/addressbook/e-book-shell-backend.c:269
+msgctxt "New"
+msgid "_Contact"
+msgstr "_Contact"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:618
-msgid "Search for text in the displayed memo"
-msgstr "Search for text in the displayed memo"
+#: ../modules/addressbook/e-book-shell-backend.c:271
+#: ../modules/addressbook/e-book-shell-view-actions.c:936
+msgid "Create a new contact"
+msgstr "Create a new contact"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
-msgid "D_elete Memo List"
-msgstr "D_elete Memo List"
+#: ../modules/addressbook/e-book-shell-backend.c:276
+msgctxt "New"
+msgid "Contact _List"
+msgstr "Contact _List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:639
-msgid "Delete the selected memo list"
-msgstr "Delete the selected memo list"
+#: ../modules/addressbook/e-book-shell-backend.c:278
+#: ../modules/addressbook/e-book-shell-view-actions.c:943
+msgid "Create a new contact list"
+msgstr "Create a new contact list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
-msgid "_New Memo List"
-msgstr "_New Memo List"
+#: ../modules/addressbook/e-book-shell-backend.c:286
+msgctxt "New"
+msgid "Address _Book"
+msgstr "Address _Book"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-msgid "Refresh the selected memo list"
-msgstr "Refresh the selected memo list"
+#: ../modules/addressbook/e-book-shell-backend.c:288
+#: ../modules/addressbook/e-book-shell-view-actions.c:866
+msgid "Create a new address book"
+msgstr "Create a new address book"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:667
-msgid "Rename the selected memo list"
-msgstr "Rename the selected memo list"
+#: ../modules/addressbook/e-book-shell-backend.c:316
+msgid "Certificates"
+msgstr "Certificates"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:672
-msgid "Show _Only This Memo List"
-msgstr "Show _Only This Memo List"
+#: ../modules/addressbook/e-book-shell-view-actions.c:198
+msgid "Address Book Properties"
+msgstr "Address Book Properties"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-msgid "Memo _Preview"
-msgstr "Memo _Preview"
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:418
+#: ../modules/addressbook/e-book-shell-view-actions.c:714
+msgid "Save as vCard"
+msgstr "Save as vCard…"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:753
-msgid "Show memo preview pane"
-msgstr "Show memo preview pane"
+#: ../modules/addressbook/e-book-shell-view-actions.c:843
+msgid "Co_py All Contacts To..."
+msgstr "Co_py All Contacts To…"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-msgid "Show memo preview below the memo list"
-msgstr "Show memo preview below the memo list"
+#: ../modules/addressbook/e-book-shell-view-actions.c:845
+msgid "Copy the contacts of the selected address book to another"
+msgstr "Copy the contacts of the selected address book to another"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-msgid "Show memo preview alongside the memo list"
-msgstr "Show memo preview alongside the memo list"
+#: ../modules/addressbook/e-book-shell-view-actions.c:850
+msgid "D_elete Address Book"
+msgstr "D_elete Address Book"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:839
-msgid "Print the list of memos"
-msgstr "Print the list of memos"
+#: ../modules/addressbook/e-book-shell-view-actions.c:852
+msgid "Delete the selected address book"
+msgstr "Delete the selected address book"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:846
-msgid "Preview the list of memos to be printed"
-msgstr "Preview the list of memos to be printed"
+#: ../modules/addressbook/e-book-shell-view-actions.c:857
+msgid "Mo_ve All Contacts To..."
+msgstr "Mo_ve All Contacts To…"
 
-#: ../modules/calendar/e-memo-shell-view.c:236
-msgid "Delete Memos"
-msgstr "Delete Memos"
+#: ../modules/addressbook/e-book-shell-view-actions.c:859
+msgid "Move the contacts of the selected address book to another"
+msgstr "Move the contacts of the selected address book to another"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
-msgid "Delete Memo"
-msgstr "Delete Memo"
+#: ../modules/addressbook/e-book-shell-view-actions.c:864
+msgid "_New Address Book"
+msgstr "_New Address Book"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:428
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d memo"
-msgstr[1] "%d memos"
+#: ../modules/addressbook/e-book-shell-view-actions.c:871
+msgid "Address _Book Properties"
+msgstr "Address _Book Properties"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:432
-#: ../modules/calendar/e-task-shell-view-private.c:613
-#, c-format
-msgid "%d selected"
-msgstr "%d selected"
+#: ../modules/addressbook/e-book-shell-view-actions.c:873
+msgid "Show properties of the selected address book"
+msgstr "Show properties of the selected address book"
 
-#: ../modules/calendar/e-task-shell-backend.c:190
-#: ../modules/calendar/e-task-shell-view-actions.c:240
-msgid "New Task List"
-msgstr "New Task List"
+#: ../modules/addressbook/e-book-shell-view-actions.c:878
+msgid "Address Book _Map"
+msgstr "Address Book _Map"
 
-#: ../modules/calendar/e-task-shell-backend.c:199
-msgctxt "New"
-msgid "_Task"
-msgstr "_Task"
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+msgid "Show map with all contacts from selected address book"
+msgstr "Show map with all contacts from selected address book"
 
-#: ../modules/calendar/e-task-shell-backend.c:206
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "Assigne_d Task"
+#: ../modules/addressbook/e-book-shell-view-actions.c:885
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
+#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/mail/e-mail-shell-view-actions.c:1377
+msgid "_Rename..."
+msgstr "_Rename…"
 
-#: ../modules/calendar/e-task-shell-backend.c:208
-msgid "Create a new assigned task"
-msgstr "Create a new assigned task"
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+msgid "Rename the selected address book"
+msgstr "Rename the selected address book"
 
-#: ../modules/calendar/e-task-shell-backend.c:216
-msgctxt "New"
-msgid "Tas_k List"
-msgstr "Tas_k List"
+#: ../modules/addressbook/e-book-shell-view-actions.c:894
+msgid "Stop loading"
+msgstr "Stop loading"
 
-#: ../modules/calendar/e-task-shell-backend.c:218
-#: ../modules/calendar/e-task-shell-view-actions.c:770
-msgid "Create a new task list"
-msgstr "Create a new task list"
+#: ../modules/addressbook/e-book-shell-view-actions.c:899
+msgid "_Copy Contact To..."
+msgstr "_Copy Contact To…"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:206
-msgid "Loading tasks"
-msgstr "Loading tasks"
+#: ../modules/addressbook/e-book-shell-view-actions.c:901
+msgid "Copy selected contacts to another address book"
+msgstr "Copy selected contacts to another address book"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:663
-msgid "Task List Selector"
-msgstr "Task List Selector"
+#: ../modules/addressbook/e-book-shell-view-actions.c:906
+msgid "_Delete Contact"
+msgstr "_Delete Contact"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:975
-#, c-format
-msgid "Opening task list '%s'"
-msgstr "Opening task list '%s'"
+#: ../modules/addressbook/e-book-shell-view-actions.c:913
+msgid "_Find in Contact..."
+msgstr "_Find in Contact…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view-actions.c:271
-msgid "Print Tasks"
-msgstr "Print Tasks"
+#: ../modules/addressbook/e-book-shell-view-actions.c:915
+msgid "Search for text in the displayed contact"
+msgstr "Search for text in the displayed contact"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:312
-msgid "Task List Properties"
-msgstr "Task List Properties"
+#: ../modules/addressbook/e-book-shell-view-actions.c:920
+msgid "_Forward Contact..."
+msgstr "_Forward Contact…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:608
-msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
-"\n"
-"Really erase these tasks?"
-msgstr ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
-"\n"
-"Really erase these tasks?"
+#: ../modules/addressbook/e-book-shell-view-actions.c:922
+msgid "Send selected contacts to another person"
+msgstr "Send selected contacts to another person"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:615
-msgid "Do not ask me again"
-msgstr "Do not ask me again"
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
+msgid "_Move Contact To..."
+msgstr "_Move Contact To…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:733
-msgid "_Delete Task"
-msgstr "_Delete Task"
+#: ../modules/addressbook/e-book-shell-view-actions.c:929
+msgid "Move selected contacts to another address book"
+msgstr "Move selected contacts to another address book"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:740
-msgid "_Find in Task..."
-msgstr "_Find in Task…"
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
+msgid "_New Contact..."
+msgstr "_New Contact…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:742
-msgid "Search for text in the displayed task"
-msgstr "Search for text in the displayed task"
+#: ../modules/addressbook/e-book-shell-view-actions.c:941
+msgid "New Contact _List..."
+msgstr "New Contact _List…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:754
-msgid "Copy..."
-msgstr "Copy…"
+#: ../modules/addressbook/e-book-shell-view-actions.c:948
+msgid "_Open Contact"
+msgstr "_Open Contact"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
-msgid "D_elete Task List"
-msgstr "D_elete Task List"
+#: ../modules/addressbook/e-book-shell-view-actions.c:950
+msgid "View the current contact"
+msgstr "View the current contact"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:763
-msgid "Delete the selected task list"
-msgstr "Delete the selected task list"
+#: ../modules/addressbook/e-book-shell-view-actions.c:955
+msgid "_Send Message to Contact..."
+msgstr "_Send Message to Contact…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:768
-msgid "_New Task List"
-msgstr "_New Task List"
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
+msgid "Send a message to the selected contacts"
+msgstr "Send a message to the selected contacts"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:784
-msgid "Refresh the selected task list"
-msgstr "Refresh the selected task list"
+#: ../modules/addressbook/e-book-shell-view-actions.c:964
+#: ../modules/calendar/e-cal-shell-view-actions.c:1601
+#: ../modules/calendar/e-task-shell-view-actions.c:846
+msgid "_Actions"
+msgstr "_Actions"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:791
-msgid "Rename the selected task list"
-msgstr "Rename the selected task list"
+#: ../modules/addressbook/e-book-shell-view-actions.c:971
+#: ../modules/calendar/e-memo-shell-view-actions.c:701
+#: ../modules/calendar/e-task-shell-view-actions.c:853
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
+msgid "_Preview"
+msgstr "_Preview"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:796
-msgid "Show _Only This Task List"
-msgstr "Show _Only This Task List"
+#: ../modules/addressbook/e-book-shell-view-actions.c:980
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-memo-shell-view-actions.c:714
+#: ../modules/calendar/e-task-shell-view-actions.c:866
+msgid "_Delete"
+msgstr "_Delete"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:810
-msgid "Mar_k as Incomplete"
-msgstr "Mar_k as Incomplete"
+#: ../modules/addressbook/e-book-shell-view-actions.c:984
+#: ../modules/mail/e-mail-shell-view-actions.c:1293
+msgid "_Properties"
+msgstr "_Properties"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:840
-msgid "Delete completed tasks"
-msgstr "Delete completed tasks"
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
+msgid "Address Book Map"
+msgstr "Address Book Map"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
-msgid "Task _Preview"
-msgstr "Task _Preview"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1020
+msgid "Contact _Preview"
+msgstr "Contact _Preview"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:917
-msgid "Show task preview pane"
-msgstr "Show task preview pane"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1022
+msgid "Show contact preview window"
+msgstr "Show contact preview window"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:938
-msgid "Show task preview below the task list"
-msgstr "Show task preview below the task list"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1028
+msgid "Show _Maps"
+msgstr "Show _Maps"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:945
-msgid "Show task preview alongside the task list"
-msgstr "Show task preview alongside the task list"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+msgid "Show maps in contact preview window"
+msgstr "Show maps in contact preview window"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:953
-msgid "Active Tasks"
-msgstr "Active Tasks"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1049
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/mail/e-mail-shell-view-actions.c:1665
+msgid "_Classic View"
+msgstr "_Classic View"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:967
-msgid "Completed Tasks"
-msgstr "Completed Tasks"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1051
+msgid "Show contact preview below the contact list"
+msgstr "Show contact preview below the contact list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:974
-msgid "Next 7 Days' Tasks"
-msgstr "Next 7 Days' Tasks"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1056
+#: ../modules/calendar/e-memo-shell-view-actions.c:778
+#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/mail/e-mail-shell-view-actions.c:1672
+msgid "_Vertical View"
+msgstr "_Vertical View"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:981
-msgid "Overdue Tasks"
-msgstr "Overdue Tasks"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1058
+msgid "Show contact preview alongside the contact list"
+msgstr "Show contact preview alongside the contact list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:988
-msgid "Tasks with Attachments"
-msgstr "Tasks with Attachments"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
+#: ../modules/calendar/e-cal-shell-view-actions.c:1778
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:994
+msgid "Unmatched"
+msgstr "Unmatched"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1038
-msgid "Print the list of tasks"
-msgstr "Print the list of tasks"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1083
+#: ../modules/calendar/e-cal-shell-view-actions.c:1788
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
+#: ../modules/mail/e-mail-shell-view-actions.c:1741
+#: ../shell/e-shell-content.c:657
+msgid "Advanced Search"
+msgstr "Advanced Search"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1045
-msgid "Preview the list of tasks to be printed"
-msgstr "Preview the list of tasks to be printed"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+msgid "Print all shown contacts"
+msgstr "Print all shown contacts"
 
-#: ../modules/calendar/e-task-shell-view.c:371
-msgid "Delete Tasks"
-msgstr "Delete Tasks"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1123
+msgid "Preview the contacts to be printed"
+msgstr "Preview the contacts to be printed"
 
-#: ../modules/calendar/e-task-shell-view.c:373
-msgid "Delete Task"
-msgstr "Delete Task"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1130
+msgid "Print selected contacts"
+msgstr "Print selected contacts"
 
-#: ../modules/calendar/e-task-shell-view-private.c:502
-msgid "Expunging"
-msgstr "Expunging"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1145
+msgid "S_ave Address Book as vCard"
+msgstr "S_ave Address Book as vCard"
 
-#: ../modules/calendar/e-task-shell-view-private.c:609
-#, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "%d task"
-msgstr[1] "%d tasks"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
+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/imap-features/e-mail-config-imap-headers-page.c:225
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:395
-msgid "IMAP Headers"
-msgstr "IMAP Headers"
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:1153
+#: ../modules/addressbook/e-book-shell-view-actions.c:1163
+msgid "_Save as vCard..."
+msgstr "_Save as vCard…"
 
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:233
-msgid ""
-"Select a predefined set of IMAP headers to fetch.\n"
-"Note, larger sets of headers take longer to download."
-msgstr ""
-"Select a predefined set of IMAP headers to fetch.\n"
-"Note, larger sets of headers take longer to download."
+#: ../modules/addressbook/e-book-shell-view-actions.c:1155
+msgid "Save selected contacts as a vCard"
+msgstr "Save selected contacts as a vCard"
+
+#: ../modules/addressbook/e-book-shell-view.c:300
+msgid "_Forward Contacts"
+msgstr "_Forward Contacts"
+
+#: ../modules/addressbook/e-book-shell-view.c:302
+msgid "_Forward Contact"
+msgstr "_Forward Contact"
 
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:243
-msgid "_Fetch All Headers"
-msgstr "_Fetch All Headers"
+#: ../modules/addressbook/e-book-shell-view.c:333
+msgid "_Send Message to Contacts"
+msgstr "_Send Message to Contacts"
 
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:257
-msgid "_Basic Headers (fastest)"
-msgstr "_Basic Headers (fastest)"
+#: ../modules/addressbook/e-book-shell-view.c:335
+msgid "_Send Message to List"
+msgstr "_Send Message to List"
 
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:271
-msgid "Use this if you are not filtering any mailing lists."
-msgstr "Use this if you are not filtering any mailing lists."
+#: ../modules/addressbook/e-book-shell-view.c:337
+msgid "_Send Message to Contact"
+msgstr "_Send Message to Contact"
 
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:281
-msgid "Basic and _Mailing List Headers (default)"
-msgstr "Basic and _Mailing List Headers (default)"
+#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:309
+msgid "Audio Player"
+msgstr "Audio Player"
 
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:330
-msgid "Custom Headers"
-msgstr "Custom Headers"
+#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
+msgid "Play the attachment in embedded audio player"
+msgstr "Play the attachment in embedded audio player"
 
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:338
+#: ../modules/backup-restore/e-mail-config-restore-page.c:165
 msgid ""
-"Specify any extra headers to fetch in addition to the predefined set of "
-"headers selected above."
+"You can restore Evolution from a backup file.\n"
+"\n"
+"This will restore all your personal data, settings mail filters, etc."
 msgstr ""
-"Specify any extra headers to fetch in addition to the predefined set of "
-"headers selected above."
-
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:139
-msgid "ITIP"
-msgstr "ITIP"
+"You can restore Evolution from a backup file.\n"
+"\n"
+"This will restore all your personal data, settings mail filters, etc."
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:145
-msgid "Display part as an invitation"
-msgstr "Display part as an invitation"
+#: ../modules/backup-restore/e-mail-config-restore-page.c:180
+msgid "_Restore from a backup file:"
+msgstr "_Restore from a backup file:"
 
-#. strftime format of a time,
-#. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:240
-msgid "Today %H:%M"
-msgstr "Today %H:%M"
+#: ../modules/backup-restore/e-mail-config-restore-page.c:191
+msgid "Choose a backup file to restore"
+msgstr "Choose a backup file to restore"
 
-#. strftime format of a time,
-#. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:244
-msgid "Today %H:%M:%S"
-msgstr "Today %H:%M:%S"
+#. Keep the title identical to EMailConfigRestorePage
+#. * so it's only shown once in the assistant sidebar.
+#: ../modules/backup-restore/e-mail-config-restore-page.c:311
+#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
+msgid "Restore from Backup"
+msgstr "Restore from Backup"
 
-#. strftime format of a time,
-#. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:253
-msgid "Today %l:%M:%S %p"
-msgstr "Today %l:%M:%S %p"
+#: ../modules/backup-restore/evolution-backup-restore.c:217
+msgid "Select name of the Evolution backup file"
+msgstr "Select name of the Evolution backup file"
 
-#. strftime format of a time,
-#. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:268
-msgid "Tomorrow %H:%M"
-msgstr "Tomorrow %H:%M"
+#: ../modules/backup-restore/evolution-backup-restore.c:250
+msgid "_Restart Evolution after backup"
+msgstr "_Restart Evolution after backup"
 
-#. strftime format of a time,
-#. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:272
-msgid "Tomorrow %H:%M:%S"
-msgstr "Tomorrow %H:%M:%S"
+#: ../modules/backup-restore/evolution-backup-restore.c:277
+msgid "Select name of the Evolution backup file to restore"
+msgstr "Select name of the Evolution backup file to restore"
 
-#. strftime format of a time,
-#. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:277
-msgid "Tomorrow %l:%M %p"
-msgstr "Tomorrow %l:%M %p"
+#: ../modules/backup-restore/evolution-backup-restore.c:290
+msgid "_Restart Evolution after restore"
+msgstr "_Restart Evolution after restore"
 
-#. strftime format of a time,
-#. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:281
-msgid "Tomorrow %l:%M:%S %p"
-msgstr "Tomorrow %l:%M:%S %p"
+#: ../modules/backup-restore/evolution-backup-restore.c:308
+msgid "_Back up Evolution Data..."
+msgstr "_Back up Evolution Data…"
 
-#. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:300
-#, c-format
-msgid "%A"
-msgstr "%A"
+#: ../modules/backup-restore/evolution-backup-restore.c:310
+msgid "Back up Evolution data and settings to an archive file"
+msgstr "Back up Evolution data and settings to an archive file"
 
-#. strftime format of a weekday and a
-#. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:305
-msgid "%A %H:%M"
-msgstr "%A %H:%M"
+#: ../modules/backup-restore/evolution-backup-restore.c:315
+msgid "R_estore Evolution Data..."
+msgstr "R_estore Evolution Data…"
 
-#. strftime format of a weekday and a
-#. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:309
-msgid "%A %H:%M:%S"
-msgstr "%A %H:%M:%S"
+#: ../modules/backup-restore/evolution-backup-restore.c:317
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "Restore Evolution data and settings from an archive file"
 
-#. strftime format of a weekday and a
-#. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:314
-msgid "%A %l:%M %p"
-msgstr "%A %l:%M %p"
+#: ../modules/backup-restore/evolution-backup-tool.c:84
+msgid "Back up Evolution directory"
+msgstr "Back up Evolution directory"
 
-#. strftime format of a weekday and a
-#. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:318
-msgid "%A %l:%M:%S %p"
-msgstr "%A %l:%M:%S %p"
+#: ../modules/backup-restore/evolution-backup-tool.c:86
+msgid "Restore Evolution directory"
+msgstr "Restore Evolution directory"
 
-#. strftime format of a weekday and a date
-#. * without a year.
-#: ../modules/itip-formatter/itip-view.c:327
-msgid "%A, %B %e"
-msgstr "%A %e %B"
+#: ../modules/backup-restore/evolution-backup-tool.c:88
+msgid "Check Evolution Back up"
+msgstr "Check Evolution Backup"
 
-#. strftime format of a weekday, a date
-#. * without a year and a time,
-#. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:333
-msgid "%A, %B %e %H:%M"
-msgstr "%A, %e %B %H:%M"
+#: ../modules/backup-restore/evolution-backup-tool.c:90
+msgid "Restart Evolution"
+msgstr "Restart Evolution"
 
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:337
-msgid "%A, %B %e %H:%M:%S"
-msgstr "%A, %e %B %H:%M:%S"
+#: ../modules/backup-restore/evolution-backup-tool.c:92
+msgid "With Graphical User Interface"
+msgstr "With Graphical User Interface"
 
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:342
-msgid "%A, %B %e %l:%M %p"
-msgstr "%A, %e %B %l:%M %p"
+#. FIXME Will the versioned setting always work?
+#: ../modules/backup-restore/evolution-backup-tool.c:321
+#: ../modules/backup-restore/evolution-backup-tool.c:515
+msgid "Shutting down Evolution"
+msgstr "Shutting down Evolution"
 
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:346
-msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%A, %e %B %l:%M:%S %p"
+#: ../modules/backup-restore/evolution-backup-tool.c:330
+msgid "Backing Evolution accounts and settings"
+msgstr "Backing up Evolution accounts and settings"
 
-#. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:352
-msgid "%A, %B %e, %Y"
-msgstr "%A, %e %B, %Y"
+#: ../modules/backup-restore/evolution-backup-tool.c:347
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr "Backing up Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 
-#. strftime format of a weekday, a date and a
-#. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:357
-msgid "%A, %B %e, %Y %H:%M"
-msgstr "%A, %e %B, %Y %H:%M"
+#: ../modules/backup-restore/evolution-backup-tool.c:363
+msgid "Back up complete"
+msgstr "Backup complete"
 
-#. strftime format of a weekday, a date and a
-#. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:361
-msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%A, %e %B, %Y %H:%M:%S"
+#: ../modules/backup-restore/evolution-backup-tool.c:370
+#: ../modules/backup-restore/evolution-backup-tool.c:702
+msgid "Restarting Evolution"
+msgstr "Restarting Evolution"
 
-#. strftime format of a weekday, a date and a
-#. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:366
-msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%A, %e %B, %Y %l:%M %p"
+#: ../modules/backup-restore/evolution-backup-tool.c:521
+msgid "Back up current Evolution data"
+msgstr "Back up current Evolution data"
 
-#. strftime format of a weekday, a date and a
-#. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:370
-msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%A, %e %B, %Y %l:%M:%S %p"
+#: ../modules/backup-restore/evolution-backup-tool.c:528
+msgid "Extracting files from back up"
+msgstr "Extracting files from backup"
 
-#: ../modules/itip-formatter/itip-view.c:408
-#: ../modules/itip-formatter/itip-view.c:409
-#: ../modules/itip-formatter/itip-view.c:498
-#: ../modules/itip-formatter/itip-view.c:499
-#: ../modules/itip-formatter/itip-view.c:588
-msgid "An unknown person"
-msgstr "An unknown person"
+#: ../modules/backup-restore/evolution-backup-tool.c:610
+msgid "Loading Evolution settings"
+msgstr "Loading Evolution settings"
 
-#: ../modules/itip-formatter/itip-view.c:413
-#: ../modules/itip-formatter/itip-view.c:503
-#: ../modules/itip-formatter/itip-view.c:592
-#, c-format
-msgid "Please respond on behalf of %s"
-msgstr "Please respond on behalf of %s"
+#: ../modules/backup-restore/evolution-backup-tool.c:676
+msgid "Removing temporary back up files"
+msgstr "Removing temporary backup files"
 
-#: ../modules/itip-formatter/itip-view.c:415
-#: ../modules/itip-formatter/itip-view.c:505
-#: ../modules/itip-formatter/itip-view.c:594
-#, c-format
-msgid "Received on behalf of %s"
-msgstr "Received on behalf of %s"
+#: ../modules/backup-restore/evolution-backup-tool.c:687
+msgid "Reloading registry service"
+msgstr "Reloading registry service"
 
-#: ../modules/itip-formatter/itip-view.c:420
-#, c-format
-msgid "%s through %s has published the following meeting information:"
-msgstr "%s through %s has published the following meeting information:"
+#: ../modules/backup-restore/evolution-backup-tool.c:914
+msgid "Evolution Back Up"
+msgstr "Evolution Back Up"
 
-#: ../modules/itip-formatter/itip-view.c:422
+#: ../modules/backup-restore/evolution-backup-tool.c:915
 #, c-format
-msgid "%s has published the following meeting information:"
-msgstr "%s has published the following meeting information:"
+msgid "Backing up to the folder %s"
+msgstr "Backing up to the folder %s"
 
-#: ../modules/itip-formatter/itip-view.c:427
-#, c-format
-msgid "%s has delegated the following meeting to you:"
-msgstr "%s has delegated the following meeting to you:"
+#: ../modules/backup-restore/evolution-backup-tool.c:919
+msgid "Evolution Restore"
+msgstr "Evolution Restore"
 
-#: ../modules/itip-formatter/itip-view.c:430
+#: ../modules/backup-restore/evolution-backup-tool.c:920
 #, c-format
-msgid "%s through %s requests your presence at the following meeting:"
-msgstr "%s through %s requests your presence at the following meeting:"
+msgid "Restoring from the folder %s"
+msgstr "Restoring from the folder %s"
 
-#: ../modules/itip-formatter/itip-view.c:432
-#, c-format
-msgid "%s requests your presence at the following meeting:"
-msgstr "%s requests your presence at the following meeting:"
+#: ../modules/backup-restore/evolution-backup-tool.c:990
+msgid "Backing up Evolution Data"
+msgstr "Backing up Evolution Data"
 
-#: ../modules/itip-formatter/itip-view.c:438
-#, c-format
-msgid "%s through %s wishes to add to an existing meeting:"
-msgstr "%s through %s wishes to add to an existing meeting:"
+#: ../modules/backup-restore/evolution-backup-tool.c:991
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Please wait while Evolution backs up your data."
 
-#: ../modules/itip-formatter/itip-view.c:440
-#, c-format
-msgid "%s wishes to add to an existing meeting:"
-msgstr "%s wishes to add to an existing meeting:"
+#: ../modules/backup-restore/evolution-backup-tool.c:993
+msgid "Restoring Evolution Data"
+msgstr "Restoring Evolution Data"
 
-#: ../modules/itip-formatter/itip-view.c:444
-#, c-format
-msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"meeting:"
-msgstr ""
-"%s through %s wishes to receive the latest information for the following "
-"meeting:"
+#: ../modules/backup-restore/evolution-backup-tool.c:994
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Please wait while Evolution restores your data."
 
-#: ../modules/itip-formatter/itip-view.c:446
-#, c-format
-msgid "%s wishes to receive the latest information for the following meeting:"
-msgstr "%s wishes to receive the latest information for the following meeting:"
+#: ../modules/backup-restore/evolution-backup-tool.c:1016
+msgid "This may take a while depending on the amount of data in your account."
+msgstr "This may take a while depending on the amount of data in your account."
 
-#: ../modules/itip-formatter/itip-view.c:450
-#, c-format
-msgid "%s through %s has sent back the following meeting response:"
-msgstr "%s through %s has sent back the following meeting response:"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Invalid Evolution backup file"
+msgstr "Invalid Evolution backup file"
 
-#: ../modules/itip-formatter/itip-view.c:452
-#, c-format
-msgid "%s has sent back the following meeting response:"
-msgstr "%s has sent back the following meeting response:"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
+msgid "Please select a valid backup file to restore."
+msgstr "Please select a valid backup file to restore."
 
-#: ../modules/itip-formatter/itip-view.c:456
-#, c-format
-msgid "%s through %s has canceled the following meeting:"
-msgstr "%s through %s has cancelled the following meeting:"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid "Are you sure you want to close Evolution?"
+msgstr "Are you sure you want to close Evolution?"
 
-#: ../modules/itip-formatter/itip-view.c:458
-#, c-format
-msgid "%s has canceled the following meeting:"
-msgstr "%s has cancelled the following meeting:"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid ""
+"To back up your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+msgstr ""
+"To back up your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
 
-#: ../modules/itip-formatter/itip-view.c:462
-#, c-format
-msgid "%s through %s has proposed the following meeting changes."
-msgstr "%s through %s has proposed the following meeting changes."
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Close and Back up Evolution"
+msgstr "Close and Back Up Evolution"
 
-#: ../modules/itip-formatter/itip-view.c:464
-#, c-format
-msgid "%s has proposed the following meeting changes:"
-msgstr "%s has proposed the following meeting changes:"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr ""
+"Are you sure you want to restore Evolution from the selected backup file?"
 
-#: ../modules/itip-formatter/itip-view.c:468
-#, c-format
-msgid "%s through %s has declined the following meeting changes:"
-msgstr "%s through %s has declined the following meeting changes:"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid ""
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"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."
 
-#: ../modules/itip-formatter/itip-view.c:470
-#, c-format
-msgid "%s has declined the following meeting changes:"
-msgstr "%s has declined the following meeting changes:"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "Close and Restore Evolution"
+msgstr "Close and Restore Evolution"
 
-#: ../modules/itip-formatter/itip-view.c:510
-#, c-format
-msgid "%s through %s has published the following task:"
-msgstr "%s through %s has published the following task:"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid "Insufficient Permissions"
+msgstr "Insufficient Permissions"
 
-#: ../modules/itip-formatter/itip-view.c:512
-#, c-format
-msgid "%s has published the following task:"
-msgstr "%s has published the following task:"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
+msgid "The selected folder is not writable."
+msgstr "The selected folder is not writable."
 
-#: ../modules/itip-formatter/itip-view.c:517
+#: ../modules/bogofilter/evolution-bogofilter.c:145
 #, c-format
-msgid "%s requests the assignment of %s to the following task:"
-msgstr "%s requests the assignment of %s to the following task:"
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "Failed to spawn Bogofilter (%s): "
 
-#: ../modules/itip-formatter/itip-view.c:520
-#, c-format
-msgid "%s through %s has assigned you a task:"
-msgstr "%s through %s has assigned you a task:"
+#: ../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/itip-formatter/itip-view.c:522
-#, c-format
-msgid "%s has assigned you a task:"
-msgstr "%s has assigned you a task:"
+#: ../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/itip-formatter/itip-view.c:528
-#, c-format
-msgid "%s through %s wishes to add to an existing task:"
-msgstr "%s through %s wishes to add to an existing task:"
+#: ../modules/bogofilter/evolution-bogofilter.c:308
+msgid "Bogofilter Options"
+msgstr "Bogofilter Options"
 
-#: ../modules/itip-formatter/itip-view.c:530
-#, c-format
-msgid "%s wishes to add to an existing task:"
-msgstr "%s wishes to add to an existing task:"
+#: ../modules/bogofilter/evolution-bogofilter.c:317
+msgid "Convert message text to _Unicode"
+msgstr "Convert message text to _Unicode"
 
-#: ../modules/itip-formatter/itip-view.c:534
-#, c-format
-msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"%s through %s wishes to receive the latest information for the following "
-"assigned task:"
+#: ../modules/bogofilter/evolution-bogofilter.c:474
+msgid "Bogofilter"
+msgstr "Bogofilter"
 
-#: ../modules/itip-formatter/itip-view.c:536
-#, c-format
-msgid ""
-"%s wishes to receive the latest information for the following assigned task:"
-msgstr ""
-"%s wishes to receive the latest information for the following assigned task:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
+msgid "Standard LDAP Port"
+msgstr "Standard LDAP Port"
 
-#: ../modules/itip-formatter/itip-view.c:540
-#, c-format
-msgid "%s through %s has sent back the following assigned task response:"
-msgstr "%s through %s has sent back the following assigned task response:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:625
+msgid "LDAP over SSL (deprecated)"
+msgstr "LDAP over SSL (deprecated)"
 
-#: ../modules/itip-formatter/itip-view.c:542
-#, c-format
-msgid "%s has sent back the following assigned task response:"
-msgstr "%s has sent back the following assigned task response:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
+msgid "Microsoft Global Catalog"
+msgstr "Microsoft Global Catalogue"
 
-#: ../modules/itip-formatter/itip-view.c:546
-#, c-format
-msgid "%s through %s has canceled the following assigned task:"
-msgstr "%s through %s has cancelled the following assigned task:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:465
+msgid "Microsoft Global Catalog over SSL"
+msgstr "Microsoft Global Catalogue over SSL"
 
-#: ../modules/itip-formatter/itip-view.c:548
-#, c-format
-msgid "%s has canceled the following assigned task:"
-msgstr "%s has cancelled the following assigned task:"
+#. Page 1
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:570
+msgid "Connecting to LDAP"
+msgstr "Connecting to LDAP"
 
-#: ../modules/itip-formatter/itip-view.c:552
-#, c-format
-msgid "%s through %s has proposed the following task assignment changes:"
-msgstr "%s through %s has proposed the following task assignment changes:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:587
+msgid "Server Information"
+msgstr "Server Information"
 
-#: ../modules/itip-formatter/itip-view.c:554
-#, c-format
-msgid "%s has proposed the following task assignment changes:"
-msgstr "%s has proposed the following task assignment changes:"
-
-#: ../modules/itip-formatter/itip-view.c:558
-#, c-format
-msgid "%s through %s has declined the following assigned task:"
-msgstr "%s through %s has declined the following assigned task:"
-
-#: ../modules/itip-formatter/itip-view.c:560
-#, c-format
-msgid "%s has declined the following assigned task:"
-msgstr "%s has declined the following assigned task:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
+msgid "StartTLS (recommended)"
+msgstr "StartTLS (recommended)"
 
-#: ../modules/itip-formatter/itip-view.c:599
-#, c-format
-msgid "%s through %s has published the following memo:"
-msgstr "%s through %s has published the following memo:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:630
+msgid "Encryption:"
+msgstr "Encryption:"
 
-#: ../modules/itip-formatter/itip-view.c:601
-#, c-format
-msgid "%s has published the following memo:"
-msgstr "%s has published the following memo:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:654
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:246
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:180
+msgid "Authentication"
+msgstr "Authentication"
 
-#: ../modules/itip-formatter/itip-view.c:606
-#, c-format
-msgid "%s through %s wishes to add to an existing memo:"
-msgstr "%s through %s wishes to add to an existing memo:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
+msgid "Anonymous"
+msgstr "Anonymous"
 
-#: ../modules/itip-formatter/itip-view.c:608
-#, c-format
-msgid "%s wishes to add to an existing memo:"
-msgstr "%s wishes to add to an existing memo:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:680
+msgid "Using email address"
+msgstr "Using e-mail address"
 
-#: ../modules/itip-formatter/itip-view.c:612
-#, c-format
-msgid "%s through %s has canceled the following shared memo:"
-msgstr "%s through %s has cancelled the following shared memo:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+msgid "Using distinguished name (DN)"
+msgstr "Using distinguished name (DN)"
 
-#: ../modules/itip-formatter/itip-view.c:614
-#, c-format
-msgid "%s has canceled the following shared memo:"
-msgstr "%s has cancelled the following shared memo:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:685
+msgid "Method:"
+msgstr "Method:"
 
-#: ../modules/itip-formatter/itip-view.c:687
-msgid "All day:"
-msgstr "All day:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Using email address\" requires anonymous access to your "
+"LDAP server."
+msgstr ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Using e-mail address\" requires anonymous access to your "
+"LDAP server."
 
-#: ../modules/itip-formatter/itip-view.c:693
-msgid "Start day:"
-msgstr "Start day:"
+#. Page 2
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:705
+msgid "Using LDAP"
+msgstr "Using LDAP"
 
-#: ../modules/itip-formatter/itip-view.c:693
-#: ../modules/itip-formatter/itip-view.c:1473
-msgid "Start time:"
-msgstr "Start time:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
+#: ../modules/mail/e-mail-shell-view.c:115
+msgid "Searching"
+msgstr "Searching"
 
-#: ../modules/itip-formatter/itip-view.c:702
-msgid "End day:"
-msgstr "End day:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:744
+msgid "Search Base:"
+msgstr "Search Base:"
 
-#: ../modules/itip-formatter/itip-view.c:702
-#: ../modules/itip-formatter/itip-view.c:1474
-msgid "End time:"
-msgstr "End time:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:749
+msgid "Find Possible Search Bases"
+msgstr "Find Possible Search Bases"
 
-#: ../modules/itip-formatter/itip-view.c:1022
-msgid "_Open Calendar"
-msgstr "_Open Calendar"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:774
+msgid "One Level"
+msgstr "One Level"
 
-#: ../modules/itip-formatter/itip-view.c:1025
-msgid "_Decline all"
-msgstr "_Decline all"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
+msgid "Subtree"
+msgstr "Subtree"
 
-#: ../modules/itip-formatter/itip-view.c:1028
-msgid "_Decline"
-msgstr "_Decline"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+msgid "Search Scope:"
+msgstr "Search Scope:"
 
-#: ../modules/itip-formatter/itip-view.c:1031
-msgid "_Tentative all"
-msgstr "_Tentative all"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:783
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree.  A search scope of \"Subtree\" will include all entries "
+"below your search base.  A search scope of \"One Level\" will only include "
+"the entries one level beneath your search base."
+msgstr ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree.  A search scope of \"Subtree\" will include all entries "
+"below your search base.  A search scope of \"One Level\" will only include "
+"the entries one level beneath your search base."
 
-#: ../modules/itip-formatter/itip-view.c:1034
-msgid "_Tentative"
-msgstr "_Tentative"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:792
+msgid "Search Filter:"
+msgstr "Search Filter:"
 
-#: ../modules/itip-formatter/itip-view.c:1037
-msgid "A_ccept all"
-msgstr "A_ccept all"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:804
+msgid "Downloading"
+msgstr "Downloading"
 
-#: ../modules/itip-formatter/itip-view.c:1040
-msgid "A_ccept"
-msgstr "A_ccept"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
+msgid "Limit:"
+msgstr "Limit:"
 
-#: ../modules/itip-formatter/itip-view.c:1043
-msgid "_Send Information"
-msgstr "_Send Information"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+msgid "contacts"
+msgstr "contacts"
 
-#: ../modules/itip-formatter/itip-view.c:1046
-msgid "_Update Attendee Status"
-msgstr "_Update Attendee Status"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:841
+msgid "Browse until limit is reached"
+msgstr "Browse until limit is reached"
 
-#: ../modules/itip-formatter/itip-view.c:1049
-msgid "_Update"
-msgstr "_Update"
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:136
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:205
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:128
+msgid "URL:"
+msgstr "URL:"
 
-#: ../modules/itip-formatter/itip-view.c:1476
-#: ../modules/itip-formatter/itip-view.c:1524
-#: ../modules/itip-formatter/itip-view.c:1595
-msgid "Comment:"
-msgstr "Comment:"
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:146
+msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr "Avoid IfMatch (needed on Apache < 2.2.8)"
 
-#. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1512
-msgid "Send reply to sender"
-msgstr "Send reply to sender"
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+#, c-format
+msgid "HTTP Error: %s"
+msgstr "HTTP Error: %s"
 
-#. Updates
-#: ../modules/itip-formatter/itip-view.c:1527
-msgid "Send _updates to attendees"
-msgstr "Send _updates to attendees"
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:475
+msgid "Could not parse response"
+msgstr "Could not parse response"
 
-#. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1530
-msgid "_Apply to all instances"
-msgstr "_Apply to all instances"
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:484
+msgid "Empty response"
+msgstr "Empty response"
 
-#: ../modules/itip-formatter/itip-view.c:1531
-msgid "Show time as _free"
-msgstr "Show time as _free"
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:492
+msgid "Unexpected reply from server"
+msgstr "Unexpected reply from server"
 
-#: ../modules/itip-formatter/itip-view.c:1532
-msgid "_Preserve my reminder"
-msgstr "_Preserve my reminder"
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1124
+msgid "Could not locate user's calendars"
+msgstr "Could not locate user's calendars"
 
-#: ../modules/itip-formatter/itip-view.c:1533
-msgid "_Inherit reminder"
-msgstr "_Inherit reminder"
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1348
+msgid "Path"
+msgstr "Path"
 
-#: ../modules/itip-formatter/itip-view.c:1861
-msgid "_Tasks:"
-msgstr "_Tasks:"
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:200
+msgid "Choose a Calendar"
+msgstr "Choose a Calendar"
 
-#: ../modules/itip-formatter/itip-view.c:1864
-msgid "_Memos:"
-msgstr "_Memos:"
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
+msgid "Choose a Memo List"
+msgstr "Choose a Memo List"
 
-#. Translators: The first '%s' is replaced with a calendar name,
-#. * the second '%s' with an error message
-#: ../modules/itip-formatter/itip-view.c:3511
-#, c-format
-msgid "Failed to load the calendar '%s' (%s)"
-msgstr "Failed to load the calendar '%s' (%s)"
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
+msgid "Choose a Task List"
+msgstr "Choose a Task List"
 
-#: ../modules/itip-formatter/itip-view.c:3670
-#, c-format
-msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr "An appointment in the calendar '%s' conflicts with this meeting"
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:219
+msgid "Find Calendars"
+msgstr "Find Calendars"
 
-#: ../modules/itip-formatter/itip-view.c:3699
-#, c-format
-msgid "Found the appointment in the calendar '%s'"
-msgstr "Found the appointment in the calendar '%s'"
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:222
+msgid "Find Memo Lists"
+msgstr "Find Memo Lists"
 
-#: ../modules/itip-formatter/itip-view.c:3812
-msgid "Unable to find any calendars"
-msgstr "Unable to find any calendars"
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:225
+msgid "Find Task Lists"
+msgstr "Find Task Lists"
 
-#: ../modules/itip-formatter/itip-view.c:3820
-msgid "Unable to find this meeting in any calendar"
-msgstr "Unable to find this meeting in any calendar"
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:243
+msgid "Email:"
+msgstr "E-mail:"
 
-#: ../modules/itip-formatter/itip-view.c:3825
-msgid "Unable to find this task in any task list"
-msgstr "Unable to find this task in any task list"
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:248
+msgid "Server handles meeting invitations"
+msgstr "Server handles meeting invitations"
 
-#: ../modules/itip-formatter/itip-view.c:3830
-msgid "Unable to find this memo in any memo list"
-msgstr "Unable to find this memo in any memo list"
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:71
+msgid "Choose which address books to use."
+msgstr "Choose which address books to use."
 
-#: ../modules/itip-formatter/itip-view.c:4179
-msgid "Opening the calendar. Please wait..."
-msgstr "Opening the calendar. Please wait…"
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:201
+msgid "Use in Birthdays & Anniversaries calendar"
+msgstr "Use in Birthdays & Anniversaries calendar"
 
-#: ../modules/itip-formatter/itip-view.c:4184
-msgid "Searching for an existing version of this appointment"
-msgstr "Searching for an existing version of this appointment"
+#: ../modules/cal-config-google/e-google-chooser-button.c:127
+msgid "Default User Calendar"
+msgstr "Default User Calendar"
 
-#: ../modules/itip-formatter/itip-view.c:4573
+#: ../modules/cal-config-google/e-google-chooser.c:508
 #, c-format
-msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "Unable to send item to calendar '%s'.  %s"
+msgid "Enter Google password for user '%s'."
+msgstr "Enter Google password for user '%s'."
 
-#: ../modules/itip-formatter/itip-view.c:4588
-#, c-format
-msgid "Sent to calendar '%s' as accepted"
-msgstr "Sent to calendar '%s' as accepted"
+#: ../modules/cal-config-google/e-google-chooser.c:525
+msgid "User declined to provide a password"
+msgstr "User declined to provide a password"
 
-#: ../modules/itip-formatter/itip-view.c:4593
-#, c-format
-msgid "Sent to calendar '%s' as tentative"
-msgstr "Sent to calendar '%s' as tentative"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:160
+msgid "Use an existing iCalendar (ics) file"
+msgstr "Use an existing iCalendar (ics) file"
 
-#: ../modules/itip-formatter/itip-view.c:4599
-#, c-format
-msgid "Sent to calendar '%s' as declined"
-msgstr "Sent to calendar '%s' as declined"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:185
+msgid "iCalendar File"
+msgstr "iCalendar File"
 
-#: ../modules/itip-formatter/itip-view.c:4605
-#, c-format
-msgid "Sent to calendar '%s' as canceled"
-msgstr "Sent to calendar '%s' as cancelled"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:197
+msgid "Choose an iCalendar file"
+msgstr "Choose an iCalendar file"
 
-#: ../modules/itip-formatter/itip-view.c:4626
-#: ../modules/itip-formatter/itip-view.c:5066
-#: ../modules/itip-formatter/itip-view.c:5173
-msgid "Saving changes to the calendar. Please wait..."
-msgstr "Saving changes to the calendar. Please wait…"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:200
+msgid "File:"
+msgstr "File:"
 
-#: ../modules/itip-formatter/itip-view.c:4667
-msgid "Unable to parse item"
-msgstr "Unable to parse item"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:215
+msgid "Allow Evolution to update the file"
+msgstr "Allow Evolution to update the file"
 
-#: ../modules/itip-formatter/itip-view.c:4857
-#, c-format
-msgid "Organizer has removed the delegate %s "
-msgstr "Organiser has removed the delegate %s "
+#: ../modules/calendar/e-cal-attachment-handler.c:318
+#: ../smime/gui/smime-ui.ui.h:9
+msgid "I_mport"
+msgstr "I_mport"
 
-#: ../modules/itip-formatter/itip-view.c:4872
-msgid "Sent a cancelation notice to the delegate"
-msgstr "Sent a cancellation notice to the delegate"
+#: ../modules/calendar/e-cal-attachment-handler.c:404
+msgid "Select a Calendar"
+msgstr "Select a Calendar"
 
-#: ../modules/itip-formatter/itip-view.c:4876
-msgid "Could not send the cancelation notice to the delegate"
-msgstr "Could not send the cancellation notice to the delegate"
+#: ../modules/calendar/e-cal-attachment-handler.c:431
+msgid "Select a Task List"
+msgstr "Select a Task List"
 
-#: ../modules/itip-formatter/itip-view.c:4924
-#, c-format
-msgid "Unable to update attendee. %s"
-msgstr "Unable to update attendee. %s"
+#: ../modules/calendar/e-cal-attachment-handler.c:441
+msgid "I_mport to Calendar"
+msgstr "I_mport to Calendar"
 
-#: ../modules/itip-formatter/itip-view.c:4932
-msgid "Attendee status updated"
-msgstr "Attendee status updated"
+#: ../modules/calendar/e-cal-attachment-handler.c:448
+msgid "I_mport to Tasks"
+msgstr "I_mport to Tasks"
 
-#: ../modules/itip-formatter/itip-view.c:4955
-msgid "The meeting is invalid and cannot be updated"
-msgstr "The meeting is invalid and cannot be updated"
+#: ../modules/calendar/e-calendar-preferences.c:401
+msgid "Selected Calendars for Alarms"
+msgstr "Selected Calendars for Alarms"
 
-#: ../modules/itip-formatter/itip-view.c:5031
-msgid "Attendee status could not be updated because the status is invalid"
-msgstr "Attendee status could not be updated because the status is invalid"
+#: ../modules/calendar/e-calendar-preferences.c:822
+msgid "Ti_me and date:"
+msgstr "Ti_me and date:"
 
-#: ../modules/itip-formatter/itip-view.c:5103
-#: ../modules/itip-formatter/itip-view.c:5143
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Attendee status can not be updated because the item no longer exists"
+#: ../modules/calendar/e-calendar-preferences.c:823
+msgid "_Date only:"
+msgstr "_Date only:"
 
-#: ../modules/itip-formatter/itip-view.c:5206
-msgid "Meeting information sent"
-msgstr "Meeting information sent"
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
+msgid "Minutes"
+msgstr "Minutes"
 
-#: ../modules/itip-formatter/itip-view.c:5211
-msgid "Task information sent"
-msgstr "Task information sent"
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Hours"
+msgstr "Hours"
 
-#: ../modules/itip-formatter/itip-view.c:5216
-msgid "Memo information sent"
-msgstr "Memo information sent"
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Days"
+msgstr "Days"
 
-#: ../modules/itip-formatter/itip-view.c:5227
-msgid "Unable to send meeting information, the meeting does not exist"
-msgstr "Unable to send meeting information, the meeting does not exist"
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
+msgid "60 minutes"
+msgstr "60 minutes"
 
-#: ../modules/itip-formatter/itip-view.c:5232
-msgid "Unable to send task information, the task does not exist"
-msgstr "Unable to send task information, the task does not exist"
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
+msgid "30 minutes"
+msgstr "30 minutes"
 
-#: ../modules/itip-formatter/itip-view.c:5237
-msgid "Unable to send memo information, the memo does not exist"
-msgstr "Unable to send memo information, the memo does not exist"
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "15 minutes"
+msgstr "15 minutes"
 
-#. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5302
-msgid "calendar.ics"
-msgstr "calendar.ics"
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
+msgid "10 minutes"
+msgstr "10 minutes"
 
-#: ../modules/itip-formatter/itip-view.c:5307
-msgid "Save Calendar"
-msgstr "Save Calendar"
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+msgid "05 minutes"
+msgstr "05 minutes"
 
-#: ../modules/itip-formatter/itip-view.c:5360
-#: ../modules/itip-formatter/itip-view.c:5373
-msgid "The calendar attached is not valid"
-msgstr "The calendar attached is not valid"
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
+msgid "Se_cond zone:"
+msgstr "Se_cond zone:"
 
-#: ../modules/itip-formatter/itip-view.c:5361
-#: ../modules/itip-formatter/itip-view.c:5374
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
-msgstr ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
+msgid "(Shown in a Day View)"
+msgstr "(Shown in a Day View)"
 
-#: ../modules/itip-formatter/itip-view.c:5416
-#: ../modules/itip-formatter/itip-view.c:5446
-#: ../modules/itip-formatter/itip-view.c:5546
-msgid "The item in the calendar is not valid"
-msgstr "The item in the calendar is not valid"
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
+msgid "Use s_ystem time zone"
+msgstr "Use s_ystem time zone"
 
-#: ../modules/itip-formatter/itip-view.c:5417
-#: ../modules/itip-formatter/itip-view.c:5447
-#: ../modules/itip-formatter/itip-view.c:5547
-msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
-msgstr ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "Time format:"
+msgstr "Time format:"
 
-#: ../modules/itip-formatter/itip-view.c:5462
-msgid "The calendar attached contains multiple items"
-msgstr "The calendar attached contains multiple items"
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "_12 hour (AM/PM)"
+msgstr "_12 hour (AM/PM)"
 
-#: ../modules/itip-formatter/itip-view.c:5463
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
-msgstr ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
+msgid "_24 hour"
+msgstr "_24 hour"
 
-#: ../modules/itip-formatter/itip-view.c:5987
-msgctxt "cal-itip"
-msgid "None"
-msgstr "None"
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+msgid "Work Week"
+msgstr "Work Week"
 
-#: ../modules/itip-formatter/itip-view.c:6003
-msgid "Tentatively Accepted"
-msgstr "Tentatively Accepted"
+#. A weekday like "Monday" follows
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
+msgid "Wee_k starts on:"
+msgstr "Wee_k starts on:"
 
-#: ../modules/itip-formatter/itip-view.c:6146
-msgid "This meeting recurs"
-msgstr "This meeting recurs"
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Work days:"
+msgstr "Work days:"
 
-#: ../modules/itip-formatter/itip-view.c:6149
-msgid "This task recurs"
-msgstr "This task recurs"
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+msgid "_Day begins:"
+msgstr "_Day begins:"
 
-#: ../modules/itip-formatter/itip-view.c:6152
-msgid "This memo recurs"
-msgstr "This memo recurs"
+#. Monday
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "_Mon"
+msgstr "_Mon"
 
-#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
-msgstr ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+#. Tuesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
+msgid "_Tue"
+msgstr "_Tue"
 
-#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
-msgid "This meeting has been delegated"
-msgstr "This meeting has been delegated"
+#. Wednesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
+msgid "_Wed"
+msgstr "_Wed"
 
-#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
-msgstr ""
-"'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+#. Thursday
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "T_hu"
+msgstr "T_hu"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:82
-msgid "Meeting Invitations"
-msgstr "Meeting Invitations"
+#. Friday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "_Fri"
+msgstr "_Fri"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:108
-msgid "_Delete message after acting"
-msgstr "_Delete message after acting"
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
+msgid "_Sat"
+msgstr "_Sat"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:122
-#: ../modules/itip-formatter/plugin/config-ui.c:153
-msgid "Conflict Search"
-msgstr "Conflict Search"
+#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+msgid "S_un"
+msgstr "S_un"
 
-#. Source selector
-#: ../modules/itip-formatter/plugin/config-ui.c:137
-msgid "Select the calendars to search for meeting conflicts"
-msgstr "Select the calendars to search for meeting conflicts"
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+msgid "Day _ends:"
+msgstr "Day _ends:"
 
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Itip Formatter"
-msgstr "Itip Formatter"
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
+msgid "Alerts"
+msgstr "Alerts"
 
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "Display \"text/calendar\" MIME parts in mail messages."
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+msgid "_Ask for confirmation when deleting items"
+msgstr "_Ask for confirmation when deleting items"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:252
-msgid "Google Features"
-msgstr "Google Features"
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "_Time divisions:"
+msgstr "_Time divisions:"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:261
-msgid "Add Google Ca_lendar to this account"
-msgstr "Add Google Ca_lendar to this account"
+#: ../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/mail-config/e-mail-config-google-summary.c:269
-msgid "Add Google Con_tacts to this account"
-msgstr "Add Google Con_tacts to this account"
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
+msgid "_Compress weekends in month view"
+msgstr "_Compress weekends in month view"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:277
-msgid "You may need to enable IMAP access"
-msgstr "You may need to enable IMAP access"
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
+msgid "Show week _numbers"
+msgstr "Show week _numbers"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:246
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
-msgid "Mail _Directory:"
-msgstr "Mail _Directory:"
+#: ../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/mail-config/e-mail-config-local-accounts.c:247
-msgid "Choose a MH mail directory"
-msgstr "Choose a MH mail directory"
+#: ../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/mail-config/e-mail-config-local-accounts.c:269
-msgid "Local Delivery _File:"
-msgstr "Local Delivery _File:"
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "Display"
+msgstr "Display"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:270
-msgid "Choose a local delivery file"
-msgstr "Choose a local delivery file"
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "Task List"
+msgstr "Task List"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:293
-msgid "Choose a Maildir mail directory"
-msgstr "Choose a Maildir mail directory"
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
+msgid "Highlight t_asks due today"
+msgstr "Highlight t_asks due today"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
-msgid "Spool _File:"
-msgstr "Spool _File:"
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "Highlight _overdue tasks"
+msgstr "Highlight _overdue tasks"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:316
-msgid "Choose a mbox spool file"
-msgstr "Choose a mbox spool file"
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
+msgid "_Hide completed tasks after"
+msgstr "_Hide completed tasks after"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:338
-msgid "Spool _Directory:"
-msgstr "Spool _Directory:"
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+msgid "Display reminders in _notification area only"
+msgstr "Display reminders in _notification area only"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:339
-msgid "Choose a mbox spool directory"
-msgstr "Choose a mbox spool directory"
+#. 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"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:149
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:82
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
-msgid "Configuration"
-msgstr "Configuration"
+#. 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/mail-config/e-mail-config-remote-accounts.c:167
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:100
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
-msgid "_Server:"
-msgstr "_Server:"
+#. 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/mail-config/e-mail-config-remote-accounts.c:193
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:229
-msgid "User_name:"
-msgstr "User_name:"
+#. 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/mail-config/e-mail-config-remote-accounts.c:226
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:150
-msgid "Encryption _method:"
-msgstr "Encryption _method:"
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
+msgid "Select the calendars for reminder notification"
+msgstr "Select the calendars for reminder notification"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:241
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:165
-msgid "STARTTLS after connecting"
-msgstr "STARTTLS after connecting"
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
+msgid "Default Free/Busy Server"
+msgstr "Default Free/Busy Server"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:169
-msgid "SSL on a dedicated port"
-msgstr "SSL on a dedicated port"
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
+msgid "Template:"
+msgstr "Template:"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:125
-msgid "Ser_ver requires authentication"
-msgstr "Ser_ver requires authentication"
+#: ../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/mail-config/e-mail-config-smtp-backend.c:211
-msgid "T_ype:"
-msgstr "T_ype:"
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+msgid "Publishing Information"
+msgstr "Publishing Information"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:247
-msgid "Yahoo! Features"
-msgstr "Yahoo! Features"
+#: ../modules/calendar/e-cal-shell-backend.c:308
+#: ../modules/calendar/e-cal-shell-view-actions.c:191
+msgid "New Calendar"
+msgstr "New Calendar"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:256
-msgid "Add Yahoo! Ca_lendar and Tasks to this account"
-msgstr "Add Yahoo! Ca_lendar and Tasks to this account"
+#: ../modules/calendar/e-cal-shell-backend.c:317
+msgctxt "New"
+msgid "_Appointment"
+msgstr "_Appointment"
 
-#: ../modules/mail/e-mail-attachment-handler.c:368
-#, c-format
-msgid "%d attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "%d attached message"
-msgstr[1] "%d attached messages"
+#: ../modules/calendar/e-cal-shell-backend.c:319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1545
+msgid "Create a new appointment"
+msgstr "Create a new appointment"
 
-#: ../modules/mail/e-mail-shell-backend.c:244
+#: ../modules/calendar/e-cal-shell-backend.c:324
 msgctxt "New"
-msgid "_Mail Message"
-msgstr "_Mail Message"
+msgid "All Day A_ppointment"
+msgstr "All Day A_ppointment"
 
-#: ../modules/mail/e-mail-shell-backend.c:246
-msgid "Compose a new mail message"
-msgstr "Compose a new mail message"
+#: ../modules/calendar/e-cal-shell-backend.c:326
+msgid "Create a new all-day appointment"
+msgstr "Create a new all-day appointment"
 
-#: ../modules/mail/e-mail-shell-backend.c:254
+#: ../modules/calendar/e-cal-shell-backend.c:331
 msgctxt "New"
-msgid "Mail Acco_unt"
-msgstr "Mail Acco_unt"
+msgid "M_eeting"
+msgstr "M_eeting"
 
-#: ../modules/mail/e-mail-shell-backend.c:256
-msgid "Create a new mail account"
-msgstr "Create a new mail account"
+#: ../modules/calendar/e-cal-shell-backend.c:333
+msgid "Create a new meeting request"
+msgstr "Create a new meeting request"
 
-#: ../modules/mail/e-mail-shell-backend.c:261
+#: ../modules/calendar/e-cal-shell-backend.c:341
 msgctxt "New"
-msgid "Mail _Folder"
-msgstr "Mail _Folder"
+msgid "Cale_ndar"
+msgstr "Cale_ndar"
 
-#: ../modules/mail/e-mail-shell-backend.c:263
-msgid "Create a new mail folder"
-msgstr "Create a new mail folder"
+#: ../modules/calendar/e-cal-shell-backend.c:343
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+msgid "Create a new calendar"
+msgstr "Create a new calendar"
 
-#: ../modules/mail/e-mail-shell-backend.c:561
-msgid "Mail Accounts"
-msgstr "Mail Accounts"
+#: ../modules/calendar/e-cal-shell-backend.c:675
+msgid "Calendar and Tasks"
+msgstr "Calendar and Tasks"
 
-#: ../modules/mail/e-mail-shell-backend.c:570
-msgid "Mail Preferences"
-msgstr "Mail Preferences"
+#: ../modules/calendar/e-cal-shell-sidebar.c:565
+msgid "Calendar Selector"
+msgstr "Calendar Selector"
 
-#: ../modules/mail/e-mail-shell-backend.c:579
-msgid "Composer Preferences"
-msgstr "Composer Preferences"
+#: ../modules/calendar/e-cal-shell-sidebar.c:868
+#, c-format
+msgid "Opening calendar '%s'"
+msgstr "Opening calendar '%s'"
 
-#: ../modules/mail/e-mail-shell-backend.c:588
-msgid "Network Preferences"
-msgstr "Network Preferences"
+#: ../modules/calendar/e-cal-shell-view-actions.c:291
+msgid "Calendar Properties"
+msgstr "Calendar Properties"
 
-#. Translators: The first item in the list, to be able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:890
-msgctxt "label"
-msgid "None"
-msgstr "None"
+#: ../modules/calendar/e-cal-shell-view-actions.c:322
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
-msgid "_Disable Account"
-msgstr "_Disable Account"
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:339
+msgid "Purge events older than"
+msgstr "Purge events older than"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1228
-msgid "Disable this account"
-msgstr "Disable this account"
+#: ../modules/calendar/e-cal-shell-view-actions.c:588
+msgid "Copying Items"
+msgstr "Copying Items"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1235
-msgid "Permanently remove all the deleted messages from all folders"
-msgstr "Permanently remove all the deleted messages from all folders"
+#: ../modules/calendar/e-cal-shell-view-actions.c:881
+msgid "Moving Items"
+msgstr "Moving Items"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1242
-msgid "Edit properties of this account"
-msgstr "Edit properties of this account"
+#. Translators: Default filename part saving an event to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-actions.c:1215
+msgid "event"
+msgstr "event"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
-msgid "_Download Messages for Offline Usage"
-msgstr "_Download Messages for Offline Usage"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1217
+#: ../modules/calendar/e-cal-shell-view-memopad.c:231
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:548
+#: ../modules/calendar/e-task-shell-view-actions.c:665
+msgid "Save as iCalendar"
+msgstr "Save as iCalendar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1249
-msgid "Download messages of accounts and folders marked for offline usage"
-msgstr "Download messages of accounts and folders marked for offline usage"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../modules/calendar/e-memo-shell-view-actions.c:629
+msgid "_Copy..."
+msgstr "_Copy…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
-msgid "Fl_ush Outbox"
-msgstr "Fl_ush Outbox"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+msgid "D_elete Calendar"
+msgstr "D_elete Calendar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
-msgid "_Copy Folder To..."
-msgstr "_Copy Folder To…"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+msgid "Delete the selected calendar"
+msgstr "Delete the selected calendar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1263
-msgid "Copy the selected folder into another folder"
-msgstr "Copy the selected folder into another folder"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+msgid "Go Back"
+msgstr "Go Back"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1270
-msgid "Permanently remove this folder"
-msgstr "Permanently remove this folder"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+msgid "Go Forward"
+msgstr "Go Forward"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
-msgid "E_xpunge"
-msgstr "E_xpunge"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+msgid "Select today"
+msgstr "Select today"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1277
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Permanently remove all deleted messages from this folder"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+msgid "Select _Date"
+msgstr "Select _Date"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
-msgid "Mar_k All Messages as Read"
-msgstr "Mar_k All Messages as Read"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+msgid "Select a specific date"
+msgstr "Select a specific date"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1284
-msgid "Mark all messages in the folder as read"
-msgstr "Mark all messages in the folder as read"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+msgid "_New Calendar"
+msgstr "_New Calendar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
-msgid "_Move Folder To..."
-msgstr "_Move Folder To…"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
+#: ../modules/calendar/e-task-shell-view-actions.c:837
+msgid "Purg_e"
+msgstr "Purg_e"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1291
-msgid "Move the selected folder into another folder"
-msgstr "Move the selected folder into another folder"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+msgid "Purge old appointments and meetings"
+msgstr "Purge old appointments and meetings"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
-msgid "_New..."
-msgstr "_New…"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:781
+msgid "Re_fresh"
+msgstr "Re_fresh"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1298
-msgid "Create a new folder for storing mail"
-msgstr "Create a new folder for storing mail"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+msgid "Refresh the selected calendar"
+msgstr "Refresh the selected calendar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1305
-msgid "Change the properties of this folder"
-msgstr "Change the properties of this folder"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+msgid "Rename the selected calendar"
+msgstr "Rename the selected calendar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1312
-msgid "Refresh the folder"
-msgstr "Refresh the folder"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+msgid "Find _next"
+msgstr "Find _next"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1319
-msgid "Change the name of this folder"
-msgstr "Change the name of this folder"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+msgid "Find next occurrence of the current search string"
+msgstr "Find next occurrence of the current search string"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
-msgid "Select Message _Thread"
-msgstr "Select Message _Thread"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+msgid "Find _previous"
+msgstr "Find _previous"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1326
-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/calendar/e-cal-shell-view-actions.c:1461
+msgid "Find previous occurrence of the current search string"
+msgstr "Find previous occurrence of the current search string"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
-msgid "Select Message S_ubthread"
-msgstr "Select Message S_ubthread"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+msgid "Stop _running search"
+msgstr "Stop _running search"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1333
-msgid "Select all replies to the currently selected message"
-msgstr "Select all replies to the currently selected message"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+msgid "Stop currently running search"
+msgstr "Stop currently running search"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
-msgid "Empty _Trash"
-msgstr "Empty Was_tebasket"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
+msgid "Show _Only This Calendar"
+msgstr "Show _Only This Calendar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1347
-msgid "Permanently remove all the deleted messages from all accounts"
-msgstr "Permanently remove all the deleted messages from all accounts"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
+msgid "Cop_y to Calendar..."
+msgstr "Cop_y to Calendar…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
-msgid "_New Label"
-msgstr "_New Label"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+msgid "_Delegate Meeting..."
+msgstr "_Delegate Meeting…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1361
-msgid "N_one"
-msgstr "N_one"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1494
+msgid "_Delete Appointment"
+msgstr "_Delete Appointment"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1375
-msgid "_Manage Subscriptions"
-msgstr "_Manage Subscriptions"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+msgid "Delete selected appointments"
+msgstr "Delete selected appointments"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
-#: ../modules/mail/e-mail-shell-view-actions.c:1454
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Subscribe or unsubscribe to folders on remote servers"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1501
+msgid "Delete This _Occurrence"
+msgstr "Delete This _Occurrence"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1382
-#: ../modules/mail/e-mail-shell-view-actions.c:1403
-msgid "Send / _Receive"
-msgstr "Send / _Receive"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+msgid "Delete this occurrence"
+msgstr "Delete this occurrence"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1384
-msgid "Send queued items and retrieve new items"
-msgstr "Send queued items and retrieve new items"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1508
+msgid "Delete All Occ_urrences"
+msgstr "Delete All Occ_urrences"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1389
-msgid "R_eceive All"
-msgstr "R_eceive All"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+msgid "Delete all occurrences"
+msgstr "Delete all occurrences"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
-msgid "Receive new items from all accounts"
-msgstr "Receive new items from all accounts"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1515
+msgid "New All Day _Event..."
+msgstr "New All Day _Event…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1396
-msgid "_Send All"
-msgstr "_Send All"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+msgid "Create a new all day event"
+msgstr "Create a new all-day event"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1398
-msgid "Send queued items in all accounts"
-msgstr "Send queued items in all accounts"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1522
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-task-shell-view-actions.c:746
+msgid "_Forward as iCalendar..."
+msgstr "_Forward as iCalendar…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1424
-#: ../widgets/misc/e-activity-proxy.c:313
-msgid "Cancel"
-msgstr "Cancel"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1529
+msgid "New _Meeting..."
+msgstr "New _Meeting…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1426
-msgid "Cancel the current mail operation"
-msgstr "Cancel the current mail operation"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+msgid "Create a new meeting"
+msgstr "Create a new meeting"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1431
-msgid "Collapse All _Threads"
-msgstr "Collapse All _Threads"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1536
+msgid "Mo_ve to Calendar..."
+msgstr "Mo_ve to Calendar…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1433
-msgid "Collapse all message threads"
-msgstr "Collapse all message threads"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1543
+msgid "New _Appointment..."
+msgstr "New _Appointment…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1438
-msgid "E_xpand All Threads"
-msgstr "E_xpand All Threads"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+msgid "Make this Occurrence _Movable"
+msgstr "Make this Occurrence _Movable"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1440
-msgid "Expand all message threads"
-msgstr "Expand all message threads"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+msgid "_Open Appointment"
+msgstr "_Open Appointment"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
-msgid "_Message Filters"
-msgstr "_Message Filters"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+msgid "View the current appointment"
+msgstr "View the current appointment"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1447
-msgid "Create or edit rules for filtering new mail"
-msgstr "Create or edit rules for filtering new mail"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+msgid "_Reply"
+msgstr "_Reply"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1452
-msgid "_Subscriptions..."
-msgstr "_Subscriptions…"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+msgid "_Schedule Meeting..."
+msgstr "_Schedule Meeting…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1461
-msgid "F_older"
-msgstr "F_older"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+msgid "Converts an appointment to a meeting"
+msgstr "Converts an appointment to a meeting"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1468
-msgid "_Label"
-msgstr "_Label"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1585
+msgid "Conv_ert to Appointment..."
+msgstr "Conv_ert to Appointment…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1485
-msgid "C_reate Search Folder From Search..."
-msgstr "C_reate Search Folder From Search…"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+msgid "Converts a meeting to an appointment"
+msgstr "Converts a meeting to an appointment"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1492
-msgid "Search F_olders"
-msgstr "Search F_olders"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1592
+msgid "Quit"
+msgstr "Quit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1494
-msgid "Create or edit search folder definitions"
-msgstr "Create or edit search folder definitions"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1712
+msgid "Day"
+msgstr "Day"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
-msgid "_New Folder..."
-msgstr "_New Folder…"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1714
+msgid "Show one day"
+msgstr "Show one day"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
-msgid "Show Message _Preview"
-msgstr "Show Message _Preview"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+msgid "List"
+msgstr "List"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1559
-msgid "Show message preview pane"
-msgstr "Show message preview pane"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1721
+msgid "Show as list"
+msgstr "Show as list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
-msgid "Show _Deleted Messages"
-msgstr "Show _Deleted Messages"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+msgid "Month"
+msgstr "Month"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1567
-msgid "Show deleted messages with a line through them"
-msgstr "Show deleted messages with a line through them"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1728
+msgid "Show one month"
+msgstr "Show one month"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1573
-msgid "_Group By Threads"
-msgstr "_Group By Threads"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1733
+msgid "Week"
+msgstr "Week"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1575
-msgid "Threaded message list"
-msgstr "Threaded message list"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1735
+msgid "Show one week"
+msgstr "Show one week"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1581
-msgid "_Unmatched Folder Enabled"
-msgstr "_Unmatched Folder Enabled"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1742
+msgid "Show one work week"
+msgstr "Show one work week"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1583
-msgid "Toggles whether Unmatched search folder is enabled"
-msgstr "Toggles whether Unmatched search folder is enabled"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1750
+msgid "Active Appointments"
+msgstr "Active Appointments"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
-msgid "Show message preview below the message list"
-msgstr "Show message preview below the message list"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1764
+msgid "Next 7 Days' Appointments"
+msgstr "Next 7 Days' Appointments"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1610
-msgid "Show message preview alongside the message list"
-msgstr "Show message preview alongside the message list"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1771
+msgid "Occurs Less Than 5 Times"
+msgstr "Occurs Less Than 5 Times"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1618
-msgid "All Messages"
-msgstr "All Messages"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1802
+#: ../modules/calendar/e-memo-shell-view-actions.c:819
+#: ../modules/calendar/e-task-shell-view-actions.c:1018
+msgid "Description contains"
+msgstr "Description contains"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1625
-msgid "Important Messages"
-msgstr "Important Messages"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1809
+#: ../modules/calendar/e-memo-shell-view-actions.c:826
+#: ../modules/calendar/e-task-shell-view-actions.c:1025
+msgid "Summary contains"
+msgstr "Summary contains"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1632
-msgid "Last 5 Days' Messages"
-msgstr "Last 5 Days' Messages"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1821
+msgid "Print this calendar"
+msgstr "Print this calendar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1639
-msgid "Messages Not Junk"
-msgstr "Messages Not Junk"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1828
+msgid "Preview the calendar to be printed"
+msgstr "Preview the calendar to be printed"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1646
-msgid "Messages with Attachments"
-msgstr "Messages with Attachments"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1850
+#: ../modules/calendar/e-cal-shell-view-memopad.c:306
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:393
+#: ../modules/calendar/e-memo-shell-view-actions.c:867
+#: ../modules/calendar/e-task-shell-view-actions.c:1066
+msgid "_Save as iCalendar..."
+msgstr "_Save as iCalendar…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1653
-msgid "No Label"
-msgstr "No Label"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1927
+msgid "Go To"
+msgstr "Go To"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1660
-msgid "Read Messages"
-msgstr "Read Messages"
+#. Translators: Default filename part saving a memo to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-memopad.c:229
+#: ../modules/calendar/e-memo-shell-view-actions.c:546
+msgid "memo"
+msgstr "memo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1667
-msgid "Unread Messages"
-msgstr "Unread Messages"
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../modules/calendar/e-memo-shell-view-actions.c:678
+msgid "New _Memo"
+msgstr "New _Memo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1719
-msgid "Subject or Addresses contain"
-msgstr "Subject or Addresses contain"
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-memo-shell-backend.c:219
+#: ../modules/calendar/e-memo-shell-view-actions.c:680
+msgid "Create a new memo"
+msgstr "Create a new memo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1729
-msgid "All Accounts"
-msgstr "All Accounts"
+#: ../modules/calendar/e-cal-shell-view-memopad.c:279
+#: ../modules/calendar/e-memo-shell-view-actions.c:685
+msgid "_Open Memo"
+msgstr "_Open Memo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1736
-msgid "Current Account"
-msgstr "Current Account"
+#: ../modules/calendar/e-cal-shell-view-memopad.c:281
+#: ../modules/calendar/e-memo-shell-view-actions.c:687
+msgid "View the selected memo"
+msgstr "View the selected memo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1743
-msgid "Current Folder"
-msgstr "Current Folder"
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-memo-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:830
+msgid "Open _Web Page"
+msgstr "Open _Web Page"
 
-#: ../modules/mail/e-mail-shell-view.c:613
-msgid "All Account Search"
-msgstr "All Account Search"
+#: ../modules/calendar/e-cal-shell-view-memopad.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:852
+msgid "Print the selected memo"
+msgstr "Print the selected memo"
 
-#: ../modules/mail/e-mail-shell-view.c:710
-msgid "Account Search"
-msgstr "Account Search"
+#: ../modules/calendar/e-cal-shell-view-private.c:1509
+msgid "Searching next matching event"
+msgstr "Searching next matching event"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1042
-#, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] "%d selected, "
-msgstr[1] "%d selected, "
+#: ../modules/calendar/e-cal-shell-view-private.c:1510
+msgid "Searching previous matching event"
+msgstr "Searching previous matching event"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/calendar/e-cal-shell-view-private.c:1531
 #, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "%d deleted"
-msgstr[1] "%d deleted"
+msgid "Cannot find matching event in the next %d year"
+msgid_plural "Cannot find matching event in the next %d years"
+msgstr[0] "Cannot find matching event in the next %d year"
+msgstr[1] "Cannot find matching event in the next %d years"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1059
-#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/calendar/e-cal-shell-view-private.c:1535
 #, c-format
-msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] "%d junk"
-msgstr[1] "%d junk"
+msgid "Cannot find matching event in the previous %d year"
+msgid_plural "Cannot find matching event in the previous %d years"
+msgstr[0] "Cannot find matching event in the previous %d year"
+msgstr[1] "Cannot find matching event in the previous %d years"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1072
-#, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "%d draft"
-msgstr[1] "%d drafts"
+#: ../modules/calendar/e-cal-shell-view-private.c:1560
+msgid "Cannot search with no active calendar"
+msgstr "Cannot search with no active calendar"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1078
-#, c-format
-msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] "%d unsent"
-msgstr[1] "%d unsent"
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:296
+#: ../modules/calendar/e-task-shell-view-actions.c:663
+msgid "task"
+msgstr "task"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1084
-#, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "%d sent"
-msgstr[1] "%d sent"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../modules/calendar/e-task-shell-view-actions.c:725
+msgid "_Assign Task"
+msgstr "_Assign Task"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1096
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "%d unread, "
-msgstr[1] "%d unread, "
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:802
+msgid "_Mark as Complete"
+msgstr "_Mark as Complete"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1099
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d total"
-msgstr[1] "%d total"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:804
+msgid "Mark selected tasks as complete"
+msgstr "Mark selected tasks as complete"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1122
-msgid "Trash"
-msgstr "Wastebasket"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+msgid "_Mark as Incomplete"
+msgstr "_Mark as Incomplete"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1538
-msgid "Send / Receive"
-msgstr "Send / Receive"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:811
+msgid "Mark selected tasks as incomplete"
+msgstr "Mark selected tasks as incomplete"
 
-#: ../modules/mail/em-composer-prefs.c:499
-msgid "Language(s)"
-msgstr "Language(s)"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-task-shell-view-actions.c:816
+msgid "New _Task"
+msgstr "New _Task"
 
-#: ../modules/mail/em-mailer-prefs.c:86
-msgid "Every time"
-msgstr "Every time"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-task-shell-backend.c:216
+#: ../modules/calendar/e-task-shell-view-actions.c:818
+msgid "Create a new task"
+msgstr "Create a new task"
 
-#: ../modules/mail/em-mailer-prefs.c:87
-msgid "Once per day"
-msgstr "Once per day"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:366
+#: ../modules/calendar/e-task-shell-view-actions.c:823
+msgid "_Open Task"
+msgstr "_Open Task"
 
-#: ../modules/mail/em-mailer-prefs.c:88
-msgid "Once per week"
-msgstr "Once per week"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
+#: ../modules/calendar/e-task-shell-view-actions.c:825
+msgid "View the selected task"
+msgstr "View the selected task"
 
-#: ../modules/mail/em-mailer-prefs.c:89
-msgid "Once per month"
-msgstr "Once per month"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:385
+#: ../modules/calendar/e-task-shell-view-actions.c:1051
+msgid "Print the selected task"
+msgstr "Print the selected task"
 
-#: ../modules/mail/em-mailer-prefs.c:318
-msgid "Header"
-msgstr "Header"
+#: ../modules/calendar/e-memo-shell-backend.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:216
+msgid "New Memo List"
+msgstr "New Memo List"
 
-#: ../modules/mail/em-mailer-prefs.c:322
-msgid "Contains Value"
-msgstr "Contains Value"
+#: ../modules/calendar/e-memo-shell-backend.c:217
+msgctxt "New"
+msgid "Mem_o"
+msgstr "Mem_o"
 
-#. 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:1145
-msgid "_Date header:"
-msgstr "_Date header:"
+#: ../modules/calendar/e-memo-shell-backend.c:224
+msgctxt "New"
+msgid "_Shared Memo"
+msgstr "_Shared Memo"
 
-#: ../modules/mail/em-mailer-prefs.c:1146
-msgid "Show _original header value"
-msgstr "Show _original header value"
+#: ../modules/calendar/e-memo-shell-backend.c:226
+msgid "Create a new shared memo"
+msgstr "Create a new shared memo"
 
-#: ../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?"
+#: ../modules/calendar/e-memo-shell-backend.c:234
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "Memo Li_st"
 
-#. 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:323
-#, 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."
+#: ../modules/calendar/e-memo-shell-backend.c:236
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
+msgid "Create a new memo list"
+msgstr "Create a new memo list"
 
-#. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:390
-#, c-format
-msgid "Delivery Notification for \"%s\""
-msgstr "Delivery Notification for \"%s\""
+#: ../modules/calendar/e-memo-shell-sidebar.c:499
+msgid "Memo List Selector"
+msgstr "Memo List Selector"
 
-#: ../modules/mdn/evolution-mdn.c:543
+#: ../modules/calendar/e-memo-shell-sidebar.c:755
 #, c-format
-msgid "Send a read receipt to '%s'"
-msgstr "Send a read receipt to '%s'"
+msgid "Opening memo list '%s'"
+msgstr "Opening memo list '%s'"
 
-#. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:548
-msgid "_Notify Sender"
-msgstr "_Notify Sender"
+#: ../modules/calendar/e-memo-shell-view-actions.c:232
+#: ../modules/calendar/e-memo-shell-view-actions.c:247
+msgid "Print Memos"
+msgstr "Print Memos"
 
-#: ../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/calendar/e-memo-shell-view-actions.c:288
+msgid "Memo List Properties"
+msgstr "Memo List Properties"
 
-#: ../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/calendar/e-memo-shell-view-actions.c:608
+msgid "_Delete Memo"
+msgstr "_Delete Memo"
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
-msgid "Evolution is currently offline."
-msgstr "Evolution is currently offline."
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
+msgid "_Find in Memo..."
+msgstr "_Find in Memo…"
 
-#: ../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/calendar/e-memo-shell-view-actions.c:617
+msgid "Search for text in the displayed memo"
+msgstr "Search for text in the displayed memo"
 
-#: ../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/calendar/e-memo-shell-view-actions.c:636
+msgid "D_elete Memo List"
+msgstr "D_elete Memo List"
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
-msgid ""
-"Evolution will return to online mode once a network connection is "
-"established."
-msgstr ""
-"Evolution will return to online mode once a network connection is "
-"established."
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
+msgid "Delete the selected memo list"
+msgstr "Delete the selected memo list"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:417
-msgid ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain an authentication token."
-msgstr ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain an authentication token."
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
+msgid "_New Memo List"
+msgstr "_New Memo List"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:504
-msgid "OAuth"
-msgstr "OAuth"
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
+msgid "Refresh the selected memo list"
+msgstr "Refresh the selected memo list"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:506
-msgid ""
-"This option will connect to the server by way of the GNOME Online Accounts "
-"service"
-msgstr ""
-"This option will connect to the server by way of the GNOME Online Accounts "
-"service"
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
+msgid "Rename the selected memo list"
+msgstr "Rename the selected memo list"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
-msgid "Author(s)"
-msgstr "Author(s)"
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
+msgid "Show _Only This Memo List"
+msgstr "Show _Only This Memo List"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:255
-msgid "Plugin Manager"
-msgstr "Plugin Manager"
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+msgid "Memo _Preview"
+msgstr "Memo _Preview"
 
-#: ../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/calendar/e-memo-shell-view-actions.c:752
+msgid "Show memo preview pane"
+msgstr "Show memo preview pane"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:299
-msgid "Overview"
-msgstr "Overview"
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
+msgid "Show memo preview below the memo list"
+msgstr "Show memo preview below the memo list"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:368
-#: ../modules/plugin-manager/evolution-plugin-manager.c:451
-msgid "Plugin"
-msgstr "Plugin"
+#: ../modules/calendar/e-memo-shell-view-actions.c:780
+msgid "Show memo preview alongside the memo list"
+msgstr "Show memo preview alongside the memo list"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
-msgid "_Plugins"
-msgstr "_Plugins"
+#: ../modules/calendar/e-memo-shell-view-actions.c:838
+msgid "Print the list of memos"
+msgstr "Print the list of memos"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:490
-msgid "Enable and disable plugins"
-msgstr "Enable and disable plugins"
+#: ../modules/calendar/e-memo-shell-view-actions.c:845
+msgid "Preview the list of memos to be printed"
+msgstr "Preview the list of memos to be printed"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
-msgid "Display plain text version"
-msgstr "Display plain text version"
+#: ../modules/calendar/e-memo-shell-view.c:236
+msgid "Delete Memos"
+msgstr "Delete Memos"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
-msgid "Display plain text version of multipart/alternative message"
-msgstr "Display plain text version of multipart/alternative message"
+#: ../modules/calendar/e-memo-shell-view.c:238
+msgid "Delete Memo"
+msgstr "Delete Memo"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
-msgid "Display HTML version"
-msgstr "Display HTML version"
+#: ../modules/calendar/e-memo-shell-view-private.c:465
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d memo"
+msgstr[1] "%d memos"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:150
-msgid "Display HTML version of multipart/alternative message"
-msgstr "Display HTML version of multipart/alternative message"
+#: ../modules/calendar/e-memo-shell-view-private.c:469
+#: ../modules/calendar/e-task-shell-view-private.c:639
+#, c-format
+msgid "%d selected"
+msgstr "%d selected"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
-#: ../modules/prefer-plain/plugin/config-ui.c:46
-msgid "Show HTML if present"
-msgstr "Show HTML if present"
+#: ../modules/calendar/e-task-shell-backend.c:205
+#: ../modules/calendar/e-task-shell-view-actions.c:239
+msgid "New Task List"
+msgstr "New Task List"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:47
-msgid "Let Evolution choose the best part to show."
-msgstr "Let Evolution choose the best part to show."
+#: ../modules/calendar/e-task-shell-backend.c:214
+msgctxt "New"
+msgid "_Task"
+msgstr "_Task"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
-#: ../modules/prefer-plain/plugin/config-ui.c:50
-msgid "Show plain text if present"
-msgstr "Show plain text if present"
+#: ../modules/calendar/e-task-shell-backend.c:221
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "Assigne_d Task"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
-#: ../modules/prefer-plain/plugin/config-ui.c:51
-msgid ""
-"Show plain text part, if present, otherwise let Evolution choose the best "
-"part to show."
-msgstr ""
-"Show plain text part, if present, otherwise let Evolution choose the best "
-"part to show."
+#: ../modules/calendar/e-task-shell-backend.c:223
+msgid "Create a new assigned task"
+msgstr "Create a new assigned task"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:91
-#: ../modules/prefer-plain/plugin/config-ui.c:55
-msgid "Only ever show plain text"
-msgstr "Only ever show plain text"
+#: ../modules/calendar/e-task-shell-backend.c:231
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "Tas_k List"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:92
-#: ../modules/prefer-plain/plugin/config-ui.c:56
-msgid ""
-"Always show plain text part and make attachments from other parts, if "
-"requested."
-msgstr ""
-"Always show plain text part and make attachments from other parts, if "
-"requested."
+#: ../modules/calendar/e-task-shell-backend.c:233
+#: ../modules/calendar/e-task-shell-view-actions.c:769
+msgid "Create a new task list"
+msgstr "Create a new task list"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:107
-msgid "Show s_uppressed HTML parts as attachments"
-msgstr "Show s_uppressed HTML parts as attachments"
+#: ../modules/calendar/e-task-shell-sidebar.c:499
+msgid "Task List Selector"
+msgstr "Task List Selector"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:129
-msgid "HTML _Mode"
-msgstr "HTML _Mode"
+#: ../modules/calendar/e-task-shell-sidebar.c:755
+#, c-format
+msgid "Opening task list '%s'"
+msgstr "Opening task list '%s'"
 
-#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
-msgid "Prefer Plain Text"
-msgstr "Prefer Plain Text"
+#: ../modules/calendar/e-task-shell-view-actions.c:255
+#: ../modules/calendar/e-task-shell-view-actions.c:270
+msgid "Print Tasks"
+msgstr "Print Tasks"
 
-#. but then we also need to create our own section frame
-#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:3
-msgid "Plain Text Mode"
-msgstr "Plain Text Mode"
+#: ../modules/calendar/e-task-shell-view-actions.c:311
+msgid "Task List Properties"
+msgstr "Task List Properties"
 
-#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
-msgid "View mail messages as plain text, even if they contain HTML content."
-msgstr "View mail messages as plain text, even if they contain HTML content."
+#: ../modules/calendar/e-task-shell-view-actions.c:607
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:192
-#, c-format
-msgid "Failed to spawn SpamAssassin (%s): "
-msgstr "Failed to spawn SpamAssassin (%s): "
+#: ../modules/calendar/e-task-shell-view-actions.c:614
+msgid "Do not ask me again"
+msgstr "Do not ask me again"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:215
-msgid "Failed to stream mail message content to SpamAssassin: "
-msgstr "Failed to stream mail message content to SpamAssassin: "
+#: ../modules/calendar/e-task-shell-view-actions.c:732
+msgid "_Delete Task"
+msgstr "_Delete Task"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:234
-#, c-format
-msgid "Failed to write '%s' to SpamAssassin: "
-msgstr "Failed to write '%s' to SpamAssassin: "
+#: ../modules/calendar/e-task-shell-view-actions.c:739
+msgid "_Find in Task..."
+msgstr "_Find in Task…"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:262
-msgid "Failed to read output from SpamAssassin: "
-msgstr "Failed to read output from SpamAssassin: "
+#: ../modules/calendar/e-task-shell-view-actions.c:741
+msgid "Search for text in the displayed task"
+msgstr "Search for text in the displayed task"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:317
-msgid "SpamAssassin either crashed or failed to process a mail message"
-msgstr "SpamAssassin either crashed or failed to process a mail message"
+#: ../modules/calendar/e-task-shell-view-actions.c:753
+msgid "Copy..."
+msgstr "Copy…"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:885
-msgid "SpamAssassin Options"
-msgstr "SpamAssassin Options"
+#: ../modules/calendar/e-task-shell-view-actions.c:760
+msgid "D_elete Task List"
+msgstr "D_elete Task List"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:900
-msgid "I_nclude remote tests"
-msgstr "I_nclude remote tests"
+#: ../modules/calendar/e-task-shell-view-actions.c:762
+msgid "Delete the selected task list"
+msgstr "Delete the selected task list"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:914
-msgid "This will make SpamAssassin more reliable, but slower."
-msgstr "This will make SpamAssassin more reliable, but slower."
+#: ../modules/calendar/e-task-shell-view-actions.c:767
+msgid "_New Task List"
+msgstr "_New Task List"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1123
-msgid "SpamAssassin"
-msgstr "SpamAssassin"
+#: ../modules/calendar/e-task-shell-view-actions.c:783
+msgid "Refresh the selected task list"
+msgstr "Refresh the selected task list"
 
-#: ../modules/startup-wizard/e-mail-config-import-page.c:204
-#: ../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/calendar/e-task-shell-view-actions.c:790
+msgid "Rename the selected task list"
+msgstr "Rename the selected task list"
 
-#: ../modules/startup-wizard/e-mail-config-import-page.c:233
-#: ../widgets/misc/e-import-assistant.c:559
-#, c-format
-msgid "From %s:"
-msgstr "From %s:"
+#: ../modules/calendar/e-task-shell-view-actions.c:795
+msgid "Show _Only This Task List"
+msgstr "Show _Only This Task List"
 
-#. Keep the title identical to EMailConfigImportPage
-#. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:264
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
-msgid "Importing Files"
-msgstr "Importing Files"
+#: ../modules/calendar/e-task-shell-view-actions.c:809
+msgid "Mar_k as Incomplete"
+msgstr "Mar_k as Incomplete"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:261
-msgid "Import cancelled."
-msgstr "Import cancelled."
+#: ../modules/calendar/e-task-shell-view-actions.c:839
+msgid "Delete completed tasks"
+msgstr "Delete completed tasks"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:278
-msgid "Import complete."
-msgstr "Import complete."
+#: ../modules/calendar/e-task-shell-view-actions.c:914
+msgid "Task _Preview"
+msgstr "Task _Preview"
 
-#: ../modules/startup-wizard/e-startup-assistant.c:154
-msgid ""
-"Welcome to Evolution.\n"
-"\n"
-"The next few screens will allow Evolution to connect to your email accounts, "
-"and to import files from other applications."
-msgstr ""
-"Welcome to Evolution.\n"
-"\n"
-"The next few screens will allow Evolution to connect to your e-mail "
-"accounts, and to import files from other applications."
+#: ../modules/calendar/e-task-shell-view-actions.c:916
+msgid "Show task preview pane"
+msgstr "Show task preview pane"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:242
-msgid "Loading accounts..."
-msgstr "Loading accounts…"
+#: ../modules/calendar/e-task-shell-view-actions.c:937
+msgid "Show task preview below the task list"
+msgstr "Show task preview below the task list"
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
-msgid "_Format as..."
-msgstr "_Format as…"
+#: ../modules/calendar/e-task-shell-view-actions.c:944
+msgid "Show task preview alongside the task list"
+msgstr "Show task preview alongside the task list"
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
-msgid "_Other languages"
-msgstr "_Other languages"
+#: ../modules/calendar/e-task-shell-view-actions.c:952
+msgid "Active Tasks"
+msgstr "Active Tasks"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:365
-msgid "Text Highlight"
-msgstr "Text Highlight"
+#: ../modules/calendar/e-task-shell-view-actions.c:966
+msgid "Completed Tasks"
+msgstr "Completed Tasks"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:371
-msgid "Syntax highlighting of mail parts"
-msgstr "Syntax highlighting of mail parts"
+#: ../modules/calendar/e-task-shell-view-actions.c:973
+msgid "Next 7 Days' Tasks"
+msgstr "Next 7 Days' Tasks"
 
-#: ../modules/text-highlight/languages.c:32
-msgid "_Plain text"
-msgstr "_Plain text"
+#: ../modules/calendar/e-task-shell-view-actions.c:980
+msgid "Overdue Tasks"
+msgstr "Overdue Tasks"
 
-#: ../modules/text-highlight/languages.c:38
-msgid "_Assembler"
-msgstr "_Assembler"
+#: ../modules/calendar/e-task-shell-view-actions.c:987
+msgid "Tasks with Attachments"
+msgstr "Tasks with Attachments"
 
-#: ../modules/text-highlight/languages.c:43
-msgid "_Bash"
-msgstr "_Bash"
+#: ../modules/calendar/e-task-shell-view-actions.c:1037
+msgid "Print the list of tasks"
+msgstr "Print the list of tasks"
 
-#: ../modules/text-highlight/languages.c:54
-msgid "_C/C++"
-msgstr "_C/C++"
+#: ../modules/calendar/e-task-shell-view-actions.c:1044
+msgid "Preview the list of tasks to be printed"
+msgstr "Preview the list of tasks to be printed"
 
-#: ../modules/text-highlight/languages.c:63
-msgid "_C#"
-msgstr "_C#"
+#: ../modules/calendar/e-task-shell-view.c:371
+msgid "Delete Tasks"
+msgstr "Delete Tasks"
 
-#: ../modules/text-highlight/languages.c:68
-msgid "_Cascade Style Sheet"
-msgstr "_Cascade Style Sheet"
+#: ../modules/calendar/e-task-shell-view.c:373
+msgid "Delete Task"
+msgstr "Delete Task"
 
-#: ../modules/text-highlight/languages.c:73
-msgid "_HTML"
-msgstr "_HTML"
+#: ../modules/calendar/e-task-shell-view-private.c:524
+msgid "Expunging"
+msgstr "Expunging"
 
-#: ../modules/text-highlight/languages.c:81
-msgid "_Java"
-msgstr "_Java"
+#: ../modules/calendar/e-task-shell-view-private.c:635
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d task"
+msgstr[1] "%d tasks"
 
-#: ../modules/text-highlight/languages.c:87
-msgid "_JavaScript"
-msgstr "_JavaScript"
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:146
+msgid "ITIP"
+msgstr "ITIP"
 
-#: ../modules/text-highlight/languages.c:93
-msgid "_Patch/diff"
-msgstr "_Patch/diff"
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:147
+msgid "Display part as an invitation"
+msgstr "Display part as an invitation"
 
-#: ../modules/text-highlight/languages.c:99
-msgid "_Perl"
-msgstr "_Perl"
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:235
+msgid "Today %H:%M"
+msgstr "Today %H:%M"
 
-#: ../modules/text-highlight/languages.c:110
-msgid "_PHP"
-msgstr "_PHP"
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:239
+msgid "Today %H:%M:%S"
+msgstr "Today %H:%M:%S"
 
-#: ../modules/text-highlight/languages.c:123
-msgid "_Python"
-msgstr "_Python"
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:248
+msgid "Today %l:%M:%S %p"
+msgstr "Today %l:%M:%S %p"
 
-#: ../modules/text-highlight/languages.c:128
-msgid "_Ruby"
-msgstr "_Ruby"
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:263
+msgid "Tomorrow %H:%M"
+msgstr "Tomorrow %H:%M"
 
-#: ../modules/text-highlight/languages.c:135
-msgid "_Tcl/Tk"
-msgstr "_Tcl/Tk"
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:267
+msgid "Tomorrow %H:%M:%S"
+msgstr "Tomorrow %H:%M:%S"
 
-#: ../modules/text-highlight/languages.c:141
-msgid "_TeX/LaTeX"
-msgstr "_TeX/LaTeX"
+#. strftime format of a time,
+#. * in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:272
+msgid "Tomorrow %l:%M %p"
+msgstr "Tomorrow %l:%M %p"
 
-#: ../modules/text-highlight/languages.c:147
-msgid "_Vala"
-msgstr "_Vala"
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:276
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "Tomorrow %l:%M:%S %p"
 
-#: ../modules/text-highlight/languages.c:152
-msgid "_Visual Basic"
-msgstr "_Visual Basic"
+#. strftime format of a weekday.
+#: ../modules/itip-formatter/itip-view.c:295
+#, c-format
+msgid "%A"
+msgstr "%A"
 
-#: ../modules/text-highlight/languages.c:159
-msgid "_XML"
-msgstr "_XML"
+#. strftime format of a weekday and a
+#. * time, in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:300
+msgid "%A %H:%M"
+msgstr "%A %H:%M"
 
-#: ../modules/text-highlight/languages.c:177
-msgid "_ActionScript"
-msgstr "_ActionScript"
+#. strftime format of a weekday and a
+#. * time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:304
+msgid "%A %H:%M:%S"
+msgstr "%A %H:%M:%S"
 
-#: ../modules/text-highlight/languages.c:182
-msgid "_ADA95"
-msgstr "_ADA95"
+#. strftime format of a weekday and a
+#. * time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:309
+msgid "%A %l:%M %p"
+msgstr "%A %l:%M %p"
 
-#: ../modules/text-highlight/languages.c:189
-msgid "_ALGOL 68"
-msgstr "_ALGOL 68"
-
-#: ../modules/text-highlight/languages.c:194
-msgid "(_G)AWK"
-msgstr "(_G)AWK"
-
-#: ../modules/text-highlight/languages.c:199
-msgid "_COBOL"
-msgstr "_COBOL"
-
-#: ../modules/text-highlight/languages.c:204
-msgid "_DOS Batch"
-msgstr "_DOS Batch"
+#. strftime format of a weekday and a
+#. * time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:313
+msgid "%A %l:%M:%S %p"
+msgstr "%A %l:%M:%S %p"
 
-#: ../modules/text-highlight/languages.c:209
-msgid "_D"
-msgstr "_D"
+#. strftime format of a weekday and a date
+#. * without a year.
+#: ../modules/itip-formatter/itip-view.c:322
+msgid "%A, %B %e"
+msgstr "%A %e %B"
 
-#: ../modules/text-highlight/languages.c:214
-msgid "_Erlang"
-msgstr "_Erlang"
+#. strftime format of a weekday, a date
+#. * without a year and a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:328
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %e %B %H:%M"
 
-#: ../modules/text-highlight/languages.c:219
-msgid "_FORTRAN 77"
-msgstr "_FORTRAN 77"
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:332
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %e %B %H:%M:%S"
 
-#: ../modules/text-highlight/languages.c:225
-msgid "_FORTRAN 90"
-msgstr "_FORTRAN 90"
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:337
+msgid "%A, %B %e %l:%M %p"
+msgstr "%A, %e %B %l:%M %p"
 
-#: ../modules/text-highlight/languages.c:230
-msgid "_F#"
-msgstr "_F#"
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:341
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %e %B %l:%M:%S %p"
 
-#: ../modules/text-highlight/languages.c:235
-msgid "_Go"
-msgstr "_Go"
+#. strftime format of a weekday and a date.
+#: ../modules/itip-formatter/itip-view.c:347
+msgid "%A, %B %e, %Y"
+msgstr "%A, %e %B, %Y"
 
-#: ../modules/text-highlight/languages.c:240
-msgid "_Haskell"
-msgstr "_Haskell"
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:352
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%A, %e %B, %Y %H:%M"
 
-#: ../modules/text-highlight/languages.c:245
-msgid "_JSP"
-msgstr "_JSP"
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:356
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%A, %e %B, %Y %H:%M:%S"
 
-#: ../modules/text-highlight/languages.c:250
-msgid "_Lisp"
-msgstr "_Lisp"
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:361
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%A, %e %B, %Y %l:%M %p"
 
-#: ../modules/text-highlight/languages.c:258
-msgid "_Lotus"
-msgstr "_Lotus"
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:365
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%A, %e %B, %Y %l:%M:%S %p"
 
-#: ../modules/text-highlight/languages.c:263
-msgid "_Lua"
-msgstr "_Lua"
+#: ../modules/itip-formatter/itip-view.c:403
+#: ../modules/itip-formatter/itip-view.c:404
+#: ../modules/itip-formatter/itip-view.c:493
+#: ../modules/itip-formatter/itip-view.c:494
+#: ../modules/itip-formatter/itip-view.c:583
+msgid "An unknown person"
+msgstr "An unknown person"
 
-#: ../modules/text-highlight/languages.c:268
-msgid "_Maple"
-msgstr "_Maple"
+#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:587
+#, c-format
+msgid "Please respond on behalf of %s"
+msgstr "Please respond on behalf of %s"
 
-#: ../modules/text-highlight/languages.c:273
-msgid "_Matlab"
-msgstr "_Matlab"
+#: ../modules/itip-formatter/itip-view.c:410
+#: ../modules/itip-formatter/itip-view.c:500
+#: ../modules/itip-formatter/itip-view.c:589
+#, c-format
+msgid "Received on behalf of %s"
+msgstr "Received on behalf of %s"
 
-#: ../modules/text-highlight/languages.c:278
-msgid "_Maya"
-msgstr "_Maya"
+#: ../modules/itip-formatter/itip-view.c:415
+#, c-format
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s through %s has published the following meeting information:"
 
-#: ../modules/text-highlight/languages.c:283
-msgid "_Oberon"
-msgstr "_Oberon"
+#: ../modules/itip-formatter/itip-view.c:417
+#, c-format
+msgid "%s has published the following meeting information:"
+msgstr "%s has published the following meeting information:"
 
-#: ../modules/text-highlight/languages.c:288
-msgid "_Objective C"
-msgstr "_Objective C"
+#: ../modules/itip-formatter/itip-view.c:422
+#, c-format
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s has delegated the following meeting to you:"
 
-#: ../modules/text-highlight/languages.c:294
-msgid "_OCaml"
-msgstr "_OCaml"
+#: ../modules/itip-formatter/itip-view.c:425
+#, c-format
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s through %s requests your presence at the following meeting:"
 
-#: ../modules/text-highlight/languages.c:299
-msgid "_Octave"
-msgstr "_Octave"
+#: ../modules/itip-formatter/itip-view.c:427
+#, c-format
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s requests your presence at the following meeting:"
 
-#: ../modules/text-highlight/languages.c:304
-msgid "_Object Script"
-msgstr "_Object Script"
+#: ../modules/itip-formatter/itip-view.c:433
+#, c-format
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s through %s wishes to add to an existing meeting:"
 
-#: ../modules/text-highlight/languages.c:309
-msgid "_Pascal"
-msgstr "_Pascal"
+#: ../modules/itip-formatter/itip-view.c:435
+#, c-format
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s wishes to add to an existing meeting:"
 
-#: ../modules/text-highlight/languages.c:314
-msgid "_POV-Ray"
-msgstr "_POV-Ray"
+#: ../modules/itip-formatter/itip-view.c:439
+#, c-format
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
 
-#: ../modules/text-highlight/languages.c:319
-msgid "_Prolog"
-msgstr "_Prolog"
+#: ../modules/itip-formatter/itip-view.c:441
+#, c-format
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s wishes to receive the latest information for the following meeting:"
 
-#: ../modules/text-highlight/languages.c:324
-msgid "_PostScript"
-msgstr "_PostScript"
+#: ../modules/itip-formatter/itip-view.c:445
+#, c-format
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s through %s has sent back the following meeting response:"
 
-#: ../modules/text-highlight/languages.c:329
-msgid "_R"
-msgstr "_R"
+#: ../modules/itip-formatter/itip-view.c:447
+#, c-format
+msgid "%s has sent back the following meeting response:"
+msgstr "%s has sent back the following meeting response:"
 
-#: ../modules/text-highlight/languages.c:334
-msgid "_RPM Spec"
-msgstr "_RPM Spec"
+#: ../modules/itip-formatter/itip-view.c:451
+#, c-format
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s through %s has cancelled the following meeting:"
 
-#: ../modules/text-highlight/languages.c:339
-msgid "_Scala"
-msgstr "_Scala"
+#: ../modules/itip-formatter/itip-view.c:453
+#, c-format
+msgid "%s has canceled the following meeting:"
+msgstr "%s has cancelled the following meeting:"
 
-#: ../modules/text-highlight/languages.c:344
-msgid "_Smalltalk"
-msgstr "_Smalltalk"
+#: ../modules/itip-formatter/itip-view.c:457
+#, c-format
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s through %s has proposed the following meeting changes."
 
-#: ../modules/text-highlight/languages.c:350
-msgid "_TCSH"
-msgstr "_TCSH"
+#: ../modules/itip-formatter/itip-view.c:459
+#, c-format
+msgid "%s has proposed the following meeting changes:"
+msgstr "%s has proposed the following meeting changes:"
 
-#: ../modules/text-highlight/languages.c:355
-msgid "_VHDL"
-msgstr "_VHDL"
+#: ../modules/itip-formatter/itip-view.c:463
+#, c-format
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s through %s has declined the following meeting changes:"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:118
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:201
-msgid "Show F_ull vCard"
-msgstr "Show F_ull vCard"
+#: ../modules/itip-formatter/itip-view.c:465
+#, c-format
+msgid "%s has declined the following meeting changes:"
+msgstr "%s has declined the following meeting changes:"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:121
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:219
-msgid "Show Com_pact vCard"
-msgstr "Show Com_pact vCard"
+#: ../modules/itip-formatter/itip-view.c:505
+#, c-format
+msgid "%s through %s has published the following task:"
+msgstr "%s through %s has published the following task:"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:145
-msgid "Save _To Addressbook"
-msgstr "Save _To Addressbook"
+#: ../modules/itip-formatter/itip-view.c:507
+#, c-format
+msgid "%s has published the following task:"
+msgstr "%s has published the following task:"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:165
-msgid "There is one other contact."
-msgstr "There is one other contact."
+#: ../modules/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s requests the assignment of %s to the following task:"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:171
+#: ../modules/itip-formatter/itip-view.c:515
 #, 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."
+msgid "%s through %s has assigned you a task:"
+msgstr "%s through %s has assigned you a task:"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:196
-msgid "Addressbook Contact"
-msgstr "Addressbook Contact"
+#: ../modules/itip-formatter/itip-view.c:517
+#, c-format
+msgid "%s has assigned you a task:"
+msgstr "%s has assigned you a task:"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:202
-msgid "Display the part as an addressbook contact"
-msgstr "Display the part as an addressbook contact"
+#: ../modules/itip-formatter/itip-view.c:523
+#, c-format
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s through %s wishes to add to an existing task:"
 
-#: ../modules/web-inspector/evolution-web-inspector.c:88
-msgid "_Inspect..."
-msgstr "_Inspect…"
+#: ../modules/itip-formatter/itip-view.c:525
+#, c-format
+msgid "%s wishes to add to an existing task:"
+msgstr "%s wishes to add to an existing task:"
 
-#: ../modules/web-inspector/evolution-web-inspector.c:90
-msgid "Inspect the HTML content (debugging feature)"
-msgstr "Inspect the HTML content (debugging feature)"
+#: ../modules/itip-formatter/itip-view.c:529
+#, c-format
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
 
-#: ../modules/web-inspector/evolution-web-inspector.c:102
-msgid "Evolution Web Inspector"
-msgstr "Evolution Web Inspector"
+#: ../modules/itip-formatter/itip-view.c:531
+#, 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/attachment-reminder/attachment-reminder.c:128
-msgid "_Do not show this message again."
-msgstr "_Do not show this message again."
+#: ../modules/itip-formatter/itip-view.c:535
+#, 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/attachment-reminder/attachment-reminder.c:590
-#: ../plugins/templates/templates.c:469
-msgid "Keywords"
-msgstr "Keywords"
+#: ../modules/itip-formatter/itip-view.c:537
+#, c-format
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s has sent back the following assigned task response:"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid "Message has no attachments"
-msgstr "Message has no attachments"
+#: ../modules/itip-formatter/itip-view.c:541
+#, c-format
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s through %s has cancelled the following assigned task:"
 
-#: ../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."
-msgstr ""
-"Evolution has found some keywords that suggest that this message should "
-"contain an attachment, but cannot find one."
+#: ../modules/itip-formatter/itip-view.c:543
+#, c-format
+msgid "%s has canceled the following assigned task:"
+msgstr "%s has cancelled the following assigned task:"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-msgid "_Add Attachment..."
-msgstr "_Add Attachment…"
+#: ../modules/itip-formatter/itip-view.c:547
+#, 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/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Edit Message"
-msgstr "_Edit Message"
+#: ../modules/itip-formatter/itip-view.c:549
+#, c-format
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s has proposed the following task assignment changes:"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
-msgid "Attachment Reminder"
-msgstr "Attachment Reminder"
+#: ../modules/itip-formatter/itip-view.c:553
+#, c-format
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s through %s has declined the following assigned task:"
 
-#: ../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."
+#: ../modules/itip-formatter/itip-view.c:555
+#, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "%s has declined the following assigned task:"
 
-#: ../plugins/bbdb/bbdb.c:650 ../plugins/bbdb/bbdb.c:659
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-msgid "Automatic Contacts"
-msgstr "Automatic Contacts"
+#: ../modules/itip-formatter/itip-view.c:594
+#, c-format
+msgid "%s through %s has published the following memo:"
+msgstr "%s through %s has published the following memo:"
 
-#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:674
-msgid "Create _address book entries when sending mails"
-msgstr "Create _address book entries when sending mails"
+#: ../modules/itip-formatter/itip-view.c:596
+#, c-format
+msgid "%s has published the following memo:"
+msgstr "%s has published the following memo:"
 
-#: ../plugins/bbdb/bbdb.c:682
-msgid "Select Address book for Automatic Contacts"
-msgstr "Select Address book for Automatic Contacts"
+#: ../modules/itip-formatter/itip-view.c:601
+#, 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/bbdb/bbdb.c:699
-msgid "Instant Messaging Contacts"
-msgstr "Instant Messaging Contacts"
+#: ../modules/itip-formatter/itip-view.c:603
+#, c-format
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s wishes to add to an existing memo:"
 
-#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:714
-msgid "_Synchronize contact info and images from Pidgin buddy list"
-msgstr "_Synchronise contact info and images from Pidgin buddy list"
+#: ../modules/itip-formatter/itip-view.c:607
+#, c-format
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s through %s has cancelled the following shared memo:"
 
-#: ../plugins/bbdb/bbdb.c:722
-msgid "Select Address book for Pidgin buddy list"
-msgstr "Select Address book for Pidgin buddy list"
+#: ../modules/itip-formatter/itip-view.c:609
+#, c-format
+msgid "%s has canceled the following shared memo:"
+msgstr "%s has cancelled the following shared memo:"
 
-#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:735
-msgid "Synchronize with _buddy list now"
-msgstr "Synchronise with _buddy list now"
+#: ../modules/itip-formatter/itip-view.c:682
+msgid "All day:"
+msgstr "All day:"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-msgid "BBDB"
-msgstr "BBDB"
+#: ../modules/itip-formatter/itip-view.c:688
+msgid "Start day:"
+msgstr "Start day:"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid ""
-"Takes the gruntwork out of managing your address book.\n"
-"\n"
-"Automatically fills your address book with names and email addresses as you "
-"reply to messages.  Also fills in IM contact information from your buddy "
-"lists."
-msgstr ""
-"Takes the gruntwork out of managing your address book.\n"
-"\n"
-"Automatically fills your address book with names and email addresses as you "
-"reply to messages.  Also fills in IM contact information from your buddy "
-"lists."
+#: ../modules/itip-formatter/itip-view.c:688
+#: ../modules/itip-formatter/itip-view.c:1490
+msgid "Start time:"
+msgstr "Start time:"
 
-#: ../plugins/dbx-import/dbx-importer.c:287
-msgid "Importing Outlook Express data"
-msgstr "Importing Outlook Express data"
+#: ../modules/itip-formatter/itip-view.c:697
+msgid "End day:"
+msgstr "End day:"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
-msgid "Outlook DBX import"
-msgstr "Outlook DBX import"
+#: ../modules/itip-formatter/itip-view.c:697
+#: ../modules/itip-formatter/itip-view.c:1491
+msgid "End time:"
+msgstr "End time:"
 
-#: ../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)"
+#: ../modules/itip-formatter/itip-view.c:1016
+msgid "Ope_n Calendar"
+msgstr "Ope_n Calendar"
 
-#: ../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"
+#: ../modules/itip-formatter/itip-view.c:1019
+msgid "_Decline all"
+msgstr "_Decline all"
 
-#: ../plugins/email-custom-header/email-custom-header.c:291
-msgctxt "email-custom-header-Security"
-msgid "Security:"
-msgstr "Security:"
+#: ../modules/itip-formatter/itip-view.c:1022
+msgid "_Decline"
+msgstr "_Decline"
 
-#: ../plugins/email-custom-header/email-custom-header.c:295
-msgctxt "email-custom-header-Security"
-msgid "Personal"
-msgstr "Personal"
+#: ../modules/itip-formatter/itip-view.c:1025
+msgid "_Tentative all"
+msgstr "_Tentative all"
 
-#: ../plugins/email-custom-header/email-custom-header.c:296
-msgctxt "email-custom-header-Security"
-msgid "Unclassified"
-msgstr "Unclassified"
+#: ../modules/itip-formatter/itip-view.c:1028
+msgid "_Tentative"
+msgstr "_Tentative"
 
-#: ../plugins/email-custom-header/email-custom-header.c:297
-msgctxt "email-custom-header-Security"
-msgid "Protected"
-msgstr "Protected"
+#: ../modules/itip-formatter/itip-view.c:1031
+msgid "Acce_pt all"
+msgstr "Acce_pt all"
 
-#: ../plugins/email-custom-header/email-custom-header.c:298
-msgctxt "email-custom-header-Security"
-msgid "Confidential"
-msgstr "Confidential"
+#: ../modules/itip-formatter/itip-view.c:1034
+msgid "Acce_pt"
+msgstr "Acce_pt"
 
-#: ../plugins/email-custom-header/email-custom-header.c:299
-msgctxt "email-custom-header-Security"
-msgid "Secret"
-msgstr "Secret"
+#: ../modules/itip-formatter/itip-view.c:1037
+msgid "Send _Information"
+msgstr "Send _Information"
 
-#: ../plugins/email-custom-header/email-custom-header.c:300
-msgctxt "email-custom-header-Security"
-msgid "Top secret"
-msgstr "Top secret"
+#: ../modules/itip-formatter/itip-view.c:1040
+msgid "_Update Attendee Status"
+msgstr "_Update Attendee Status"
 
-#: ../plugins/email-custom-header/email-custom-header.c:357
-msgctxt "email-custom-header"
-msgid "None"
-msgstr "None"
+#: ../modules/itip-formatter/itip-view.c:1043
+msgid "_Update"
+msgstr "_Update"
 
-#: ../plugins/email-custom-header/email-custom-header.c:530
-msgid "_Custom Header"
-msgstr "_Custom Header"
+#: ../modules/itip-formatter/itip-view.c:1493
+#: ../modules/itip-formatter/itip-view.c:1541
+#: ../modules/itip-formatter/itip-view.c:1612
+msgid "Comment:"
+msgstr "Comment:"
 
-#. 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:799
-msgid ""
-"The format for specifying a Custom Header key value is:\n"
-"Name of the Custom Header key values separated by \";\"."
-msgstr ""
-"The format for specifying a Custom Header key value is:\n"
-"Name of the Custom Header key values separated by \";\"."
+#. RSVP area
+#: ../modules/itip-formatter/itip-view.c:1529
+msgid "Send reply to sender"
+msgstr "Send reply to sender"
 
-#: ../plugins/email-custom-header/email-custom-header.c:851
-msgid "Key"
-msgstr "Key"
+#. Updates
+#: ../modules/itip-formatter/itip-view.c:1544
+msgid "Send _updates to attendees"
+msgstr "Send _updates to attendees"
 
-#: ../plugins/email-custom-header/email-custom-header.c:867
-#: ../plugins/templates/templates.c:477
-msgid "Values"
-msgstr "Values"
+#. The recurrence check button
+#: ../modules/itip-formatter/itip-view.c:1547
+msgid "_Apply to all instances"
+msgstr "_Apply to all instances"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
-msgid "Custom Header"
-msgstr "Custom Header"
+#: ../modules/itip-formatter/itip-view.c:1548
+msgid "Show time as _free"
+msgstr "Show time as _free"
 
-#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to 
specify what value for the message header would be added
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
-msgid "Add custom headers to outgoing mail messages."
-msgstr "Add custom headers to outgoing mail messages."
+#: ../modules/itip-formatter/itip-view.c:1549
+msgid "_Preserve my reminder"
+msgstr "_Preserve my reminder"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
-msgid "Email Custom Header"
-msgstr "E-mail Custom Header"
+#: ../modules/itip-formatter/itip-view.c:1550
+msgid "_Inherit reminder"
+msgstr "_Inherit reminder"
 
-#: ../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: "
+#: ../modules/itip-formatter/itip-view.c:1880
+msgid "_Tasks:"
+msgstr "_Tasks:"
 
-#: ../plugins/external-editor/external-editor.c:115
-msgid ""
-"For XEmacs use \"xemacs\"\n"
-"For Vim use \"gvim -f\""
-msgstr ""
-"For XEmacs use \"xemacs\"\n"
-"For Vim use \"gvim -f\""
+#: ../modules/itip-formatter/itip-view.c:1883
+msgid "_Memos:"
+msgstr "_Memos:"
 
-#: ../plugins/external-editor/external-editor.c:396
-#: ../plugins/external-editor/external-editor.c:398
-msgid "Compose in External Editor"
-msgstr "Compose in External Editor"
+#: ../modules/itip-formatter/itip-view.c:3111
+msgid "Sa_ve"
+msgstr "Sa_ve"
 
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
-msgid "External Editor"
-msgstr "External Editor"
+#: ../modules/itip-formatter/itip-view.c:3682
+#, 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/external-editor/org-gnome-external-editor.eplug.xml.h:2
-msgid "Use an external editor to compose plain-text mail messages."
-msgstr "Use an external editor to compose plain-text mail messages."
+#: ../modules/itip-formatter/itip-view.c:3711
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "Found the appointment in the calendar '%s'"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
-msgid "Editor not launchable"
-msgstr "Editor not launchable"
-
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
-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."
-msgstr ""
-"Evolution is unable to create a temporary file to save your mail. Retry "
-"later."
-
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
-msgid "External editor still running"
-msgstr "External editor still running"
-
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid ""
-"The external editor is still running. The mail composer window cannot be "
-"closed as long as the editor is active."
-msgstr ""
-"The external editor is still running. The mail composer window cannot be "
-"closed as long as the editor is active."
-
-#: ../plugins/face/face.c:292
-msgid "Select a Face Picture"
-msgstr "Select a Face Picture"
+#: ../modules/itip-formatter/itip-view.c:3824
+msgid "Unable to find any calendars"
+msgstr "Unable to find any calendars"
 
-#: ../plugins/face/face.c:302
-msgid "Image files"
-msgstr "Image files"
+#: ../modules/itip-formatter/itip-view.c:3832
+msgid "Unable to find this meeting in any calendar"
+msgstr "Unable to find this meeting in any calendar"
 
-#: ../plugins/face/face.c:361
-msgid "_Insert Face picture by default"
-msgstr "_Insert Face picture by default"
+#: ../modules/itip-formatter/itip-view.c:3837
+msgid "Unable to find this task in any task list"
+msgstr "Unable to find this task in any task list"
 
-#: ../plugins/face/face.c:374
-msgid "Load new _Face picture"
-msgstr "Load new _Face picture"
+#: ../modules/itip-formatter/itip-view.c:3842
+msgid "Unable to find this memo in any memo list"
+msgstr "Unable to find this memo in any memo list"
 
-#: ../plugins/face/face.c:435
-msgid "Include _Face"
-msgstr "Include _Face"
+#: ../modules/itip-formatter/itip-view.c:4188
+msgid "Opening the calendar. Please wait..."
+msgstr "Opening the calendar. Please wait…"
 
-#: ../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."
+#: ../modules/itip-formatter/itip-view.c:4193
+msgid "Searching for an existing version of this appointment"
+msgstr "Searching for an existing version of this appointment"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:1
-msgid "Failed Read"
-msgstr "Failed Read"
+#: ../modules/itip-formatter/itip-view.c:4584
+#, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr "Unable to send item to calendar '%s'.  %s"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:2
-msgid "The file cannot be read"
-msgstr "The file cannot be read"
+#: ../modules/itip-formatter/itip-view.c:4600
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr "Sent to calendar '%s' as accepted"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:3
-msgid "Invalid Image Size"
-msgstr "Invalid Image Size"
+#: ../modules/itip-formatter/itip-view.c:4605
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr "Sent to calendar '%s' as tentative"
 
-#: ../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"
+#: ../modules/itip-formatter/itip-view.c:4611
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr "Sent to calendar '%s' as declined"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:5
-msgid "Not an image"
-msgstr "Not an image"
+#: ../modules/itip-formatter/itip-view.c:4617
+#, c-format
+msgid "Sent to calendar '%s' as canceled"
+msgstr "Sent to calendar '%s' as cancelled"
 
-#: ../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}"
+#: ../modules/itip-formatter/itip-view.c:4638
+#: ../modules/itip-formatter/itip-view.c:5085
+#: ../modules/itip-formatter/itip-view.c:5192
+msgid "Saving changes to the calendar. Please wait..."
+msgstr "Saving changes to the calendar. Please wait…"
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-msgid "Inline Image"
-msgstr "Inline Image"
+#: ../modules/itip-formatter/itip-view.c:4679
+msgid "Unable to parse item"
+msgstr "Unable to parse item"
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-msgid "View image attachments directly in mail messages."
-msgstr "View image attachments directly in mail messages."
+#: ../modules/itip-formatter/itip-view.c:4872
+#, c-format
+msgid "Organizer has removed the delegate %s "
+msgstr "Organiser has removed the delegate %s "
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:365
-msgid "Get List _Archive"
-msgstr "Get List _Archive"
+#: ../modules/itip-formatter/itip-view.c:4889
+msgid "Sent a cancelation notice to the delegate"
+msgstr "Sent a cancellation notice to the delegate"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
-msgid "Get an archive of the list this message belongs to"
-msgstr "Get an archive of the list this message belongs to"
+#: ../modules/itip-formatter/itip-view.c:4893
+msgid "Could not send the cancelation notice to the delegate"
+msgstr "Could not send the cancellation notice to the delegate"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:372
-msgid "Get List _Usage Information"
-msgstr "Get List _Usage Information"
+#: ../modules/itip-formatter/itip-view.c:4944
+#, c-format
+msgid "Unable to update attendee. %s"
+msgstr "Unable to update attendee. %s"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
-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"
+#: ../modules/itip-formatter/itip-view.c:4951
+msgid "Attendee status updated"
+msgstr "Attendee status updated"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:379
-msgid "Contact List _Owner"
-msgstr "Contact List _Owner"
+#: ../modules/itip-formatter/itip-view.c:4974
+msgid "The meeting is invalid and cannot be updated"
+msgstr "The meeting is invalid and cannot be updated"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
-msgid "Contact the owner of the mailing list this message belongs to"
-msgstr "Contact the owner of the mailing list this message belongs to"
+#: ../modules/itip-formatter/itip-view.c:5050
+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/mailing-list-actions/mailing-list-actions.c:386
-msgid "_Post Message to List"
-msgstr "_Post Message to List"
+#: ../modules/itip-formatter/itip-view.c:5122
+#: ../modules/itip-formatter/itip-view.c:5162
+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/mailing-list-actions/mailing-list-actions.c:388
-msgid "Post a message to the mailing list this message belongs to"
-msgstr "Post a message to the mailing list this message belongs to"
+#: ../modules/itip-formatter/itip-view.c:5225
+msgid "Meeting information sent"
+msgstr "Meeting information sent"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:393
-msgid "_Subscribe to List"
-msgstr "_Subscribe to List"
+#: ../modules/itip-formatter/itip-view.c:5230
+msgid "Task information sent"
+msgstr "Task information sent"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:395
-msgid "Subscribe to the mailing list this message belongs to"
-msgstr "Subscribe to the mailing list this message belongs to"
+#: ../modules/itip-formatter/itip-view.c:5235
+msgid "Memo information sent"
+msgstr "Memo information sent"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:400
-msgid "_Unsubscribe from List"
-msgstr "_Unsubscribe from List"
+#: ../modules/itip-formatter/itip-view.c:5246
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr "Unable to send meeting information, the meeting does not exist"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:402
-msgid "Unsubscribe from the mailing list this message belongs to"
-msgstr "Unsubscribe from the mailing list this message belongs to"
+#: ../modules/itip-formatter/itip-view.c:5251
+msgid "Unable to send task information, the task does not exist"
+msgstr "Unable to send task information, the task does not exist"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:409
-msgid "Mailing _List"
-msgstr "Mailing _List"
+#: ../modules/itip-formatter/itip-view.c:5256
+msgid "Unable to send memo information, the memo does not exist"
+msgstr "Unable to send memo information, the memo does not exist"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-msgid "Mailing List Actions"
-msgstr "Mailing List Actions"
+#. Translators: This is a default filename for a calendar.
+#: ../modules/itip-formatter/itip-view.c:5321
+msgid "calendar.ics"
+msgstr "calendar.ics"
 
-#: ../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.)."
+#: ../modules/itip-formatter/itip-view.c:5326
+msgid "Save Calendar"
+msgstr "Save Calendar"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
-msgid "Action not available"
-msgstr "Action not available"
+#: ../modules/itip-formatter/itip-view.c:5379
+#: ../modules/itip-formatter/itip-view.c:5392
+msgid "The calendar attached is not valid"
+msgstr "The calendar attached is not valid"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+#: ../modules/itip-formatter/itip-view.c:5380
+#: ../modules/itip-formatter/itip-view.c:5393
 msgid ""
-"This message does not contain the header information required for this "
-"action."
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
 msgstr ""
-"This message does not contain the header information required for this "
-"action."
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
-msgid "Posting not allowed"
-msgstr "Posting not allowed"
+#: ../modules/itip-formatter/itip-view.c:5435
+#: ../modules/itip-formatter/itip-view.c:5465
+#: ../modules/itip-formatter/itip-view.c:5566
+msgid "The item in the calendar is not valid"
+msgstr "The item in the calendar is not valid"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
+#: ../modules/itip-formatter/itip-view.c:5436
+#: ../modules/itip-formatter/itip-view.c:5466
+#: ../modules/itip-formatter/itip-view.c:5567
 msgid ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
 msgstr ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
 
-#: ../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?"
+#: ../modules/itip-formatter/itip-view.c:5481
+msgid "The calendar attached contains multiple items"
+msgstr "The calendar attached contains multiple items"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+#: ../modules/itip-formatter/itip-view.c:5482
 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."
+"To process all of these items, the file should be saved and the calendar "
+"imported"
 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."
+"To process all of these items, the file should be saved and the calendar "
+"imported"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
-msgid "_Send message"
-msgstr "_Send message"
+#: ../modules/itip-formatter/itip-view.c:5970
+msgctxt "cal-itip"
+msgid "None"
+msgstr "None"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
-msgid "_Edit message"
-msgstr "_Edit message"
+#: ../modules/itip-formatter/itip-view.c:5986
+msgid "Tentatively Accepted"
+msgstr "Tentatively Accepted"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:11
-msgid "Malformed header"
-msgstr "Malformed header"
+#: ../modules/itip-formatter/itip-view.c:6129
+msgid "This meeting recurs"
+msgstr "This meeting recurs"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:12
+#: ../modules/itip-formatter/itip-view.c:6132
+msgid "This task recurs"
+msgstr "This task recurs"
+
+#: ../modules/itip-formatter/itip-view.c:6135
+msgid "This memo recurs"
+msgstr "This memo recurs"
+
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
-"The {0} header of this message is malformed and could not be processed.\n"
-"\n"
-"Header: {1}"
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
-"The {0} header of this message is malformed and could not be processed.\n"
-"\n"
-"Header: {1}"
+"This response is not from a current attendee. Add the sender as an attendee?"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
-msgid "No e-mail action"
-msgstr "No e-mail action"
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+msgid "This meeting has been delegated"
+msgstr "This meeting has been delegated"
 
-#: ../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}"
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 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}"
+"'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 
-#: ../plugins/mail-notification/mail-notification.c:385
-#: ../plugins/mail-notification/mail-notification.c:421
-#, 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."
+#: ../modules/itip-formatter/plugin/config-ui.c:82
+msgid "Meeting Invitations"
+msgstr "Meeting Invitations"
 
-#. Translators: "Subject:" is preceding a new mail
-#. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:410
-#, c-format
-msgid "Subject: %s"
-msgstr "Subject: %s"
+#: ../modules/itip-formatter/plugin/config-ui.c:108
+msgid "_Delete message after acting"
+msgstr "_Delete message after acting"
 
-#: ../plugins/mail-notification/mail-notification.c:427
-msgid "New email in Evolution"
-msgstr "New e-mail in Evolution"
+#: ../modules/itip-formatter/plugin/config-ui.c:122
+#: ../modules/itip-formatter/plugin/config-ui.c:153
+msgid "Conflict Search"
+msgstr "Conflict Search"
 
-#. Translators: The '%s' is a mail
-#. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:458
-#, c-format
-msgid "Show %s"
-msgstr "Show %s"
+#. Source selector
+#: ../modules/itip-formatter/plugin/config-ui.c:137
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "Select the calendars to search for meeting conflicts"
 
-#: ../plugins/mail-notification/mail-notification.c:658
-msgid "_Play sound when a new message arrives"
-msgstr "_Play sound when a new message arrives"
+#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
+msgid "Itip Formatter"
+msgstr "Itip Formatter"
 
-#: ../plugins/mail-notification/mail-notification.c:690
-msgid "_Beep"
-msgstr "_Beep"
+#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "Display \"text/calendar\" MIME parts in mail messages."
 
-#: ../plugins/mail-notification/mail-notification.c:703
-msgid "Use sound _theme"
-msgstr "Use sound _theme"
+#: ../modules/mail-config/e-mail-config-google-summary.c:252
+msgid "Google Features"
+msgstr "Google Features"
 
-#: ../plugins/mail-notification/mail-notification.c:722
-msgid "Play _file:"
-msgstr "Play _file:"
+#: ../modules/mail-config/e-mail-config-google-summary.c:261
+msgid "Add Google Ca_lendar to this account"
+msgstr "Add Google Ca_lendar to this account"
 
-#: ../plugins/mail-notification/mail-notification.c:731
-msgid "Select sound file"
-msgstr "Select sound file"
+#: ../modules/mail-config/e-mail-config-google-summary.c:269
+msgid "Add Google Con_tacts to this account"
+msgstr "Add Google Con_tacts to this account"
 
-#: ../plugins/mail-notification/mail-notification.c:787
-msgid "Notify new messages for _Inbox only"
-msgstr "Notify new messages for _Inbox only"
+#: ../modules/mail-config/e-mail-config-google-summary.c:277
+msgid "You may need to enable IMAP access"
+msgstr "You may need to enable IMAP access"
 
-#: ../plugins/mail-notification/mail-notification.c:797
-msgid "Show _notification when a new message arrives"
-msgstr "Show _notification when a new message arrives"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:246
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+msgid "Mail _Directory:"
+msgstr "Mail _Directory:"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-msgid "Mail Notification"
-msgstr "Mail Notification"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:247
+msgid "Choose a MH mail directory"
+msgstr "Choose a MH mail directory"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
-msgid "Notifies you when new mail messages arrive."
-msgstr "Notifies you when new mail messages arrive."
+#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+msgid "Local Delivery _File:"
+msgstr "Local Delivery _File:"
 
-#. 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:239
-#, c-format
-msgid "Created from a mail by %s"
-msgstr "Created from a mail by %s"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+msgid "Choose a local delivery file"
+msgstr "Choose a local delivery file"
 
-#: ../plugins/mail-to-task/mail-to-task.c:622
-#, c-format
-msgid ""
-"Selected calendar contains event '%s' already. Would you like to edit the "
-"old event?"
-msgstr ""
-"Selected calendar contains event '%s' already. Would you like to edit the "
-"old event?"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:293
+msgid "Choose a Maildir mail directory"
+msgstr "Choose a Maildir mail directory"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
-#, c-format
-msgid ""
-"Selected task list contains task '%s' already. Would you like to edit the "
-"old task?"
-msgstr ""
-"Selected task list contains task '%s' already. Would you like to edit the "
-"old task?"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+msgid "Spool _File:"
+msgstr "Spool _File:"
 
-#: ../plugins/mail-to-task/mail-to-task.c:628
-#, c-format
-msgid ""
-"Selected memo list contains memo '%s' already. Would you like to edit the "
-"old memo?"
-msgstr ""
-"Selected memo list contains memo '%s' already. Would you like to edit the "
-"old memo?"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:316
+msgid "Choose a mbox spool file"
+msgstr "Choose a mbox spool file"
 
-#. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:647
-#, c-format
-msgid ""
-"You have selected %d mails to be converted to events. Do you really want to "
-"add them all?"
-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?"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+msgid "Spool _Directory:"
+msgstr "Spool _Directory:"
 
-#. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:653
-#, c-format
-msgid ""
-"You have selected %d mails to be converted to tasks. Do you really want to "
-"add them all?"
-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?"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:339
+msgid "Choose a mbox spool directory"
+msgstr "Choose a mbox spool directory"
 
-#. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:659
-#, c-format
-msgid ""
-"You have selected %d mails to be converted to memos. Do you really want to "
-"add them all?"
-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?"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:80
+#: ../modules/plugin-manager/evolution-plugin-manager.c:159
+msgid "Configuration"
+msgstr "Configuration"
 
-#: ../plugins/mail-to-task/mail-to-task.c:680
-msgid "Do you wish to continue converting remaining mails?"
-msgstr "Do you wish to continue converting remaining mails?"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:98
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+msgid "_Server:"
+msgstr "_Server:"
 
-#: ../plugins/mail-to-task/mail-to-task.c:755
-msgid "[No Summary]"
-msgstr "[No Summary]"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
+msgid "_Port:"
+msgstr "_Port:"
 
-#: ../plugins/mail-to-task/mail-to-task.c:767
-msgid "Invalid object returned from a server"
-msgstr "Invalid object returned from a server"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:227
+msgid "User_name:"
+msgstr "User_name:"
 
-#: ../plugins/mail-to-task/mail-to-task.c:819
-#, c-format
-msgid "An error occurred during processing: %s"
-msgstr "An error occurred during processing: %s"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:214
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:148
+msgid "Encryption _method:"
+msgstr "Encryption _method:"
 
-#: ../plugins/mail-to-task/mail-to-task.c:844
-#, c-format
-msgid "Cannot open calendar. %s"
-msgstr "Cannot open calendar. %s"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
+msgid "STARTTLS after connecting"
+msgstr "STARTTLS after connecting"
 
-#: ../plugins/mail-to-task/mail-to-task.c:844
-msgid "Unknown error."
-msgstr "Unknown error."
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:233
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:167
+msgid "SSL on a dedicated port"
+msgstr "SSL on a dedicated port"
 
-#: ../plugins/mail-to-task/mail-to-task.c:851
-msgid ""
-"Selected source is read only, thus cannot create event there. Select other "
-"source, please."
-msgstr ""
-"Selected source is read only, thus cannot create event there. Select other "
-"source, please."
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+msgid "_Use custom binary, instead of 'sendmail'"
+msgstr "_Use custom binary, instead of 'sendmail'"
 
-#: ../plugins/mail-to-task/mail-to-task.c:854
-msgid ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
-msgstr ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+msgid "_Custom binary:"
+msgstr "_Custom binary:"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+msgid "U_se custom arguments"
+msgstr "U_se custom arguments"
 
-#: ../plugins/mail-to-task/mail-to-task.c:857
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+msgid "Cus_tom arguments:"
+msgstr "Cus_tom arguments:"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
 msgid ""
-"Selected source is read only, thus cannot create memo there. Select other "
-"source, please."
+"Default arguments are '-i -f %F -- %R', where\n"
+"   %F - stands for the From address\n"
+"   %R - stands for the recipient addresses"
 msgstr ""
-"Selected source is read only, thus cannot create memo there. Select other "
-"source, please."
-
-#: ../plugins/mail-to-task/mail-to-task.c:1186
-msgid "No writable calendar is available."
-msgstr "No writeable calendar is available."
+"Default arguments are '-i -f %F -- %R', where\n"
+"   %F - stands for the From address\n"
+"   %R - stands for the recipient addresses"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
-msgid "Create an _Appointment"
-msgstr "Create an _Appointment"
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
+msgid "Ser_ver requires authentication"
+msgstr "Ser_ver requires authentication"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1272
-msgid "Create a new event from the selected message"
-msgstr "Create a new event from the selected message"
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:209
+msgid "T_ype:"
+msgstr "T_ype:"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
-msgid "Create a Mem_o"
-msgstr "Create a Mem_o"
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:247
+msgid "Yahoo! Features"
+msgstr "Yahoo! Features"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1279
-msgid "Create a new memo from the selected message"
-msgstr "Create a new memo from the selected message"
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:256
+msgid "Add Yahoo! Ca_lendar and Tasks to this account"
+msgstr "Add Yahoo! Ca_lendar and Tasks to this account"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1284
-msgid "Create a _Task"
-msgstr "Create a _Task"
+#: ../modules/mail/e-mail-attachment-handler.c:404
+#, c-format
+msgid "%d attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "%d attached message"
+msgstr[1] "%d attached messages"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1286
-msgid "Create a new task from the selected message"
-msgstr "Create a new task from the selected message"
+#: ../modules/mail/e-mail-shell-backend.c:238
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "_Mail Message"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1294
-msgid "Create a _Meeting"
-msgstr "Create a _Meeting"
+#: ../modules/mail/e-mail-shell-backend.c:240
+msgid "Compose a new mail message"
+msgstr "Compose a new mail message"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1296
-msgid "Create a new meeting from the selected message"
-msgstr "Create a new meeting from the selected message"
+#: ../modules/mail/e-mail-shell-backend.c:248
+msgctxt "New"
+msgid "Mail Acco_unt"
+msgstr "Mail Acco_unt"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid "Convert a mail message to a task."
-msgstr "Convert a mail message to a task."
+#: ../modules/mail/e-mail-shell-backend.c:250
+msgid "Create a new mail account"
+msgstr "Create a new mail account"
 
-#: ../plugins/mark-all-read/mark-all-read.c:43
-msgid "Also mark messages in subfolders?"
-msgstr "Also mark messages in subfolders?"
+#: ../modules/mail/e-mail-shell-backend.c:255
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "Mail _Folder"
 
-#: ../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?"
-msgstr ""
-"Do you want to mark messages as read in the current folder only, or in the "
-"current folder as well as all subfolders?"
+#: ../modules/mail/e-mail-shell-backend.c:257
+msgid "Create a new mail folder"
+msgstr "Create a new mail folder"
 
-#: ../plugins/mark-all-read/mark-all-read.c:185
-msgid "In Current Folder and _Subfolders"
-msgstr "In Current Folder and _Subfolders"
+#: ../modules/mail/e-mail-shell-backend.c:555
+msgid "Mail Accounts"
+msgstr "Mail Accounts"
 
-#: ../plugins/mark-all-read/mark-all-read.c:199
-msgid "In Current _Folder Only"
-msgstr "In Current _Folder Only"
+#: ../modules/mail/e-mail-shell-backend.c:564
+msgid "Mail Preferences"
+msgstr "Mail Preferences"
 
-#: ../plugins/mark-all-read/mark-all-read.c:545
-msgid "Mark Me_ssages as Read"
-msgstr "Mark Me_ssages as Read"
+#: ../modules/mail/e-mail-shell-backend.c:573
+msgid "Composer Preferences"
+msgstr "Composer Preferences"
 
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
-msgid "Mark All Read"
-msgstr "Mark All Read"
+#: ../modules/mail/e-mail-shell-backend.c:582
+msgid "Network Preferences"
+msgstr "Network Preferences"
 
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark all messages in a folder as read."
-msgstr "Mark all messages in a folder as read."
+#. Translators: The first item in the list, to be able to set rule: [Label] [is/is-not] [None]
+#: ../modules/mail/e-mail-shell-backend.c:883
+msgctxt "label"
+msgid "None"
+msgstr "None"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
-msgid "Outlook PST import"
-msgstr "Outlook PST import"
+#: ../modules/mail/e-mail-shell-view-actions.c:1279
+msgid "_Disable Account"
+msgstr "_Disable Account"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
-msgid "Outlook personal folders (.pst)"
-msgstr "Outlook personal folders (.pst)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1281
+msgid "Disable this account"
+msgstr "Disable this account"
 
-#: ../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"
+#: ../modules/mail/e-mail-shell-view-actions.c:1288
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "Permanently remove all the deleted messages from all folders"
 
-#: ../plugins/pst-import/pst-importer.c:555
-msgid "_Mail"
-msgstr "_Mail"
+#: ../modules/mail/e-mail-shell-view-actions.c:1295
+msgid "Edit properties of this account"
+msgstr "Edit properties of this account"
 
-#: ../plugins/pst-import/pst-importer.c:584
-msgid "Destination folder:"
-msgstr "Destination folder:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1300
+msgid "_Refresh"
+msgstr "_Refresh"
 
-#: ../plugins/pst-import/pst-importer.c:594
-msgid "_Address Book"
-msgstr "_Address Book"
+#: ../modules/mail/e-mail-shell-view-actions.c:1302
+msgid "Refresh list of folders of this account"
+msgstr "Refresh list of folders of this account"
 
-#: ../plugins/pst-import/pst-importer.c:599
-msgid "A_ppointments"
-msgstr "A_ppointments"
+#: ../modules/mail/e-mail-shell-view-actions.c:1307
+msgid "_Download Messages for Offline Usage"
+msgstr "_Download Messages for Offline Usage"
 
-#: ../plugins/pst-import/pst-importer.c:604 ../views/tasks/galview.xml.h:1
-msgid "_Tasks"
-msgstr "_Tasks"
+#: ../modules/mail/e-mail-shell-view-actions.c:1309
+msgid "Download messages of accounts and folders marked for offline usage"
+msgstr "Download messages of accounts and folders marked for offline usage"
 
-#: ../plugins/pst-import/pst-importer.c:609
-msgid "_Journal entries"
-msgstr "_Journal entries"
+#: ../modules/mail/e-mail-shell-view-actions.c:1314
+msgid "Fl_ush Outbox"
+msgstr "Fl_ush Outbox"
 
-#: ../plugins/pst-import/pst-importer.c:721
-msgid "Importing Outlook data"
-msgstr "Importing Outlook data"
+#: ../modules/mail/e-mail-shell-view-actions.c:1321
+msgid "_Copy Folder To..."
+msgstr "_Copy Folder To…"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:145
-#: ../plugins/publish-calendar/publish-calendar.c:152
-msgid "Calendar Publishing"
-msgstr "Calendar Publishing"
+#: ../modules/mail/e-mail-shell-view-actions.c:1323
+msgid "Copy the selected folder into another folder"
+msgstr "Copy the selected folder into another folder"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
-msgid "Locations"
-msgstr "Locations"
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
+msgid "Permanently remove this folder"
+msgstr "Permanently remove this folder"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
-msgid "Publish calendars to the web."
-msgstr "Publish calendars to the web."
+#: ../modules/mail/e-mail-shell-view-actions.c:1335
+msgid "E_xpunge"
+msgstr "E_xpunge"
 
-#: ../plugins/publish-calendar/publish-calendar.c:211
-#: ../plugins/publish-calendar/publish-calendar.c:463
-#, c-format
-msgid "Could not open %s:"
-msgstr "Could not open %s:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1337
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Permanently remove all deleted messages from this folder"
 
-#: ../plugins/publish-calendar/publish-calendar.c:213
-#, c-format
-msgid "Could not open %s: Unknown error"
-msgstr "Could not open %s: Unknown error"
+#: ../modules/mail/e-mail-shell-view-actions.c:1342
+msgid "Mar_k All Messages as Read"
+msgstr "Mar_k All Messages as Read"
 
-#: ../plugins/publish-calendar/publish-calendar.c:233
-#, c-format
-msgid "There was an error while publishing to %s:"
-msgstr "There was an error while publishing to %s:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1344
+msgid "Mark all messages in the folder as read"
+msgstr "Mark all messages in the folder as read"
 
-#: ../plugins/publish-calendar/publish-calendar.c:235
-#, c-format
-msgid "Publishing to %s finished successfully"
-msgstr "Publishing to %s finished successfully"
+#: ../modules/mail/e-mail-shell-view-actions.c:1349
+msgid "_Move Folder To..."
+msgstr "_Move Folder To…"
 
-#: ../plugins/publish-calendar/publish-calendar.c:279
-#, c-format
-msgid "Mount of %s failed:"
-msgstr "Mount of %s failed:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1351
+msgid "Move the selected folder into another folder"
+msgstr "Move the selected folder into another folder"
 
-#: ../plugins/publish-calendar/publish-calendar.c:626
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
-msgid "E_nable"
-msgstr "E_nable"
+#: ../modules/mail/e-mail-shell-view-actions.c:1356
+msgid "_New..."
+msgstr "_New…"
 
-#: ../plugins/publish-calendar/publish-calendar.c:774
-msgid "Are you sure you want to remove this location?"
-msgstr "Are you sure you want to remove this location?"
+#: ../modules/mail/e-mail-shell-view-actions.c:1358
+msgid "Create a new folder for storing mail"
+msgstr "Create a new folder for storing mail"
 
-#. To Translators: This is shown to a user when creation of a new thread,
-#. * where the publishing should be done, fails. Basically, this shouldn't
-#. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1104
-msgid "Could not create publish thread."
-msgstr "Could not create publish thread."
+#: ../modules/mail/e-mail-shell-view-actions.c:1365
+msgid "Change the properties of this folder"
+msgstr "Change the properties of this folder"
 
-#: ../plugins/publish-calendar/publish-calendar.c:1112
-msgid "_Publish Calendar Information"
-msgstr "_Publish Calendar Information"
+#: ../modules/mail/e-mail-shell-view-actions.c:1372
+msgid "Refresh the folder"
+msgstr "Refresh the folder"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:1
-msgid "iCal"
-msgstr "iCal"
+#: ../modules/mail/e-mail-shell-view-actions.c:1379
+msgid "Change the name of this folder"
+msgstr "Change the name of this folder"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:3
-msgid "Daily"
-msgstr "Daily"
+#: ../modules/mail/e-mail-shell-view-actions.c:1384
+msgid "Select Message _Thread"
+msgstr "Select Message _Thread"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:4
-msgid "Weekly"
-msgstr "Weekly"
+#: ../modules/mail/e-mail-shell-view-actions.c:1386
+msgid "Select all messages in the same thread as the selected message"
+msgstr "Select all messages in the same thread as the selected message"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:5
-msgid "Manual (via Actions menu)"
-msgstr "Manual (via Actions menu)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1391
+msgid "Select Message S_ubthread"
+msgstr "Select Message S_ubthread"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:9
-msgid "Secure FTP (SFTP)"
-msgstr "Secure FTP (SFTP)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1393
+msgid "Select all replies to the currently selected message"
+msgstr "Select all replies to the currently selected message"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:10
-msgid "Public FTP"
-msgstr "Public FTP"
+#: ../modules/mail/e-mail-shell-view-actions.c:1405
+msgid "Empty _Trash"
+msgstr "Empty Was_tebasket"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:11
-msgid "FTP (with login)"
-msgstr "FTP (with login)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1407
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr "Permanently remove all the deleted messages from all accounts"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:12
-msgid "Windows share"
-msgstr "Windows share"
+#: ../modules/mail/e-mail-shell-view-actions.c:1412
+msgid "_New Label"
+msgstr "_New Label"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:13
-msgid "WebDAV (HTTP)"
-msgstr "WebDAV (HTTP)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1421
+msgid "N_one"
+msgstr "N_one"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:14
-msgid "Secure WebDAV (HTTPS)"
-msgstr "Secure WebDAV (HTTPS)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
+msgid "_Manage Subscriptions"
+msgstr "_Manage Subscriptions"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:15
-msgid "Custom Location"
-msgstr "Custom Location"
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
+#: ../modules/mail/e-mail-shell-view-actions.c:1514
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Subscribe or unsubscribe to folders on remote servers"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:17
-msgid "_Publish as:"
-msgstr "_Publish as:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1442
+#: ../modules/mail/e-mail-shell-view-actions.c:1463
+msgid "Send / _Receive"
+msgstr "Send / _Receive"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:18
-msgid "Publishing _Frequency:"
-msgstr "Publishing _Frequency:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1444
+msgid "Send queued items and retrieve new items"
+msgstr "Send queued items and retrieve new items"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:19
-msgid "Time _duration:"
-msgstr "Time _duration:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1449
+msgid "R_eceive All"
+msgstr "R_eceive All"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:20
-msgid "Sources"
-msgstr "Sources"
+#: ../modules/mail/e-mail-shell-view-actions.c:1451
+msgid "Receive new items from all accounts"
+msgstr "Receive new items from all accounts"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-msgid "Service _type:"
-msgstr "Service _type:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1456
+msgid "_Send All"
+msgstr "_Send All"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:25
-msgid "_File:"
-msgstr "_File:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1458
+msgid "Send queued items in all accounts"
+msgstr "Send queued items in all accounts"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:27
-msgid "P_ort:"
-msgstr "P_ort:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1486
+msgid "Cancel the current mail operation"
+msgstr "Cancel the current mail operation"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:28
-msgid "_Username:"
-msgstr "_Username:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1491
+msgid "Collapse All _Threads"
+msgstr "Collapse All _Threads"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:29
-msgid "_Password:"
-msgstr "_Password:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1493
+msgid "Collapse all message threads"
+msgstr "Collapse all message threads"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "_Remember password"
-msgstr "_Remember password"
+#: ../modules/mail/e-mail-shell-view-actions.c:1498
+msgid "E_xpand All Threads"
+msgstr "E_xpand All Threads"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:31
-msgid "Publishing Location"
-msgstr "Publishing Location"
+#: ../modules/mail/e-mail-shell-view-actions.c:1500
+msgid "Expand all message threads"
+msgstr "Expand all message threads"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:97
-#: ../plugins/publish-calendar/publish-format-ical.c:95
-#, c-format
-msgid "Could not publish calendar: Calendar backend no longer exists"
-msgstr "Could not publish calendar: Calendar backend no longer exists"
+#: ../modules/mail/e-mail-shell-view-actions.c:1505
+msgid "_Message Filters"
+msgstr "_Message Filters"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:539
-msgid "New Location"
-msgstr "New Location"
+#: ../modules/mail/e-mail-shell-view-actions.c:1507
+msgid "Create or edit rules for filtering new mail"
+msgstr "Create or edit rules for filtering new mail"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:541
-msgid "Edit Location"
-msgstr "Edit Location"
+#: ../modules/mail/e-mail-shell-view-actions.c:1512
+msgid "_Subscriptions..."
+msgstr "_Subscriptions…"
 
-#. Translators: the %F %T is the third argument for a
-#. * strftime function.  It lets you define the formatting
-#. * of the date in the csv-file.
-#: ../plugins/save-calendar/csv-format.c:161
-msgid "%F %T"
-msgstr "%F %T"
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
+msgid "F_older"
+msgstr "F_older"
 
-#: ../plugins/save-calendar/csv-format.c:371
-msgid "UID"
-msgstr "UID"
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
+msgid "_Label"
+msgstr "_Label"
 
-#: ../plugins/save-calendar/csv-format.c:373
-msgid "Description List"
-msgstr "Description List"
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
+msgid "C_reate Search Folder From Search..."
+msgstr "C_reate Search Folder From Search…"
 
-#: ../plugins/save-calendar/csv-format.c:374
-msgid "Categories List"
-msgstr "Categories List"
+#: ../modules/mail/e-mail-shell-view-actions.c:1552
+msgid "Search F_olders"
+msgstr "Search F_olders"
 
-#: ../plugins/save-calendar/csv-format.c:375
-msgid "Comment List"
-msgstr "Comment List"
+#: ../modules/mail/e-mail-shell-view-actions.c:1554
+msgid "Create or edit search folder definitions"
+msgstr "Create or edit search folder definitions"
 
-#: ../plugins/save-calendar/csv-format.c:378
-msgid "Contact List"
-msgstr "Contact List"
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
+msgid "_New Folder..."
+msgstr "_New Folder…"
 
-#: ../plugins/save-calendar/csv-format.c:379
-msgid "Start"
-msgstr "Start"
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
+msgid "Show Message _Preview"
+msgstr "Show Message _Preview"
 
-#: ../plugins/save-calendar/csv-format.c:380
-msgid "End"
-msgstr "End"
+#: ../modules/mail/e-mail-shell-view-actions.c:1623
+msgid "Show message preview pane"
+msgstr "Show message preview pane"
 
-#: ../plugins/save-calendar/csv-format.c:381
-msgid "Due"
-msgstr "Due"
+#: ../modules/mail/e-mail-shell-view-actions.c:1629
+msgid "Show _Deleted Messages"
+msgstr "Show _Deleted Messages"
 
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "percent Done"
-msgstr "percent Done"
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
+msgid "Show deleted messages with a line through them"
+msgstr "Show deleted messages with a line through them"
 
-#: ../plugins/save-calendar/csv-format.c:384
-msgid "URL"
-msgstr "URL"
+#: ../modules/mail/e-mail-shell-view-actions.c:1637
+msgid "_Group By Threads"
+msgstr "_Group By Threads"
 
-#: ../plugins/save-calendar/csv-format.c:385
-msgid "Attendees List"
-msgstr "Attendees List"
+#: ../modules/mail/e-mail-shell-view-actions.c:1639
+msgid "Threaded message list"
+msgstr "Threaded message list"
 
-#: ../plugins/save-calendar/csv-format.c:387
-msgid "Modified"
-msgstr "Modified"
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
+msgid "_Unmatched Folder Enabled"
+msgstr "_Unmatched Folder Enabled"
 
-#: ../plugins/save-calendar/csv-format.c:562
-msgid "A_dvanced options for the CSV format"
-msgstr "A_dvanced options for the CSV format"
+#: ../modules/mail/e-mail-shell-view-actions.c:1647
+msgid "Toggles whether Unmatched search folder is enabled"
+msgstr "Toggles whether Unmatched search folder is enabled"
 
-#: ../plugins/save-calendar/csv-format.c:570
-msgid "Prepend a _header"
-msgstr "Prepend a _header"
+#: ../modules/mail/e-mail-shell-view-actions.c:1667
+msgid "Show message preview below the message list"
+msgstr "Show message preview below the message list"
 
-#: ../plugins/save-calendar/csv-format.c:579
-msgid "_Value delimiter:"
-msgstr "_Value delimiter:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1674
+msgid "Show message preview alongside the message list"
+msgstr "Show message preview alongside the message list"
 
-#: ../plugins/save-calendar/csv-format.c:590
-msgid "_Record delimiter:"
-msgstr "_Record delimiter:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
+msgid "All Messages"
+msgstr "All Messages"
 
-#: ../plugins/save-calendar/csv-format.c:601
-msgid "_Encapsulate values with:"
-msgstr "_Encapsulate values with:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
+msgid "Important Messages"
+msgstr "Important Messages"
 
-#: ../plugins/save-calendar/csv-format.c:627
-msgid "Comma separated values (.csv)"
-msgstr "Comma separated values (.csv)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
+msgid "Last 5 Days' Messages"
+msgstr "Last 5 Days' Messages"
 
-#: ../plugins/save-calendar/ical-format.c:165 ../shell/e-shell-utils.c:199
-msgid "iCalendar (.ics)"
-msgstr "iCalendar (.ics)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
+msgid "Messages Not Junk"
+msgstr "Messages Not Junk"
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
-msgid "Save Selected"
-msgstr "Save Selected"
+#: ../modules/mail/e-mail-shell-view-actions.c:1710
+msgid "Messages with Attachments"
+msgstr "Messages with Attachments"
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Save a calendar or task list to disk."
-msgstr "Save a calendar or task list to disk."
+#: ../modules/mail/e-mail-shell-view-actions.c:1717
+msgid "No Label"
+msgstr "No Label"
 
-#.
-#. * Translator: the %FT%T is the thirth argument for a strftime function.
-#. * 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:146
-msgid "%FT%T"
-msgstr "%FT%T"
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
+msgid "Read Messages"
+msgstr "Read Messages"
 
-#: ../plugins/save-calendar/rdf-format.c:377
-msgid "RDF (.rdf)"
-msgstr "RDF (.rdf)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
+msgid "Unread Messages"
+msgstr "Unread Messages"
 
-#: ../plugins/save-calendar/save-calendar.c:123
-msgid "_Format:"
-msgstr "_Format:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1783
+msgid "Subject or Addresses contain"
+msgstr "Subject or Addresses contain"
 
-#: ../plugins/save-calendar/save-calendar.c:185
-msgid "Select destination file"
-msgstr "Select destination file"
+#: ../modules/mail/e-mail-shell-view-actions.c:1793
+msgid "All Accounts"
+msgstr "All Accounts"
 
-#: ../plugins/save-calendar/save-calendar.c:340
-msgid "Save the selected calendar to disk"
-msgstr "Save the selected calendar to disk"
+#: ../modules/mail/e-mail-shell-view-actions.c:1800
+msgid "Current Account"
+msgstr "Current Account"
 
-#: ../plugins/save-calendar/save-calendar.c:371
-msgid "Save the selected memo list to disk"
-msgstr "Save the selected memo list to disk"
+#: ../modules/mail/e-mail-shell-view-actions.c:1807
+msgid "Current Folder"
+msgstr "Current Folder"
 
-#: ../plugins/save-calendar/save-calendar.c:402
-msgid "Save the selected task list to disk"
-msgstr "Save the selected task list to disk"
+#: ../modules/mail/e-mail-shell-view.c:616
+msgid "All Account Search"
+msgstr "All Account Search"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid ""
-"Drafts based template plugin. You can use variables like $ORIG[subject], "
-"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
-"an email you are replying to."
-msgstr ""
-"Drafts based template plugin. You can use variables like $ORIG[subject], "
-"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
-"an e-mail you are replying to."
+#: ../modules/mail/e-mail-shell-view.c:717
+msgid "Account Search"
+msgstr "Account Search"
 
-#: ../plugins/templates/templates.c:1112
-msgid "No Title"
-msgstr "No Title"
+#: ../modules/mail/e-mail-shell-view-private.c:1022
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d selected, "
+msgstr[1] "%d selected, "
 
-#: ../plugins/templates/templates.c:1221
-msgid "Save as _Template"
-msgstr "Save as _Template"
+#: ../modules/mail/e-mail-shell-view-private.c:1033
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d deleted"
+msgstr[1] "%d deleted"
 
-#: ../plugins/templates/templates.c:1223
-msgid "Save as Template"
-msgstr "Save as Template"
+#: ../modules/mail/e-mail-shell-view-private.c:1039
+#: ../modules/mail/e-mail-shell-view-private.c:1046
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d junk"
+msgstr[1] "%d junk"
 
-#: ../shell/e-shell.c:313
-msgid "Preparing to go offline..."
-msgstr "Preparing to go offline…"
+#: ../modules/mail/e-mail-shell-view-private.c:1052
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d draft"
+msgstr[1] "%d drafts"
 
-#: ../shell/e-shell.c:366
-msgid "Preparing to go online..."
-msgstr "Preparing to go online…"
+#: ../modules/mail/e-mail-shell-view-private.c:1058
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d unsent"
+msgstr[1] "%d unsent"
 
-#: ../shell/e-shell.c:437
-msgid "Preparing to quit..."
-msgstr "Preparing to quit…"
+#: ../modules/mail/e-mail-shell-view-private.c:1064
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d sent"
+msgstr[1] "%d sent"
 
-#: ../shell/e-shell-content.c:727 ../shell/e-shell-content.c:728
-msgid "Searches"
-msgstr "Searches"
+#: ../modules/mail/e-mail-shell-view-private.c:1076
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d unread, "
+msgstr[1] "%d unread, "
 
-#: ../shell/e-shell-content.c:771
-msgid "Save Search"
-msgstr "Save Search"
+#: ../modules/mail/e-mail-shell-view-private.c:1079
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d total"
+msgstr[1] "%d total"
 
-#. Translators: The "Show:" label precedes a combo box that
-#. * 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:940
-msgid "Sho_w:"
-msgstr "Sho_w:"
+#: ../modules/mail/e-mail-shell-view-private.c:1102
+msgid "Trash"
+msgstr "Wastebasket"
 
-#. Translators: This is part of the quick search interface.
-#. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:973
-msgid "Sear_ch:"
-msgstr "Sear_ch:"
+#: ../modules/mail/e-mail-shell-view-private.c:1518
+msgid "Send / Receive"
+msgstr "Send / Receive"
 
-#. Translators: This is part of the quick search interface.
-#. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1036
-msgid "i_n"
-msgstr "i_n"
+#: ../modules/mail/em-composer-prefs.c:492
+msgid "Language(s)"
+msgstr "Language(s)"
 
-#: ../shell/e-shell-utils.c:197
-msgid "vCard (.vcf)"
-msgstr "vCard (.vcf)"
+#: ../modules/mail/em-mailer-prefs.c:80
+msgid "On exit, every time"
+msgstr "On exit, every time"
 
-#: ../shell/e-shell-utils.c:220
-msgid "All Files (*)"
-msgstr "All Files (*)"
+#: ../modules/mail/em-mailer-prefs.c:81
+msgid "On exit, once per day"
+msgstr "On exit, once per day"
 
-#: ../shell/e-shell-view.c:304
-msgid "Saving user interface state"
-msgstr "Saving user interface state"
+#: ../modules/mail/em-mailer-prefs.c:82
+msgid "On exit, once per week"
+msgstr "On exit, once per week"
 
-#. The translator-credits string is for translators to list
-#. * per-language credits for translation, displayed in the
-#. * about dialog.
-#: ../shell/e-shell-window-actions.c:642
-msgid "translator-credits"
-msgstr ""
-"Gareth Owen <gowen72 yahoo com>\n"
-"David Lodge <dave cirt net>\n"
-"Philip Withnall <philip tecnocode co uk>\n"
-"Bruce Cowan <bruce bcowan me uk>"
-
-#: ../shell/e-shell-window-actions.c:653
-msgid "Evolution Website"
-msgstr "Evolution Website"
+#: ../modules/mail/em-mailer-prefs.c:83
+msgid "On exit, once per month"
+msgstr "On exit, once per month"
 
-#: ../shell/e-shell-window-actions.c:891
-msgid "Categories Editor"
-msgstr "Categories Editor"
-
-#: ../shell/e-shell-window-actions.c:1228
-msgid "Bug Buddy is not installed."
-msgstr "Bug Buddy is not installed."
+#: ../modules/mail/em-mailer-prefs.c:84
+msgid "Immediately, on folder leave"
+msgstr "Immediately, on folder leave"
 
-#: ../shell/e-shell-window-actions.c:1230
-msgid "Bug Buddy could not be run."
-msgstr "Bug Buddy could not be run."
+#: ../modules/mail/em-mailer-prefs.c:313
+msgid "Header"
+msgstr "Header"
 
-#: ../shell/e-shell-window-actions.c:1411
-msgid "Show information about Evolution"
-msgstr "Show information about Evolution"
+#: ../modules/mail/em-mailer-prefs.c:317
+msgid "Contains Value"
+msgstr "Contains Value"
 
-#: ../shell/e-shell-window-actions.c:1416
-#: ../shell/e-shell-window-actions.c:1430
-msgid "_Close Window"
-msgstr "_Close Window"
+#. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
+#: ../modules/mail/em-mailer-prefs.c:1141
+msgid "_Date header:"
+msgstr "_Date header:"
 
-#: ../shell/e-shell-window-actions.c:1437
-msgid "_Contents"
-msgstr "_Contents"
+#: ../modules/mail/em-mailer-prefs.c:1142
+msgid "Show _original header value"
+msgstr "Show _original header value"
 
-#: ../shell/e-shell-window-actions.c:1439
-msgid "Open the Evolution User Guide"
-msgstr "Open the Evolution User Guide"
+#: ../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?"
 
-#: ../shell/e-shell-window-actions.c:1465
-msgid "I_mport..."
-msgstr "I_mport…"
+#. Translators: First %s is an email address, second %s
+#. * is the subject of the email, third %s is the date.
+#: ../modules/mdn/evolution-mdn.c:311
+#, 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."
 
-#: ../shell/e-shell-window-actions.c:1467
-msgid "Import data from other programs"
-msgstr "Import data from other programs"
+#. Translators: %s is the subject of the email message.
+#: ../modules/mdn/evolution-mdn.c:378
+#, c-format
+msgid "Delivery Notification for \"%s\""
+msgstr "Delivery Notification for \"%s\""
 
-#: ../shell/e-shell-window-actions.c:1472
-msgid "New _Window"
-msgstr "New _Window"
+#: ../modules/mdn/evolution-mdn.c:536
+#, c-format
+msgid "Send a read receipt to '%s'"
+msgstr "Send a read receipt to '%s'"
 
-#: ../shell/e-shell-window-actions.c:1474
-msgid "Create a new window displaying this view"
-msgstr "Create a new window displaying this view"
+#. name doesn't matter
+#: ../modules/mdn/evolution-mdn.c:541
+msgid "_Notify Sender"
+msgstr "_Notify Sender"
 
-#: ../shell/e-shell-window-actions.c:1486
-msgid "Available Cate_gories"
-msgstr "Available Cate_gories"
+#: ../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."
 
-#: ../shell/e-shell-window-actions.c:1488
-msgid "Manage available categories"
-msgstr "Manage available categories"
+#: ../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."
 
-#: ../shell/e-shell-window-actions.c:1500
-msgid "_Quick Reference"
-msgstr "_Quick Reference"
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Evolution is currently offline."
+msgstr "Evolution is currently offline."
 
-#: ../shell/e-shell-window-actions.c:1502
-msgid "Show Evolution's shortcut keys"
-msgstr "Show Evolution's shortcut keys"
+#: ../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."
 
-#: ../shell/e-shell-window-actions.c:1509
-msgid "Exit the program"
-msgstr "Exit the program"
+#: ../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."
 
-#: ../shell/e-shell-window-actions.c:1514
-msgid "_Advanced Search..."
-msgstr "_Advanced Search…"
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
+msgid ""
+"Evolution will return to online mode once a network connection is "
+"established."
+msgstr ""
+"Evolution will return to online mode once a network connection is "
+"established."
 
-#: ../shell/e-shell-window-actions.c:1516
-msgid "Construct a more advanced search"
-msgstr "Construct a more advanced search"
+#: ../modules/online-accounts/camel-sasl-xoauth.c:298
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
+msgstr ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
 
-#: ../shell/e-shell-window-actions.c:1523
-msgid "Clear the current search parameters"
-msgstr "Clear the current search parameters"
+#: ../modules/online-accounts/camel-sasl-xoauth.c:380
+msgid "OAuth"
+msgstr "OAuth"
 
-#: ../shell/e-shell-window-actions.c:1528
-msgid "_Edit Saved Searches..."
-msgstr "_Edit Saved Searches…"
+#: ../modules/online-accounts/camel-sasl-xoauth.c:382
+msgid ""
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
+msgstr ""
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
 
-#: ../shell/e-shell-window-actions.c:1530
-msgid "Manage your saved searches"
-msgstr "Manage your saved searches"
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+msgid "Author(s)"
+msgstr "Author(s)"
 
-#: ../shell/e-shell-window-actions.c:1537
-msgid "Click here to change the search type"
-msgstr "Click here to change the search type"
+#: ../modules/plugin-manager/evolution-plugin-manager.c:254
+msgid "Plugin Manager"
+msgstr "Plugin Manager"
 
-#: ../shell/e-shell-window-actions.c:1542
-msgid "_Find Now"
-msgstr "_Find Now"
+#: ../modules/plugin-manager/evolution-plugin-manager.c:269
+msgid "Note: Some changes will not take effect until restart"
+msgstr "Note: Some changes will not take effect until restart"
 
-#. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1544
-msgid "Execute the current search parameters"
-msgstr "Execute the current search parameters"
+#: ../modules/plugin-manager/evolution-plugin-manager.c:298
+msgid "Overview"
+msgstr "Overview"
 
-#: ../shell/e-shell-window-actions.c:1549
-msgid "_Save Search..."
-msgstr "_Save Search…"
+#: ../modules/plugin-manager/evolution-plugin-manager.c:367
+#: ../modules/plugin-manager/evolution-plugin-manager.c:450
+msgid "Plugin"
+msgstr "Plugin"
 
-#: ../shell/e-shell-window-actions.c:1551
-msgid "Save the current search parameters"
-msgstr "Save the current search parameters"
+#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+msgid "_Plugins"
+msgstr "_Plugins"
 
-#: ../shell/e-shell-window-actions.c:1563
-msgid "Submit _Bug Report..."
-msgstr "Submit _Bug Report…"
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+msgid "Enable and disable plugins"
+msgstr "Enable and disable plugins"
 
-#: ../shell/e-shell-window-actions.c:1565
-msgid "Submit a bug report using Bug Buddy"
-msgstr "Submit a bug report using Bug Buddy"
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
+msgid "Display plain text version"
+msgstr "Display plain text version"
 
-#: ../shell/e-shell-window-actions.c:1570
-msgid "_Work Offline"
-msgstr "_Work Offline"
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
+msgid "Display plain text version of multipart/alternative message"
+msgstr "Display plain text version of multipart/alternative message"
 
-#: ../shell/e-shell-window-actions.c:1572
-msgid "Put Evolution into offline mode"
-msgstr "Put Evolution into offline mode"
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
+msgid "Display HTML version"
+msgstr "Display HTML version"
 
-#: ../shell/e-shell-window-actions.c:1577
-msgid "_Work Online"
-msgstr "_Work Online"
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:150
+msgid "Display HTML version of multipart/alternative message"
+msgstr "Display HTML version of multipart/alternative message"
 
-#: ../shell/e-shell-window-actions.c:1579
-msgid "Put Evolution into online mode"
-msgstr "Put Evolution into online mode"
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/plugin/config-ui.c:44
+msgid "Show HTML if present"
+msgstr "Show HTML if present"
 
-#: ../shell/e-shell-window-actions.c:1607
-msgid "Lay_out"
-msgstr "Lay_out"
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/plugin/config-ui.c:45
+msgid "Let Evolution choose the best part to show."
+msgstr "Let Evolution choose the best part to show."
 
-#: ../shell/e-shell-window-actions.c:1614
-msgid "_New"
-msgstr "_New"
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/plugin/config-ui.c:48
+msgid "Show plain text if present"
+msgstr "Show plain text if present"
 
-#: ../shell/e-shell-window-actions.c:1621
-msgid "_Search"
-msgstr "_Search"
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:49
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
 
-#: ../shell/e-shell-window-actions.c:1628
-msgid "_Switcher Appearance"
-msgstr "_Switcher Appearance"
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/plugin/config-ui.c:53
+msgid "Only ever show plain text"
+msgstr "Only ever show plain text"
 
-#: ../shell/e-shell-window-actions.c:1642
-msgid "_Window"
-msgstr "_Window"
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/plugin/config-ui.c:54
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
 
-#: ../shell/e-shell-window-actions.c:1671
-msgid "Show Side _Bar"
-msgstr "Show Side _Bar"
+#: ../modules/prefer-plain/plugin/config-ui.c:105
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr "Show s_uppressed HTML parts as attachments"
 
-#: ../shell/e-shell-window-actions.c:1673
-msgid "Show the side bar"
-msgstr "Show the side bar"
+#: ../modules/prefer-plain/plugin/config-ui.c:127
+msgid "HTML _Mode"
+msgstr "HTML _Mode"
 
-#: ../shell/e-shell-window-actions.c:1679
-msgid "Show _Buttons"
-msgstr "Show _Buttons"
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
+msgid "Prefer Plain Text"
+msgstr "Prefer Plain Text"
 
-#: ../shell/e-shell-window-actions.c:1681
-msgid "Show the switcher buttons"
-msgstr "Show the switcher buttons"
+#. but then we also need to create our own section frame
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Plain Text Mode"
+msgstr "Plain Text Mode"
 
-#: ../shell/e-shell-window-actions.c:1687
-msgid "Show _Status Bar"
-msgstr "Show _Status Bar"
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr "View mail messages as plain text, even if they contain HTML content."
 
-#: ../shell/e-shell-window-actions.c:1689
-msgid "Show the status bar"
-msgstr "Show the status bar"
+#: ../modules/spamassassin/evolution-spamassassin.c:184
+#, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr "Failed to spawn SpamAssassin (%s): "
 
-#: ../shell/e-shell-window-actions.c:1695
-msgid "Show _Tool Bar"
-msgstr "Show _Tool Bar"
+#: ../modules/spamassassin/evolution-spamassassin.c:207
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr "Failed to stream mail message content to SpamAssassin: "
 
-#: ../shell/e-shell-window-actions.c:1697
-msgid "Show the tool bar"
-msgstr "Show the tool bar"
+#: ../modules/spamassassin/evolution-spamassassin.c:226
+#, c-format
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "Failed to write '%s' to SpamAssassin: "
 
-#: ../shell/e-shell-window-actions.c:1719
-msgid "_Icons Only"
-msgstr "_Icons Only"
+#: ../modules/spamassassin/evolution-spamassassin.c:254
+msgid "Failed to read output from SpamAssassin: "
+msgstr "Failed to read output from SpamAssassin: "
 
-#: ../shell/e-shell-window-actions.c:1721
-msgid "Display window buttons with icons only"
-msgstr "Display window buttons with icons only"
+#: ../modules/spamassassin/evolution-spamassassin.c:309
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr "SpamAssassin either crashed or failed to process a mail message"
 
-#: ../shell/e-shell-window-actions.c:1726
-msgid "_Text Only"
-msgstr "_Text Only"
+#: ../modules/spamassassin/evolution-spamassassin.c:747
+msgid "SpamAssassin Options"
+msgstr "SpamAssassin Options"
 
-#: ../shell/e-shell-window-actions.c:1728
-msgid "Display window buttons with text only"
-msgstr "Display window buttons with text only"
+#: ../modules/spamassassin/evolution-spamassassin.c:762
+msgid "I_nclude remote tests"
+msgstr "I_nclude remote tests"
 
-#: ../shell/e-shell-window-actions.c:1733
-msgid "Icons _and Text"
-msgstr "Icons _and Text"
+#: ../modules/spamassassin/evolution-spamassassin.c:776
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "This will make SpamAssassin more reliable, but slower."
 
-#: ../shell/e-shell-window-actions.c:1735
-msgid "Display window buttons with icons and text"
-msgstr "Display window buttons with icons and text"
+#: ../modules/spamassassin/evolution-spamassassin.c:1033
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
 
-#: ../shell/e-shell-window-actions.c:1740
-msgid "Tool_bar Style"
-msgstr "Tool_bar Style"
+#. Keep the title identical to EMailConfigImportPage
+#. * so it's only shown once in the assistant sidebar.
+#: ../modules/startup-wizard/e-mail-config-import-page.c:262
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
+msgid "Importing Files"
+msgstr "Importing Files"
+
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:261
+msgid "Import cancelled."
+msgstr "Import cancelled."
+
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:278
+msgid "Import complete."
+msgstr "Import complete."
+
+#: ../modules/startup-wizard/e-startup-assistant.c:156
+msgid ""
+"Welcome to Evolution.\n"
+"\n"
+"The next few screens will allow Evolution to connect to your email accounts, "
+"and to import files from other applications."
+msgstr ""
+"Welcome to Evolution.\n"
+"\n"
+"The next few screens will allow Evolution to connect to your e-mail "
+"accounts, and to import files from other applications."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:239
+msgid "Loading accounts..."
+msgstr "Loading accounts…"
+
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
+msgid "_Format as..."
+msgstr "_Format as…"
+
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
+msgid "_Other languages"
+msgstr "_Other languages"
+
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:371
+msgid "Text Highlight"
+msgstr "Text Highlight"
+
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:372
+msgid "Syntax highlighting of mail parts"
+msgstr "Syntax highlighting of mail parts"
+
+#: ../modules/text-highlight/languages.c:32
+msgid "_Plain text"
+msgstr "_Plain text"
+
+#: ../modules/text-highlight/languages.c:38
+msgid "_Assembler"
+msgstr "_Assembler"
+
+#: ../modules/text-highlight/languages.c:43
+msgid "_Bash"
+msgstr "_Bash"
+
+#: ../modules/text-highlight/languages.c:54
+msgid "_C/C++"
+msgstr "_C/C++"
+
+#: ../modules/text-highlight/languages.c:63
+msgid "_C#"
+msgstr "_C#"
+
+#: ../modules/text-highlight/languages.c:68
+msgid "_Cascade Style Sheet"
+msgstr "_Cascade Style Sheet"
+
+#: ../modules/text-highlight/languages.c:73
+msgid "_HTML"
+msgstr "_HTML"
+
+#: ../modules/text-highlight/languages.c:81
+msgid "_Java"
+msgstr "_Java"
+
+#: ../modules/text-highlight/languages.c:87
+msgid "_JavaScript"
+msgstr "_JavaScript"
+
+#: ../modules/text-highlight/languages.c:93
+msgid "_Patch/diff"
+msgstr "_Patch/diff"
+
+#: ../modules/text-highlight/languages.c:99
+msgid "_Perl"
+msgstr "_Perl"
+
+#: ../modules/text-highlight/languages.c:110
+msgid "_PHP"
+msgstr "_PHP"
+
+#: ../modules/text-highlight/languages.c:123
+msgid "_Python"
+msgstr "_Python"
+
+#: ../modules/text-highlight/languages.c:128
+msgid "_Ruby"
+msgstr "_Ruby"
+
+#: ../modules/text-highlight/languages.c:135
+msgid "_Tcl/Tk"
+msgstr "_Tcl/Tk"
+
+#: ../modules/text-highlight/languages.c:141
+msgid "_TeX/LaTeX"
+msgstr "_TeX/LaTeX"
+
+#: ../modules/text-highlight/languages.c:147
+msgid "_Vala"
+msgstr "_Vala"
+
+#: ../modules/text-highlight/languages.c:152
+msgid "_Visual Basic"
+msgstr "_Visual Basic"
+
+#: ../modules/text-highlight/languages.c:159
+msgid "_XML"
+msgstr "_XML"
+
+#: ../modules/text-highlight/languages.c:177
+msgid "_ActionScript"
+msgstr "_ActionScript"
+
+#: ../modules/text-highlight/languages.c:182
+msgid "_ADA95"
+msgstr "_ADA95"
+
+#: ../modules/text-highlight/languages.c:189
+msgid "_ALGOL 68"
+msgstr "_ALGOL 68"
+
+#: ../modules/text-highlight/languages.c:194
+msgid "(_G)AWK"
+msgstr "(_G)AWK"
+
+#: ../modules/text-highlight/languages.c:199
+msgid "_COBOL"
+msgstr "_COBOL"
+
+#: ../modules/text-highlight/languages.c:204
+msgid "_DOS Batch"
+msgstr "_DOS Batch"
+
+#: ../modules/text-highlight/languages.c:209
+msgid "_D"
+msgstr "_D"
+
+#: ../modules/text-highlight/languages.c:214
+msgid "_Erlang"
+msgstr "_Erlang"
+
+#: ../modules/text-highlight/languages.c:219
+msgid "_FORTRAN 77"
+msgstr "_FORTRAN 77"
+
+#: ../modules/text-highlight/languages.c:225
+msgid "_FORTRAN 90"
+msgstr "_FORTRAN 90"
+
+#: ../modules/text-highlight/languages.c:230
+msgid "_F#"
+msgstr "_F#"
+
+#: ../modules/text-highlight/languages.c:235
+msgid "_Go"
+msgstr "_Go"
+
+#: ../modules/text-highlight/languages.c:240
+msgid "_Haskell"
+msgstr "_Haskell"
+
+#: ../modules/text-highlight/languages.c:245
+msgid "_JSP"
+msgstr "_JSP"
+
+#: ../modules/text-highlight/languages.c:250
+msgid "_Lisp"
+msgstr "_Lisp"
+
+#: ../modules/text-highlight/languages.c:258
+msgid "_Lotus"
+msgstr "_Lotus"
+
+#: ../modules/text-highlight/languages.c:263
+msgid "_Lua"
+msgstr "_Lua"
+
+#: ../modules/text-highlight/languages.c:268
+msgid "_Maple"
+msgstr "_Maple"
+
+#: ../modules/text-highlight/languages.c:273
+msgid "_Matlab"
+msgstr "_Matlab"
+
+#: ../modules/text-highlight/languages.c:278
+msgid "_Maya"
+msgstr "_Maya"
+
+#: ../modules/text-highlight/languages.c:283
+msgid "_Oberon"
+msgstr "_Oberon"
+
+#: ../modules/text-highlight/languages.c:288
+msgid "_Objective C"
+msgstr "_Objective C"
+
+#: ../modules/text-highlight/languages.c:294
+msgid "_OCaml"
+msgstr "_OCaml"
+
+#: ../modules/text-highlight/languages.c:299
+msgid "_Octave"
+msgstr "_Octave"
+
+#: ../modules/text-highlight/languages.c:304
+msgid "_Object Script"
+msgstr "_Object Script"
+
+#: ../modules/text-highlight/languages.c:309
+msgid "_Pascal"
+msgstr "_Pascal"
+
+#: ../modules/text-highlight/languages.c:314
+msgid "_POV-Ray"
+msgstr "_POV-Ray"
+
+#: ../modules/text-highlight/languages.c:319
+msgid "_Prolog"
+msgstr "_Prolog"
+
+#: ../modules/text-highlight/languages.c:324
+msgid "_PostScript"
+msgstr "_PostScript"
+
+#: ../modules/text-highlight/languages.c:329
+msgid "_R"
+msgstr "_R"
+
+#: ../modules/text-highlight/languages.c:334
+msgid "_RPM Spec"
+msgstr "_RPM Spec"
+
+#: ../modules/text-highlight/languages.c:339
+msgid "_Scala"
+msgstr "_Scala"
+
+#: ../modules/text-highlight/languages.c:344
+msgid "_Smalltalk"
+msgstr "_Smalltalk"
+
+#: ../modules/text-highlight/languages.c:350
+msgid "_TCSH"
+msgstr "_TCSH"
+
+#: ../modules/text-highlight/languages.c:355
+msgid "_VHDL"
+msgstr "_VHDL"
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:126
+#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:194
+msgid "Show F_ull vCard"
+msgstr "Show F_ull vCard"
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:129
+#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:212
+msgid "Show Com_pact vCard"
+msgstr "Show Com_pact vCard"
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:153
+msgid "Save _To Addressbook"
+msgstr "Save _To Addressbook"
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:173
+msgid "There is one other contact."
+msgstr "There is one other contact."
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:179
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "There is %d other contact."
+msgstr[1] "There are %d other contacts."
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:204
+msgid "Addressbook Contact"
+msgstr "Addressbook Contact"
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:205
+msgid "Display the part as an addressbook contact"
+msgstr "Display the part as an addressbook contact"
+
+#: ../modules/web-inspector/evolution-web-inspector.c:96
+msgid "Evolution Web Inspector"
+msgstr "Evolution Web Inspector"
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:121
+msgid "_Do not show this message again."
+msgstr "_Do not show this message again."
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:583
+#: ../plugins/templates/templates.c:473
+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."
+msgstr ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+msgid "_Add Attachment..."
+msgstr "_Add Attachment…"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Edit Message"
+msgstr "_Edit Message"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+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/bbdb/bbdb.c:638 ../plugins/bbdb/bbdb.c:647
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+msgid "Automatic Contacts"
+msgstr "Automatic Contacts"
+
+#. Enable BBDB checkbox
+#: ../plugins/bbdb/bbdb.c:662
+msgid "Create _address book entries when sending mails"
+msgstr "Create _address book entries when sending mails"
+
+#: ../plugins/bbdb/bbdb.c:670
+msgid "Select Address book for Automatic Contacts"
+msgstr "Select Address book for Automatic Contacts"
 
-#: ../shell/e-shell-window-actions.c:1742
-msgid "Display window buttons using the desktop toolbar setting"
-msgstr "Display window buttons using the desktop toolbar setting"
+#: ../plugins/bbdb/bbdb.c:687
+msgid "Instant Messaging Contacts"
+msgstr "Instant Messaging Contacts"
 
-#: ../shell/e-shell-window-actions.c:1750
-msgid "Define Views..."
-msgstr "Define Views…"
+#. Enable Gaim Checkbox
+#: ../plugins/bbdb/bbdb.c:702
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr "_Synchronise contact info and images from Pidgin buddy list"
+
+#: ../plugins/bbdb/bbdb.c:710
+msgid "Select Address book for Pidgin buddy list"
+msgstr "Select Address book for Pidgin buddy list"
+
+#. Synchronize now button.
+#: ../plugins/bbdb/bbdb.c:723
+msgid "Synchronize with _buddy list now"
+msgstr "Synchronise with _buddy list now"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
+msgstr ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
+
+#: ../plugins/dbx-import/dbx-importer.c:282
+msgid "Importing Outlook Express data"
+msgstr "Importing Outlook Express data"
+
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+msgid "Outlook DBX import"
+msgstr "Outlook DBX import"
+
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "Outlook Express 5/6 personal folders (.dbx)"
+
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Import Outlook Express messages from DBX file"
+msgstr "Import Outlook Express messages from DBX file"
+
+#: ../plugins/email-custom-header/email-custom-header.c:291
+msgctxt "email-custom-header-Security"
+msgid "Security:"
+msgstr "Security:"
+
+#: ../plugins/email-custom-header/email-custom-header.c:295
+msgctxt "email-custom-header-Security"
+msgid "Personal"
+msgstr "Personal"
+
+#: ../plugins/email-custom-header/email-custom-header.c:296
+msgctxt "email-custom-header-Security"
+msgid "Unclassified"
+msgstr "Unclassified"
+
+#: ../plugins/email-custom-header/email-custom-header.c:297
+msgctxt "email-custom-header-Security"
+msgid "Protected"
+msgstr "Protected"
+
+#: ../plugins/email-custom-header/email-custom-header.c:298
+msgctxt "email-custom-header-Security"
+msgid "Confidential"
+msgstr "Confidential"
+
+#: ../plugins/email-custom-header/email-custom-header.c:299
+msgctxt "email-custom-header-Security"
+msgid "Secret"
+msgstr "Secret"
+
+#: ../plugins/email-custom-header/email-custom-header.c:300
+msgctxt "email-custom-header-Security"
+msgid "Top secret"
+msgstr "Top secret"
+
+#: ../plugins/email-custom-header/email-custom-header.c:360
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "None"
+
+#: ../plugins/email-custom-header/email-custom-header.c:536
+msgid "_Custom Header"
+msgstr "_Custom Header"
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
+#: ../plugins/email-custom-header/email-custom-header.c:806
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+
+#: ../plugins/email-custom-header/email-custom-header.c:859
+msgid "Key"
+msgstr "Key"
+
+#: ../plugins/email-custom-header/email-custom-header.c:876
+#: ../plugins/templates/templates.c:482
+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:3
+msgid "Add custom headers to outgoing mail messages."
+msgstr "Add custom headers to outgoing mail messages."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+msgid "Email Custom Header"
+msgstr "E-mail Custom Header"
+
+#: ../plugins/external-editor/external-editor.c:112
+msgid "Command to be executed to launch the editor: "
+msgstr "Command to be executed to launch the editor: "
+
+#: ../plugins/external-editor/external-editor.c:113
+msgid ""
+"For XEmacs use \"xemacs\"\n"
+"For Vim use \"gvim -f\""
+msgstr ""
+"For XEmacs use \"xemacs\"\n"
+"For Vim use \"gvim -f\""
+
+#: ../plugins/external-editor/external-editor.c:413
+#: ../plugins/external-editor/external-editor.c:415
+msgid "Compose in External Editor"
+msgstr "Compose in External Editor"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+msgid "External Editor"
+msgstr "External Editor"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+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 "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."
+msgstr ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid "External editor still running"
+msgstr "External editor still running"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+
+#: ../plugins/face/face.c:171 ../smime/gui/certificate-manager.c:322
+msgid "Unknown error"
+msgstr "Unknown error"
+
+#: ../plugins/face/face.c:289
+msgid "Select a Face Picture"
+msgstr "Select a Face Picture"
+
+#: ../plugins/face/face.c:299
+msgid "Image files"
+msgstr "Image files"
+
+#: ../plugins/face/face.c:358
+msgid "_Insert Face picture by default"
+msgstr "_Insert Face picture by default"
+
+#: ../plugins/face/face.c:371
+msgid "Load new _Face picture"
+msgstr "Load new _Face picture"
+
+#: ../plugins/face/face.c:432
+msgid "Include _Face"
+msgstr "Include _Face"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Attach a small picture of your face to outgoing messages."
+msgstr "Attach a small picture of your face to outgoing messages."
+
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+msgid "Failed Read"
+msgstr "Failed Read"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+msgid "The file cannot be read"
+msgstr "The file cannot be read"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+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 "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/image-inline/org-gnome-image-inline.eplug.xml.h:1
+msgid "Inline Image"
+msgstr "Inline Image"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
+msgstr "View image attachments directly in mail messages."
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
+msgid "Get List _Archive"
+msgstr "Get List _Archive"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
+msgid "Get an archive of the list this message belongs to"
+msgstr "Get an archive of the list this message belongs to"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
+msgid "Get List _Usage Information"
+msgstr "Get List _Usage Information"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
+msgid "Get information about the usage of the list this message belongs to"
+msgstr "Get information about the usage of the list this message belongs to"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
+msgid "Contact List _Owner"
+msgstr "Contact List _Owner"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "Contact the owner of the mailing list this message belongs to"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:388
+msgid "_Post Message to List"
+msgstr "_Post Message to List"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "Post a message to the mailing list this message belongs to"
 
-#: ../shell/e-shell-window-actions.c:1752
-msgid "Create or edit views"
-msgstr "Create or edit views"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:395
+msgid "_Subscribe to List"
+msgstr "_Subscribe to List"
 
-#: ../shell/e-shell-window-actions.c:1757
-msgid "Save Custom View..."
-msgstr "Save Custom View…"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:397
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "Subscribe to the mailing list this message belongs to"
 
-#: ../shell/e-shell-window-actions.c:1759
-msgid "Save current custom view"
-msgstr "Save current custom view"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:402
+msgid "_Unsubscribe from List"
+msgstr "_Unsubscribe from List"
 
-#: ../shell/e-shell-window-actions.c:1766
-msgid "C_urrent View"
-msgstr "C_urrent View"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:404
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr "Unsubscribe from the mailing list this message belongs to"
 
-#: ../shell/e-shell-window-actions.c:1776
-msgid "Custom View"
-msgstr "Custom View"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:411
+msgid "Mailing _List"
+msgstr "Mailing _List"
 
-#: ../shell/e-shell-window-actions.c:1778
-msgid "Current view is a customized view"
-msgstr "Current view is a customised view"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "Mailing List Actions"
 
-#: ../shell/e-shell-window-actions.c:1788
-msgid "Change the page settings for your current printer"
-msgstr "Change the page settings for your current printer"
+#: ../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.)."
 
-#: ../shell/e-shell-window-actions.c:2178
-#, c-format
-msgid "Switch to %s"
-msgstr "Switch to %s"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+msgid "Action not available"
+msgstr "Action not available"
 
-#: ../shell/e-shell-window-actions.c:2299
-#, c-format
-msgid "Select view: %s"
-msgstr "Select view: %s"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr ""
+"This message does not contain the header information required for this "
+"action."
 
-#: ../shell/e-shell-window-actions.c:2400
-msgid "Execute these search parameters"
-msgstr "Execute these search parameters"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
+msgid "Posting not allowed"
+msgstr "Posting not allowed"
 
-#: ../shell/e-shell-window.c:497
-msgid "New"
-msgstr "New"
+#: ../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."
 
-#. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:585
-#, c-format
-msgid "%s - Evolution"
-msgstr "%s — Evolution"
+#: ../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?"
 
-#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:190
-#, no-c-format
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"This version of Evolution is not yet complete. It is getting close,\n"
-"but some features are either unfinished or do not work properly.\n"
-"\n"
-"If you want a stable version of Evolution, we urge you to uninstall\n"
-"this version, and install version %s instead.\n"
-"\n"
-"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
+"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"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 msgstr ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"This version of Evolution is not yet complete. It is getting close,\n"
-"but some features are either unfinished or do not work properly.\n"
-"\n"
-"If you want a stable version of Evolution, we urge you to uninstall\n"
-"this version, and install version %s instead.\n"
-"\n"
-"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
+"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"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 
-#: ../shell/main.c:214
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+msgid "_Send message"
+msgstr "_Send message"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+msgid "_Edit message"
+msgstr "_Edit message"
+
+#: ../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 ""
-"Thanks\n"
-"The Evolution Team\n"
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
 msgstr ""
-"Thanks\n"
-"The Evolution Team\n"
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
 
-#: ../shell/main.c:220
-msgid "Do not tell me again"
-msgstr "Do not tell me again"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
+msgid "No e-mail action"
+msgstr "No e-mail action"
 
-#. Translators: Do NOT translate the five component
-#. * names, they MUST remain in English!
-#: ../shell/main.c:311
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
-"Start Evolution showing the specified component. Available options are "
-"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+"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 ""
-"Start Evolution showing the specified component. Available options are "
-"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
+"\n"
+"Header: {0}"
 
-#: ../shell/main.c:315
-msgid "Apply the given geometry to the main window"
-msgstr "Apply the given geometry to the main window"
+#: ../plugins/mail-notification/mail-notification.c:384
+#: ../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."
 
-#: ../shell/main.c:319
-msgid "Start in online mode"
-msgstr "Start in online mode"
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:409
+#, c-format
+msgid "Subject: %s"
+msgstr "Subject: %s"
 
-#: ../shell/main.c:321
-msgid "Ignore network availability"
-msgstr "Ignore network availability"
+#: ../plugins/mail-notification/mail-notification.c:426
+msgid "New email in Evolution"
+msgstr "New e-mail in Evolution"
 
-#: ../shell/main.c:323
-msgid "Start in \"express\" mode"
-msgstr "Start in \"express\" mode"
+#. Translators: The '%s' is a mail
+#. * folder name.  (e.g. "Show Inbox")
+#: ../plugins/mail-notification/mail-notification.c:461
+#, c-format
+msgid "Show %s"
+msgstr "Show %s"
 
-#: ../shell/main.c:326
-msgid "Forcibly shut down Evolution"
-msgstr "Forcibly shut down Evolution"
+#: ../plugins/mail-notification/mail-notification.c:663
+msgid "_Play sound when a new message arrives"
+msgstr "_Play sound when a new message arrives"
 
-#: ../shell/main.c:329
-msgid "Disable loading of any plugins."
-msgstr "Disable loading of any plugins."
+#: ../plugins/mail-notification/mail-notification.c:695
+msgid "_Beep"
+msgstr "_Beep"
 
-#: ../shell/main.c:331
-msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr "Disable preview pane of Mail, Contacts and Tasks."
+#: ../plugins/mail-notification/mail-notification.c:708
+msgid "Use sound _theme"
+msgstr "Use sound _theme"
 
-#: ../shell/main.c:335
-msgid "Import URIs or filenames given as rest of arguments."
-msgstr "Import URIs or filenames given as rest of arguments."
+#: ../plugins/mail-notification/mail-notification.c:727
+msgid "Play _file:"
+msgstr "Play _file:"
 
-#: ../shell/main.c:337
-msgid "Request a running Evolution process to quit"
-msgstr "Request a running Evolution process to quit"
+#: ../plugins/mail-notification/mail-notification.c:736
+msgid "Select sound file"
+msgstr "Select sound file"
 
-#: ../shell/main.c:526 ../shell/main.c:531
-msgid "- The Evolution PIM and Email Client"
-msgstr "- The Evolution PIM and E-mail Client"
+#: ../plugins/mail-notification/mail-notification.c:792
+msgid "Notify new messages for _Inbox only"
+msgstr "Notify new messages for _Inbox only"
+
+#: ../plugins/mail-notification/mail-notification.c:802
+msgid "Show _notification when a new message arrives"
+msgstr "Show _notification when a new message arrives"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "Mail Notification"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Notifies you when new mail messages arrive."
+msgstr "Notifies you when new mail messages arrive."
+
+#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
+#: ../plugins/mail-to-task/mail-to-task.c:233
+#, c-format
+msgid "Created from a mail by %s"
+msgstr "Created from a mail by %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:617
+#, c-format
+msgid ""
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
+msgstr ""
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:620
+#, c-format
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+msgstr ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:623
+#, c-format
+msgid ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
+msgstr ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
+
+#: ../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?"
+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?"
 
-#: ../shell/main.c:598
+#: ../plugins/mail-to-task/mail-to-task.c:650
 #, c-format
 msgid ""
-"%s: --online and --offline cannot be used together.\n"
-"  Run '%s --help' for more information.\n"
-msgstr ""
-"%s: --online and --offline cannot be used together.\n"
-"  Run '%s --help' for more information.\n"
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
+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?"
 
-#: ../shell/main.c:604
+#: ../plugins/mail-to-task/mail-to-task.c:657
 #, c-format
 msgid ""
-"%s: --force-online and --offline cannot be used together.\n"
-"  Run '%s --help' for more information.\n"
-msgstr ""
-"%s: --force-online and --offline cannot be used together.\n"
-"  Run '%s --help' for more information.\n"
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
+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?"
 
-#: ../shell/shell.error.xml.h:2
-msgid "Upgrade from previous version failed:"
-msgstr "Upgrade from previous version failed:"
+#: ../plugins/mail-to-task/mail-to-task.c:678
+msgid "Do you wish to continue converting remaining mails?"
+msgstr "Do you wish to continue converting remaining mails?"
 
-#: ../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"
+#: ../plugins/mail-to-task/mail-to-task.c:754
+msgid "[No Summary]"
+msgstr "[No Summary]"
 
-#: ../shell/shell.error.xml.h:7
-msgid "Continue Anyway"
-msgstr "Continue Anyway"
+#: ../plugins/mail-to-task/mail-to-task.c:767
+msgid "Invalid object returned from a server"
+msgstr "Invalid object returned from a server"
 
-#: ../shell/shell.error.xml.h:8
-msgid "Quit Now"
-msgstr "Quit Now"
+#: ../plugins/mail-to-task/mail-to-task.c:819
+#, c-format
+msgid "An error occurred during processing: %s"
+msgstr "An error occurred during processing: %s"
 
-#  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}"
+#: ../plugins/mail-to-task/mail-to-task.c:852
+#, c-format
+msgid "Cannot open calendar. %s"
+msgstr "Cannot open calendar. %s"
 
-#: ../shell/shell.error.xml.h:10
+#: ../plugins/mail-to-task/mail-to-task.c:859
 msgid ""
-"Evolution no longer supports upgrading directly from version {0}. However as "
-"a workaround you might try first upgrading to Evolution 2, and then "
-"upgrading to Evolution 3."
+"Selected calendar is read only, thus cannot create event there. Select other "
+"calendar, please."
 msgstr ""
-"Evolution no longer supports upgrading directly from version {0}. However as "
-"a workaround you might try first upgrading to Evolution 2, and then "
-"upgrading to Evolution 3."
-
-#: ../smclient/eggdesktopfile.c:166
-#, c-format
-msgid "File is not a valid .desktop file"
-msgstr "File is not a valid .desktop file"
+"Selected calendar is read only, thus cannot create event there. Select other "
+"calendar, please."
 
-#: ../smclient/eggdesktopfile.c:189
-#, c-format
-msgid "Unrecognized desktop file Version '%s'"
-msgstr "Unrecognised desktop file Version '%s'"
+#: ../plugins/mail-to-task/mail-to-task.c:862
+msgid ""
+"Selected task list is read only, thus cannot create task there. Select other "
+"task list, please."
+msgstr ""
+"Selected task list is read only, thus cannot create task there. Select other "
+"task list, please."
 
-#: ../smclient/eggdesktopfile.c:959
-#, c-format
-msgid "Starting %s"
-msgstr "Starting %s"
+#: ../plugins/mail-to-task/mail-to-task.c:865
+msgid ""
+"Selected memo list is read only, thus cannot create memo there. Select other "
+"memo list, please."
+msgstr ""
+"Selected memo list is read only, thus cannot create memo there. Select other "
+"memo list, please."
 
-#: ../smclient/eggdesktopfile.c:1102
-#, c-format
-msgid "Application does not accept documents on command line"
-msgstr "Application does not accept documents on command line"
+#: ../plugins/mail-to-task/mail-to-task.c:1199
+msgid "No writable calendar is available."
+msgstr "No writeable calendar is available."
 
-#: ../smclient/eggdesktopfile.c:1170
-#, c-format
-msgid "Unrecognized launch option: %d"
-msgstr "Unrecognised launch option: %d"
+#: ../plugins/mail-to-task/mail-to-task.c:1277
+msgid "Create an _Appointment"
+msgstr "Create an _Appointment"
 
-#: ../smclient/eggdesktopfile.c:1370
-#, c-format
-msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "Can't pass document URIs to a 'Type=Link' desktop entry"
+#: ../plugins/mail-to-task/mail-to-task.c:1279
+msgid "Create a new event from the selected message"
+msgstr "Create a new event from the selected message"
 
-#: ../smclient/eggdesktopfile.c:1391
-#, c-format
-msgid "Not a launchable item"
-msgstr "Not a launchable item"
+#: ../plugins/mail-to-task/mail-to-task.c:1284
+msgid "Create a Mem_o"
+msgstr "Create a Mem_o"
 
-#: ../smclient/eggsmclient.c:229
-msgid "Disable connection to session manager"
-msgstr "Disable connection to session manager"
+#: ../plugins/mail-to-task/mail-to-task.c:1286
+msgid "Create a new memo from the selected message"
+msgstr "Create a new memo from the selected message"
 
-#: ../smclient/eggsmclient.c:232
-msgid "Specify file containing saved configuration"
-msgstr "Specify file containing saved configuration"
+#: ../plugins/mail-to-task/mail-to-task.c:1291
+msgid "Create a _Task"
+msgstr "Create a _Task"
 
-#: ../smclient/eggsmclient.c:232
-msgid "FILE"
-msgstr "FILE"
+#: ../plugins/mail-to-task/mail-to-task.c:1293
+msgid "Create a new task from the selected message"
+msgstr "Create a new task from the selected message"
 
-#: ../smclient/eggsmclient.c:235
-msgid "Specify session management ID"
-msgstr "Specify session management ID"
+#: ../plugins/mail-to-task/mail-to-task.c:1301
+msgid "Create a _Meeting"
+msgstr "Create a _Meeting"
 
-#: ../smclient/eggsmclient.c:235
-msgid "ID"
-msgstr "ID"
+#: ../plugins/mail-to-task/mail-to-task.c:1303
+msgid "Create a new meeting from the selected message"
+msgstr "Create a new meeting from the selected message"
 
-#: ../smclient/eggsmclient.c:256
-msgid "Session management options:"
-msgstr "Session management options:"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "Convert a mail message to a task."
 
-#: ../smclient/eggsmclient.c:257
-msgid "Show session management options"
-msgstr "Show session management options"
+#: ../plugins/mark-all-read/mark-all-read.c:42
+msgid "Also mark messages in subfolders?"
+msgstr "Also mark messages in subfolders?"
 
-#: ../smime/gui/ca-trust-dialog.c:107
-#, c-format
+#: ../plugins/mark-all-read/mark-all-read.c:44
 msgid ""
-"Certificate '%s' is a CA certificate.\n"
-"\n"
-"Edit trust settings:"
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
 msgstr ""
-"Certificate '%s' is a CA certificate.\n"
-"\n"
-"Edit trust settings:"
-
-#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:96
-#: ../smime/gui/certificate-manager.c:116
-msgid "Certificate Name"
-msgstr "Certificate Name"
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
 
-#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
-msgid "Issued To Organization"
-msgstr "Issued To Organisation"
+#: ../plugins/mark-all-read/mark-all-read.c:184
+msgid "In Current Folder and _Subfolders"
+msgstr "In Current Folder and _Subfolders"
 
-#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
-msgid "Issued To Organizational Unit"
-msgstr "Issued To Organisational Unit"
+#: ../plugins/mark-all-read/mark-all-read.c:198
+msgid "In Current _Folder Only"
+msgstr "In Current _Folder Only"
 
-#: ../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:542
-msgid "Serial Number"
-msgstr "Serial Number"
+#: ../plugins/mark-all-read/mark-all-read.c:544
+msgid "Mark Me_ssages as Read"
+msgstr "Mark Me_ssages as Read"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
-#: ../smime/gui/certificate-manager.c:119
-msgid "Purposes"
-msgstr "Purposes"
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
+msgstr "Mark All Read"
 
-#: ../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"
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+msgid "Mark all messages in a folder as read."
+msgstr "Mark all messages in a folder as read."
 
-#: ../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"
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+msgid "Outlook PST import"
+msgstr "Outlook PST import"
 
-#: ../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"
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook personal folders (.pst)"
+msgstr "Outlook personal folders (.pst)"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
-#: ../smime/gui/certificate-manager.c:123
-msgid "Issued"
-msgstr "Issued"
+#: ../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"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
-#: ../smime/gui/certificate-manager.c:124
-msgid "Expires"
-msgstr "Expires"
+#: ../plugins/pst-import/pst-importer.c:530
+msgid "_Mail"
+msgstr "_Mail"
 
-#: ../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"
+#: ../plugins/pst-import/pst-importer.c:559
+msgid "Destination folder:"
+msgstr "Destination folder:"
 
-#: ../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"
+#: ../plugins/pst-import/pst-importer.c:569
+msgid "_Address Book"
+msgstr "_Address Book"
 
-#: ../smime/gui/certificate-manager.c:97
-#: ../smime/gui/certificate-manager.c:117
-msgid "Email Address"
-msgstr "E-mail Address"
+#: ../plugins/pst-import/pst-importer.c:574
+msgid "A_ppointments"
+msgstr "A_ppointments"
 
-#: ../smime/gui/certificate-manager.c:589
-msgid "Select a certificate to import..."
-msgstr "Select a certificate to import…"
+#: ../plugins/pst-import/pst-importer.c:579 ../views/tasks/galview.xml.h:1
+msgid "_Tasks"
+msgstr "_Tasks"
 
-#: ../smime/gui/certificate-manager.c:602
-msgid "All files"
-msgstr "All files"
+#: ../plugins/pst-import/pst-importer.c:584
+msgid "_Journal entries"
+msgstr "_Journal entries"
 
-#: ../smime/gui/certificate-manager.c:637
-msgid "Failed to import certificate"
-msgstr "Failed to import certificate"
+#: ../plugins/pst-import/pst-importer.c:704
+msgid "Importing Outlook data"
+msgstr "Importing Outlook data"
 
-#: ../smime/gui/certificate-manager.c:1013
-msgid "All PKCS12 files"
-msgstr "All PKCS12 files"
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../plugins/publish-calendar/publish-calendar.c:142
+#: ../plugins/publish-calendar/publish-calendar.c:149
+msgid "Calendar Publishing"
+msgstr "Calendar Publishing"
 
-#: ../smime/gui/certificate-manager.c:1030
-msgid "All email certificate files"
-msgstr "All e-mail certificate files"
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+msgid "Locations"
+msgstr "Locations"
 
-#: ../smime/gui/certificate-manager.c:1047
-msgid "All CA certificate files"
-msgstr "All CA certificate files"
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Publish calendars to the web."
+msgstr "Publish calendars to the web."
 
-#: ../smime/gui/certificate-viewer.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:214
+#: ../plugins/publish-calendar/publish-calendar.c:472
 #, 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"
+msgid "Could not open %s:"
+msgstr "Could not open %s:"
 
-#: ../smime/gui/component.c:50
+#: ../plugins/publish-calendar/publish-calendar.c:216
 #, c-format
-msgid "Enter the password for '%s'"
-msgstr "Enter the password for '%s'"
-
-#. we're setting the password initially
-#: ../smime/gui/component.c:76
-msgid "Enter new password for certificate database"
-msgstr "Enter new password for certificate database"
+msgid "Could not open %s: Unknown error"
+msgstr "Could not open %s: Unknown error"
 
-#: ../smime/gui/component.c:79
-msgid "Enter new password"
-msgstr "Enter new password"
+#: ../plugins/publish-calendar/publish-calendar.c:236
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr "There was an error while publishing to %s:"
 
-#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:122
+#: ../plugins/publish-calendar/publish-calendar.c:238
 #, c-format
-msgid ""
-"Issued to:\n"
-"  Subject: %s\n"
-msgstr ""
-"Issued to:\n"
-"  Subject: %s\n"
+msgid "Publishing to %s finished successfully"
+msgstr "Publishing to %s finished successfully"
 
-#: ../smime/gui/e-cert-selector.c:123
+#: ../plugins/publish-calendar/publish-calendar.c:282
 #, c-format
-msgid ""
-"Issued by:\n"
-"  Subject: %s\n"
-msgstr ""
-"Issued by:\n"
-"  Subject: %s\n"
+msgid "Mount of %s failed:"
+msgstr "Mount of %s failed:"
 
-#: ../smime/gui/e-cert-selector.c:176
-msgid "Select certificate"
-msgstr "Select certificate"
+#: ../plugins/publish-calendar/publish-calendar.c:635
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "E_nable"
+msgstr "E_nable"
 
-#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:802
-msgid "SSL Client Certificate"
-msgstr "SSL Client Certificate"
+#: ../plugins/publish-calendar/publish-calendar.c:785
+msgid "Are you sure you want to remove this location?"
+msgstr "Are you sure you want to remove this location?"
 
-#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:806
-msgid "SSL Server Certificate"
-msgstr "SSL Server Certificate"
+#. To Translators: This is shown to a user when creation of a new thread,
+#. * where the publishing should be done, fails. Basically, this shouldn't
+#. * ever happen, and if so, then something is really wrong.
+#: ../plugins/publish-calendar/publish-calendar.c:1124
+msgid "Could not create publish thread."
+msgstr "Could not create publish thread."
 
-#: ../smime/gui/smime-ui.ui.h:5
-msgid "Email Signer Certificate"
-msgstr "E-mail Signer Certificate"
+#: ../plugins/publish-calendar/publish-calendar.c:1134
+msgid "_Publish Calendar Information"
+msgstr "_Publish Calendar Information"
 
-#: ../smime/gui/smime-ui.ui.h:6
-msgid "Email Recipient Certificate"
-msgstr "E-mail Recipient Certificate"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+msgid "iCal"
+msgstr "iCal"
 
-#: ../smime/gui/smime-ui.ui.h:7
-msgid "This certificate has been verified for the following uses:"
-msgstr "This certificate has been verified for the following uses:"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+msgid "Daily"
+msgstr "Daily"
 
-#: ../smime/gui/smime-ui.ui.h:8
-msgid "Issued To"
-msgstr "Issued To"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "Weekly"
+msgstr "Weekly"
 
-#: ../smime/gui/smime-ui.ui.h:9
-msgid "Common Name (CN)"
-msgstr "Common Name (CN)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "Manual (via Actions menu)"
+msgstr "Manual (via Actions menu)"
 
-#: ../smime/gui/smime-ui.ui.h:10
-msgid "Organization (O)"
-msgstr "Organisation (O)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Secure FTP (SFTP)"
+msgstr "Secure FTP (SFTP)"
 
-#: ../smime/gui/smime-ui.ui.h:11
-msgid "Organizational Unit (OU)"
-msgstr "Organisational Unit (OU)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+msgid "Public FTP"
+msgstr "Public FTP"
 
-#: ../smime/gui/smime-ui.ui.h:13
-msgid "Issued On"
-msgstr "Issued On"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
+msgid "FTP (with login)"
+msgstr "FTP (with login)"
 
-#: ../smime/gui/smime-ui.ui.h:14
-msgid "Expires On"
-msgstr "Expires On"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Windows share"
+msgstr "Windows share"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Fingerprints"
-msgstr "Fingerprints"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
 
-#: ../smime/gui/smime-ui.ui.h:19
-msgid "<Not Part of Certificate>"
-msgstr "<Not Part of Certificate>"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
+msgid "Secure WebDAV (HTTPS)"
+msgstr "Secure WebDAV (HTTPS)"
 
-#: ../smime/gui/smime-ui.ui.h:20
-msgid "Validity"
-msgstr "Validity"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Custom Location"
+msgstr "Custom Location"
 
-#: ../smime/gui/smime-ui.ui.h:22
-msgid "Certificate Hierarchy"
-msgstr "Certificate Hierarchy"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
+msgid "_Publish as:"
+msgstr "_Publish as:"
 
-#: ../smime/gui/smime-ui.ui.h:23
-msgid "Certificate Fields"
-msgstr "Certificate Fields"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+msgid "Publishing _Frequency:"
+msgstr "Publishing _Frequency:"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Field Value"
-msgstr "Field Value"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
+msgid "Time _duration:"
+msgstr "Time _duration:"
 
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Details"
-msgstr "Details"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+msgid "Sources"
+msgstr "Sources"
 
-#: ../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:"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+msgid "Service _type:"
+msgstr "Service _type:"
 
-#: ../smime/gui/smime-ui.ui.h:27
-msgid "Certificates Table"
-msgstr "Certificates Table"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+msgid "_File:"
+msgstr "_File:"
 
-#. This is a verb, as in "make a backup".
-#: ../smime/gui/smime-ui.ui.h:30
-msgid "_Backup"
-msgstr "_Backup"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+msgid "P_ort:"
+msgstr "P_ort:"
 
-#: ../smime/gui/smime-ui.ui.h:31
-msgid "Backup _All"
-msgstr "Back Up _All"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+msgid "_Username:"
+msgstr "_Username:"
 
-#: ../smime/gui/smime-ui.ui.h:33
-msgid "Your Certificates"
-msgstr "Your Certificates"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
+msgid "_Password:"
+msgstr "_Password:"
 
-#: ../smime/gui/smime-ui.ui.h:34
-msgid "You have certificates on file that identify these people:"
-msgstr "You have certificates on file that identify these people:"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+msgid "_Remember password"
+msgstr "_Remember password"
 
-#: ../smime/gui/smime-ui.ui.h:35
-msgid "Contact Certificates"
-msgstr "Contact Certificates"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "Publishing Location"
+msgstr "Publishing Location"
 
-#: ../smime/gui/smime-ui.ui.h:36
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr ""
-"You have certificates on file that identify these certificate authorities:"
+#: ../plugins/publish-calendar/publish-format-fb.c:100
+#: ../plugins/publish-calendar/publish-format-ical.c:98
+#, c-format
+msgid "Invalid source UID '%s'"
+msgstr "Invalid source UID '%s'"
 
-#: ../smime/gui/smime-ui.ui.h:37
-msgid "Authorities"
-msgstr "Authorities"
+#: ../plugins/publish-calendar/url-editor-dialog.c:540
+msgid "New Location"
+msgstr "New Location"
 
-#: ../smime/gui/smime-ui.ui.h:38
-msgid "Certificate Authority Trust"
-msgstr "Certificate Authority Trust"
+#: ../plugins/publish-calendar/url-editor-dialog.c:542
+msgid "Edit Location"
+msgstr "Edit Location"
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify _websites."
-msgstr "Trust this CA to identify _websites."
+#. Translators: the %F %T is the third argument for a
+#. * strftime function.  It lets you define the formatting
+#. * of the date in the csv-file.
+#: ../plugins/save-calendar/csv-format.c:161
+msgid "%F %T"
+msgstr "%F %T"
 
-#: ../smime/gui/smime-ui.ui.h:40
-msgid "Trust this CA to identify _email users."
-msgstr "Trust this CA to identify _e-mail users."
+#: ../plugins/save-calendar/csv-format.c:375
+msgid "UID"
+msgstr "UID"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "Trust this CA to identify _software developers."
-msgstr "Trust this CA to identify _software developers."
+#: ../plugins/save-calendar/csv-format.c:377
+msgid "Description List"
+msgstr "Description List"
 
-#: ../smime/gui/smime-ui.ui.h:42
-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)."
+#: ../plugins/save-calendar/csv-format.c:378
+msgid "Categories List"
+msgstr "Categories List"
 
-#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1071
-msgid "Certificate"
-msgstr "Certificate"
+#: ../plugins/save-calendar/csv-format.c:379
+msgid "Comment List"
+msgstr "Comment List"
 
-#: ../smime/gui/smime-ui.ui.h:45
-msgid "Certificate details"
-msgstr "Certificate details"
+#: ../plugins/save-calendar/csv-format.c:382
+msgid "Contact List"
+msgstr "Contact List"
 
-#: ../smime/gui/smime-ui.ui.h:46
-msgid "Email Certificate Trust Settings"
-msgstr "E-mail Certificate Trust Settings"
+#: ../plugins/save-calendar/csv-format.c:383
+msgid "Start"
+msgstr "Start"
 
-#: ../smime/gui/smime-ui.ui.h:47
-msgid "Trust the authenticity of this certificate"
-msgstr "Trust the authenticity of this certificate"
+#: ../plugins/save-calendar/csv-format.c:384
+msgid "End"
+msgstr "End"
 
-#: ../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"
+#: ../plugins/save-calendar/csv-format.c:385
+msgid "Due"
+msgstr "Due"
 
-#: ../smime/gui/smime-ui.ui.h:49
-msgid "_Edit CA Trust"
-msgstr "_Edit CA Trust"
+#: ../plugins/save-calendar/csv-format.c:386
+msgid "percent Done"
+msgstr "percent Done"
+
+#: ../plugins/save-calendar/csv-format.c:388
+msgid "URL"
+msgstr "URL"
+
+#: ../plugins/save-calendar/csv-format.c:389
+msgid "Attendees List"
+msgstr "Attendees List"
+
+#: ../plugins/save-calendar/csv-format.c:391
+msgid "Modified"
+msgstr "Modified"
 
-#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
-msgid "%d/%m/%Y"
-msgstr "%d/%m/%Y"
+#: ../plugins/save-calendar/csv-format.c:566
+msgid "A_dvanced options for the CSV format"
+msgstr "A_dvanced options for the CSV format"
 
-#. x509 certificate usage types
-#: ../smime/lib/e-cert.c:390
-msgid "Sign"
-msgstr "Sign"
+#: ../plugins/save-calendar/csv-format.c:574
+msgid "Prepend a _header"
+msgstr "Prepend a _header"
 
-#: ../smime/lib/e-cert.c:391
-msgid "Encrypt"
-msgstr "Encrypt"
+#: ../plugins/save-calendar/csv-format.c:583
+msgid "_Value delimiter:"
+msgstr "_Value delimiter:"
 
-#: ../smime/lib/e-cert.c:503
-msgid "Version"
-msgstr "Version"
+#: ../plugins/save-calendar/csv-format.c:594
+msgid "_Record delimiter:"
+msgstr "_Record delimiter:"
 
-#: ../smime/lib/e-cert.c:518
-msgid "Version 1"
-msgstr "Version 1"
+#: ../plugins/save-calendar/csv-format.c:605
+msgid "_Encapsulate values with:"
+msgstr "_Encapsulate values with:"
 
-#: ../smime/lib/e-cert.c:521
-msgid "Version 2"
-msgstr "Version 2"
+#: ../plugins/save-calendar/csv-format.c:631
+msgid "Comma separated values (.csv)"
+msgstr "Comma separated values (.csv)"
 
-#: ../smime/lib/e-cert.c:524
-msgid "Version 3"
-msgstr "Version 3"
+#: ../plugins/save-calendar/ical-format.c:171 ../shell/e-shell-utils.c:197
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
 
-#: ../smime/lib/e-cert.c:607
-msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr "PKCS #1 MD2 With RSA Encryption"
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+msgid "Save Selected"
+msgstr "Save Selected"
 
-#: ../smime/lib/e-cert.c:610
-msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr "PKCS #1 MD5 With RSA Encryption"
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+msgid "Save a calendar or task list to disk."
+msgstr "Save a calendar or task list to disk."
 
-#: ../smime/lib/e-cert.c:613
-msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr "PKCS #1 SHA-1 With RSA Encryption"
+#.
+#. * Translator: the %FT%T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the rdf-file.
+#. * Also check out http://www.w3.org/2002/12/cal/tzd
+#. *
+#: ../plugins/save-calendar/rdf-format.c:147
+msgid "%FT%T"
+msgstr "%FT%T"
 
-#: ../smime/lib/e-cert.c:616
-msgid "PKCS #1 SHA-256 With RSA Encryption"
-msgstr "PKCS #1 SHA-256 With RSA Encryption"
+#: ../plugins/save-calendar/rdf-format.c:386
+msgid "RDF (.rdf)"
+msgstr "RDF (.rdf)"
 
-#: ../smime/lib/e-cert.c:619
-msgid "PKCS #1 SHA-384 With RSA Encryption"
-msgstr "PKCS #1 SHA-384 With RSA Encryption"
+#: ../plugins/save-calendar/save-calendar.c:121
+msgid "_Format:"
+msgstr "_Format:"
 
-#: ../smime/lib/e-cert.c:622
-msgid "PKCS #1 SHA-512 With RSA Encryption"
-msgstr "PKCS #1 SHA-512 With RSA Encryption"
+#: ../plugins/save-calendar/save-calendar.c:187
+msgid "Select destination file"
+msgstr "Select destination file"
 
-#: ../smime/lib/e-cert.c:649
-msgid "PKCS #1 RSA Encryption"
-msgstr "PKCS #1 RSA Encryption"
+#: ../plugins/save-calendar/save-calendar.c:343
+msgid "Save the selected calendar to disk"
+msgstr "Save the selected calendar to disk"
 
-#: ../smime/lib/e-cert.c:652
-msgid "Certificate Key Usage"
-msgstr "Certificate Key Usage"
+#: ../plugins/save-calendar/save-calendar.c:374
+msgid "Save the selected memo list to disk"
+msgstr "Save the selected memo list to disk"
 
-#: ../smime/lib/e-cert.c:655
-msgid "Netscape Certificate Type"
-msgstr "Netscape Certificate Type"
+#: ../plugins/save-calendar/save-calendar.c:405
+msgid "Save the selected task list to disk"
+msgstr "Save the selected task list to disk"
 
-#: ../smime/lib/e-cert.c:658
-msgid "Certificate Authority Key Identifier"
-msgstr "Certificate Authority Key Identifier"
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid ""
+"Drafts based template plugin. You can use variables like $ORIG[subject], "
+"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
+"an email you are replying to."
+msgstr ""
+"Drafts based template plugin. You can use variables like $ORIG[subject], "
+"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
+"an e-mail you are replying to."
 
-#: ../smime/lib/e-cert.c:670
-#, c-format
-msgid "Object Identifier (%s)"
-msgstr "Object Identifier (%s)"
+#: ../plugins/templates/templates.c:1135
+msgid "No Title"
+msgstr "No Title"
 
-#: ../smime/lib/e-cert.c:722
-msgid "Algorithm Identifier"
-msgstr "Algorithm Identifier"
+#: ../plugins/templates/templates.c:1244
+msgid "Save as _Template"
+msgstr "Save as _Template"
 
-#: ../smime/lib/e-cert.c:730
-msgid "Algorithm Parameters"
-msgstr "Algorithm Parameters"
+#: ../plugins/templates/templates.c:1246
+msgid "Save as Template"
+msgstr "Save as Template"
 
-#: ../smime/lib/e-cert.c:752
-msgid "Subject Public Key Info"
-msgstr "Subject Public Key Info"
+#: ../shell/e-shell.c:307
+msgid "Preparing to go offline..."
+msgstr "Preparing to go offline…"
 
-#: ../smime/lib/e-cert.c:757
-msgid "Subject Public Key Algorithm"
-msgstr "Subject Public Key Algorithm"
+#: ../shell/e-shell.c:360
+msgid "Preparing to go online..."
+msgstr "Preparing to go online…"
 
-#: ../smime/lib/e-cert.c:772
-msgid "Subject's Public Key"
-msgstr "Subject's Public Key"
+#: ../shell/e-shell.c:434
+msgid "Preparing to quit"
+msgstr "Preparing to quit"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:843
-msgid "Error: Unable to process extension"
-msgstr "Error: Unable to process extension"
+#: ../shell/e-shell.c:440
+msgid "Preparing to quit..."
+msgstr "Preparing to quit…"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
-msgid "Object Signer"
-msgstr "Object Signer"
+#: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
+msgid "Searches"
+msgstr "Searches"
 
-#: ../smime/lib/e-cert.c:818
-msgid "SSL Certificate Authority"
-msgstr "SSL Certificate Authority"
+#: ../shell/e-shell-content.c:764
+msgid "Save Search"
+msgstr "Save Search"
 
-#: ../smime/lib/e-cert.c:822
-msgid "Email Certificate Authority"
-msgstr "E-mail Certificate Authority"
+#. Translators: The "Show:" label precedes a combo box that
+#. * allows the user to filter the current view.  Examples of
+#. * items that appear in the combo box are "Unread Messages",
+#. * "Important Messages", or "Active Appointments".
+#: ../shell/e-shell-searchbar.c:1143
+msgid "Sho_w:"
+msgstr "Sho_w:"
 
-#: ../smime/lib/e-cert.c:851
-msgid "Signing"
-msgstr "Signing"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:1186
+msgid "Sear_ch:"
+msgstr "Sear_ch:"
 
-#: ../smime/lib/e-cert.c:855
-msgid "Non-repudiation"
-msgstr "Non-repudiation"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:1272
+msgid "i_n"
+msgstr "i_n"
 
-#: ../smime/lib/e-cert.c:859
-msgid "Key Encipherment"
-msgstr "Key Encipherment"
+#: ../shell/e-shell-utils.c:195
+msgid "vCard (.vcf)"
+msgstr "vCard (.vcf)"
 
-#: ../smime/lib/e-cert.c:863
-msgid "Data Encipherment"
-msgstr "Data Encipherment"
+#: ../shell/e-shell-utils.c:218
+msgid "All Files (*)"
+msgstr "All Files (*)"
 
-#: ../smime/lib/e-cert.c:867
-msgid "Key Agreement"
-msgstr "Key Agreement"
+#: ../shell/e-shell-view.c:295
+msgid "Saving user interface state"
+msgstr "Saving user interface state"
 
-#: ../smime/lib/e-cert.c:871
-msgid "Certificate Signer"
-msgstr "Certificate Signer"
+#. The translator-credits string is for translators to list
+#. * per-language credits for translation, displayed in the
+#. * about dialog.
+#: ../shell/e-shell-window-actions.c:74
+msgid "translator-credits"
+msgstr ""
+"Gareth Owen <gowen72 yahoo com>\n"
+"David Lodge <dave cirt net>\n"
+"Philip Withnall <philip tecnocode co uk>\n"
+"Bruce Cowan <bruce bcowan me uk>\n"
+"Chris Leonard <cjl laptop org>"
 
-#: ../smime/lib/e-cert.c:875
-msgid "CRL Signer"
-msgstr "CRL Signer"
+#: ../shell/e-shell-window-actions.c:85
+msgid "Evolution Website"
+msgstr "Evolution Website"
 
-#: ../smime/lib/e-cert.c:924
-msgid "Critical"
-msgstr "Critical"
+#: ../shell/e-shell-window-actions.c:323
+msgid "Categories Editor"
+msgstr "Categories Editor"
 
-#: ../smime/lib/e-cert.c:926 ../smime/lib/e-cert.c:929
-msgid "Not Critical"
-msgstr "Not Critical"
+#: ../shell/e-shell-window-actions.c:660
+msgid "Bug Buddy is not installed."
+msgstr "Bug Buddy is not installed."
 
-#: ../smime/lib/e-cert.c:950
-msgid "Extensions"
-msgstr "Extensions"
+#: ../shell/e-shell-window-actions.c:661
+msgid "Bug Buddy could not be run."
+msgstr "Bug Buddy could not be run."
 
-#. Translators: This string is used in Certificate
-#. * details for fields like Issuer or Subject, which
-#. * shows the field name on the left and its respective
-#. * value on the right, both as stored in the
-#. * certificate itself.  You probably do not need to
-#. * change this string, unless changing the order of
-#. * name and value.  As a result example:
-#. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1029
-#, c-format
-msgid "%s = %s"
-msgstr "%s = %s"
+#: ../shell/e-shell-window-actions.c:841
+msgid "Show information about Evolution"
+msgstr "Show information about Evolution"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
-msgid "Certificate Signature Algorithm"
-msgstr "Certificate Signature Algorithm"
+#: ../shell/e-shell-window-actions.c:846 ../shell/e-shell-window-actions.c:860
+msgid "_Close Window"
+msgstr "_Close Window"
 
-#: ../smime/lib/e-cert.c:1094
-msgid "Issuer"
-msgstr "Issuer"
+#: ../shell/e-shell-window-actions.c:867
+msgid "_Contents"
+msgstr "_Contents"
 
-#: ../smime/lib/e-cert.c:1149
-msgid "Issuer Unique ID"
-msgstr "Issuer Unique ID"
+#: ../shell/e-shell-window-actions.c:869
+msgid "Open the Evolution User Guide"
+msgstr "Open the Evolution User Guide"
 
-#: ../smime/lib/e-cert.c:1168
-msgid "Subject Unique ID"
-msgstr "Subject Unique ID"
+#: ../shell/e-shell-window-actions.c:895
+msgid "I_mport..."
+msgstr "I_mport…"
 
-#: ../smime/lib/e-cert.c:1214
-msgid "Certificate Signature Value"
-msgstr "Certificate Signature Value"
+#: ../shell/e-shell-window-actions.c:897
+msgid "Import data from other programs"
+msgstr "Import data from other programs"
 
-#: ../smime/lib/e-cert-db.c:860
-msgid "Certificate already exists"
-msgstr "Certificate already exists"
+#: ../shell/e-shell-window-actions.c:902
+msgid "New _Window"
+msgstr "New _Window"
 
-#: ../smime/lib/e-pkcs12.c:200
-msgid "PKCS12 File Password"
-msgstr "PKCS12 File Password"
+#: ../shell/e-shell-window-actions.c:904
+msgid "Create a new window displaying this view"
+msgstr "Create a new window displaying this view"
 
-#: ../smime/lib/e-pkcs12.c:201
-msgid "Enter password for PKCS12 file:"
-msgstr "Enter password for PKCS12 file:"
+#: ../shell/e-shell-window-actions.c:916
+msgid "Available Cate_gories"
+msgstr "Available Cate_gories"
 
-#: ../smime/lib/e-pkcs12.c:307
-msgid "Imported Certificate"
-msgstr "Imported Certificate"
+#: ../shell/e-shell-window-actions.c:918
+msgid "Manage available categories"
+msgstr "Manage available categories"
 
-#: ../views/addressbook/galview.xml.h:1
-msgid "_Address Cards"
-msgstr "_Address Cards"
+#: ../shell/e-shell-window-actions.c:930
+msgid "_Quick Reference"
+msgstr "_Quick Reference"
 
-#: ../views/addressbook/galview.xml.h:2 ../views/calendar/galview.xml.h:5
-msgid "_List View"
-msgstr "_List View"
+#: ../shell/e-shell-window-actions.c:932
+msgid "Show Evolution's shortcut keys"
+msgstr "Show Evolution's shortcut keys"
 
-#: ../views/addressbook/galview.xml.h:3
-msgid "By _Company"
-msgstr "By _Company"
+#: ../shell/e-shell-window-actions.c:939
+msgid "Exit the program"
+msgstr "Exit the program"
 
-#: ../views/calendar/galview.xml.h:1
-msgid "_Day View"
-msgstr "_Day View"
+#: ../shell/e-shell-window-actions.c:944
+msgid "_Advanced Search..."
+msgstr "_Advanced Search…"
 
-#: ../views/calendar/galview.xml.h:2
-msgid "_Work Week View"
-msgstr "_Work Week View"
+#: ../shell/e-shell-window-actions.c:946
+msgid "Construct a more advanced search"
+msgstr "Construct a more advanced search"
+
+#: ../shell/e-shell-window-actions.c:953
+msgid "Clear the current search parameters"
+msgstr "Clear the current search parameters"
 
-#: ../views/calendar/galview.xml.h:3
-msgid "W_eek View"
-msgstr "W_eek View"
+#: ../shell/e-shell-window-actions.c:958
+msgid "_Edit Saved Searches..."
+msgstr "_Edit Saved Searches…"
 
-#: ../views/calendar/galview.xml.h:4
-msgid "_Month View"
-msgstr "_Month View"
+#: ../shell/e-shell-window-actions.c:960
+msgid "Manage your saved searches"
+msgstr "Manage your saved searches"
 
-#: ../views/mail/galview.xml.h:1
-msgid "_Messages"
-msgstr "_Messages"
+#: ../shell/e-shell-window-actions.c:967
+msgid "Click here to change the search type"
+msgstr "Click here to change the search type"
 
-#: ../views/mail/galview.xml.h:2
-msgid "As _Sent Folder"
-msgstr "As _Sent Folder"
+#: ../shell/e-shell-window-actions.c:972
+msgid "_Find Now"
+msgstr "_Find Now"
 
-#: ../views/mail/galview.xml.h:3
-msgid "By Su_bject"
-msgstr "By Su_bject"
+#. Block the default Ctrl+F.
+#: ../shell/e-shell-window-actions.c:974
+msgid "Execute the current search parameters"
+msgstr "Execute the current search parameters"
 
-#: ../views/mail/galview.xml.h:4
-msgid "By Se_nder"
-msgstr "By Se_nder"
+#: ../shell/e-shell-window-actions.c:979
+msgid "_Save Search..."
+msgstr "_Save Search…"
 
-#: ../views/mail/galview.xml.h:5
-msgid "By S_tatus"
-msgstr "By S_tatus"
+#: ../shell/e-shell-window-actions.c:981
+msgid "Save the current search parameters"
+msgstr "Save the current search parameters"
 
-#: ../views/mail/galview.xml.h:6
-msgid "By _Follow Up Flag"
-msgstr "By _Follow Up Flag"
+#: ../shell/e-shell-window-actions.c:993
+msgid "Submit _Bug Report..."
+msgstr "Submit _Bug Report…"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "For _Wide View"
+#: ../shell/e-shell-window-actions.c:995
+msgid "Submit a bug report using Bug Buddy"
+msgstr "Submit a bug report using Bug Buddy"
 
-#: ../views/mail/galview.xml.h:8
-msgid "As Sent Folder for Wi_de View"
-msgstr "As Sent Folder for Wi_de View"
+#: ../shell/e-shell-window-actions.c:1000
+msgid "_Work Offline"
+msgstr "_Work Offline"
 
-#: ../views/memos/galview.xml.h:1
-msgid "_Memos"
-msgstr "_Memos"
+#: ../shell/e-shell-window-actions.c:1002
+msgid "Put Evolution into offline mode"
+msgstr "Put Evolution into offline mode"
 
-#: ../views/tasks/galview.xml.h:2
-msgid "With _Due Date"
-msgstr "With _Due Date"
+#: ../shell/e-shell-window-actions.c:1007
+msgid "_Work Online"
+msgstr "_Work Online"
 
-#: ../views/tasks/galview.xml.h:3
-msgid "With _Status"
-msgstr "With _Status"
+#: ../shell/e-shell-window-actions.c:1009
+msgid "Put Evolution into online mode"
+msgstr "Put Evolution into online mode"
 
-#. Put the "UTC" entry at the top of the combo's list.
-#: ../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"
+#: ../shell/e-shell-window-actions.c:1037
+msgid "Lay_out"
+msgstr "Lay_out"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "Select a Time Zone"
+#: ../shell/e-shell-window-actions.c:1044
+msgid "_New"
+msgstr "_New"
 
-#: ../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"
-"Use the right mouse button to zoom out."
-msgstr ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
+#: ../shell/e-shell-window-actions.c:1051
+msgid "_Search"
+msgstr "_Search"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
-msgid "Time Zones"
-msgstr "Time Zones"
+#: ../shell/e-shell-window-actions.c:1058
+msgid "_Switcher Appearance"
+msgstr "_Switcher Appearance"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
-msgid "_Selection"
-msgstr "_Selection"
+#: ../shell/e-shell-window-actions.c:1072
+msgid "_Window"
+msgstr "_Window"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
-msgid "Timezone drop-down combination box"
-msgstr "Timezone drop-down combination box"
+#: ../shell/e-shell-window-actions.c:1101
+msgid "Show Side _Bar"
+msgstr "Show Side _Bar"
 
-#: ../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"
+#: ../shell/e-shell-window-actions.c:1103
+msgid "Show the side bar"
+msgstr "Show the side bar"
 
-#: ../widgets/menus/gal-define-views-dialog.c:372
-#: ../widgets/menus/gal-define-views-dialog.c:374
-msgid "Define Views"
-msgstr "Define Views"
+#: ../shell/e-shell-window-actions.c:1109
+msgid "Show _Buttons"
+msgstr "Show _Buttons"
 
-#: ../widgets/menus/gal-define-views.ui.h:2
-#, no-c-format
-msgid "Define Views for \"%s\""
-msgstr "Define Views for \"%s\""
+#: ../shell/e-shell-window-actions.c:1111
+msgid "Show the switcher buttons"
+msgstr "Show the switcher buttons"
 
-#: ../widgets/menus/gal-view-factory-etable.c:115
-msgid "Table"
-msgstr "Table"
+#: ../shell/e-shell-window-actions.c:1117
+msgid "Show _Status Bar"
+msgstr "Show _Status Bar"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:288
-msgid "Save Current View"
-msgstr "Save Current View"
+#: ../shell/e-shell-window-actions.c:1119
+msgid "Show the status bar"
+msgstr "Show the status bar"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "_Create new view"
+#: ../shell/e-shell-window-actions.c:1125
+msgid "Show _Tool Bar"
+msgstr "Show _Tool Bar"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "_Replace existing view"
+#: ../shell/e-shell-window-actions.c:1127
+msgid "Show the tool bar"
+msgstr "Show the tool bar"
 
-#: ../widgets/menus/gal-view-new-dialog.c:172
-msgid "Define New View"
-msgstr "Define New View"
+#: ../shell/e-shell-window-actions.c:1149
+msgid "_Icons Only"
+msgstr "_Icons Only"
 
-#: ../widgets/menus/gal-view-new-dialog.ui.h:1
-msgid "Name of new view:"
-msgstr "Name of new view:"
+#: ../shell/e-shell-window-actions.c:1151
+msgid "Display window buttons with icons only"
+msgstr "Display window buttons with icons only"
 
-#: ../widgets/menus/gal-view-new-dialog.ui.h:2
-msgid "Type of view:"
-msgstr "Type of view:"
+#: ../shell/e-shell-window-actions.c:1156
+msgid "_Text Only"
+msgstr "_Text Only"
 
-#: ../widgets/menus/gal-view-new-dialog.ui.h:3
-msgid "Type of View"
-msgstr "Type of View"
+#: ../shell/e-shell-window-actions.c:1158
+msgid "Display window buttons with text only"
+msgstr "Display window buttons with text only"
 
-#: ../widgets/misc/ea-calendar-item.c:308
-#: ../widgets/misc/ea-calendar-item.c:317
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
+#: ../shell/e-shell-window-actions.c:1163
+msgid "Icons _and Text"
+msgstr "Icons _and Text"
 
-#: ../widgets/misc/ea-calendar-item.c:320
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Calendar: from %s to %s"
+#: ../shell/e-shell-window-actions.c:1165
+msgid "Display window buttons with icons and text"
+msgstr "Display window buttons with icons and text"
 
-#: ../widgets/misc/ea-calendar-item.c:356
-msgid "evolution calendar item"
-msgstr "evolution calendar item"
+#: ../shell/e-shell-window-actions.c:1170
+msgid "Tool_bar Style"
+msgstr "Tool_bar Style"
 
-#: ../widgets/misc/e-alert-bar.c:120
-msgid "Close this message"
-msgstr "Close this message"
+#: ../shell/e-shell-window-actions.c:1172
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "Display window buttons using the desktop toolbar setting"
 
-#: ../widgets/misc/e-attachment-bar.c:658
-#: ../widgets/misc/e-attachment-paned.c:703
-msgid "Icon View"
-msgstr "Icon View"
+#: ../shell/e-shell-window-actions.c:1180
+msgid "Define Views..."
+msgstr "Define Views…"
 
-#: ../widgets/misc/e-attachment-bar.c:660
-#: ../widgets/misc/e-attachment-paned.c:705
-msgid "List View"
-msgstr "List View"
+#: ../shell/e-shell-window-actions.c:1182
+msgid "Create or edit views"
+msgstr "Create or edit views"
 
-#. 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:979
-msgid "Attached message"
-msgstr "Attached message"
+#: ../shell/e-shell-window-actions.c:1187
+msgid "Save Custom View..."
+msgstr "Save Custom View…"
 
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1842 ../widgets/misc/e-attachment.c:2397
-#: ../widgets/misc/e-attachment-store.c:525
-msgid "attachment.dat"
-msgstr "attachment.dat"
+#: ../shell/e-shell-window-actions.c:1189
+msgid "Save current custom view"
+msgstr "Save current custom view"
 
-#: ../widgets/misc/e-attachment.c:1887 ../widgets/misc/e-attachment.c:2699
-msgid "A load operation is already in progress"
-msgstr "A load operation is already in progress"
+#: ../shell/e-shell-window-actions.c:1196
+msgid "C_urrent View"
+msgstr "C_urrent View"
 
-#: ../widgets/misc/e-attachment.c:1895 ../widgets/misc/e-attachment.c:2707
-msgid "A save operation is already in progress"
-msgstr "A save operation is already in progress"
+#: ../shell/e-shell-window-actions.c:1206
+msgid "Custom View"
+msgstr "Custom View"
 
-#: ../widgets/misc/e-attachment.c:2002
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Could not load '%s'"
+#: ../shell/e-shell-window-actions.c:1208
+msgid "Current view is a customized view"
+msgstr "Current view is a customised view"
 
-#: ../widgets/misc/e-attachment.c:2005
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Could not load the attachment"
+#: ../shell/e-shell-window-actions.c:1218
+msgid "Change the page settings for your current printer"
+msgstr "Change the page settings for your current printer"
 
-#: ../widgets/misc/e-attachment.c:2278
+#: ../shell/e-shell-window-actions.c:1608
 #, c-format
-msgid "Could not open '%s'"
-msgstr "Could not open '%s'"
+msgid "Switch to %s"
+msgstr "Switch to %s"
 
-#: ../widgets/misc/e-attachment.c:2281
+#: ../shell/e-shell-window-actions.c:1729
 #, c-format
-msgid "Could not open the attachment"
-msgstr "Could not open the attachment"
+msgid "Select view: %s"
+msgstr "Select view: %s"
 
-#: ../widgets/misc/e-attachment.c:2715
-msgid "Attachment contents not loaded"
-msgstr "Attachment contents not loaded"
+#: ../shell/e-shell-window-actions.c:1830
+msgid "Execute these search parameters"
+msgstr "Execute these search parameters"
+
+#: ../shell/e-shell-window.c:497
+msgid "New"
+msgstr "New"
 
-#: ../widgets/misc/e-attachment.c:2791
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:585
 #, c-format
-msgid "Could not save '%s'"
-msgstr "Could not save '%s'"
+msgid "%s - Evolution"
+msgstr "%s — Evolution"
+
+#. Preview/Alpha/Beta version warning message
+#: ../shell/main.c:182
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Evolution groupware suite.\n"
+"\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Evolution groupware suite.\n"
+"\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 
-#: ../widgets/misc/e-attachment.c:2794
-#, c-format
-msgid "Could not save the attachment"
-msgstr "Could not save the attachment"
+#: ../shell/main.c:206
+msgid ""
+"Thanks\n"
+"The Evolution Team\n"
+msgstr ""
+"Thanks\n"
+"The Evolution Team\n"
 
-#: ../widgets/misc/e-attachment-dialog.c:311
-msgid "Attachment Properties"
-msgstr "Attachment Properties"
+#: ../shell/main.c:212
+msgid "Do not tell me again"
+msgstr "Do not tell me again"
 
-#: ../widgets/misc/e-attachment-dialog.c:333
-#: ../widgets/misc/e-import-assistant.c:273
-msgid "F_ilename:"
-msgstr "F_ilename:"
+#. Translators: Do NOT translate the five component
+#. * names, they MUST remain in English!
+#: ../shell/main.c:303
+msgid ""
+"Start Evolution showing the specified component. Available options are "
+"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+msgstr ""
+"Start Evolution showing the specified component. Available options are "
+"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 
-#: ../widgets/misc/e-attachment-dialog.c:368
-msgid "MIME Type:"
-msgstr "MIME Type:"
+#: ../shell/main.c:307
+msgid "Apply the given geometry to the main window"
+msgstr "Apply the given geometry to the main window"
 
-#: ../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"
+#: ../shell/main.c:311
+msgid "Start in online mode"
+msgstr "Start in online mode"
 
-#: ../widgets/misc/e-attachment-handler-image.c:99
-msgid "Could not set as background"
-msgstr "Could not set as background"
+#: ../shell/main.c:313
+msgid "Ignore network availability"
+msgstr "Ignore network availability"
 
-#: ../widgets/misc/e-attachment-handler-image.c:149
-msgid "Set as _Background"
-msgstr "Set as _Background"
+#: ../shell/main.c:315
+msgid "Start in \"express\" mode"
+msgstr "Start in \"express\" mode"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:93
-msgid "Could not send attachment"
-msgid_plural "Could not send attachments"
-msgstr[0] "Could not send attachment"
-msgstr[1] "Could not send attachments"
+#: ../shell/main.c:318
+msgid "Forcibly shut down Evolution"
+msgstr "Forcibly shut down Evolution"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:135
-msgid "_Send To..."
-msgstr "_Send To…"
+#: ../shell/main.c:321
+msgid "Disable loading of any plugins."
+msgstr "Disable loading of any plugins."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:137
-msgid "Send the selected attachments somewhere"
-msgstr "Send the selected attachments somewhere"
+#: ../shell/main.c:323
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+msgstr "Disable preview pane of Mail, Contacts and Tasks."
 
-#: ../widgets/misc/e-attachment-icon-view.c:166
-#: ../widgets/misc/e-attachment-tree-view.c:549
-msgid "Loading"
-msgstr "Loading"
+#: ../shell/main.c:327
+msgid "Import URIs or filenames given as rest of arguments."
+msgstr "Import URIs or filenames given as rest of arguments."
 
-#: ../widgets/misc/e-attachment-icon-view.c:178
-#: ../widgets/misc/e-attachment-tree-view.c:561
-msgid "Saving"
-msgstr "Saving"
+#: ../shell/main.c:329
+msgid "Request a running Evolution process to quit"
+msgstr "Request a running Evolution process to quit"
 
-#: ../widgets/misc/e-attachment-paned.c:104
-msgid "Hide Attachment _Bar"
-msgstr "Hide Attachment _Bar"
+#: ../shell/main.c:419
+#, c-format
+msgid ""
+"Cannot start Evolution.  Another Evolution instance may be unresponsive. "
+"System error: %s"
+msgstr ""
+"Cannot start Evolution.  Another Evolution instance may be unresponsive. "
+"System error: %s"
 
-#: ../widgets/misc/e-attachment-paned.c:106
-#: ../widgets/misc/e-attachment-paned.c:719
-msgid "Show Attachment _Bar"
-msgstr "Show Attachment _Bar"
+#: ../shell/main.c:515 ../shell/main.c:520
+msgid "- The Evolution PIM and Email Client"
+msgstr "- The Evolution PIM and E-mail Client"
 
-#: ../widgets/misc/e-attachment-store.c:430
-msgid "Add Attachment"
-msgstr "Add Attachment"
+#: ../shell/main.c:587
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Run '%s --help' for more information.\n"
+msgstr ""
+"%s: --online and --offline cannot be used together.\n"
+"  Run '%s --help' for more information.\n"
 
-#: ../widgets/misc/e-attachment-store.c:433
-msgid "A_ttach"
-msgstr "A_ttach"
+#: ../shell/main.c:593
+#, c-format
+msgid ""
+"%s: --force-online and --offline cannot be used together.\n"
+"  Run '%s --help' for more information.\n"
+msgstr ""
+"%s: --force-online and --offline cannot be used together.\n"
+"  Run '%s --help' for more information.\n"
 
-#: ../widgets/misc/e-attachment-store.c:496
-msgid "Save Attachment"
-msgid_plural "Save Attachments"
-msgstr[0] "Save Attachment"
-msgstr[1] "Save Attachments"
+#: ../shell/shell.error.xml.h:2
+msgid "Upgrade from previous version failed:"
+msgstr "Upgrade from previous version failed:"
 
-#: ../widgets/misc/e-attachment-view.c:379
-msgid "Open With Other Application..."
-msgstr "Open With Other Application…"
+#: ../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"
 
-#: ../widgets/misc/e-attachment-view.c:386
-msgid "S_ave All"
-msgstr "S_ave All"
+#: ../shell/shell.error.xml.h:7
+msgid "Continue Anyway"
+msgstr "Continue Anyway"
 
-#: ../widgets/misc/e-attachment-view.c:412
-msgid "A_dd Attachment..."
-msgstr "A_dd Attachment…"
+#: ../shell/shell.error.xml.h:8
+msgid "Quit Now"
+msgstr "Quit Now"
 
-#: ../widgets/misc/e-attachment-view.c:436
-msgid "_Hide"
-msgstr "_Hide"
+#  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}"
 
-#: ../widgets/misc/e-attachment-view.c:443
-msgid "Hid_e All"
-msgstr "Hid_e All"
+#: ../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 "
+"upgrading to Evolution 3."
+msgstr ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
 
-#: ../widgets/misc/e-attachment-view.c:450
-msgid "_View Inline"
-msgstr "_View Inline"
+#: ../smime/gui/ca-trust-dialog.c:109
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
 
-#: ../widgets/misc/e-attachment-view.c:457
-msgid "Vie_w All Inline"
-msgstr "Vie_w All Inline"
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+msgid "Certificate Name"
+msgstr "Certificate Name"
 
-#: ../widgets/misc/e-attachment-view.c:778
-#, c-format
-msgid "Open With \"%s\""
-msgstr "Open With \"%s\""
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+msgid "Issued To Organization"
+msgstr "Issued To Organisation"
 
-#: ../widgets/misc/e-attachment-view.c:781
-#, c-format
-msgid "Open this attachment in %s"
-msgstr "Open this attachment in %s"
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+msgid "Issued To Organizational Unit"
+msgstr "Issued To Organisational Unit"
 
-#: ../widgets/misc/e-book-source-config.c:98
-msgid "Mark as default address book"
-msgstr "Mark as default address book"
+#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
+#: ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-viewer.c:638 ../smime/lib/e-asn1-object.c:134
+msgid "Serial Number"
+msgstr "Serial Number"
 
-#: ../widgets/misc/e-book-source-config.c:103
-msgid "Autocomplete with this address book"
-msgstr "Autocomplete with this address book"
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
+msgid "Purposes"
+msgstr "Purposes"
 
-#: ../widgets/misc/e-book-source-config.c:277
-msgid "Copy book content locally for offline operation"
-msgstr "Copy book content locally for offline operation"
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116
+#: ../smime/gui/certificate-viewer.c:640
+msgid "Issued By"
+msgstr "Issued By"
 
-#. 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:389
-msgid "Ctrl-click to open a link"
-msgstr "Ctrl-click to open a link"
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
+msgid "Issued By Organization"
+msgstr "Issued By Organisation"
 
-#: ../widgets/misc/e-calendar.c:187
-msgid "Previous month"
-msgstr "Previous month"
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
+msgid "Issued By Organizational Unit"
+msgstr "Issued By Organisational Unit"
 
-#: ../widgets/misc/e-calendar.c:211
-msgid "Next month"
-msgstr "Next month"
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
+msgid "Issued"
+msgstr "Issued"
 
-#: ../widgets/misc/e-calendar.c:233
-msgid "Previous year"
-msgstr "Previous year"
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
+msgid "Expires"
+msgstr "Expires"
 
-#: ../widgets/misc/e-calendar.c:254
-msgid "Next year"
-msgstr "Next year"
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-viewer.c:650
+msgid "SHA1 Fingerprint"
+msgstr "SHA1 Fingerprint"
 
-#: ../widgets/misc/e-calendar.c:278
-msgid "Month Calendar"
-msgstr "Month Calendar"
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-viewer.c:651
+msgid "MD5 Fingerprint"
+msgstr "MD5 Fingerprint"
 
-#. This is a strftime() format. %B = Month name.
-#: ../widgets/misc/e-calendar-item.c:1283
-#: ../widgets/misc/e-calendar-item.c:2136
-msgctxt "CalItem"
-msgid "%B"
-msgstr "%B"
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+msgid "Email Address"
+msgstr "E-mail Address"
 
-#. This is a strftime() format. %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1285
-msgctxt "CalItem"
-msgid "%Y"
-msgstr "%Y"
+#: ../smime/gui/certificate-manager.c:614
+msgid "Select a certificate to import..."
+msgstr "Select a certificate to import…"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1322
-msgctxt "CalItem"
-msgid "%B %Y"
-msgstr "%B %Y"
+#: ../smime/gui/certificate-manager.c:628
+msgid "All files"
+msgstr "All files"
 
-#: ../widgets/misc/e-cal-source-config.c:170
-msgid "Mark as default calendar"
-msgstr "Mark as default calendar"
+#: ../smime/gui/certificate-manager.c:664
+msgid "Failed to import certificate"
+msgstr "Failed to import certificate"
 
-#: ../widgets/misc/e-cal-source-config.c:173
-msgid "Mark as default task list"
-msgstr "Mark as default task list"
+#: ../smime/gui/certificate-manager.c:1046
+msgid "All PKCS12 files"
+msgstr "All PKCS12 files"
 
-#: ../widgets/misc/e-cal-source-config.c:176
-msgid "Mark as default memo list"
-msgstr "Mark as default memo list"
+#: ../smime/gui/certificate-manager.c:1063
+msgid "All email certificate files"
+msgstr "All e-mail certificate files"
 
-#: ../widgets/misc/e-cal-source-config.c:201
-msgid "Color:"
-msgstr "Colour:"
+#: ../smime/gui/certificate-manager.c:1080
+msgid "All CA certificate files"
+msgstr "All CA certificate files"
+
+#: ../smime/gui/certificate-viewer.c:292
+msgid "Not part of certificate"
+msgstr "Not part of certificate"
 
-#: ../widgets/misc/e-cal-source-config.c:406
-msgid "Copy calendar contents locally for offline operation"
-msgstr "Copy calendar contents locally for offline operation"
+#: ../smime/gui/certificate-viewer.c:600
+msgid "This certificate has been verified for the following uses:"
+msgstr "This certificate has been verified for the following uses:"
 
-#: ../widgets/misc/e-cal-source-config.c:410
-msgid "Copy task list contents locally for offline operation"
-msgstr "Copy task list contents locally for offline operation"
+#: ../smime/gui/certificate-viewer.c:604 ../smime/lib/e-asn1-object.c:387
+msgid "SSL Client Certificate"
+msgstr "SSL Client Certificate"
 
-#: ../widgets/misc/e-cal-source-config.c:414
-msgid "Copy memo list contents locally for offline operation"
-msgstr "Copy memo list contents locally for offline operation"
+#: ../smime/gui/certificate-viewer.c:609 ../smime/lib/e-asn1-object.c:391
+msgid "SSL Server Certificate"
+msgstr "SSL Server Certificate"
 
-#: ../widgets/misc/e-charset-combo-box.c:100
-msgid "Character Encoding"
-msgstr "Character Encoding"
+#: ../smime/gui/certificate-viewer.c:614
+msgid "Email Signer Certificate"
+msgstr "E-mail Signer Certificate"
 
-#: ../widgets/misc/e-charset-combo-box.c:123
-msgid "Enter the character set to use"
-msgstr "Enter the character set to use"
+#: ../smime/gui/certificate-viewer.c:619
+msgid "Email Recipient Certificate"
+msgstr "E-mail Recipient Certificate"
 
-#: ../widgets/misc/e-charset-combo-box.c:342
-msgid "Other..."
-msgstr "Other…"
+#: ../smime/gui/certificate-viewer.c:634
+msgid "Issued To"
+msgstr "Issued To"
 
-#: ../widgets/misc/e-contact-map-window.c:356
-msgid "Contacts Map"
-msgstr "Contacts Map"
+#: ../smime/gui/certificate-viewer.c:635 ../smime/gui/certificate-viewer.c:641
+msgid "Common Name (CN)"
+msgstr "Common Name (CN)"
 
-#: ../widgets/misc/e-dateedit.c:504
-msgid "Date and Time"
-msgstr "Date and Time"
+#: ../smime/gui/certificate-viewer.c:636 ../smime/gui/certificate-viewer.c:642
+msgid "Organization (O)"
+msgstr "Organisation (O)"
 
-#: ../widgets/misc/e-dateedit.c:525
-msgid "Text entry to input date"
-msgstr "Text entry to input date"
+#: ../smime/gui/certificate-viewer.c:637 ../smime/gui/certificate-viewer.c:643
+msgid "Organizational Unit (OU)"
+msgstr "Organisational Unit (OU)"
 
-#: ../widgets/misc/e-dateedit.c:547
-msgid "Click this button to show a calendar"
-msgstr "Click this button to show a calendar"
+#: ../smime/gui/certificate-viewer.c:645
+msgid "Validity"
+msgstr "Validity"
 
-#: ../widgets/misc/e-dateedit.c:594
-msgid "Drop-down combination box to select time"
-msgstr "Drop-down combination box to select time"
+#: ../smime/gui/certificate-viewer.c:646
+msgid "Issued On"
+msgstr "Issued On"
 
-#: ../widgets/misc/e-dateedit.c:666
-msgid "No_w"
-msgstr "No_w"
+#: ../smime/gui/certificate-viewer.c:647
+msgid "Expires On"
+msgstr "Expires On"
 
-#: ../widgets/misc/e-dateedit.c:673
-msgid "_Today"
-msgstr "_Today"
+#: ../smime/gui/certificate-viewer.c:649
+msgid "Fingerprints"
+msgstr "Fingerprints"
 
-#. Note that we don't show this here, since by default a 'None' date
-#. * is not permitted.
-#: ../widgets/misc/e-dateedit.c:682
-msgid "_None"
-msgstr "_None"
+#: ../smime/gui/certificate-viewer.c:671
+msgid "Certificate Hierarchy"
+msgstr "Certificate Hierarchy"
 
-#. Translators: "None" for date field of a date edit, shown when
-#. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1697 ../widgets/misc/e-dateedit.c:1930
-msgctxt "date"
-msgid "None"
-msgstr "None"
+#: ../smime/gui/certificate-viewer.c:674
+msgid "Certificate Fields"
+msgstr "Certificate Fields"
 
-#: ../widgets/misc/e-dateedit.c:1824
-msgid "Invalid Date Value"
-msgstr "Invalid Date Value"
+#: ../smime/gui/certificate-viewer.c:677
+msgid "Field Value"
+msgstr "Field Value"
 
-#: ../widgets/misc/e-dateedit.c:1868
-msgid "Invalid Time Value"
-msgstr "Invalid Time Value"
+#: ../smime/gui/certificate-viewer.c:679
+msgid "Details"
+msgstr "Details"
 
-#: ../widgets/misc/e-import-assistant.c:256
+#: ../smime/gui/cert-trust-dialog.c:153
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
 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:283
-msgid "Select a file"
-msgstr "Select a file"
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
 
-#: ../widgets/misc/e-import-assistant.c:297
-#: ../widgets/misc/e-import-assistant.c:472
-msgid "File _type:"
-msgstr "File _type:"
+#: ../smime/gui/cert-trust-dialog.c:158
+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"
 
-#: ../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"
+#: ../smime/gui/component.c:51
+#, c-format
+msgid "Enter the password for '%s'"
+msgstr "Enter the password for '%s'"
 
-#: ../widgets/misc/e-import-assistant.c:365
-msgid "Choose the type of importer to run:"
-msgstr "Choose the type of importer to run:"
+#. we're setting the password initially
+#: ../smime/gui/component.c:77
+msgid "Enter new password for certificate database"
+msgstr "Enter new password for certificate database"
 
-#: ../widgets/misc/e-import-assistant.c:373
-msgid "Import data and settings from _older programs"
-msgstr "Import data and settings from _older programs"
+#: ../smime/gui/component.c:80
+msgid "Enter new password"
+msgstr "Enter new password"
 
-#: ../widgets/misc/e-import-assistant.c:381
-msgid "Import a _single file"
-msgstr "Import a _single file"
+#. FIXME: add serial no, validity date, uses
+#: ../smime/gui/e-cert-selector.c:122
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+"Issued to:\n"
+"  Subject: %s\n"
 
-#: ../widgets/misc/e-import-assistant.c:533
+#: ../smime/gui/e-cert-selector.c:123
+#, c-format
 msgid ""
-"Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
+"Issued by:\n"
+"  Subject: %s\n"
 msgstr ""
-"Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
+"Issued by:\n"
+"  Subject: %s\n"
 
-#. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:775
-msgid "_Cancel Import"
-msgstr "_Cancel Import"
+#: ../smime/gui/e-cert-selector.c:176
+msgid "Select certificate"
+msgstr "Select certificate"
 
-#: ../widgets/misc/e-import-assistant.c:919
-msgid "Preview data to be imported"
-msgstr "Preview data to be imported"
+#: ../smime/gui/smime-ui.ui.h:3
+msgid "You have certificates from these organizations that identify you:"
+msgstr "You have certificates from these organisations that identify you:"
 
-#: ../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"
+#: ../smime/gui/smime-ui.ui.h:4
+msgid "Certificates Table"
+msgstr "Certificates Table"
 
-#: ../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."
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:7
+msgid "_Backup"
+msgstr "_Backup"
 
-#: ../widgets/misc/e-import-assistant.c:1281
-#: ../widgets/misc/e-import-assistant.c:1316
-msgid "Evolution Import Assistant"
-msgstr "Evolution Import Assistant"
+#: ../smime/gui/smime-ui.ui.h:8
+msgid "Backup _All"
+msgstr "Back Up _All"
 
-#: ../widgets/misc/e-import-assistant.c:1298
-#: ../widgets/misc/e-import-assistant.c:1354
-msgid "Import Location"
-msgstr "Import Location"
+#: ../smime/gui/smime-ui.ui.h:10
+msgid "Your Certificates"
+msgstr "Your Certificates"
+
+#: ../smime/gui/smime-ui.ui.h:11
+msgid "You have certificates on file that identify these people:"
+msgstr "You have certificates on file that identify these people:"
+
+#: ../smime/gui/smime-ui.ui.h:12
+msgid "Contact Certificates"
+msgstr "Contact Certificates"
 
-#: ../widgets/misc/e-import-assistant.c:1309
+#: ../smime/gui/smime-ui.ui.h:13
 msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing "
-"external files into Evolution."
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing "
-"external files into Evolution."
+"You have certificates on file that identify these certificate authorities:"
 
-#: ../widgets/misc/e-import-assistant.c:1326
-msgid "Importer Type"
-msgstr "Importer Type"
+#: ../smime/gui/smime-ui.ui.h:14
+msgid "Authorities"
+msgstr "Authorities"
 
-#: ../widgets/misc/e-import-assistant.c:1336
-msgid "Select Information to Import"
-msgstr "Select Information to Import"
+#: ../smime/gui/smime-ui.ui.h:15
+msgid "Certificate Authority Trust"
+msgstr "Certificate Authority Trust"
 
-#: ../widgets/misc/e-import-assistant.c:1345
-msgid "Select a File"
-msgstr "Select a File"
+#: ../smime/gui/smime-ui.ui.h:16
+msgid "Trust this CA to identify _websites."
+msgstr "Trust this CA to identify _websites."
 
-#: ../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."
+#: ../smime/gui/smime-ui.ui.h:17
+msgid "Trust this CA to identify _email users."
+msgstr "Trust this CA to identify _e-mail users."
 
-#: ../widgets/misc/e-mail-signature-combo-box.c:378
-msgid "Autogenerated"
-msgstr "Autogenerated"
+#: ../smime/gui/smime-ui.ui.h:18
+msgid "Trust this CA to identify _software developers."
+msgstr "Trust this CA to identify _software developers."
 
-#: ../widgets/misc/e-mail-signature-editor.c:294
-msgid "Close"
-msgstr "Close"
+#: ../smime/gui/smime-ui.ui.h:19
+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)."
 
-#: ../widgets/misc/e-mail-signature-editor.c:299
-msgid "_Save and Close"
-msgstr "_Save and Close"
+#: ../smime/gui/smime-ui.ui.h:21 ../smime/lib/e-asn1-object.c:658
+msgid "Certificate"
+msgstr "Certificate"
 
-#: ../widgets/misc/e-mail-signature-editor.c:513
-msgid "Edit Signature"
-msgstr "Edit Signature"
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "Certificate details"
+msgstr "Certificate details"
 
-#: ../widgets/misc/e-mail-signature-editor.c:533
-msgid "_Signature Name:"
-msgstr "_Signature Name:"
+#: ../smime/gui/smime-ui.ui.h:23
+msgid "Email Certificate Trust Settings"
+msgstr "E-mail Certificate Trust Settings"
 
-#: ../widgets/misc/e-mail-signature-editor.c:579
-msgid "Unnamed"
-msgstr "Unnamed"
+#: ../smime/gui/smime-ui.ui.h:24
+msgid "Trust the authenticity of this certificate"
+msgstr "Trust the authenticity of this certificate"
 
-#: ../widgets/misc/e-mail-signature-manager.c:337
-msgid "Add _Script"
-msgstr "Add _Script"
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Do not trust the authenticity of this certificate"
+msgstr "Do not trust the authenticity of this certificate"
 
-#: ../widgets/misc/e-mail-signature-manager.c:422
-msgid "Add Signature Script"
-msgstr "Add Signature Script"
+#: ../smime/gui/smime-ui.ui.h:26
+msgid "_Edit CA Trust"
+msgstr "_Edit CA Trust"
 
-#: ../widgets/misc/e-mail-signature-manager.c:492
-msgid "Edit Signature Script"
-msgstr "Edit Signature Script"
+#: ../smime/lib/e-asn1-object.c:95
+msgid "Version"
+msgstr "Version"
 
-#: ../widgets/misc/e-mail-signature-script-dialog.c:395
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only."
-msgstr ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only."
+#: ../smime/lib/e-asn1-object.c:110
+msgid "Version 1"
+msgstr "Version 1"
+
+#: ../smime/lib/e-asn1-object.c:113
+msgid "Version 2"
+msgstr "Version 2"
 
-#: ../widgets/misc/e-mail-signature-script-dialog.c:446
-msgid "S_cript:"
-msgstr "S_cript:"
+#: ../smime/lib/e-asn1-object.c:116
+msgid "Version 3"
+msgstr "Version 3"
 
-#: ../widgets/misc/e-mail-signature-script-dialog.c:477
-msgid "Script file must be executable."
-msgstr "Script file must be executable."
+#: ../smime/lib/e-asn1-object.c:192
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr "PKCS #1 MD2 With RSA Encryption"
 
-#: ../widgets/misc/e-map.c:886
-msgid "World Map"
-msgstr "World Map"
+#: ../smime/lib/e-asn1-object.c:195
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr "PKCS #1 MD5 With RSA Encryption"
 
-#: ../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."
-msgstr ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should instead select the timezone from the drop-down combination box below."
+#: ../smime/lib/e-asn1-object.c:198
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr "PKCS #1 SHA-1 With RSA Encryption"
 
-#: ../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."
+#: ../smime/lib/e-asn1-object.c:201
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256 With RSA Encryption"
 
-#: ../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."
+#: ../smime/lib/e-asn1-object.c:204
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384 With RSA Encryption"
 
-#: ../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."
+#: ../smime/lib/e-asn1-object.c:207
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512 With RSA Encryption"
 
-#: ../widgets/misc/e-preferences-window.c:317
-msgid "Evolution Preferences"
-msgstr "Evolution Preferences"
+#: ../smime/lib/e-asn1-object.c:234
+msgid "PKCS #1 RSA Encryption"
+msgstr "PKCS #1 RSA Encryption"
+
+#: ../smime/lib/e-asn1-object.c:237
+msgid "Certificate Key Usage"
+msgstr "Certificate Key Usage"
+
+#: ../smime/lib/e-asn1-object.c:240
+msgid "Netscape Certificate Type"
+msgstr "Netscape Certificate Type"
+
+#: ../smime/lib/e-asn1-object.c:243
+msgid "Certificate Authority Key Identifier"
+msgstr "Certificate Authority Key Identifier"
 
-#: ../widgets/misc/e-search-bar.c:79
+#: ../smime/lib/e-asn1-object.c:255
 #, c-format
-msgid "Matches: %u"
-msgstr "Matches: %u"
+msgid "Object Identifier (%s)"
+msgstr "Object Identifier (%s)"
 
-#: ../widgets/misc/e-search-bar.c:527
-msgid "Close the find bar"
-msgstr "Close the find bar"
+#: ../smime/lib/e-asn1-object.c:306
+msgid "Algorithm Identifier"
+msgstr "Algorithm Identifier"
 
-#: ../widgets/misc/e-search-bar.c:535
-msgid "Fin_d:"
-msgstr "Fin_d:"
+#: ../smime/lib/e-asn1-object.c:314
+msgid "Algorithm Parameters"
+msgstr "Algorithm Parameters"
 
-#: ../widgets/misc/e-search-bar.c:547
-msgid "Clear the search"
-msgstr "Clear the search"
+#: ../smime/lib/e-asn1-object.c:336
+msgid "Subject Public Key Info"
+msgstr "Subject Public Key Info"
 
-#: ../widgets/misc/e-search-bar.c:571
-msgid "_Previous"
-msgstr "_Previous"
+#: ../smime/lib/e-asn1-object.c:341
+msgid "Subject Public Key Algorithm"
+msgstr "Subject Public Key Algorithm"
 
-#: ../widgets/misc/e-search-bar.c:577
-msgid "Find the previous occurrence of the phrase"
-msgstr "Find the previous occurrence of the phrase"
+#: ../smime/lib/e-asn1-object.c:356
+msgid "Subject's Public Key"
+msgstr "Subject's Public Key"
 
-#: ../widgets/misc/e-search-bar.c:590
-msgid "_Next"
-msgstr "_Next"
+#: ../smime/lib/e-asn1-object.c:378 ../smime/lib/e-asn1-object.c:428
+msgid "Error: Unable to process extension"
+msgstr "Error: Unable to process extension"
 
-#: ../widgets/misc/e-search-bar.c:596
-msgid "Find the next occurrence of the phrase"
-msgstr "Find the next occurrence of the phrase"
+#: ../smime/lib/e-asn1-object.c:399 ../smime/lib/e-asn1-object.c:411
+msgid "Object Signer"
+msgstr "Object Signer"
 
-#: ../widgets/misc/e-search-bar.c:609
-msgid "Mat_ch case"
-msgstr "Mat_ch case"
+#: ../smime/lib/e-asn1-object.c:403
+msgid "SSL Certificate Authority"
+msgstr "SSL Certificate Authority"
 
-#: ../widgets/misc/e-search-bar.c:637
-msgid "Reached bottom of page, continued from top"
-msgstr "Reached bottom of page, continued from top"
+#: ../smime/lib/e-asn1-object.c:407
+msgid "Email Certificate Authority"
+msgstr "E-mail Certificate Authority"
 
-#: ../widgets/misc/e-search-bar.c:659
-msgid "Reached top of page, continued from bottom"
-msgstr "Reached top of page, continued from bottom"
+#: ../smime/lib/e-asn1-object.c:436
+msgid "Signing"
+msgstr "Signing"
 
-#: ../widgets/misc/e-send-options.c:570
-msgid "When de_leted:"
-msgstr "When de_leted:"
+#: ../smime/lib/e-asn1-object.c:440
+msgid "Non-repudiation"
+msgstr "Non-repudiation"
 
-#: ../widgets/misc/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "Standard"
+#: ../smime/lib/e-asn1-object.c:444
+msgid "Key Encipherment"
+msgstr "Key Encipherment"
 
-#: ../widgets/misc/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr "Proprietary"
+#: ../smime/lib/e-asn1-object.c:448
+msgid "Data Encipherment"
+msgstr "Data Encipherment"
 
-#: ../widgets/misc/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "Secret"
+#: ../smime/lib/e-asn1-object.c:452
+msgid "Key Agreement"
+msgstr "Key Agreement"
 
-#: ../widgets/misc/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "Top Secret"
+#: ../smime/lib/e-asn1-object.c:456
+msgid "Certificate Signer"
+msgstr "Certificate Signer"
 
-#: ../widgets/misc/e-send-options.ui.h:10
-msgid "For Your Eyes Only"
-msgstr "For Your Eyes Only"
+#: ../smime/lib/e-asn1-object.c:460
+msgid "CRL Signer"
+msgstr "CRL Signer"
 
-#. Translators: Used in send options dialog
-#: ../widgets/misc/e-send-options.ui.h:12
-msgctxt "send-options"
-msgid "None"
-msgstr "None"
+#: ../smime/lib/e-asn1-object.c:509
+msgid "Critical"
+msgstr "Critical"
 
-#: ../widgets/misc/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "Mail Receipt"
+#: ../smime/lib/e-asn1-object.c:511 ../smime/lib/e-asn1-object.c:514
+msgid "Not Critical"
+msgstr "Not Critical"
 
-#: ../widgets/misc/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "R_eply requested"
+#: ../smime/lib/e-asn1-object.c:535
+msgid "Extensions"
+msgstr "Extensions"
 
-#: ../widgets/misc/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "Wi_thin"
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not need to
+#. * change this string, unless changing the order of
+#. * name and value.  As a result example:
+#. * "OU = VeriSign Trust Network"
+#: ../smime/lib/e-asn1-object.c:615
+#, c-format
+msgid "%s = %s"
+msgstr "%s = %s"
 
-#: ../widgets/misc/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "days"
+#: ../smime/lib/e-asn1-object.c:672 ../smime/lib/e-asn1-object.c:807
+msgid "Certificate Signature Algorithm"
+msgstr "Certificate Signature Algorithm"
 
-#: ../widgets/misc/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "_When convenient"
+#: ../smime/lib/e-asn1-object.c:681
+msgid "Issuer"
+msgstr "Issuer"
 
-#: ../widgets/misc/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "_Delay message delivery"
+#: ../smime/lib/e-asn1-object.c:735
+msgid "Issuer Unique ID"
+msgstr "Issuer Unique ID"
 
-#: ../widgets/misc/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_After"
+#: ../smime/lib/e-asn1-object.c:754
+msgid "Subject Unique ID"
+msgstr "Subject Unique ID"
 
-#: ../widgets/misc/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "days"
+#: ../smime/lib/e-asn1-object.c:813
+msgid "Certificate Signature Value"
+msgstr "Certificate Signature Value"
 
-#: ../widgets/misc/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "_Set expiration date"
+#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
 
-#: ../widgets/misc/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_Until"
+#. x509 certificate usage types
+#: ../smime/lib/e-cert.c:392
+msgid "Sign"
+msgstr "Sign"
 
-#: ../widgets/misc/e-send-options.ui.h:25
-msgid "Delivery Options"
-msgstr "Delivery Options"
+#: ../smime/lib/e-cert.c:393
+msgid "Encrypt"
+msgstr "Encrypt"
 
-#: ../widgets/misc/e-send-options.ui.h:27
-msgid "_Classification:"
-msgstr "_Classification:"
+#: ../smime/lib/e-cert-db.c:864
+msgid "Certificate already exists"
+msgstr "Certificate already exists"
 
-#: ../widgets/misc/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "Gene_ral Options"
+#: ../smime/lib/e-pkcs12.c:199
+msgid "PKCS12 File Password"
+msgstr "PKCS12 File Password"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "Creat_e a sent item to track information"
-msgstr "Creat_e a sent item to track information"
+#: ../smime/lib/e-pkcs12.c:200
+msgid "Enter password for PKCS12 file:"
+msgstr "Enter password for PKCS12 file:"
 
-#: ../widgets/misc/e-send-options.ui.h:30
-msgid "_Delivered"
-msgstr "_Delivered"
+#: ../smime/lib/e-pkcs12.c:307
+msgid "Imported Certificate"
+msgstr "Imported Certificate"
 
-#: ../widgets/misc/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "Deli_vered and opened"
+#: ../views/addressbook/galview.xml.h:1
+msgid "_Address Cards"
+msgstr "_Address Cards"
 
-#: ../widgets/misc/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "_All information"
+#: ../views/addressbook/galview.xml.h:2 ../views/calendar/galview.xml.h:5
+msgid "_List View"
+msgstr "_List View"
 
-#: ../widgets/misc/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "A_uto-delete sent item"
+#: ../views/addressbook/galview.xml.h:3
+msgid "By _Company"
+msgstr "By _Company"
 
-#: ../widgets/misc/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "Status Tracking"
+#: ../views/calendar/galview.xml.h:1
+msgid "_Day View"
+msgstr "_Day View"
 
-#: ../widgets/misc/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "_When opened:"
+#: ../views/calendar/galview.xml.h:2
+msgid "_Work Week View"
+msgstr "_Work Week View"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "When decli_ned:"
+#: ../views/calendar/galview.xml.h:3
+msgid "W_eek View"
+msgstr "W_eek View"
 
-#: ../widgets/misc/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "When co_mpleted:"
+#: ../views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr "_Month View"
 
-#: ../widgets/misc/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "When acce_pted:"
+#: ../views/mail/galview.xml.h:1
+msgid "_Messages"
+msgstr "_Messages"
 
-#: ../widgets/misc/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr "Return Notification"
+#: ../views/mail/galview.xml.h:2
+msgid "As _Sent Folder"
+msgstr "As _Sent Folder"
 
-#: ../widgets/misc/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "Sta_tus Tracking"
+#: ../views/mail/galview.xml.h:3
+msgid "By Su_bject"
+msgstr "By Su_bject"
 
-#: ../widgets/misc/e-source-config.c:680 ../widgets/misc/e-source-config.c:684
-msgid "Type:"
-msgstr "Type:"
+#: ../views/mail/galview.xml.h:4
+msgid "By Se_nder"
+msgstr "By Se_nder"
+
+#: ../views/mail/galview.xml.h:5
+msgid "By S_tatus"
+msgstr "By S_tatus"
 
-#: ../widgets/misc/e-source-config.c:692 ../widgets/misc/e-source-config.c:696
-msgid "Name:"
-msgstr "Name:"
+#: ../views/mail/galview.xml.h:6
+msgid "By _Follow Up Flag"
+msgstr "By _Follow Up Flag"
 
-#. Translators: This is the first of a sequence of widgets:
-#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../widgets/misc/e-source-config.c:1294
-msgid "Refresh every"
-msgstr "Refresh every"
+#: ../views/mail/galview.xml.h:7
+msgid "For _Wide View"
+msgstr "For _Wide View"
 
-#: ../widgets/misc/e-source-config.c:1324
-#: ../widgets/misc/e-source-config.c:1373
-msgid "Use a secure connection"
-msgstr "Use a secure connection"
+#: ../views/mail/galview.xml.h:8
+msgid "As Sent Folder for Wi_de View"
+msgstr "As Sent Folder for Wi_de View"
 
-#: ../widgets/misc/e-source-config.c:1397
-msgid "Ignore invalid SSL certificate"
-msgstr "Ignore invalid SSL certificate"
+#: ../views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr "_Memos"
 
-#: ../widgets/misc/e-source-config.c:1434
-msgid "User"
-msgstr "User"
+#: ../views/tasks/galview.xml.h:2
+msgid "With _Due Date"
+msgstr "With _Due Date"
 
-#. no suggestions. Put something in the menu anyway...
-#: ../widgets/misc/e-spell-entry.c:351
-msgid "(no suggestions)"
-msgstr "(no suggestions)"
+#: ../views/tasks/galview.xml.h:3
+msgid "With _Status"
+msgstr "With _Status"
 
-#: ../widgets/misc/e-spell-entry.c:375
-msgid "More..."
-msgstr "More…"
+#~ msgid "Export in asynchronous mode"
+#~ msgstr "Export in asynchronous mode"
 
-#. + Add to Dictionary
-#: ../widgets/misc/e-spell-entry.c:444
-#, c-format
-msgid "Add \"%s\" to Dictionary"
-msgstr "Add \"%s\" to Dictionary"
+#~ msgid ""
+#~ "The number of cards in one output file in asynchronous mode, default size "
+#~ "100."
+#~ msgstr ""
+#~ "The number of cards in one output file in asynchronous mode, default size "
+#~ "100."
 
-#. - Ignore All
-#: ../widgets/misc/e-spell-entry.c:487
-msgid "Ignore All"
-msgstr "Ignore All"
+#~ msgid "NUMBER"
+#~ msgstr "NUMBER"
 
-#: ../widgets/misc/e-spell-entry.c:513
-msgid "Spelling Suggestions"
-msgstr "Spelling Suggestions"
+#~ msgid "In async mode, output must be file."
+#~ msgstr "In async mode, output must be file."
 
-#: ../widgets/misc/e-url-entry.c:78
-msgid "Click here to go to URL"
-msgstr "Click here to go to URL"
+#~ msgid "In normal mode, there is no need for the size option."
+#~ msgstr "In normal mode, there is no need for the size option."
 
-#: ../widgets/misc/e-web-view.c:274 ../widgets/misc/e-web-view-gtkhtml.c:407
-msgid "_Copy Link Location"
-msgstr "_Copy Link Location"
+#~ msgid "The Evolution tasks have quit unexpectedly."
+#~ msgstr "The Evolution tasks have quit unexpectedly."
 
-#: ../widgets/misc/e-web-view.c:276 ../widgets/misc/e-web-view-gtkhtml.c:409
-msgid "Copy the link to the clipboard"
-msgstr "Copy the link to the clipboard"
+#~ msgid "Your calendars will not be available until Evolution is restarted."
+#~ msgstr "Your calendars will not be available until Evolution is restarted."
 
-#: ../widgets/misc/e-web-view.c:284 ../widgets/misc/e-web-view-gtkhtml.c:417
-msgid "_Open Link in Browser"
-msgstr "_Open Link in Browser"
+#~ msgid "The Evolution memo has quit unexpectedly."
+#~ msgstr "The Evolution memo has quit unexpectedly."
 
-#: ../widgets/misc/e-web-view.c:286 ../widgets/misc/e-web-view-gtkhtml.c:419
-msgid "Open the link in a web browser"
-msgstr "Open the link in a web browser"
+#~ msgid "The Evolution calendars have quit unexpectedly."
+#~ msgstr "The Evolution calendars have quit unexpectedly."
 
-#: ../widgets/misc/e-web-view.c:294 ../widgets/misc/e-web-view-gtkhtml.c:427
-msgid "_Copy Email Address"
-msgstr "_Copy E-mail Address"
+#~ msgid "Delete remote calendar &quot;{0}&quot;?"
+#~ msgstr "Delete remote calendar &quot;{0}&quot;?"
 
-#: ../widgets/misc/e-web-view.c:311 ../widgets/misc/e-web-view-gtkhtml.c:444
-msgid "_Copy Image"
-msgstr "_Copy Image"
+#~ msgid "Delete remote task list &quot;{0}&quot;?"
+#~ msgstr "Delete remote task list &quot;{0}&quot;?"
 
-#: ../widgets/misc/e-web-view.c:313 ../widgets/misc/e-web-view-gtkhtml.c:446
-msgid "Copy the image to the clipboard"
-msgstr "Copy the image to the clipboard"
+#~ msgid "Delete remote memo list &quot;{0}&quot;?"
+#~ msgstr "Delete remote memo list &quot;{0}&quot;?"
 
-#: ../widgets/misc/e-web-view.c:333 ../widgets/misc/e-web-view.c:1440
-#: ../widgets/misc/e-web-view-gtkhtml.c:466
-#: ../widgets/misc/e-web-view-gtkhtml.c:1311
-msgid "Select all text and images"
-msgstr "Select all text and images"
+#~ msgid "Cannot create a new event"
+#~ msgstr "Cannot create a new event"
 
-#: ../widgets/misc/e-web-view.c:1099 ../widgets/misc/e-web-view.c:1101
-#: ../widgets/misc/e-web-view.c:1103 ../widgets/misc/e-web-view-gtkhtml.c:975
-#: ../widgets/misc/e-web-view-gtkhtml.c:977
-#: ../widgets/misc/e-web-view-gtkhtml.c:979
-#, c-format
-msgid "Click to call %s"
-msgstr "Click to call %s"
+#~ 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."
 
-#: ../widgets/misc/e-web-view.c:1105 ../widgets/misc/e-web-view-gtkhtml.c:981
-msgid "Click to hide/unhide addresses"
-msgstr "Click to hide/unhide addresses"
+#~ msgid "Error on {0}: {1}"
+#~ msgstr "Error on {0}: {1}"
 
-#: ../widgets/misc/e-web-view.c:1107 ../widgets/misc/e-web-view-gtkhtml.c:983
-#, c-format
-msgid "Click to open %s"
-msgstr "Click to open %s"
+#~ msgid "Could not perform this operation."
+#~ msgstr "Could not perform this operation."
 
-#: ../widgets/misc/widgets.error.xml.h:1
-msgid "Do you wish to save your changes?"
-msgstr "Do you wish to save your changes?"
+#~ msgid "Unable to open the calendar '%s': %s"
+#~ msgstr "Unable to open the calendar '%s': %s"
 
-#: ../widgets/misc/widgets.error.xml.h:2
-msgid "This signature has been changed, but has not been saved."
-msgstr "This signature has been changed, but has not been saved."
+#~ msgid "Unable to open memos in '%s': %s"
+#~ msgstr "Unable to open memos in '%s': %s"
 
-#: ../widgets/misc/widgets.error.xml.h:3
-msgid "_Discard changes"
-msgstr "_Discard changes"
+#~ msgid "Unable to open tasks in '%s': %s"
+#~ msgstr "Unable to open tasks in '%s': %s"
 
-#: ../widgets/misc/widgets.error.xml.h:4
-msgid "Blank Signature"
-msgstr "Blank Signature"
+#~ msgid "Opening %s"
+#~ msgstr "Opening %s"
 
-#: ../widgets/misc/widgets.error.xml.h:5
-msgid "Please provide an unique name to identify this signature."
-msgstr "Please provide an unique name to identify this signature."
+#~ msgid "List of MIME types to check for Bonobo component viewers"
+#~ msgstr "List of MIME types to check for Bonobo component viewers"
 
-#: ../widgets/misc/widgets.error.xml.h:6
-msgid "Could not load signature."
-msgstr "Could not load signature."
+#~ 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."
 
-#: ../widgets/misc/widgets.error.xml.h:7
-msgid "Could not save signature."
-msgstr "Could not save signature."
+#~ msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+#~ msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
 
-#: ../widgets/table/e-cell-combo.c:187
-msgid "popup list"
-msgstr "popup list"
+#~ msgid "SpamAssassin client binary"
+#~ msgstr "SpamAssassin client binary"
 
-#: ../widgets/table/e-cell-date-edit.c:299
-msgid "Now"
-msgstr "Now"
+#~ msgid "SpamAssassin daemon binary"
+#~ msgstr "SpamAssassin daemon binary"
 
-#. 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"
+#~ msgid "No mail exchanger record for '%s'"
+#~ msgstr "No mail exchanger record for '%s'"
 
-#: ../widgets/table/e-cell-date-edit.c:325
-msgid "OK"
-msgstr "OK"
+#~ msgid "Temporarily unable to resolve '%s'"
+#~ msgstr "Temporarily unable to resolve '%s'"
 
-#: ../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"
+#~ msgid "Error resolving '%s'"
+#~ msgstr "Error resolving '%s'"
 
-#: ../widgets/table/e-cell-percent.c:80
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "The percent value must be between 0 and 100, inclusive"
+#~ msgid "No authoritative name server for '%s'"
+#~ msgstr "No authoritative name server for '%s'"
 
-#: ../widgets/table/e-table-click-to-add.c:609
-#: ../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"
-msgstr "click to add"
+#~ msgid "Unable to create local mail folders at '%s': %s"
+#~ msgstr "Unable to create local mail folders at '%s': %s"
 
-#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
-msgid "(Ascending)"
-msgstr "(Ascending)"
+#~ msgid "Cannot open source \"{1}\"."
+#~ msgstr "Cannot open source \"{1}\"."
 
-#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
-msgid "(Descending)"
-msgstr "(Descending)"
+#~ msgid "Sent Messages"
+#~ msgstr "Sent Messages"
 
-#: ../widgets/table/e-table-config.c:400
-msgid "Not sorted"
-msgstr "Not sorted"
+#~ msgid "Path:"
+#~ msgstr "Path:"
 
-#: ../widgets/table/e-table-config.c:441
-msgid "No grouping"
-msgstr "No grouping"
+#~ msgid "Loading calendars"
+#~ msgstr "Loading calendars"
 
-#: ../widgets/table/e-table-config.c:666
-#: ../widgets/table/e-table-config.ui.h:1
-msgid "Show Fields"
-msgstr "Show Fields"
+#~ msgid "Loading memos"
+#~ msgstr "Loading memos"
 
-#: ../widgets/table/e-table-config.c:686
-msgid "Available Fields"
-msgstr "Available Fields"
+#~ msgid "Loading tasks"
+#~ msgstr "Loading tasks"
 
-#: ../widgets/table/e-table-config.ui.h:2
-msgid "A_vailable Fields:"
-msgstr "A_vailable Fields:"
+#~ msgid "IMAP Headers"
+#~ msgstr "IMAP Headers"
 
-#: ../widgets/table/e-table-config.ui.h:3
-msgid "_Show these fields in order:"
-msgstr "_Show these fields in order:"
+#~ msgid ""
+#~ "Select a predefined set of IMAP headers to fetch.\n"
+#~ "Note, larger sets of headers take longer to download."
+#~ msgstr ""
+#~ "Select a predefined set of IMAP headers to fetch.\n"
+#~ "Note, larger sets of headers take longer to download."
 
-#: ../widgets/table/e-table-config.ui.h:4
-msgid "Move _Up"
-msgstr "Move _Up"
+#~ msgid "_Fetch All Headers"
+#~ msgstr "_Fetch All Headers"
 
-#: ../widgets/table/e-table-config.ui.h:5
-msgid "Move _Down"
-msgstr "Move _Down"
+#~ msgid "_Basic Headers (fastest)"
+#~ msgstr "_Basic Headers (fastest)"
 
-#: ../widgets/table/e-table-config.ui.h:7
-msgid "_Remove"
-msgstr "_Remove"
+#~ msgid "Use this if you are not filtering any mailing lists."
+#~ msgstr "Use this if you are not filtering any mailing lists."
 
-#: ../widgets/table/e-table-config.ui.h:9
-msgid "_Show field in View"
-msgstr "_Show field in View"
+#~ msgid "Basic and _Mailing List Headers (default)"
+#~ msgstr "Basic and _Mailing List Headers (default)"
 
-#: ../widgets/table/e-table-config.ui.h:10
-#: ../widgets/table/e-table-header-item.c:1736
-msgid "Ascending"
-msgstr "Ascending"
+#~ msgid "Custom Headers"
+#~ msgstr "Custom Headers"
 
-#: ../widgets/table/e-table-config.ui.h:11
-#: ../widgets/table/e-table-header-item.c:1736
-msgid "Descending"
-msgstr "Descending"
+#~ msgid ""
+#~ "Specify any extra headers to fetch in addition to the predefined set of "
+#~ "headers selected above."
+#~ msgstr ""
+#~ "Specify any extra headers to fetch in addition to the predefined set of "
+#~ "headers selected above."
 
-#: ../widgets/table/e-table-config.ui.h:12
-msgid "Group Items By"
-msgstr "Group Items By"
+#~ msgid "A_ccept"
+#~ msgstr "A_ccept"
 
-#: ../widgets/table/e-table-config.ui.h:13
-msgid "Show _field in View"
-msgstr "Show _field in View"
+#~ msgid "Failed to load the calendar '%s' (%s)"
+#~ msgstr "Failed to load the calendar '%s' (%s)"
 
-#: ../widgets/table/e-table-config.ui.h:14
-msgid "Then By"
-msgstr "Then By"
+#~ msgid "Proxy _Logout"
+#~ msgstr "Proxy _Logout"
 
-#: ../widgets/table/e-table-config.ui.h:15
-msgid "Show field i_n View"
-msgstr "Show field i_n View"
+#~ msgid "_Inspect..."
+#~ msgstr "_Inspect…"
 
-#: ../widgets/table/e-table-config.ui.h:16
-msgid "Show field in _View"
-msgstr "Show field in _View"
+#~ msgid "Inspect the HTML content (debugging feature)"
+#~ msgstr "Inspect the HTML content (debugging feature)"
 
-#: ../widgets/table/e-table-config.ui.h:17
-msgid "Clear _All"
-msgstr "Clear _All"
+#~ msgid "Unknown error."
+#~ msgstr "Unknown error."
 
-#: ../widgets/table/e-table-config.ui.h:18
-msgid "Sort"
-msgstr "Sort"
+#~ msgid "Could not publish calendar: Calendar backend no longer exists"
+#~ msgstr "Could not publish calendar: Calendar backend no longer exists"
 
-#: ../widgets/table/e-table-config.ui.h:19
-msgid "Sort Items By"
-msgstr "Sort Items By"
+#~ msgid "File is not a valid .desktop file"
+#~ msgstr "File is not a valid .desktop file"
 
-#: ../widgets/table/e-table-config.ui.h:20
-msgid "Clear All"
-msgstr "Clear All"
+#~ msgid "Unrecognized desktop file Version '%s'"
+#~ msgstr "Unrecognised desktop file Version '%s'"
 
-#: ../widgets/table/e-table-config.ui.h:21
-msgid "_Sort..."
-msgstr "_Sort…"
+#~ msgid "Starting %s"
+#~ msgstr "Starting %s"
 
-#: ../widgets/table/e-table-config.ui.h:22
-msgid "_Group By..."
-msgstr "_Group By…"
+#~ msgid "Application does not accept documents on command line"
+#~ msgstr "Application does not accept documents on command line"
 
-#: ../widgets/table/e-table-config.ui.h:23
-msgid "_Fields Shown..."
-msgstr "_Fields Shown…"
+#~ msgid "Unrecognized launch option: %d"
+#~ msgstr "Unrecognised launch option: %d"
 
-#: ../widgets/table/e-table-field-chooser.c:152
-msgid ""
-"To add a column to your table, drag it into\n"
-"the location in which you want it to appear."
-msgstr ""
-"To add a column to your table, drag it into\n"
-"the location in which you want it to appear."
+#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+#~ msgstr "Can't pass document URIs to a 'Type=Link' desktop entry"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:224
-msgid "Add a Column"
-msgstr "Add a Column"
+#~ msgid "Not a launchable item"
+#~ msgstr "Not a launchable item"
 
-#. Translators: This text is used as a special row when an ETable
-#. * has turned on grouping on a column, which has set a title.
-#. * The first %s is replaced with a column title.
-#. * The second %s is replaced with an actual  group value.
-#. * Finally the %d is replaced with count of items in this group.
-#. * Example: "Family name: Smith (13 items)"
-#.
-#: ../widgets/table/e-table-group-container.c:360
-#, c-format
-msgid "%s: %s (%d item)"
-msgid_plural "%s: %s (%d items)"
-msgstr[0] "%s: %s (%d item)"
-msgstr[1] "%s: %s (%d items)"
+#~ msgid "Disable connection to session manager"
+#~ msgstr "Disable connection to session manager"
 
-#. Translators: This text is used as a special row when an ETable
-#. * has turned on grouping on a column, which doesn't have set a title.
-#. * The %s is replaced with an actual group value.
-#. * The %d is replaced with count of items in this group.
-#. * Example: "Smith (13 items)"
-#.
-#: ../widgets/table/e-table-group-container.c:372
-#, c-format
-msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d item)"
-msgstr[1] "%s (%d items)"
+#~ msgid "Specify file containing saved configuration"
+#~ msgstr "Specify file containing saved configuration"
 
-#: ../widgets/table/e-table-header-item.c:1574
-msgid "Customize Current View"
-msgstr "Customise Current View"
+#~ msgid "FILE"
+#~ msgstr "FILE"
 
-#: ../widgets/table/e-table-header-item.c:1596
-msgid "Sort _Ascending"
-msgstr "Sort _Ascending"
+#~ msgid "Specify session management ID"
+#~ msgstr "Specify session management ID"
 
-#: ../widgets/table/e-table-header-item.c:1599
-msgid "Sort _Descending"
-msgstr "Sort _Descending"
+#~ msgid "ID"
+#~ msgstr "ID"
 
-#: ../widgets/table/e-table-header-item.c:1602
-msgid "_Unsort"
-msgstr "_Unsort"
+#~ msgid "Session management options:"
+#~ msgstr "Session management options:"
 
-#: ../widgets/table/e-table-header-item.c:1605
-msgid "Group By This _Field"
-msgstr "Group By This _Field"
+#~ msgid "Show session management options"
+#~ msgstr "Show session management options"
 
-#: ../widgets/table/e-table-header-item.c:1608
-msgid "Group By _Box"
-msgstr "Group By _Box"
+#~ msgid "Certificate Viewer: %s"
+#~ msgstr "Certificate Viewer: %s"
 
-#: ../widgets/table/e-table-header-item.c:1612
-msgid "Remove This _Column"
-msgstr "Remove This _Column"
+#~ msgid "Anonymously"
+#~ msgstr "Anonymously"
 
-#: ../widgets/table/e-table-header-item.c:1615
-msgid "Add a C_olumn..."
-msgstr "Add a C_olumn…"
+#~ msgid "One"
+#~ msgstr "One"
 
-#: ../widgets/table/e-table-header-item.c:1619
-msgid "A_lignment"
-msgstr "A_lignment"
+#~ msgid "Sub"
+#~ msgstr "Sub"
 
-#: ../widgets/table/e-table-header-item.c:1622
-msgid "B_est Fit"
-msgstr "B_est Fit"
+#~ msgid "Supported Search Bases"
+#~ msgstr "Supported Search Bases"
 
-#: ../widgets/table/e-table-header-item.c:1625
-msgid "Format Column_s..."
-msgstr "Format Column_s…"
+#~ msgid "Ser_ver:"
+#~ msgstr "Ser_ver:"
 
-#: ../widgets/table/e-table-header-item.c:1629
-msgid "Custo_mize Current View..."
-msgstr "Custo_mise Current View…"
+#~ msgid "Use secure _connection:"
+#~ msgstr "Use secure _connection:"
 
-#: ../widgets/table/e-table-header-item.c:1691
-msgid "_Sort By"
-msgstr "_Sort By"
+#~ msgid "_Login method:"
+#~ msgstr "_Login method:"
 
-#. Custom
-#: ../widgets/table/e-table-header-item.c:1709
-msgid "_Custom"
-msgstr "_Custom"
+#~ msgid "Lo_gin:"
+#~ msgstr "Lo_gin:"
 
-#: ../widgets/table/gal-a11y-e-cell.c:123
-msgid "Table Cell"
-msgstr "Table Cell"
+#~ msgid "Search _base:"
+#~ msgstr "Search _base:"
 
-#. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:125
-msgid "popup a child"
-msgstr "pop up a child"
+#~ msgid "_Search scope:"
+#~ msgstr "_Search scope:"
 
-#. Translators: description of a "toggle" action
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
-msgid "toggle the cell"
-msgstr "toggle the cell"
+#~ msgid "_Find Possible Search Bases"
+#~ msgstr "_Find Possible Search Bases"
 
-#. Translators: description of an "expand" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:214
-msgid "expands the row in the ETree containing this cell"
-msgstr "expands the row in the ETree containing this cell"
+#~ msgid "S_earch filter:"
+#~ msgstr "S_earch filter:"
 
-#. Translators: description of a "collapse" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:221
-msgid "collapses the row in the ETree containing this cell"
-msgstr "collapses the row in the ETree containing this cell"
+#~ msgid "Search Filter"
+#~ msgstr "Search Filter"
 
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
-msgid "click"
-msgstr "click"
+#~ 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\"."
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:161
-msgid "sort"
-msgstr "sort"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../widgets/text/e-text.c:2074
-msgid "Select All"
-msgstr "Select All"
+#~ msgid "5"
+#~ msgstr "5"
 
-#: ../widgets/text/e-text.c:2087
-msgid "Input Methods"
-msgstr "Input Methods"
+#~ msgid "_Timeout:"
+#~ msgstr "_Timeout:"
 
-#~ msgid "Proxy _Logout"
-#~ msgstr "Proxy _Logout"
+#~ msgid "_Download limit:"
+#~ msgstr "_Download limit:"
+
+#~ msgid "B_rowse this book until limit reached"
+#~ msgstr "B_rowse this book until limit reached"
 
 #~ msgid "Some features may not work properly with your current server"
 #~ msgstr "Some features may not work properly with your current server"
@@ -23021,9 +23172,6 @@ msgstr "Input Methods"
 #~ msgid "None"
 #~ msgstr "None"
 
-#~ msgid "Custom Alarm:"
-#~ msgstr "Custom Alarm:"
-
 #~ msgid "_Alarm"
 #~ msgstr "_Alarm"
 
@@ -23166,9 +23314,6 @@ msgstr "Input Methods"
 #~ msgid "Retract Mail"
 #~ msgstr "Retract Mail"
 
-#~ msgid "Accept"
-#~ msgstr "Accept"
-
 #~ msgid "Accept Tentatively"
 #~ msgstr "Accept Tentatively"
 
@@ -25173,9 +25318,6 @@ msgstr "Input Methods"
 #~ msgid "Frozen"
 #~ msgstr "Frozen"
 
-#~ msgid "Table header"
-#~ msgstr "Table header"
-
 #~ msgid "Table model"
 #~ msgstr "Table model"
 
@@ -25625,9 +25767,6 @@ msgstr "Input Methods"
 #~ msgid "Evolution Information"
 #~ msgstr "Evolution Information"
 
-#~ msgid "Evolution Query"
-#~ msgstr "Evolution Query"
-
 #~ msgid "Overwrite file?"
 #~ msgstr "Overwrite file?"
 
@@ -25832,12 +25971,6 @@ msgstr "Input Methods"
 #~ "Using distinguished name (DN)"
 
 #~ msgid ""
-#~ "Evolution will use this email address to authenticate you with the server."
-#~ msgstr ""
-#~ "Evolution will use this e-mail address to authenticate you with the "
-#~ "server."
-
-#~ msgid ""
 #~ "One\n"
 #~ "Sub"
 #~ msgstr ""
@@ -26097,9 +26230,6 @@ msgstr "Input Methods"
 #~ msgid "C_alendar:"
 #~ msgstr "C_alendar:"
 
-#~ msgid "Co_ntacts:"
-#~ msgstr "Co_ntacts:"
-
 #~ msgid "Delegates"
 #~ msgstr "Delegates"
 
@@ -26935,9 +27065,6 @@ msgstr "Input Methods"
 #~ msgid "P_rint..."
 #~ msgstr "P_rint…"
 
-#~ msgid "C_ut"
-#~ msgstr "C_ut"
-
 #~ msgid "_Forward as iCalendar"
 #~ msgstr "_Forward as iCalendar"
 
@@ -27259,9 +27386,6 @@ msgstr "Input Methods"
 #~ msgid "Evolution Shell Config factory"
 #~ msgstr "Evolution Shell Config factory"
 
-#~ msgid "Evolution Test"
-#~ msgstr "Evolution Test"
-
 #~ msgid "Evolution Test component"
 #~ msgstr "Evolution Test component"
 
@@ -27482,9 +27606,6 @@ msgstr "Input Methods"
 #~ msgid "Column width"
 #~ msgstr "Column width"
 
-#~ msgid "Search"
-#~ msgstr "Search"
-
 #~ msgid "_Clear"
 #~ msgstr "_Clear"
 
@@ -28313,9 +28434,6 @@ msgstr "Input Methods"
 #~ msgid "Height:"
 #~ msgstr "Height:"
 
-#~ msgid "Immediately follow each other"
-#~ msgstr "Immediately follow each other"
-
 #~ msgid "Landscape"
 #~ msgstr "Landscape"
 
@@ -28844,9 +28962,6 @@ msgstr "Input Methods"
 #~ msgid "Holiday Cards"
 #~ msgstr "Holiday Cards"
 
-#~ msgid "Hot Contacts"
-#~ msgstr "Hot Contacts"
-
 #~ msgid "Ideas"
 #~ msgstr "Ideas"
 
@@ -29060,9 +29175,6 @@ msgstr "Input Methods"
 #~ msgid "Enable attachment reminder plugin."
 #~ msgstr "Enable attachment reminder plugin."
 
-#~ msgid "_Refresh:"
-#~ msgstr "_Refresh:"
-
 #~ msgid "Gives an option to print from the composer."
 #~ msgstr "Gives an option to print from the composer."
 
@@ -29120,9 +29232,6 @@ msgstr "Input Methods"
 #~ msgid "Refresh List"
 #~ msgstr "Refresh List"
 
-#~ msgid "Refresh List of Folders"
-#~ msgstr "Refresh List of Folders"
-
 #~ msgid "Remove folder from your list of subscribed folders"
 #~ msgstr "Remove folder from your list of subscribed folders"
 
@@ -29671,9 +29780,6 @@ msgstr "Input Methods"
 #~ msgid "Select an Action"
 #~ msgstr "Select an Action"
 
-#~ msgid "Create a new contact \"%s\""
-#~ msgstr "Create a new contact \"%s\""
-
 #~ msgid "Merge E-Mail Address"
 #~ msgstr "Merge E-Mail Address"
 


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